Author: bodewig
Date: Tue Oct 11 10:27:41 2011
New Revision: 1181687

URL: http://svn.apache.org/viewvc?rev=1181687&view=rev
Log:
proper trademark attribution for Microsoft(R) .NET

Modified:
    logging/log4net/trunk/log4net.build
    logging/log4net/trunk/src/site/xdoc/history.xml
    logging/log4net/trunk/src/site/xdoc/index.xml
    logging/log4net/trunk/src/site/xdoc/release/example-apps.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/framework-support.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/log4net.build
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/log4net.build?rev=1181687&r1=1181686&r2=1181687&view=diff
==============================================================================
--- logging/log4net/trunk/log4net.build (original)
+++ logging/log4net/trunk/log4net.build Tue Oct 11 10:27:41 2011
@@ -1146,7 +1146,7 @@ limitations under the License.
       The log4net CLI 1.0 assembly is runtime compatible with the
       following frameworks:
 
-      * Microsoft .NET Framework 1.0 (and higher)
+      * Microsoft(R) .NET Framework 1.0 (and higher)
       * Mono 1.0 (and higher)
 
       We only provide this "flavor" of log4net in release

Modified: logging/log4net/trunk/src/site/xdoc/history.xml
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/site/xdoc/history.xml?rev=1181687&r1=1181686&r2=1181687&view=diff
==============================================================================
--- logging/log4net/trunk/src/site/xdoc/history.xml (original)
+++ logging/log4net/trunk/src/site/xdoc/history.xml Tue Oct 11 10:27:41 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&#xae; .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=1181687&r1=1181686&r2=1181687&view=diff
==============================================================================
--- logging/log4net/trunk/src/site/xdoc/index.xml (original)
+++ logging/log4net/trunk/src/site/xdoc/index.xml Tue Oct 11 10:27:41 2011
@@ -30,7 +30,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 
-                    .NET runtime. We have kept the framework similar in spirit to the original log4j 
+                    Microsoft&#xae; .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.
                 </p>

Modified: logging/log4net/trunk/src/site/xdoc/release/example-apps.xml
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/site/xdoc/release/example-apps.xml?rev=1181687&r1=1181686&r2=1181687&view=diff
==============================================================================
--- logging/log4net/trunk/src/site/xdoc/release/example-apps.xml (original)
+++ logging/log4net/trunk/src/site/xdoc/release/example-apps.xml Tue Oct 11 10:27:41 2011
@@ -44,7 +44,7 @@ limitations under the License.
                     <p>
                         For example running <span class="code">nant</span> in the 
                         <span class="code">examples\net\1.0\Tutorials\ConsoleApp\cs</span> directory
-                        will build the C# version of the .NET 1.0 ConsoleApp example.
+                        will build the C# version of the Microsoft&#xae; .NET 1.0 ConsoleApp example.
                     </p>
                     <p>
                         <span class="code">nant</span> can be run in any directory containing a

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=1181687&r1=1181686&r2=1181687&view=diff
==============================================================================
--- logging/log4net/trunk/src/site/xdoc/release/faq.xml (original)
+++ logging/log4net/trunk/src/site/xdoc/release/faq.xml Tue Oct 11 10:27:41 2011
@@ -88,7 +88,7 @@ limitations under the License.
                     <p>
                         log4net runs on many different frameworks and each framework has its own requirements.
                         As a rule of thumb you will need an ECMA-335 compliant CLI runtime, for example, 
-                        the Microsoft .NET runtime 1.0 (1.0.3705) or 1.1 (1.1.4322).
+                        the Microsoft&#xae; .NET runtime 1.0 (1.0.3705) or 1.1 (1.1.4322).
                     </p>
                     <p>
                         Not all frameworks are created equal and some features have been excluded from 

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=1181687&r1=1181686&r2=1181687&view=diff
==============================================================================
--- logging/log4net/trunk/src/site/xdoc/release/features.xml (original)
+++ logging/log4net/trunk/src/site/xdoc/release/features.xml Tue Oct 11 10:27:41 2011
@@ -69,7 +69,7 @@ limitations under the License.
                     log4net has specific builds for the following frameworks:
                 </p>
                 <ul>
-                    <li>Microsoft .NET Framework 1.0</li>
+                    <li>Microsoft&#xae; .NET Framework 1.0</li>
                     <li>Microsoft .NET Framework 1.1</li>
                     <li>Microsoft .NET Framework 2.0</li>
                     <li>Microsoft .NET Framework 3.5</li>

Modified: logging/log4net/trunk/src/site/xdoc/release/framework-support.xml
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/site/xdoc/release/framework-support.xml?rev=1181687&r1=1181686&r2=1181687&view=diff
==============================================================================
--- logging/log4net/trunk/src/site/xdoc/release/framework-support.xml (original)
+++ logging/log4net/trunk/src/site/xdoc/release/framework-support.xml Tue Oct 11 10:27:41 2011
@@ -41,7 +41,7 @@ limitations under the License.
                 <p>
                     While the number of different builds available may seem confusing, you only need to select the
                     nearest build for your platform that is equal to or earlier than your chosen deployment framework.
-                    If you intend to deploy your application on the Microsoft .NET Framework 1.0 don't pick the
+                    If you intend to deploy your application on the Microsoft&#xae; .NET Framework 1.0 don't pick the
                     log4net build that is built against the Microsoft .NET Framework 1.1 because the .NET framework
                     does not guarantee forward compatibility only backward compatibility.
                 </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=1181687&r1=1181686&r2=1181687&view=diff
==============================================================================
--- logging/log4net/trunk/src/site/xdoc/release/manual/introduction.xml (original)
+++ logging/log4net/trunk/src/site/xdoc/release/manual/introduction.xml Tue Oct 11 10:27:41 2011
@@ -81,7 +81,7 @@ limitations under the License.
                     assembly targeting that framework is built:
                 </p>
                 <ul>
-                    <li>Microsoft .NET Framework 1.0</li>
+                    <li>Microsoft&#xae; .NET Framework 1.0</li>
                     <li>Microsoft .NET Framework 1.1</li>
                     <li>Microsoft .NET Framework 2.0</li>
                     <li>Microsoft .NET Framework 3.5</li>

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=1181687&r1=1181686&r2=1181687&view=diff
==============================================================================
--- logging/log4net/trunk/src/site/xdoc/release/release-notes.xml (original)
+++ logging/log4net/trunk/src/site/xdoc/release/release-notes.xml Tue Oct 11 10:27:41 2011
@@ -31,7 +31,7 @@ limitations under the License.
           <section id="1.2.11" name="1.2.11">
             <p>
               log4net 1.2.11 is not only a bugfix release, it also
-              adds support for .NET 4.0 as well as the client profiles
+              adds support for Microsoft&#xae; .NET 4.0 as well as the client profiles
               of .NET 3.5 and .NET 4.0.
             </p>