You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by er...@apache.org on 2010/11/02 16:48:23 UTC

svn commit: r1030090 - in /james/server/trunk/src/site: ./ xdoc/

Author: eric
Date: Tue Nov  2 15:48:22 2010
New Revision: 1030090

URL: http://svn.apache.org/viewvc?rev=1030090&view=rev
Log:
Rename server v3 pages name prefix - Enhance install.xml

Added:
    james/server/trunk/src/site/xdoc/configure.xml
      - copied, changed from r1029966, james/server/trunk/src/site/xdoc/configuration.xml
    james/server/trunk/src/site/xdoc/configure_common.xml
      - copied, changed from r1029966, james/server/trunk/src/site/xdoc/configuration_common.xml
    james/server/trunk/src/site/xdoc/configure_dns.xml
      - copied unchanged from r1029966, james/server/trunk/src/site/xdoc/configuration_dns.xml
    james/server/trunk/src/site/xdoc/configure_domainlist.xml
      - copied unchanged from r1029966, james/server/trunk/src/site/xdoc/configuration_domainlist.xml
    james/server/trunk/src/site/xdoc/configure_fetchmail.xml
      - copied unchanged from r1029966, james/server/trunk/src/site/xdoc/configuration_fetchmail.xml
    james/server/trunk/src/site/xdoc/configure_imap4.xml
      - copied unchanged from r1029966, james/server/trunk/src/site/xdoc/configuration_imap4.xml
    james/server/trunk/src/site/xdoc/configure_listmanager.xml
      - copied unchanged from r1029966, james/server/trunk/src/site/xdoc/configuration_listmanager.xml
    james/server/trunk/src/site/xdoc/configure_mailetcontainer.xml
      - copied unchanged from r1029966, james/server/trunk/src/site/xdoc/configuration_mailetcontainer.xml
    james/server/trunk/src/site/xdoc/configure_mailstores.xml
      - copied unchanged from r1029966, james/server/trunk/src/site/xdoc/configuration_mailstores.xml
    james/server/trunk/src/site/xdoc/configure_nntp.xml
      - copied unchanged from r1029966, james/server/trunk/src/site/xdoc/configuration_nntp.xml
    james/server/trunk/src/site/xdoc/configure_pop3.xml
      - copied unchanged from r1029966, james/server/trunk/src/site/xdoc/configuration_pop3.xml
    james/server/trunk/src/site/xdoc/configure_remotemanager.xml
      - copied unchanged from r1029966, james/server/trunk/src/site/xdoc/configuration_remotemanager.xml
    james/server/trunk/src/site/xdoc/configure_serverwide.xml
      - copied, changed from r1029966, james/server/trunk/src/site/xdoc/configuration_serverwide.xml
    james/server/trunk/src/site/xdoc/configure_smtp_lmtp.xml
      - copied unchanged from r1029966, james/server/trunk/src/site/xdoc/configuration_smtp_lmtp.xml
    james/server/trunk/src/site/xdoc/configure_users.xml
      - copied unchanged from r1029966, james/server/trunk/src/site/xdoc/configuration_users.xml
    james/server/trunk/src/site/xdoc/dev.xml
      - copied unchanged from r1029966, james/server/trunk/src/site/xdoc/dev_architecture.xml
    james/server/trunk/src/site/xdoc/install.xml
      - copied, changed from r1029966, james/server/trunk/src/site/xdoc/installation.xml
    james/server/trunk/src/site/xdoc/manage.xml
      - copied unchanged from r1029966, james/server/trunk/src/site/xdoc/management.xml
    james/server/trunk/src/site/xdoc/manage_domains.xml
      - copied unchanged from r1029966, james/server/trunk/src/site/xdoc/management_domains.xml
    james/server/trunk/src/site/xdoc/manage_users.xml
      - copied unchanged from r1029966, james/server/trunk/src/site/xdoc/management_users.xml
    james/server/trunk/src/site/xdoc/manage_virtualusers.xml
      - copied unchanged from r1029966, james/server/trunk/src/site/xdoc/management_virtualusers.xml
    james/server/trunk/src/site/xdoc/monitor.xml
      - copied, changed from r1029966, james/server/trunk/src/site/xdoc/monitoring.xml
    james/server/trunk/src/site/xdoc/monitor_jmx.xml
      - copied unchanged from r1029966, james/server/trunk/src/site/xdoc/monitoring_jmx.xml
    james/server/trunk/src/site/xdoc/monitor_logging.xml
      - copied unchanged from r1029966, james/server/trunk/src/site/xdoc/monitoring_logging.xml
