From 38a0bf7ca4837439f2016991fc214da6347524b2 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Wed, 7 Nov 2007 00:24:02 +0000
Subject: [PATCH] SEC-564: Documented checkout of 1.0.x branch and trunk
 separately.

---
 src/site/apt/svn-usage.apt  | 17 +++++++++++++++--
 src/site/xdoc/cvs-usage.xml | 16 +++++++++++++---
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/site/apt/svn-usage.apt b/src/site/apt/svn-usage.apt
index d01b9dd376..3cec1fc6c7 100644
--- a/src/site/apt/svn-usage.apt
+++ b/src/site/apt/svn-usage.apt
@@ -11,7 +11,18 @@ Subversion Usage
 
 * Subversion Access
 
-    The code can be checked out anonymously using the subversion command-line client:
+    If you want to get a copy of the source code to experiment with the latest changes or to build the sample
+    applications, it can be checked out anonymously using the subversion command-line client:
+
++----------------------------------------------------------------------------------------------------------------------+
+
+          svn co http://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/branches/1.0.x-branch/
+
++----------------------------------------------------------------------------------------------------------------------+
+
+    This will pull down a copy of the latest development source for the 1.0 branch of the project, which
+    should be pretty stable and suitable for new users. For the latest new features, you can
+    check out the cutting-edge trunk source, using the command:
 
 +----------------------------------------------------------------------------------------------------------------------+
 
@@ -19,10 +30,12 @@ Subversion Usage
 
 +----------------------------------------------------------------------------------------------------------------------+
 
+    This isn't recommended for new users.
+
 * Nightly Snapshots
 
     If you'd prefer not to use the subversion client directly, please see our {{{"downloads.html"}downloads page}} for
-    nightly snapshots.
+    nightly snapshots. Note that these are from the project trunk and may not be entirely suitable for new users.
 
 
 
diff --git a/src/site/xdoc/cvs-usage.xml b/src/site/xdoc/cvs-usage.xml
index daf0a9fef5..dda2549eb4 100644
--- a/src/site/xdoc/cvs-usage.xml
+++ b/src/site/xdoc/cvs-usage.xml
@@ -15,17 +15,27 @@
             </subsection>
             <subsection name="Subversion Command-Line Access">
                 <p>
-                    The code can be checked out anonymously with the following command:
+    If you want to get a copy of the source code to experiment with the latest changes or to build the sample
+    applications, it can be checked out anonymously using the subversion command-line client:
                 </p>
                 <p>
-                    svn co http://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/trunk/
+    svn co http://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/branches/1.0.x-branch/
+                </p>
+                <p>
+    This will pull down a copy of the latest development source for the 1.0 branch of the project, which
+    should be pretty stable and suitable for new users. For the latest new features, you can
+    check out the cutting-edge trunk source, using the command:
+                </p>
+                <p>
+    svn co http://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/trunk/
                 </p>
 
             </subsection>
             <subsection name="Nightly Snapshots">
                 <p>If you'd prefer not to use subversion directly, please see our
                     <a href="downloads.html">downloads page</a>
-                    for nightly snapshots.
+                    for nightly snapshots. Note that these are from the project trunk and may not be suitable
+                    for new users
                 </p>
             </subsection>
         </section>