Author: eric
Date: Sun Oct 31 09:31:22 2010
New Revision: 1029282

URL: http://svn.apache.org/viewvc?rev=1029282&view=rev
Log:
Cleanup usermanual - still todo on that level.

Modified:
    james/server/trunk/src/site/xdoc/configuration.xml
    james/server/trunk/src/site/xdoc/configuration_common.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/feature_mailetcontainer.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/monitoring.xml
    james/server/trunk/src/site/xdoc/monitoring_jmx.xml
    james/server/trunk/src/site/xdoc/monitoring_logging.xml
    james/server/trunk/src/site/xdoc/upgrade_2.3.xml

Modified: james/server/trunk/src/site/xdoc/configuration.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/configuration.xml?rev=1029282&r1=1029281&r2=1029282&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/configuration.xml (original)
+++ james/server/trunk/src/site/xdoc/configuration.xml Sun Oct 31 09:31:22 2010
@@ -25,7 +25,7 @@
 
 <body>
 
-  <section name="Configuration">
+  <section name="Configure James Server">
   
     <p>All configuration files resides in the ./conf/ and ./conf/META-INF/ 
directories.
       You can/must configure James for the following:</p>

Modified: james/server/trunk/src/site/xdoc/configuration_common.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/configuration_common.xml?rev=1029282&r1=1029281&r2=1029282&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/configuration_common.xml (original)
+++ james/server/trunk/src/site/xdoc/configuration_common.xml Sun Oct 31 
09:31:22 2010
@@ -202,7 +202,7 @@
     
   </section>
   
-  <section name="James 3.0 - Using TLS">
+  <section name="Using TLS">
   
     <p>This document explains how to enable James 3.0 services to use 
Transport Layer Security (TLS) for encrypted client-server communication.</p>
     
@@ -262,96 +262,6 @@
     
   </section>
   
-  <section name="How To Create Mailing Lists">
-
-    <p>One of the frequent questions on the James-User Mailing List is how
-    to create a mailing list. This document explains one way of using the
-    currently supplied Matchers and Mailets in James v3.0.</p>
-    
-    <p>Basically, the process requires creating two &lt;mailet&gt; entries
-    and a repository.  The first mailet handles list commands (currently
-    only <i>list-name</i>-on and <i>list-name</i>-off).  The second mailet
-    handles list messages.  The repository will hold the e-mail addresses
-    of list subscribers.</p>
-    
-    <p>The mailets go into the processor chain (e.g., at the top of the
-    <i>transport</i> processor), the repository goes into the
-    &lt;users-store&gt; block.</p>
-    
-    <subsection name="Setting up the Mailets">
-    
-    <p>You need to setup two mailets.</p>
-    
-    <p>The first mailet that you need to setup is an instance of the <a
-    href="provided_mailets.html#AvalonListservManager">Avalon Listserv
-    Manager</a> mailet.  This will handle subscribing and unsubscribing.
-    [Note: the current code does not support confirmed opt-in, just basic
-    commands.]  The <a
-    href="provided_matchers.html#CommandForListserv">CommandForListserv</a>
-    matcher is used to invoke match messages containing commands for the
-    mailing list.</p>
-    
-    <p>The second mailet is an instance of the <a
-    href="provided_mailets.html#AvalonListserv">Avalon Listserv</a>
-    mailet.  That mailet actually receives messages for the list and
-    causes them to be distributed.  The <a
-    href="provided_matchers.html#RecipientIs">RecipientIs</a> matcher
-    is used to match messages intended for the mailing list.</p>
-    
-    <p>The following illustrates the two &lt;mailet&gt; elements that need to 
be added:</p>
-    
-    <source>
-      &lt;mailet match="CommandForListserv=<i>list-name</i>@<i>domain</i>"
-              class="AvalonListservManager"&gt;
-        &lt;repositoryName&gt;<i>list-name</i>&lt;/repositoryName&gt;
-      &lt;/mailet&gt;
-    
-      &lt;mailet match="RecipientIs=<i>list-name</i>@<i>domain</i>" 
class="AvalonListserv"&gt;
-        &lt;repositoryName&gt;<i>list-name</i>&lt;/repositoryName&gt;
-        ... list options ...
-      &lt;/mailet&gt;
-    </source>
-    
-    </subsection>
-    
-    <subsection name="Setting up the Repository">
-    
-    <p>The mailing list mailets need a repository within which to store
-    the subscriber list.  There is a separate repository for each mailing
-    list, and is completely independent of the user repository used by
-    James to manage e-mail accounts.  This is configured in the
-    &lt;users-store&gt; block of config.xml.</p>
-    
-    <p>The following illustrates a database-backed repository using JDBC
-    with the ListUsersJdbcRepository class.  Notice that there will be a
-    single table, <i>lists</i>, created in the db://maildb resource
-    defined elsewhere.  There are currently two columns: the list name and
-    the list subscriber.</p>
-    
-    <source>
-      &lt;repository name="<i>list-name</i>"
-                     
class="org.apache.james.userrepository.ListUsersJdbcRepository"
-                     destinationURL="db://maildb/lists/<i>list-name</i>"&gt;
-        &lt;sqlFile&gt;file://conf/sqlResources.xml&lt;/sqlFile&gt;
-      &lt;/repository&gt;
-    </source>
-    
-    <p>The following illustrates a file-system repository using the
-    UsersFileRepository class. [Note: the destination URL is a child
-    element when configuring a file-system repository, and an attribute
-    when configuring a database-backed repository.  This inconsistency
-    will be addressed in a future version of James.]</p>
-    
-    <source>
-      &lt;repository name="<i>list-name</i>"
-                     
class="org.apache.james.userrepository.UsersFileRepository"&gt;
-        &lt;destination URL="file://var/lists/<i>list-name</i>/" /&gt; 
-      &lt;/repository&gt;
-    </source>
-    </subsection>
-    
-  </section>
-
 </body>
 
 </document>