Removed:
    james/server/trunk/src/site/xdoc/configuration.xml
    james/server/trunk/src/site/xdoc/configuration_common.xml
    james/server/trunk/src/site/xdoc/configuration_dns.xml
    james/server/trunk/src/site/xdoc/configuration_domainlist.xml
    james/server/trunk/src/site/xdoc/configuration_fetchmail.xml
    james/server/trunk/src/site/xdoc/configuration_imap4.xml
    james/server/trunk/src/site/xdoc/configuration_listmanager.xml
    james/server/trunk/src/site/xdoc/configuration_mailetcontainer.xml
    james/server/trunk/src/site/xdoc/configuration_mailstores.xml
    james/server/trunk/src/site/xdoc/configuration_nntp.xml
    james/server/trunk/src/site/xdoc/configuration_pop3.xml
    james/server/trunk/src/site/xdoc/configuration_remotemanager.xml
    james/server/trunk/src/site/xdoc/configuration_serverwide.xml
    james/server/trunk/src/site/xdoc/configuration_smtp_lmtp.xml
    james/server/trunk/src/site/xdoc/configuration_users.xml
    james/server/trunk/src/site/xdoc/dev_architecture.xml
    james/server/trunk/src/site/xdoc/installation.xml
    james/server/trunk/src/site/xdoc/management.xml
    james/server/trunk/src/site/xdoc/management_domains.xml
    james/server/trunk/src/site/xdoc/management_users.xml
    james/server/trunk/src/site/xdoc/management_virtualusers.xml
    james/server/trunk/src/site/xdoc/monitoring.xml
    james/server/trunk/src/site/xdoc/monitoring_jmx.xml
    james/server/trunk/src/site/xdoc/monitoring_logging.xml
Modified:
    james/server/trunk/src/site/site.xml
    james/server/trunk/src/site/xdoc/dev_build.xml
    james/server/trunk/src/site/xdoc/dev_custom_mailet.xml
    james/server/trunk/src/site/xdoc/dev_custom_matcher.xml
    james/server/trunk/src/site/xdoc/dev_provided_mailets.xml
    james/server/trunk/src/site/xdoc/dev_provided_matchers.xml
    james/server/trunk/src/site/xdoc/feature_mailetcontainer.xml
    james/server/trunk/src/site/xdoc/feature_summary.xml
    james/server/trunk/src/site/xdoc/index.xml

Modified: james/server/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/site.xml?rev=1030090&r1=1030089&r2=1030090&view=diff
==============================================================================
--- james/server/trunk/src/site/site.xml (original)
+++ james/server/trunk/src/site/site.xml Tue Nov  2 15:48:22 2010
@@ -55,36 +55,36 @@
     </menu>
     
     <menu name="User Manual">
-      <item name="1. Install James" href="/installation.html" />
-      <item name="2. Configure James" href="/configuration.html" collapse="true" >
-        <item name="Server-wide" href="/configuration_serverwide.html" />
-        <item name="Domain List" href="/configuration_domainlist.html" />
-        <item name="Users" href="/configuration_users.html" />
-        <item name="Mail Stores" href="/configuration_mailstores.html" />
-        <item name="DNS" href="/configuration_dns.html" />
-        <item name="IMAP4" href="/configuration_imap4.html" />
-        <item name="POP3" href="/configuration_pop3.html" />
-        <item name="SMTP LMTP" href="/configuration_smtp_lmtp.html" />
-        <item name="Mailet Container" href="/configuration_mailetcontainer.html" />
-        <item name="FetchMail" href="/configuration_fetchmail.html" />
-        <item name="Remote Manager" href="/configuration_remotemanager.html" />
-        <item name="List Manager" href="/configuration_listmanager.html" />
-        <item name="Common Configs" href="/configuration_common.html" />
+      <item name="1. Install James" href="/install.html" />
+      <item name="2. Configure James" href="/configure.html" collapse="true" >
+        <item name="Server-wide" href="/configure_serverwide.html" />
+        <item name="Domain List" href="/configure_domainlist.html" />
+        <item name="Users" href="/configure_users.html" />
+        <item name="Mail Stores" href="/configure_mailstores.html" />
+        <item name="DNS" href="/configure_dns.html" />
+        <item name="IMAP4" href="/configure_imap4.html" />
+        <item name="POP3" href="/configure_pop3.html" />
+        <item name="SMTP LMTP" href="/configure_smtp_lmtp.html" />
+        <item name="Mailet Container" href="/configure_mailetcontainer.html" />
+        <item name="FetchMail" href="/configure_fetchmail.html" />
+        <item name="Remote Manager" href="/configure_remotemanager.html" />
+        <item name="List Manager" href="/configure_listmanager.html" />
+        <item name="Common Configs" href="/configure_common.html" />
       </item>
