Author: bodewig
Date: Tue Jan 14 08:14:04 2014
New Revision: 1557966
URL: http://svn.apache.org/r1557966
Log:
merge fix for LOG4NET-417 from 1.2.x branch
Modified:
logging/log4net/trunk/doc/site/src/ (props changed)
logging/log4net/trunk/doc/site/src/xdoc/release/example-apps.xml
logging/log4net/trunk/doc/site/src/xdoc/release/faq.xml
logging/log4net/trunk/doc/site/src/xdoc/release/manual/configuration.xml
logging/log4net/trunk/doc/site/src/xdoc/release/release-notes.xml
Propchange: logging/log4net/trunk/doc/site/src/
------------------------------------------------------------------------------
Merged /logging/log4net/branches/log4net-1.2.x/src/site:r1557965
Modified: logging/log4net/trunk/doc/site/src/xdoc/release/example-apps.xml
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/doc/site/src/xdoc/release/example-apps.xml?rev=1557966&r1=1557965&r2=1557966&view=diff
==============================================================================
--- logging/log4net/trunk/doc/site/src/xdoc/release/example-apps.xml (original)
+++ logging/log4net/trunk/doc/site/src/xdoc/release/example-apps.xml Tue Jan 14
08:14:04 2014
@@ -30,7 +30,7 @@ limitations under the License.
<section id="overview" name="Overview">
<p>
<strong>The following examples are only available in the
log4net source download, not
- on-line. To obtain the examples <a
href="../download.html">download</a> the log4net source release.
+ on-line. To obtain the examples <a
href="../download_log4net.cgi">download</a> the log4net source release.
</strong>
</p>
</section>
Modified: logging/log4net/trunk/doc/site/src/xdoc/release/faq.xml
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/doc/site/src/xdoc/release/faq.xml?rev=1557966&r1=1557965&r2=1557966&view=diff
==============================================================================
--- logging/log4net/trunk/doc/site/src/xdoc/release/faq.xml (original)
+++ logging/log4net/trunk/doc/site/src/xdoc/release/faq.xml Tue Jan 14 08:14:04
2014
@@ -138,7 +138,7 @@ limitations under the License.
log4net supports multiple output appenders per
logger.</li>
</ul>
<p>
- See the <a href="../features.html">features</a>
overview document for more information on the features of log4net.
+ See the <a href="features.html">features</a> overview
document for more information on the features of log4net.
</p>
</section>
<p><a href="#top">Back to Top</a></p>
Modified:
logging/log4net/trunk/doc/site/src/xdoc/release/manual/configuration.xml
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/doc/site/src/xdoc/release/manual/configuration.xml?rev=1557966&r1=1557965&r2=1557966&view=diff
==============================================================================
--- logging/log4net/trunk/doc/site/src/xdoc/release/manual/configuration.xml
(original)
+++ logging/log4net/trunk/doc/site/src/xdoc/release/manual/configuration.xml
Tue Jan 14 08:14:04 2014
@@ -793,7 +793,7 @@ DEBUG [main] (Bar.cs:12) - Doing it agai
<p>
For examples of configuring appenders see the
- <a href="example-config-appender.html">Example
Appender Configuration</a>
+ <a href="../config-examples.html">Example Appender
Configuration</a>
document.
</p>
Modified: logging/log4net/trunk/doc/site/src/xdoc/release/release-notes.xml
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/doc/site/src/xdoc/release/release-notes.xml?rev=1557966&r1=1557965&r2=1557966&view=diff
==============================================================================
--- logging/log4net/trunk/doc/site/src/xdoc/release/release-notes.xml (original)
+++ logging/log4net/trunk/doc/site/src/xdoc/release/release-notes.xml Tue Jan
14 08:14:04 2014
@@ -790,7 +790,7 @@ public class SpecialFolderPatternConvert
<h3>Features document</h3>
<p>
Added a new document that covers the main features
of log4net.
- See the <a href="doc/features.html">features</a>
+ See the <a href="features.html">features</a>
document for more information.
</p>
<h3>Hierarchy disabled until it is configured</h3>
@@ -824,7 +824,7 @@ public class SpecialFolderPatternConvert
</p>
<h3>Added document with example appender
configurations</h3>
<p>
- See the <a
href="doc/manual/example-config-appender.html">Example Appender
Configuration</a>
+ See the <a href="config-examples.html">Example
Appender Configuration</a>
document for more information.
</p>
</section>
@@ -866,7 +866,7 @@ public class SpecialFolderPatternConvert
<br />
<p>
Not all frameworks are created equal and some
features have been excluded from
- some of the builds. See the <a
href="doc/manual/framework-support.html">Framework Support</a> document for
more information.
+ some of the builds. See the <a
href="framework-support.html">Framework Support</a> document for more
information.
</p>
<h3>New build system using NAnt</h3>
<p>