Modified: james/server/trunk/src/site/xdoc/configuration_listmanager.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/configuration_listmanager.xml?rev=1029282&r1=1029281&r2=1029282&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/configuration_listmanager.xml (original)
+++ james/server/trunk/src/site/xdoc/configuration_listmanager.xml Sun Oct 31 
09:31:22 2010
@@ -27,8 +27,94 @@
 
 <section name="List Manager Configuration">
 
-</section>
-
+    <p>One of the frequent questions on the James-User Mailing List is how
+    to create a mailing list. This document explains one way of using the
+    currently supplied Matchers and Mailets in James v3.0.</p>
+    
+    <p>Basically, the process requires creating two &lt;mailet&gt; entries
+    and a repository.  The first mailet handles list commands (currently
+    only <i>list-name</i>-on and <i>list-name</i>-off).  The second mailet
+    handles list messages.  The repository will hold the e-mail addresses
+    of list subscribers.</p>
+    
+    <p>The mailets go into the processor chain (e.g., at the top of the
+    <i>transport</i> processor), the repository goes into the
+    &lt;users-store&gt; block.</p>
+    
+    <subsection name="Setting up the Mailets">
+    
+    <p>You need to setup two mailets.</p>
+    
+    <p>The first mailet that you need to setup is an instance of the <a
+    href="provided_mailets.html#AvalonListservManager">Avalon Listserv
+    Manager</a> mailet.  This will handle subscribing and unsubscribing.
+    [Note: the current code does not support confirmed opt-in, just basic
+    commands.]  The <a
+    href="provided_matchers.html#CommandForListserv">CommandForListserv</a>
+    matcher is used to invoke match messages containing commands for the
+    mailing list.</p>
+    
+    <p>The second mailet is an instance of the <a
+    href="provided_mailets.html#AvalonListserv">Avalon Listserv</a>
+    mailet.  That mailet actually receives messages for the list and
+    causes them to be distributed.  The <a
+    href="provided_matchers.html#RecipientIs">RecipientIs</a> matcher
+    is used to match messages intended for the mailing list.</p>
+    
+    <p>The following illustrates the two &lt;mailet&gt; elements that need to 
be added:</p>
+    
+    <source>
+      &lt;mailet match="CommandForListserv=<i>list-name</i>@<i>domain</i>"
+              class="AvalonListservManager"&gt;
+        &lt;repositoryName&gt;<i>list-name</i>&lt;/repositoryName&gt;
+      &lt;/mailet&gt;
+    
+      &lt;mailet match="RecipientIs=<i>list-name</i>@<i>domain</i>" 
class="AvalonListserv"&gt;
+        &lt;repositoryName&gt;<i>list-name</i>&lt;/repositoryName&gt;
+        ... list options ...
+      &lt;/mailet&gt;
+    </source>
+    
+    </subsection>
+    
+    <subsection name="Setting up the Repository">
+    
+    <p>The mailing list mailets need a repository within which to store
+    the subscriber list.  There is a separate repository for each mailing
+    list, and is completely independent of the user repository used by
+    James to manage e-mail accounts.  This is configured in the
+    &lt;users-store&gt; block of config.xml.</p>
+    
+    <p>The following illustrates a database-backed repository using JDBC
+    with the ListUsersJdbcRepository class.  Notice that there will be a
+    single table, <i>lists</i>, created in the db://maildb resource
+    defined elsewhere.  There are currently two columns: the list name and
+    the list subscriber.</p>
+    
+    <source>
+      &lt;repository name="<i>list-name</i>"
+                     
class="org.apache.james.userrepository.ListUsersJdbcRepository"
+                     destinationURL="db://maildb/lists/<i>list-name</i>"&gt;
+        &lt;sqlFile&gt;file://conf/sqlResources.xml&lt;/sqlFile&gt;
+      &lt;/repository&gt;
+    </source>
+    
+    <p>The following illustrates a file-system repository using the
+    UsersFileRepository class. [Note: the destination URL is a child
+    element when configuring a file-system repository, and an attribute
+    when configuring a database-backed repository.  This inconsistency
+    will be addressed in a future version of James.]</p>
+    
+    <source>
+      &lt;repository name="<i>list-name</i>"
+                     
class="org.apache.james.userrepository.UsersFileRepository"&gt;
+        &lt;destination URL="file://var/lists/<i>list-name</i>/" /&gt; 
+      &lt;/repository&gt;
+    </source>
+    </subsection>
+    
+  </section>
+  
 </body>
 
 </document>

