svn commit: r2132 - in logback/trunk/logback-site/src/site/pages: . manual - logback-dev

25 Jan 2009

Author: ceki
Date: Sun Jan 25 19:33:24 2009
New Revision: 2132

Added:
   logback/trunk/logback-site/src/site/pages/manual/configuration.html
      - copied, changed from r2131, /logback/trunk/logback-site/src/site/pages/manual/joran.html
   logback/trunk/logback-site/src/site/pages/manual/onJoran.html
      - copied, changed from r2131, /logback/trunk/logback-site/src/site/pages/joran.html
Removed:
   logback/trunk/logback-site/src/site/pages/joran.html
   logback/trunk/logback-site/src/site/pages/manual/joran.html
Modified:
   logback/trunk/logback-site/src/site/pages/.htaccess
   logback/trunk/logback-site/src/site/pages/documentation.html
   logback/trunk/logback-site/src/site/pages/manual/.htaccess
   logback/trunk/logback-site/src/site/pages/manual/index.html
   logback/trunk/logback-site/src/site/pages/manual/menu.js

Log:
- rearranging the chapter on Joran (it is now part of the manual)

Modified: logback/trunk/logback-site/src/site/pages/.htaccess
==============================================================================

--- logback/trunk/logback-site/src/site/pages/.htaccess	(original)
+++ logback/trunk/logback-site/src/site/pages/.htaccess	Sun Jan 25 19:33:24 2009
@@ -1 +1,2 @@
-Redirect jmxConfig.html http://logback.qos.ch/manual/jmxConfig.html
\ No newline at end of file
+Redirect jmxConfig.html http://logback.qos.ch/manual/jmxConfig.html
+Redirect joran.html http://logback.qos.ch/manual/onJoran.html
\ No newline at end of file

Modified: logback/trunk/logback-site/src/site/pages/documentation.html
==============================================================================
--- logback/trunk/logback-site/src/site/pages/documentation.html	(original)
+++ logback/trunk/logback-site/src/site/pages/documentation.html	Sun Jan 25 19:33:24 2009
@@ -40,10 +40,6 @@
       </li>
           
       <li>
-      	<a href="joran.html">Using Joran in your applications</a>
-      </li>
-  
-      <li>
         <a href="demo.html">Walk-through logback-demo webApp</a>
       </li>    
       <li>

Modified: logback/trunk/logback-site/src/site/pages/manual/.htaccess
==============================================================================
--- logback/trunk/logback-site/src/site/pages/manual/.htaccess	(original)
+++ logback/trunk/logback-site/src/site/pages/manual/.htaccess	Sun Jan 25 19:33:24 2009
@@ -1 +1,2 @@
-Redirect contextSelector.html http://logback.qos.ch/manual/loggingSeparation.html
\ No newline at end of file
+Redirect contextSelector.html http://logback.qos.ch/manual/loggingSeparation.html
+Redirect joran.html http://logback.qos.ch/manual/configuration.html
\ No newline at end of file

Copied: logback/trunk/logback-site/src/site/pages/manual/configuration.html (from r2131, /logback/trunk/logback-site/src/site/pages/manual/joran.html)
==============================================================================
--- /logback/trunk/logback-site/src/site/pages/manual/joran.html	(original)
+++ logback/trunk/logback-site/src/site/pages/manual/configuration.html	Sun Jan 25 19:33:24 2009
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-    <title>Chapter3: Logback configuration & Joran</title>
+    <title>Chapter3: Logback configuration</title>
     
     <link rel="stylesheet" type="text/css" href="../css/common.css" />
     <link rel="stylesheet" type="text/css" href="../css/screen.css" media="screen" />
@@ -21,7 +21,7 @@
     </div>
     <div id="content" class="chapter">
       
-      <h1>Chapter 3: Logback configuration & Joran</h1>
+      <h1>Chapter 3: Logback configuration</h1>
       
     <div class="quote">
       <p><em>In symbols one observes an advantage in discovery which

Modified: logback/trunk/logback-site/src/site/pages/manual/index.html
==============================================================================
--- logback/trunk/logback-site/src/site/pages/manual/index.html	(original)
+++ logback/trunk/logback-site/src/site/pages/manual/index.html	Sun Jan 25 19:33:24 2009
@@ -36,7 +36,7 @@
         <li><p>logback configuration scripts in XML format</p></li>
         <li><p>appenders</p></li>
         <li><p>layouts</p></li>