-      <item name="3. Manage James" href="/management.html" collapse="true" >
-        <item name="Domains" href="/management_domains.html" />
-        <item name="Users" href="/management_users.html" />
-        <item name="Virtual Users" href="/management_virtualusers.html" />
+      <item name="3. Manage James" href="/manage.html" collapse="true" >
+        <item name="Domains" href="/manage_domains.html" />
+        <item name="Users" href="/manage_users.html" />
+        <item name="Virtual Users" href="/manage_virtualusers.html" />
       </item>
-      <item name="4. Monitor James" href="/monitoring.html" collapse="true" >
-        <item name="Logging" href="/monitoring_logging.html" />
-        <item name="JMX" href="/monitoring_jmx.html" />
+      <item name="4. Monitor James" href="/monitor.html" collapse="true" >
+        <item name="Logging" href="/monitor_logging.html" />
+        <item name="JMX" href="/monitor_jmx.html" />
       </item>
       <item name="5. Upgrade from James 2.3" href="/upgrade_2.3.html" />
     </menu>
 
     <menu name="Developers Corner">
-      <item name="Architecture" href="/dev_architecture.html" />
+      <item name="Architecture" href="/dev.html" />
       <item name="Build from source" href="/dev_build.html" />
       <item name="Provided Mailets" href="/dev_provided_mailets.html" />
       <item name="Provided Matchers" href="/dev_provided_matchers.html" />

Copied: james/server/trunk/src/site/xdoc/configure.xml (from r1029966, james/server/trunk/src/site/xdoc/configuration.xml)
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/configure.xml?p2=james/server/trunk/src/site/xdoc/configure.xml&p1=james/server/trunk/src/site/xdoc/configuration.xml&r1=1029966&r2=1030090&rev=1030090&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/configuration.xml (original)
+++ james/server/trunk/src/site/xdoc/configure.xml Tue Nov  2 15:48:22 2010
@@ -31,19 +31,19 @@
       You can/must configure James for the following:</p>
     
     <ul>
-        <li><a href="configuration_serverwide.html">Server-wide Configuration</a></li>
-        <li><a href="configuration_domainlist.html">Domain List Configuration</a></li>
-        <li><a href="configuration_users.html">Users Configuration</a></li>
-        <li><a href="configuration_mailstores.html">Mail Stores Configuration</a></li>
-        <li><a href="configuration_dns.html">DNS Configuration</a></li>
-        <li><a href="configuration_imap4.html">IMAP4 Configuration</a></li>
-        <li><a href="configuration_pop3.html">POP3 Configuration</a></li>
-        <li><a href="configuration_smtp_lmtp.html">SMTP LMTP Configuration</a></li>
-        <li><a href="configuration_mailetcontainer.html">Mailet Container Configuration</a></li>
-        <li><a href="configuration_fetchmail.html">FetchMail Configuration</a></li>
-        <li><a href="configuration_remotemanager.html">Remote Manager Configuration</a></li>
-        <li><a href="configuration_listmanager.html">List Manager Configuration</a></li>
-        <li><a href="configuration_common.html">Common Configuration</a></li>
+        <li><a href="configure_serverwide.html">Server-wide Configuration</a></li>
+        <li><a href="configure_domainlist.html">Domain List Configuration</a></li>
+        <li><a href="configure_users.html">Users Configuration</a></li>
+        <li><a href="configure_mailstores.html">Mail Stores Configuration</a></li>
+        <li><a href="configure_dns.html">DNS Configuration</a></li>
+        <li><a href="configure_imap4.html">IMAP4 Configuration</a></li>
+        <li><a href="configure_pop3.html">POP3 Configuration</a></li>
+        <li><a href="configure_smtp_lmtp.html">SMTP LMTP Configuration</a></li>
+        <li><a href="configure_mailetcontainer.html">Mailet Container Configuration</a></li>
+        <li><a href="configure_fetchmail.html">FetchMail Configuration</a></li>
+        <li><a href="configure_remotemanager.html">Remote Manager Configuration</a></li>
+        <li><a href="configure_listmanager.html">List Manager Configuration</a></li>
+        <li><a href="configure_common.html">Common Configuration</a></li>
     </ul>
 
     <subsection name="JMX on Windows">