Modified: james/server/trunk/src/site/xdoc/configuration_mailetcontainer.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/configuration_mailetcontainer.xml?rev=1029282&r1=1029281&r2=1029282&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/configuration_mailetcontainer.xml 
(original)
+++ james/server/trunk/src/site/xdoc/configuration_mailetcontainer.xml Sun Oct 
31 09:31:22 2010
@@ -26,6 +26,7 @@
 <body>
 
 <section name="Mailet Container Configuration">
+
 <p>The SpoolManager is controlled by a single configuration block in the 
config.xml.
 The spoolmanager tag defines the boundaries of the configuration block.  The 
behavior of 
 the SpoolManager, most importantly the routing of mail messages through the 
processor tree,

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=1029282&r1=1029281&r2=1029282&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/feature_mailetcontainer.xml (original)
+++ james/server/trunk/src/site/xdoc/feature_mailetcontainer.xml Sun Oct 31 
09:31:22 2010
@@ -25,50 +25,7 @@
 
 <body>
 
-  <section name="Mailet API">
-
-    <p>The Mailet API is a simple API used to build mail processing 
applications.  James is a Mailet 
-    container, allowing administrators to deploy Mailets (both custom and 
pre-made) to carry out a 
-    variety of complex mail processing tasks.  In the default configuration 
James uses Mailets to carry 
-    out a number of tasks that are carried out deep in the source code of 
other mail servers (i.e. list 
-    processing, remote and local delivery).</p>
-
-    <p>As it stands today, the Mailet API defines interfaces for both Matchers 
and Mailets.</p>
-
-    <ul>
-      <li>Matchers, as their name would suggest, match mail messages against 
certain conditions.  They 
-          return some subset (possibly the entire set) of the original 
recipients of the message if there 
-          is a match.  An inherent part of the Matcher contract is that a 
Matcher should not induce any changes
-          in a message under evaluation.</li>
-      <li>Mailets are responsible for actually processing the message.  They 
may alter the message in any fashion,
-          or pass the message to an external API or component.  This can 
include delivering a message to its destination 
-          repository or SMTP server.</li>
-    </ul>
-
-    <p>The Mailet API is currently in its second revision.  Although, the 
Mailet API is expected to undergo substantial changes in the near future, it is 
our aim that existing Mailets that abided purely by the prior Mailet API 
interfaces will continue to run with the revised specification.</p>
-
-    <p>The Javadoc for the Mailet API can be found <a 
href="http://james.apache.org/mailet/api/apidocs/";>here</a>.</p>
-
-    <p>James bundles a number of Matchers and Mailets in its distribution.  
Descriptions of provided matchers 
-    can be found <a href="dev_provided_matchers.html">here</a>, while 
descriptions of provided mailets can be found 
-    <a href="dev_provided_mailets.html">here</a>.</p>
-    
-    <p>You can read more on mailets on following web sites:</p>
-
-    <ul>
-      <li><a href="http://james.apache.org/mailet/index.html";>Mailet 
Site</a></li>
-      <li><a href="http://james.apache.org/mailet/api/index.html";>Mailet 
API</a></li>
-      <li><a href="http://james.apache.org/mailet/base/index.html";>Mailet 
Toolkit</a></li>
-      <li><a href="http://james.apache.org/mailet/crypto/index.html";>Mailet 
Crypto</a></li>
-      <li><a href="http://james.apache.org/mailet/standard/index.html";>Mailet 
Sieve</a></li>
-      <li><a href="http://james.apache.org/mailet/standard/index.html";>Mailet 
Standard</a></li>
-      <li><a 
href="http://james.apache.org/mailet/maven-mailetdocs-plugin/index.html";>Mailet 
Docs</a></li>
-      <li><a href="/james-server-mailets-function/mailet-report.html">Server 
Mailets</a></li>
-    </ul>
-
-  </section>
-
-  <section name="Matchers and Mailets, Processors and SpoolManager">
+  <section name="MailetContainer for Matchers and Mailets, Processors and 
SpoolManager">
   
     <p>James separates the services that deliver mail to James (i.e. SMTP, 
FetchMail) 
     from the engine that processes mail after it is received by James.  The 
