Author: bodewig
Date: Wed Oct 12 04:17:13 2011
New Revision: 1182196
URL: http://svn.apache.org/viewvc?rev=1182196&view=rev
Log:
trademark attributions for log4j
Modified:
logging/log4net/trunk/src/site/xdoc/history.xml
logging/log4net/trunk/src/site/xdoc/index.xml
logging/log4net/trunk/src/site/xdoc/release/faq.xml
logging/log4net/trunk/src/site/xdoc/release/features.xml
logging/log4net/trunk/src/site/xdoc/release/howto/chainsaw.xml
logging/log4net/trunk/src/site/xdoc/release/manual/introduction.xml
logging/log4net/trunk/src/site/xdoc/release/release-notes.xml
Modified: logging/log4net/trunk/src/site/xdoc/history.xml
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/site/xdoc/history.xml?rev=1182196&r1=1182195&r2=1182196&view=diff
==============================================================================
--- logging/log4net/trunk/src/site/xdoc/history.xml (original)
+++ logging/log4net/trunk/src/site/xdoc/history.xml Wed Oct 12 04:17:13 2011
@@ -30,7 +30,7 @@ limitations under the License.
<p>
The log4net project was started by <a
href="http://www.neoworks.com";>Neoworks Limited</a>
in June 2001. It was created as an internal project within
Neoworks to port the Apache
- log4j code base to the Microsoft® .NET Framework. The
code base was initially branched
+ log4j™ code base to the Microsoft® .NET Framework.
The code base was initially branched
from a pre-alpha log4j 1.2.
</p>
Modified: logging/log4net/trunk/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/site/xdoc/index.xml?rev=1182196&r1=1182195&r2=1182196&view=diff
==============================================================================
--- logging/log4net/trunk/src/site/xdoc/index.xml (original)
+++ logging/log4net/trunk/src/site/xdoc/index.xml Wed Oct 12 04:17:13 2011
@@ -29,7 +29,7 @@ limitations under the License.
<p>
The Apache log4net library is a tool to help the
programmer output log statements to a variety
- of output targets. log4net is a port of the excellent
log4j framework to the
+ of output targets. log4net is a port of the excellent
Apache log4j™ framework to the
Microsoft® .NET runtime. We have kept the framework
similar in spirit to the original log4j
while taking advantage of new features in the .NET runtime.
For more information on log4net see the <a
href="release/features.html">features</a> document.
Modified: logging/log4net/trunk/src/site/xdoc/release/faq.xml
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/site/xdoc/release/faq.xml?rev=1182196&r1=1182195&r2=1182196&view=diff
==============================================================================
--- logging/log4net/trunk/src/site/xdoc/release/faq.xml (original)
+++ logging/log4net/trunk/src/site/xdoc/release/faq.xml Wed Oct 12 04:17:13 2011
@@ -271,7 +271,7 @@ limitations under the License.
<section id="history" name="What is the history of log4net?">
<p>
- log4net is a port of the popular <a
href="http://logging.apache.org/log4j/";>log4j</a> logging library.
+ log4net is a port of the popular <a
href="http://logging.apache.org/log4j/";>Apache log4j™</a> logging
library.
The initial port was done in June 2001, since then we
have tried to remain in the
spirit of the original log4j. See the log4net <a
href="../history.html">history</a> page for more details.
</p>
Modified: logging/log4net/trunk/src/site/xdoc/release/features.xml
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/site/xdoc/release/features.xml?rev=1182196&r1=1182195&r2=1182196&view=diff
==============================================================================
--- logging/log4net/trunk/src/site/xdoc/release/features.xml (original)
+++ logging/log4net/trunk/src/site/xdoc/release/features.xml Wed Oct 12
04:17:13 2011
@@ -299,7 +299,7 @@ limitations under the License.
<section id="history" name="Proven architecture">
<p>
- log4net is based on the highly successful log4j logging
library,
+ log4net is based on the highly successful Apache
log4j™ logging library,
in development since 1996. This popular and proven
architecture has
so far been ported to 12 languages.
</p>
Modified: logging/log4net/trunk/src/site/xdoc/release/howto/chainsaw.xml
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/site/xdoc/release/howto/chainsaw.xml?rev=1182196&r1=1182195&r2=1182196&view=diff
==============================================================================
--- logging/log4net/trunk/src/site/xdoc/release/howto/chainsaw.xml (original)
+++ logging/log4net/trunk/src/site/xdoc/release/howto/chainsaw.xml Wed Oct 12
04:17:13 2011
@@ -28,7 +28,7 @@ limitations under the License.
<body>
<section id="main" name="How To view logging events using Apache log4j
Chainsaw">
<p>
- Apache log4j™ includes <a
href="http://logging.apache.org/log4j/docs/chainsaw.html";>Chainsaw™</a>
+ Apache log4j™ includes <a
href="http://logging.apache.org/log4j/docs/chainsaw.html";>Apache
Chainsaw™</a>
a graphical log viewer.
</p>
<p>
Modified: logging/log4net/trunk/src/site/xdoc/release/manual/introduction.xml
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/site/xdoc/release/manual/introduction.xml?rev=1182196&r1=1182195&r2=1182196&view=diff
==============================================================================
--- logging/log4net/trunk/src/site/xdoc/release/manual/introduction.xml
(original)
+++ logging/log4net/trunk/src/site/xdoc/release/manual/introduction.xml Wed Oct
12 04:17:13 2011
@@ -31,8 +31,8 @@ limitations under the License.
This document is based on <i>Short introduction to
log4j</i> by <i>Ceki Gülcü</i>.
</p>
<p>
- The log4net framework is based on log4j, see <a
href="http://logging.apache.org/log4j";>
- http://logging.apache.org/log4j</a> for more
information on log4j.
+ The log4net framework is based on Apache log4j™,
see <a href="http://logging.apache.org/log4j/";>
+ http://logging.apache.org/log4j/</a> for more
information on log4j.
The log4net framework, source code, binaries,
documentation, examples and related
materials are published under the terms of the
<a
href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version
2.0</a>,
Modified: logging/log4net/trunk/src/site/xdoc/release/release-notes.xml
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/site/xdoc/release/release-notes.xml?rev=1182196&r1=1182195&r2=1182196&view=diff
==============================================================================
--- logging/log4net/trunk/src/site/xdoc/release/release-notes.xml (original)
+++ logging/log4net/trunk/src/site/xdoc/release/release-notes.xml Wed Oct 12
04:17:13 2011
@@ -592,7 +592,7 @@ public class SpecialFolderPatternConvert
<h3>New Layout: XmlLayoutSchemaLog4j</h3>
<p>
This new layout formats the logging events as XML
which complies with
- the log4j event dtd. This can be used to transfer
log event from log4net
+ the Apache log4j™ event dtd. This can be
used to transfer log event from log4net
to log4j. Currently the only appender that can
communicate directly with
log4j is the <span class="code">UdpAppender</span>.
</p>