Copied: james/server/trunk/src/site/xdoc/configure_common.xml (from r1029966, james/server/trunk/src/site/xdoc/configuration_common.xml)
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/configure_common.xml?p2=james/server/trunk/src/site/xdoc/configure_common.xml&p1=james/server/trunk/src/site/xdoc/configuration_common.xml&r1=1029966&r2=1030090&rev=1030090&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/configuration_common.xml (original)
+++ james/server/trunk/src/site/xdoc/configure_common.xml Tue Nov  2 15:48:22 2010
@@ -240,9 +240,9 @@
     <p>The remaining children should not need to be deleted or adjusted.</p>
     </subsection>
     <subsection name="Configuring a Service to Use TLS">
-    <p>Each of the services - <a href="smtp_configuration.html">SMTP</a>, 
-    <a href="pop3_configuration.html">POP3</a>, <a href="nntp_configuration.html">NNTP</a>, 
-    and <a href="remotemanager_configuration.html">RemoteManager</a> - supports use of TLS.  Each of
+    <p>Each of the services - <a href="configure_smtp_lmpt.html">SMTP</a>, 
+    <a href="configure_pop3.html">POP3</a>, 
+    and <a href="configure_remotemanager.html">RemoteManager</a> - supports use of TLS.  Each of
     these services has an optional boolean configuration element <b>useTLS</b> which is used to toggle 
     use of TLS for the service.  When this value is set to true, that particular service will use the "ssl" 
     server socket factory to spawn server sockets.</p>

Copied: james/server/trunk/src/site/xdoc/configure_serverwide.xml (from r1029966, james/server/trunk/src/site/xdoc/configuration_serverwide.xml)
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/configure_serverwide.xml?p2=james/server/trunk/src/site/xdoc/configure_serverwide.xml&p1=james/server/trunk/src/site/xdoc/configuration_serverwide.xml&r1=1029966&r2=1030090&rev=1030090&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/configuration_serverwide.xml (original)
+++ james/server/trunk/src/site/xdoc/configure_serverwide.xml Tue Nov  2 15:48:22 2010
@@ -90,7 +90,7 @@
           Only expert administrators should modify this configuration.</p>
           
       <ul>
-        <li>log4j.properties: See <a href="monitoring_logging.html">logging page</a></li>
+        <li>log4j.properties: See <a href="monitor_logging.html">logging page</a></li>
         <li>database.properties</li>
         <li>sqlResources.xml and mailboxManagerSqlResources.xml</li>
       </ul>

Modified: james/server/trunk/src/site/xdoc/dev_build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/dev_build.xml?rev=1030090&r1=1030089&r2=1030090&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/dev_build.xml (original)
+++ james/server/trunk/src/site/xdoc/dev_build.xml Tue Nov  2 15:48:22 2010
@@ -66,8 +66,8 @@
       <li>Java Development Kit - You must have a JDK of Java version 1.5 or higher installed to build the 
           James distribution.  The exact JDKs available depend on the platform.  A JDK must be downloaded and
           installed before the build can run.</li>
-      <li>Maven - This is a Java-tailored, XML-configured, extensible build or make system. You need ant (2.2.1+) in order
-          to build James. You can get the latest version of maven <a href="http://maven.apache.org/download.html">here</a>.
+      <li>Maven 2.2.1 - This is a Java-tailored, XML-configured, extensible build or make system. You need ant (2.2.1+) in order
+          to build James. You can get maven 2.2.1 from <a href="http://maven.apache.org/download.html">here</a>.
           Installation instructions for maven are also available on the same page <a href="http://maven.apache.org/download.html">http://maven.apache.org/download.html</a>.</li>
     </ol>
     <p>Set (on windows) or export (on Unix) MAVEN_OPTS to tune the memory needed by maven with "MAVEN_OPTS=-Xmx1024m -XX:MaxPermSize=128m"</p>

Modified: james/server/trunk/src/site/xdoc/dev_custom_mailet.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/dev_custom_mailet.xml?rev=1030090&r1=1030089&r2=1030090&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/dev_custom_mailet.xml (original)
+++ james/server/trunk/src/site/xdoc/dev_custom_mailet.xml Tue Nov  2 15:48:22 2010
@@ -39,7 +39,7 @@ these can be easily overridden to provid
 getMailetInfo(), and service(Mail).  And only the last is required in all cases.</p>
 
 <subsection name="Configuration">