@@ -136,6 +93,49 @@
   
   </section>
   
+  <section name="Mailet API">
+
+    <p>The Mailet API is a simple API used to build mail processing 
applications.  James is a Mailet 
+    container, allowing administrators to deploy Mailets (both custom and 
pre-made) to carry out a 
+    variety of complex mail processing tasks.  In the default configuration 
James uses Mailets to carry 
+    out a number of tasks that are carried out deep in the source code of 
other mail servers (i.e. list 
+    processing, remote and local delivery).</p>
+
+    <p>As it stands today, the Mailet API defines interfaces for both Matchers 
and Mailets.</p>
+
+    <ul>
+      <li>Matchers, as their name would suggest, match mail messages against 
certain conditions.  They 
+          return some subset (possibly the entire set) of the original 
recipients of the message if there 
+          is a match.  An inherent part of the Matcher contract is that a 
Matcher should not induce any changes
+          in a message under evaluation.</li>
+      <li>Mailets are responsible for actually processing the message.  They 
may alter the message in any fashion,
+          or pass the message to an external API or component.  This can 
include delivering a message to its destination 
+          repository or SMTP server.</li>
+    </ul>
+
+    <p>The Mailet API is currently in its second revision.  Although, the 
Mailet API is expected to undergo substantial changes in the near future, it is 
our aim that existing Mailets that abided purely by the prior Mailet API 
interfaces will continue to run with the revised specification.</p>
+
+    <p>The Javadoc for the Mailet API can be found <a 
href="http://james.apache.org/mailet/api/apidocs/";>here</a>.</p>
+
+    <p>James bundles a number of Matchers and Mailets in its distribution.  
Descriptions of provided matchers 
+    can be found <a href="dev_provided_matchers.html">here</a>, while 
descriptions of provided mailets can be found 
+    <a href="dev_provided_mailets.html">here</a>.</p>
+    
+    <p>You can read more on mailets on following web sites:</p>
+
+    <ul>
+      <li><a href="http://james.apache.org/mailet/index.html";>Mailet 
Site</a></li>
+      <li><a href="http://james.apache.org/mailet/api/index.html";>Mailet 
API</a></li>
+      <li><a href="http://james.apache.org/mailet/base/index.html";>Mailet 
Toolkit</a></li>
+      <li><a href="http://james.apache.org/mailet/crypto/index.html";>Mailet 
Crypto</a></li>
+      <li><a href="http://james.apache.org/mailet/standard/index.html";>Mailet 
Sieve</a></li>
+      <li><a href="http://james.apache.org/mailet/standard/index.html";>Mailet 
Standard</a></li>
+      <li><a 
href="http://james.apache.org/mailet/maven-mailetdocs-plugin/index.html";>Mailet 
Docs</a></li>
+      <li><a href="/james-server-mailets-function/mailet-report.html">Server 
Mailets</a></li>
+    </ul>
+
+  </section>
+
 </body>
 
 </document>