-        <li><p>filter chains</p></li>
+        <li><p>filters</p></li>
         <li><p>mapped diagnostic contexts</p></li>
         <li><p>logback default initialization</p></li>
         <li><p>logback in Servlet Containers</p></li>
@@ -81,7 +81,7 @@
           <a href="architecture.html"><b>Chapter 2: Architecture</b></a>
         </p></li>
         <li><p>
-          <a href="joran.html"><b>Chapter 3: Logback configuration with Joran</b></a>
+          <a href="configuration.html"><b>Chapter 3: Configuration</b></a>
         </p></li>
         
         <li><p>
@@ -107,6 +107,11 @@
         <li><p>
           <a href="jmxConfigurator.html"><b>Chapter 9: JMX Configurator</b></a>
         </p></li>
+
+        <li><p>
+          <a href="onJoran.html"><b>Chapter 10: Joran</b></a>
+        </p></li>
+
       </ul>
     </div>
 

Modified: logback/trunk/logback-site/src/site/pages/manual/menu.js
==============================================================================
--- logback/trunk/logback-site/src/site/pages/manual/menu.js	(original)
+++ logback/trunk/logback-site/src/site/pages/manual/menu.js	Sun Jan 25 19:33:24 2009
@@ -2,10 +2,11 @@
 document.write('<p class="menu_header">Chapter Index</p>')
 document.write('<p class="menu"><a href="introduction.html"><b>Ch1: Introduction to logback</b></a></p>');
 document.write('<p class="menu"><a href="architecture.html"><b>Ch2: Architecture</b></a>');
-document.write('<p class="menu"><a href="joran.html"><b>Ch3: Logback configuration with Joran</b></a>');
+document.write('<p class="menu"><a href="configuration.html"><b>Ch3: Configuration</b></a>');
 document.write('<p class="menu"><a href="appenders.html"><b>Ch4: Appenders</b></a>');
 document.write('<p class="menu"><a href="layouts.html"><b>Ch5: Layouts</b></a>');
 document.write('<p class="menu"><a href="filters.html"><b>Ch6: Filter chains</b></a>');
 document.write('<p class="menu"><a href="mdc.html"><b>Ch7: Mapped Diagnostic Contexts</b></a>');
 document.write('<p class="menu"><a href="loggingSeparation.html"><b>Ch8: Logging Separation</b></a>');
 document.write('<p class="menu"><a href="jmxConfig.html"><b>Ch9: JMX Configurator</b></a>');
+document.write('<p class="menu"><a href="onJoran.html"><b>Ch9: Joran</b></a>');

Copied: logback/trunk/logback-site/src/site/pages/manual/onJoran.html (from r2131, /logback/trunk/logback-site/src/site/pages/joran.html)
==============================================================================
--- /logback/trunk/logback-site/src/site/pages/joran.html	(original)
+++ logback/trunk/logback-site/src/site/pages/manual/onJoran.html	Sun Jan 25 19:33:24 2009
@@ -4,25 +4,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-    <title>Using Joran</title>
-    <link rel="stylesheet" type="text/css" href="css/common.css" />
-    <link rel="stylesheet" type="text/css" href="css/screen.css" media="screen" />
-    <link rel="stylesheet" type="text/css" href="css/_print.css" media="print" />
+    <title>Joran</title>
+    <link rel="stylesheet" type="text/css" href="../css/common.css" />
+    <link rel="stylesheet" type="text/css" href="../css/screen.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="../css/_print.css" media="print" />
 
   </head>
   <body>
-    <script type="text/javascript">prefix='./'</script>
-    <script type="text/javascript" src="templates/header.js"></script>
+   <script type="text/javascript">
+      prefix='../';	
+    </script>
+    <script src="../templates/header.js" type="text/javascript"></script>
     <div id="left">
-      <script type="text/javascript" src="templates/left.js"></script>
+      <script src="../templates/left.js" type="text/javascript"></script>
+    </div>
+    <div id="right">
+      <script src="menu.js" type="text/javascript"></script>
     </div>
     <div id="content">
       
-    <h2>Using Joran in your own applications</h2>
+    <h2>Joran in your own applications</h2>
 
     <p>As we've seen, logback relies on Joran, a mature, flexible and
     powerful configuration framework. Many of the capabilities offered
-    by logback modules are possible with the help of Joran.
+    by logback modules are only possible on account of Joran.
     </p>
 
     <p>Joran is actually a generic configuration system which can be

    

svn commit: r2132 - in logback/trunk/logback-site/src/site/pages: . manual

noreply.ceki＠qos.ch

tags

participants (1)