-<p>As described in the <a href="spoolmanager_configuration.html">SpoolManager configuration 
+<p>As described in the <a href="configure_mailetcontainer.html">SpoolManager configuration 
 section</a>, mailets are configured with a set of String (name, value) pairs.  These values are
 passed into the Mailet upon initialization (although the details of this process are hidden by 
 the GenericMailet implementation).  GenericMailet provides access to this configuration 
@@ -135,7 +135,7 @@ After that restart james.
 
 <subsection name="James Configuration">
 <p>Configuration of the processor chain is discussed 
-<a href="configuration_mailetcontainer.html">elsewhere</a> in this documentation.  The 
+<a href="configure_mailetcontainer.html">elsewhere</a> in this documentation.  The 
 details of configuring mailet deployment is discussed at length.  Here we will only comment 
 that it is important to add the appropriate mailet package for your custom mailet to the 
 &lt;mailetpackages&gt; list and that the name of your mailet should not conflict with any of 

Modified: james/server/trunk/src/site/xdoc/dev_custom_matcher.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/dev_custom_matcher.xml?rev=1030090&r1=1030089&r2=1030090&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/dev_custom_matcher.xml (original)
+++ james/server/trunk/src/site/xdoc/dev_custom_matcher.xml Tue Nov  2 15:48:22 2010
@@ -147,7 +147,7 @@ After that restart james.
 
 <subsection name="James Configuration">
 <p>Configuration of the processor chain is discussed 
-<a href="configuration_mailetcontainer.html">elsewhere</a> in this documentation.  The 
+<a href="configure_mailetcontainer.html">elsewhere</a> in this documentation.  The 
 details of configuring matcher deployment is discussed at length.  Here we will only comment 
 that it is important to add the appropriate matcher package for your custom matcher to the 
 &lt;matcherpackages&gt; list and that the name of your matcher should not conflict with any of 

Modified: james/server/trunk/src/site/xdoc/dev_provided_mailets.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/dev_provided_mailets.xml?rev=1030090&r1=1030089&r2=1030090&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/dev_provided_mailets.xml (original)
+++ james/server/trunk/src/site/xdoc/dev_provided_mailets.xml Tue Nov  2 15:48:22 2010
@@ -30,7 +30,7 @@
 <p>James provides a number of implemented Mailets for use by James administrators in their 
 configurations.  These are primarily mailets that members of the James developer or user 
 communities have found useful in their own configurations.  A description of how to configure 
-Mailets and use them in the James SpoolManager can be found <a href="spoolmanager_configuration.html">here</a>.</p>
+Mailets and use them in the James SpoolManager can be found <a href="configure_mailetcontainer.html">here</a>.</p>
 
 <subsection name="AddFooter">
 <p>Description: This mailet adds a text footer to the message.</p>

Modified: james/server/trunk/src/site/xdoc/dev_provided_matchers.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/dev_provided_matchers.xml?rev=1030090&r1=1030089&r2=1030090&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/dev_provided_matchers.xml (original)
+++ james/server/trunk/src/site/xdoc/dev_provided_matchers.xml Tue Nov  2 15:48:22 2010
@@ -30,7 +30,7 @@
 <p>James provides a number of implemented Matchers for use by James administrators in their 
 configurations.  These are primarily matchers that members of the James developer or user 
 communities have found useful in their own configurations.  A description of how to configure 
-Matchers and use them in the James SpoolManager can be found <a href="spoolmanager_configuration.html">here</a>.</p>
+Matchers and use them in the James SpoolManager can be found <a href="configure_mailetcontainer.html">here</a>.</p>
 
 <subsection name="All">
 <p>Description: This matcher is the trivial one - it matches all mails being processed. All recipients are returned.</p>

Modified: james/server/trunk/src/site/xdoc/feature_mailetcontainer.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/feature_mailetcontainer.xml?rev=1030090&r1=1030089&r2=1030090&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/feature_mailetcontainer.xml (original)
+++ james/server/trunk/src/site/xdoc/feature_mailetcontainer.xml Tue Nov  2 15:48:22 2010
@@ -81,7 +81,7 @@
       the processor tree until they reach the end of a processor or are marked completed 
       by a mailet.</p>
     
-      <p>More on configuration of the SpoolManager can be found <a href="configuration_mailetcontainer.html">here</a>.</p>
+      <p>More on configuration of the SpoolManager can be found <a href="configure_mailetcontainer.html">here</a>.</p>
     
       <p>Much of the power of James lies in the SpoolManager component.  Custom matchers and 
       mailets can be easily developed to address an administrator's particular needs.  The 