Modified: james/server/trunk/src/site/xdoc/installation.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/installation.xml?rev=1029282&r1=1029281&r2=1029282&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/installation.xml (original)
+++ james/server/trunk/src/site/xdoc/installation.xml Sun Oct 31 09:31:22 2010
@@ -25,7 +25,7 @@
 
 <body>
 
-<section name="Requirements">
+<section name="Requirements for James Server">
 
 <subsection name="Java Virtual Machine">
 
@@ -53,31 +53,34 @@
 
 </section>
 
-<section name="Installing the Binary">
+<section name="Install James Server - Short">
 
   <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>
+    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>
 
 </section>
 
-<section name="Step 0: Build - only for source packages"> 
+
+<section name="Install James Server - Long">
+
+<subsection name="Step 0: Build - only for source packages"> 
 
   <p>If you have downloaded a binary distribution, you do not need to build 
James. 
     Proceed directory to Step 1.</p>
   
   <p>If you have download a source package, process to the <a 
href="dev_build.html">build</a>.</p>
 
-</section>
+</subsection>
 
-<section name="Step 1: Deploy"> 
+<subsection name="Step 1: Deploy"> 
 
   <p>Extract or copy all the files in the archive or dist 
     directory into your installation directory. </p>
 
-</section>
+</subsection>
 
-<section name="Step 2: Configure">
+<subsection name="Step 2: Configure">
 
   <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 
@@ -127,9 +130,9 @@
     and the IP address of a DNS server. Once you have edited the configuration 
files, 
     press 'Enter' on the terminal where Avalon is waiting. </p>
 
-</section>
+</subsection>
 
-<section name="Step 3: Kickstart">
+<subsection name="Step 3: Kickstart">
 
   <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 
@@ -160,6 +163,8 @@
       the mailet pipe line (/conf/JAMES.conf.xml). Look at it if you want to
       understand what's happening.</p>
 
+</subsection>
+
 </section>
 
 </body>

Modified: james/server/trunk/src/site/xdoc/management.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/management.xml?rev=1029282&r1=1029281&r2=1029282&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/management.xml (original)
+++ james/server/trunk/src/site/xdoc/management.xml Sun Oct 31 09:31:22 2010
@@ -25,14 +25,14 @@
 
 <body>
 
-  <section name="James Management">
+  <section name="Manage James Server">
   
     <p>You can manage James via:</p>
     
-    <ul>
+    <ol>
       <li>JMX</li>
       <li>Remote Manager</li>
-    </ul>
+    </ol>
     
     <p>You need to make sure that your user/domain/mail repository 
configuration is correct before managing.  If 
     you change your user/domain/mail repository type (i.e. file to database) 
or the configuration of your user repository 
@@ -42,7 +42,7 @@
     <p>After you've done this, restart James to ensure that any changes you've 
made in the configuration are incorporated into 
     the running system.  You are now ready to create users/domains.</p>
 
-    <subsection name="Management via JMX">
+    <subsection name="Manage via JMX">
     
       <p>James can be managed via JMX. Simply launch jconsole to access 
         the exposed attributes and methods.</p>
@@ -61,9 +61,9 @@
   
     </subsection>
   
-    <subsection name="Management via Telnet">
+    <subsection name="Manage via Telnet">
   
-      <p>Once James is up and listening, adding a user is simple:</p>
+      <p>Once James is up and listening, manage via telnet is simple:</p>
       <ul>
         <li>Telnet to the host and port on which the RemoteManager is 
listening.  For command-line telnet clients 
             this is generally done by typing "telnet &lt;host&gt; 
&lt;port&gt;" where &lt;host&gt; is the James 

Modified: james/server/trunk/src/site/xdoc/management_domains.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/management_domains.xml?rev=1029282&r1=1029281&r2=1029282&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/management_domains.xml (original)
+++ james/server/trunk/src/site/xdoc/management_domains.xml Sun Oct 31 09:31:22 
2010
@@ -33,20 +33,21 @@
     
     <p>Once James is up and listening, adding a Domain is simple:</p>
 
-    <p>1. Telnet to the host and port on which the RemoteManager is listening. 
 For command-line telnet clients 
