Return-Path: 
 <commits-return-3302-apmail-logging-commits-archive=logging.apache.org@logging.apache.org>
X-Original-To: apmail-logging-commits-archive@minotaur.apache.org
Delivered-To: apmail-logging-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id AD16310F34
	for <apmail-logging-commits-archive@minotaur.apache.org>;
 Tue, 14 Jan 2014 08:14:33 +0000 (UTC)
Received: (qmail 57130 invoked by uid 500); 14 Jan 2014 08:14:32 -0000
Delivered-To: apmail-logging-commits-archive@logging.apache.org
Received: (qmail 57094 invoked by uid 500); 14 Jan 2014 08:14:30 -0000
Mailing-List: contact commits-help@logging.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@logging.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@logging.apache.org>
List-Post: <mailto:commits@logging.apache.org>
List-Id: <commits.logging.apache.org>
Reply-To: dev@logging.apache.org
Delivered-To: mailing list commits@logging.apache.org
Received: (qmail 57085 invoked by uid 99); 14 Jan 2014 08:14:29 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jan 2014 08:14:29 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jan 2014 08:14:26 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 67D1623888FE;
	Tue, 14 Jan 2014 08:14:05 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1557966 - in /logging/log4net/trunk/doc/site/src: ./
 xdoc/release/example-apps.xml xdoc/release/faq.xml
 xdoc/release/manual/configuration.xml xdoc/release/release-notes.xml
Date: Tue, 14 Jan 2014 08:14:05 -0000
To: commits@logging.apache.org
From: bodewig@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140114081405.67D1623888FE@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>