Modified: james/server/trunk/src/site/xdoc/feature_summary.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/feature_summary.xml?rev=1030090&r1=1030089&r2=1030090&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/feature_summary.xml (original)
+++ james/server/trunk/src/site/xdoc/feature_summary.xml Tue Nov  2 15:48:22 2010
@@ -47,7 +47,7 @@
       with support for some optional features such as message size limits, SMTP auth, and encrypted 
       client/server communication.</p>
       
-      <p>More information on configuring the SMTP service can be found <a href="configuration_smtp_lmtp.html">here</a>.</p>
+      <p>More information on configuring the SMTP service can be found <a href="configure_smtp_lmtp.html">here</a>.</p>
     
     </subsection>
     
@@ -61,7 +61,7 @@
       POP3 clients.  In addition, James can be configured to require SSL/TLS connections for
       POP3 client connecting to the server.</p>
       
-      <p>More information on configuring the POP3 service can be found <a href="configuration_pop3.html">here</a>.</p>
+      <p>More information on configuring the POP3 service can be found <a href="configure_pop3.html">here</a>.</p>
     
     </subsection>
     
@@ -75,7 +75,7 @@
       IMAP4 clients.  In addition, James can be configured to require SSL/TLS connections for
       IMAP4 client connecting to the server.</p>
       
-      <p>More information on configuring the IMAP4 service can be found <a href="configuration_imap4.html">here</a>.</p>
+      <p>More information on configuring the IMAP4 service can be found <a href="configure_imap4.html">here</a>.</p>
     
     </subsection>
     
@@ -86,7 +86,7 @@
       servers and deliver them to the local spool.  This is useful for consolidating mail delivered to a
       number of accounts on different machines to a single account.</p>
       
-      <p>More information on configuring FetchMail can be found <a href="configuration_fetchmail.html">here</a>.</p>
+      <p>More information on configuring FetchMail can be found <a href="configure_fetchmail.html">here</a>.</p>
 
     </subsection>
     
@@ -97,7 +97,7 @@
       SpoolManager component is James' mail processing engine.  James' SpoolManager component 
       is also called the Mailet container. It is these mailets and matchers that actually carry out mail processing.</p>
       
-      <p>More on the structure of the SpoolManager and the Mailet API can be found <a href="configuration_mailetcontainer.html">here</a>.</p>
+      <p>More on the structure of the SpoolManager and the Mailet API can be found <a href="configure_mailetcontainer.html">here</a>.</p>
     
     </subsection>
     
@@ -109,7 +109,7 @@
       Stores/repositories contain messages that are still being processed.  Aside from what type of data they store, 
       repositories are distinguished by where they store data.  There are three types of storage - File, Database, and DBFile.</p>
     
-      <p>More information the stores can be found <a href="configuration_mailstores.html">here</a>.</p>
+      <p>More information the stores can be found <a href="configure_mailstores.html">here</a>.</p>
 
     </subsection>
     
@@ -118,7 +118,7 @@
       <p>James provides a simple telnet-based interface for control.  Through this interface you can add 
       and delete users, configure per-user aliases and forward addresses, and shut down the server.</p>
 
-      <p>More on the configuring the RemoteManager can be found <a href="configuration_remotemanager.html">here</a>.</p>
+      <p>More on the configuring the RemoteManager can be found <a href="configure_remotemanager.html">here</a>.</p>
   
     </subsection>  
       

Modified: james/server/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/index.xml?rev=1030090&r1=1030089&r2=1030090&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/index.xml (original)
+++ james/server/trunk/src/site/xdoc/index.xml Tue Nov  2 15:48:22 2010
@@ -61,8 +61,8 @@
 	      James is based on currently available open protocols.</p>
 	    
 	    <p>This documentation is intended to be an introduction to the concepts behind the James usage, as well 
-	      as a guide to <a href="installation.html">install</a>, <a href="configuration.html">configure</a> 
-	      and <a href="dev_build.html">develop</a> James server.</p>
+	      as a guide to <a href="install.html">install</a>, <a href="configure.html">configure</a> 
+	      and <a href="dev.html">develop</a> James server.</p>
 
         <p>Download James Mail Server.</p>
         <p>
@@ -112,7 +112,7 @@
 
           <subsection name="Configureable">
           
-            <p>Configure the stores,... via the well-known Spring framework - <a href="configuration.html">read more</a>.</p>
+            <p>Configure the stores,... via the well-known Spring framework - <a href="configure.html">read more</a>.</p>
         
             <img src="images/conf/config_example.png" height="400px" />
         