-    this is generally done by typing "telnet &lt;host&gt; &lt;port&gt;" where 
&lt;host&gt; is the James 
-    hostname and &lt;port&gt; is the RemoteManager port specified in the James 
config.xml.</p>
+    <p><ol>
 
-    <p>2. You will be prompted for your administrator Domainid and password.  
Enter the values you specified 
-    in the James config.xml.</p>
+      <li>Telnet to the host and port on which the RemoteManager is listening. 
 For command-line telnet clients 
+      this is generally done by typing "telnet &lt;host&gt; &lt;port&gt;" 
where &lt;host&gt; is the James 
+      hostname and &lt;port&gt; is the RemoteManager port specified in the 
James config.xml.</li>
+  
+      <li>You will be prompted for your administrator userid and password.  
Enter the values you specified 
+      in the James config.xml.</li>
+      
+      <li>After logging in, type "adddomain &lt;domain&gt;" where 
&lt;domain&gt; is the domain name 
+      of the domain you wish to create.</li>
+      
+      <li>Repeat step 3 for all user accounts you wish to create.</li>
     
-    <p>3. After logging in, type "addDomain &lt;Domain&gt; &lt;password&gt;" 
where &lt;Domain&gt; is the Domain name 
-    and &lt;password&gt; is the password of the you wish to create.  Please 
note that the Domain name 
-    should NOT be a complete email address.  Rather, all email addresses of 
the form &lt;Domain&gt;@&lt;domain&gt; 
-    (where &lt;domain&gt; is any of the values specified in the 
&lt;servernames&gt; block) will be delivered to 
-    this by default.  Mailet configuration can change this default 
behavior.</p>
-    
-    <p>4. Repeat step 3 for all Domain you wish to create.</p>
+    </ol></p>
     
     <p>That's it.  Your Domain are now created and can be used by all James 
services.</p>
     

Modified: james/server/trunk/src/site/xdoc/management_users.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/management_users.xml?rev=1029282&r1=1029281&r2=1029282&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/management_users.xml (original)
+++ james/server/trunk/src/site/xdoc/management_users.xml Sun Oct 31 09:31:22 
2010
@@ -32,21 +32,25 @@
     account is available for authenticated SMTP and NNTP.</p>
     
     <p>Once James is up and listening, adding a user is simple:</p>
-
-    <p>1. Telnet to the host and port on which the RemoteManager is listening. 
 For command-line telnet clients 
-    this is generally done by typing "telnet &lt;host&gt; &lt;port&gt;" where 
&lt;host&gt; is the James 
-    hostname and &lt;port&gt; is the RemoteManager port specified in the James 
config.xml.</p>
-
-    <p>2. You will be prompted for your administrator userid and password.  
Enter the values you specified 
-    in the James config.xml.</p>
     
-    <p>3. After logging in, type "adduser &lt;user&gt; &lt;password&gt;" where 
&lt;user&gt; is the user name 
-    and &lt;password&gt; is the password of the account you wish to create.  
Please note that the user name 
-    should NOT be a complete email address.  Rather, all email addresses of 
the form &lt;user&gt;@&lt;domain&gt; 
-    (where &lt;domain&gt; is any of the values specified in the 
&lt;servernames&gt; block) will be delivered to 
-    this account by default.  Mailet configuration can change this default 
behavior.</p>
+    <p><ol>
+
+      <li>Telnet to the host and port on which the RemoteManager is listening. 
 For command-line telnet clients 
+      this is generally done by typing "telnet &lt;host&gt; &lt;port&gt;" 
where &lt;host&gt; is the James 
+      hostname and &lt;port&gt; is the RemoteManager port specified in the 
James config.xml.</li>
+  
+      <li>You will be prompted for your administrator userid and password.  
Enter the values you specified 
+      in the James config.xml.</li>
+      
+      <li>After logging in, type "adduser &lt;user&gt; &lt;password&gt;" where 
&lt;user&gt; is the user name 
+      and &lt;password&gt; is the password of the account you wish to create.  
Please note that the user name 
+      should NOT be a complete email address.  Rather, all email addresses of 
the form &lt;user&gt;@&lt;domain&gt; 
+      (where &lt;domain&gt; is any of the values specified in the 
&lt;servernames&gt; block) will be delivered to 
+      this account by default.  Mailet configuration can change this default 
behavior.</li>
+      
+      <li>Repeat step 3 for all user accounts you wish to create.</li>
     