@@ -124,7 +124,7 @@
 
           <subsection name="Manageable">
         
-            <p>Manage domains, users,... via well-known JMX tools - <a href="management.html">read more</a>.</p>
+            <p>Manage domains, users,... via well-known JMX tools - <a href="manage.html">read more</a>.</p>
             
             <img src="images/jmx_management/jmx_user_part.png" />
 

Copied: james/server/trunk/src/site/xdoc/install.xml (from r1029966, james/server/trunk/src/site/xdoc/installation.xml)
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/install.xml?p2=james/server/trunk/src/site/xdoc/install.xml&p1=james/server/trunk/src/site/xdoc/installation.xml&r1=1029966&r2=1030090&rev=1030090&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/installation.xml (original)
+++ james/server/trunk/src/site/xdoc/install.xml Tue Nov  2 15:48:22 2010
@@ -30,9 +30,9 @@
 <subsection name="Java Virtual Machine">
 
   <p>James requires a Java Runtime Environment of Java version 1.5 or higher installed to run the 
-  James application.  The exact JREs available depend on the platform.  A JRE must be downloaded and
-  installed before James can run.  In addition, the environment variable JAVA_HOME should be set to
-  the JRE home directory before running James.</p>
+     James application.  The exact JREs available depend on the platform.  A JRE must be downloaded and
+     installed before James can run.  In addition, the environment variable JAVA_HOME should be set to
+     the JRE home directory before running James.</p>
   
   <p>James 3.0 has been successfully tested on OpenJDK, Sun JDK and IBM JDK</p>
 
@@ -41,30 +41,44 @@
 <subsection name="System Requirements">
   
   <p>On Unix platforms, root access will be required to run James.  On these platforms, access to ports 
-  below 1024 is generally restricted to the root user.  As SMTP, POP3, and IMAP all need to open 
-  server sockets on such ports in standard configurations, James requires root access.</p>
+     below 1024 is generally restricted to the root user.  As SMTP, POP3, and IMAP all need to open 
+     server sockets on such ports in standard configurations, James requires root access.</p>
   
   <p>Obviously James also requires sufficient disk space, processor power, and network bandwidth.  But, 
-  other than what's been discussed here, it has no additional special requirements.</p>
+     other than what's been discussed here, it has no additional special requirements.</p>
   
   <p>James needs by default 512 MB RAM, but may need more depending on the load.</p>
 
+  <p>On Linux, to run the startup/shutdown script via the 'james' commande, you also need libc6 
+     (on Ubuntu for example: <code>sudo apt-get install libc6-i386 libc6-dev-i386</code>).</p>
+
 </subsection>
 
 </section>
 
-<section name="Install James Server - Short">
+<section name="Summary">
 
-  <p>Obtain the full James binary distribution from the <a href="http://james.apache.org/download.cgi">James 
-    release mirrors</a>.  Unpack the archive into your James installation directory.  Go to the bin subdirectory of the 
-    installation directory and run "./james start".</p>
+<code>
+#Step 1: Get It
+
+#Step 2: Deploy It
+
+#Step 3: Configure It
+
+#Step 4: Start It Up
+
+</code>
 
 </section>
 
 
-<section name="Install James Server - Long">
+<section name="Details">
+
+<subsection name="Step 1: Get It"> 
 
-<subsection name="Step 0: Build - only for source packages"> 
+  <p>Obtain the full James binary distribution from the <a href="http://james.apache.org/download.cgi">James 
+    release mirrors</a>.  Unpack the archive into your James installation directory.  Go to the bin subdirectory of the 
+    installation directory and run "./james start".</p>
 
   <p>If you have downloaded a binary distribution, you do not need to build James. 
     Proceed directory to Step 1.</p>
@@ -73,14 +87,14 @@
 
 </subsection>
 
-<subsection name="Step 1: Deploy"> 
+<subsection name="Step 2: Deploy It">
 
   <p>Extract or copy all the files in the archive or dist 
     directory into your installation directory. </p>
 
 </subsection>
 
-<subsection name="Step 2: Configure">
+<subsection name="Step 3: Configure It">
 
   <p>After installing the binary, the next step is to adjust the initial configuration.  The server should be stopped, and then 
   configuration can proceed.  The most essential configuration is set in the config.xml file.  This file can be 
@@ -90,25 +104,25 @@
   be appropriate for real-world servers.  There are a few issues that should be addressed immediately upon installation:</p>
     <ul>
       <li>RemoteManager Administrator Account - Before the RemoteManager service can be used to add users to this server 
-      installation an administrator account must be created.  More information can be found <a href="remotemanager_configuration.html">here</a>.</li>
+      installation an administrator account must be created.  More information can be found <a href="configure_remotemanager.html">here</a>.</li>
       <li>DNS Servers - James needs to have access to a DNS server for domain resolution.  The out of the box 
       configuration assumes that there is a DNS server on localhost.  In general administrators will have to change 
       the configuration to point to a valid DNS server.  This can be done by adjusting the dnsserver configuration 
-      block in the config.xml.  More information can be found <a href="serverwide_configuration.html">here</a>.</li>
+      block in the config.xml.  More information can be found <a href="configure_serverwide.html">here</a>.</li>
       <li>Managed Domain Names/IP Addresses - Out of the box, James only handles mail that is sent to recipients at 
       localhost.  It will attempt to deliver all other email to remote SMTP servers.  To allow James to handle email 
       for your domain or IP address, you simply need to add the appropriate domain name or IP address to the servernames 
-      section of the config.xml.  More information can be found <a href="serverwide_configuration.html">here</a>.</li>
-      <li>Postmaster Address - More information can be found <a href="serverwide_configuration.html">here</a>.</li>
+      section of the config.xml.  More information can be found <a href="configure_serverwide.html">here</a>.</li>
+      <li>Postmaster Address - More information can be found <a href="configure_serverwide.html">here</a>.</li>
     </ul>
   
   <p>In addition to adjusting these parameters, you may wish to consult the documentation for a discussion of
-  common configurations.  A list of such configurations, as well as the steps necessary to configure them, can
-  be found <a href="index.html">here</a>.</p>
+     common configurations.  A list of such configurations, as well as the steps necessary to configure them, can
+     be found <a href="index.html">here</a>.</p>
   
   <p>Read the short and snappy documentation at docs/index.html for a proper
       overview of configuring the system.</p>
-  <p><b>Summary</b> (for impatient people)</p>
+
   <p>M$ users should just run /bin/run.bat. Unix users will find run.sh under the 
     same directory. A JVM must be present and its location specified in the JAVA_HOME 
     environment variable. Set this on windows at the command prompt with something 
@@ -132,16 +146,16 @@
 
 </subsection>
 
-<subsection name="Step 3: Kickstart">
+<subsection name="Step 4: Start It Up">
 
   <p>Once you have edited the configuration file you will need to restart James so that the changes take 
-  effect.  When James starts, a list of the James services and the ports on which they are listening should 
-  be displayed on the console.  Additional information about the system configuration is printed in the James log files 
-  upon startup.</p>
+    effect.  When James starts, a list of the James services and the ports on which they are listening should 
+    be displayed on the console.  Additional information about the system configuration is printed in the James log files 
+    upon startup.</p>
   
   <p>Finally, after configuration is complete, it will be necessary to create user accounts before the James server 
-  will be fully operational.  Instructions on creating user accounts can be found 
-  <a href="adding_users.html">here</a>.</p>
+    will be fully operational.  Instructions on creating user accounts can be found 
+    <a href="adding_users.html">here</a>.</p>
   
   <p>Once started you'll see a message saying Avalon is running. This means that
       Avalon has loaded JAMES and every other needed Block (see /logs/avalon.log)
@@ -153,6 +167,7 @@
       type "help" for a list of available commands in the "JAMES remote
       administrator tool". It is really a basic set but should allow you to test
       installation.</p>
+      
   <p>Once you have some local users registered, try sending mail to one of them
       @localhost with SMTP (port 25) (assuming you have not changed the default
       server names in the conf.xml file). You'll see the mail appear under

Copied: james/server/trunk/src/site/xdoc/monitor.xml (from r1029966, james/server/trunk/src/site/xdoc/monitoring.xml)
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/monitor.xml?p2=james/server/trunk/src/site/xdoc/monitor.xml&p1=james/server/trunk/src/site/xdoc/monitoring.xml&r1=1029966&r2=1030090&rev=1030090&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/monitoring.xml (original)
+++ james/server/trunk/src/site/xdoc/monitor.xml Tue Nov  2 15:48:22 2010
@@ -27,8 +27,8 @@
 
   <section name="Monitor James Server">
   
-    <p>You can monitor James Server via <a href="monitoring_logging.html">logging</a>
-       and via <a href="monitoring_jmx.html">JMX</a>.</p>
+    <p>You can monitor James Server via <a href="monitor_logging.html">logging</a>
+       and via <a href="monitor_jmx.html">JMX</a>.</p>
   
   </section>
   



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org