-    <p>4. Repeat step 3 for all user accounts you wish to create.</p>
+    </ol></p>
     
     <p>That's it.  Your user accounts are now created and can be used by all 
James services.</p>
     

Modified: james/server/trunk/src/site/xdoc/monitoring.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/monitoring.xml?rev=1029282&r1=1029281&r2=1029282&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/monitoring.xml (original)
+++ james/server/trunk/src/site/xdoc/monitoring.xml Sun Oct 31 09:31:22 2010
@@ -20,16 +20,16 @@
 <document>
 
  <properties>
-  <title>James 3.0 - Monitoring Instructions</title>
+  <title>James 3.0 - Monitor James Server</title>
  </properties>
 
 <body>
 
-  <section name="Monitoring Instructions">
+  <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>smtp/imap/lmtp/pop3/remotemanager/dnsservice/domainlist</p>
-    <p>connections are active per component, whats the limit,...</p>
-
   </section>
   
 </body>

Modified: james/server/trunk/src/site/xdoc/monitoring_jmx.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/monitoring_jmx.xml?rev=1029282&r1=1029281&r2=1029282&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/monitoring_jmx.xml (original)
+++ james/server/trunk/src/site/xdoc/monitoring_jmx.xml Sun Oct 31 09:31:22 2010
@@ -20,16 +20,27 @@
 <document>
 
  <properties>
-  <title>James 3.0 - JMX Monitoring</title>
+  <title>James 3.0 - Monitor via JMX</title>
  </properties>
 
 <body>
 
   <section name="JMX Monitoring">
   
-    <subsection name="Queues Monitoring">
-  
-    </subsection>
+    <p>You can monitor James Server via JMX.</p>
+
+    <ul>
+      <li>smtp</li>
+      <li>imap</li>
+      <li>lmtp</li>
+      <li>pop3</li>
+      <li>remotemanager</li>
+      <li>dnsservice</li>
+      <li>domainlist</li>
+      <li>queues</li>
+    </ul>
+
+    <p>Connections are active per component, limits,... are displayed.</p>
 
   </section>
 

Modified: james/server/trunk/src/site/xdoc/monitoring_logging.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/monitoring_logging.xml?rev=1029282&r1=1029281&r2=1029282&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/monitoring_logging.xml (original)
+++ james/server/trunk/src/site/xdoc/monitoring_logging.xml Sun Oct 31 09:31:22 
2010
@@ -20,12 +20,14 @@
 <document>
 
  <properties>
-  <title>James 3.0 - Logging</title>
+  <title>James 3.0 - Monitor via Logging</title>
  </properties>
 
 <body>
 
-  <section name="Logging">
+  <section name="Monitor via Logging">
+  
+    <p>Use the well-known log4j system.</p>
   
   </section>
 

Modified: james/server/trunk/src/site/xdoc/upgrade_2.3.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/upgrade_2.3.xml?rev=1029282&r1=1029281&r2=1029282&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/upgrade_2.3.xml (original)
+++ james/server/trunk/src/site/xdoc/upgrade_2.3.xml Sun Oct 31 09:31:22 2010
@@ -27,11 +27,15 @@
 
   <section name="Migration Tool">
 
-    <p>Provide a tool to migrate 2.3 mail-repositories to 3.0 
mailbox-stores</p>
-    <p><a 
href="https://issues.apache.org/jira/browse/JAMES-1052";>https://issues.apache.org/jira/browse/JAMES-1052</a></p>
+    <p>We are working on a tool that will migrate 2.3 mail and user
+      repositories to 3.0 mailbox store and user repository.</p>
 
-  </section>
+    <p>See <a 
href="https://issues.apache.org/jira/browse/JAMES-1052";>https://issues.apache.org/jira/browse/JAMES-1052</a>
+       and <a 
href="https://issues.apache.org/jira/browse/JAMES-1090";>https://issues.apache.org/jira/browse/JAMES-1090</a>
+       to follow progress on this.</p>
 
+  </section>
+<!-- 
   <section name="Upgrading Comments">
     <p>James upgrading involves a number of steps, each of which is described 
in some detail in the 
     following sections.  But as this sequence of steps has confused some users 
in the past, additional 
@@ -73,7 +77,7 @@
     <section name="Start James">
     <p> Now you should be able to start james without problems.</p>
   </section>
-
+ -->
 </body>
 
 </document>



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to