SEC-624: Moved community and samples sections into 'getting started' part

src/docbkx/community.xml

@@ -1,9 +1,9 @@
 <chapter xmlns="http://docbook.org/ns/docbook" version="5.0" 
     xml:id="community"
     xmlns:xlink="http://www.w3.org/1999/xlink" >
-    
-    
-    <info><title>Community Support</title></info>
+
+    <info>
+        <title>Spring Security Community</title></info>
 
 
 <section xml:id="jira">
@@ -18,27 +18,30 @@
     <para>If possible, in your issue report please provide a JUnit test
         that demonstrates any incorrect behaviour. Or, better yet, provide a
         patch that corrects the issue. Similarly, enhancements are welcome to
-        be logged in the issue tracker, although we only accept commit enhancement requests
+        be logged in the issue tracker, although we only accept enhancement requests
         if you include corresponding unit tests. This is necessary to ensure
         project test coverage is adequately maintained.</para>
     
     <para>You can access the issue tracker at 
-        <link xlink:href="http://jira.springframework.org/browse/SEC">http://jira.springframework.org/browse/SEC</link>.</para>
+        <link xlink:href="http://jira.springframework.org/browse/SEC">http://jira.springframework.org/browse/SEC</link>.
+    </para>
 </section>
 
-<section xml:id="becoming-involved"><info><title>Becoming Involved</title></info>
+<section xml:id="becoming-involved">
+    <info><title>Becoming Involved</title></info>
     
-    
-    <para>We welcome you to become involved in Spring Security project.
-        There are many ways of contributing, including reading the mailing
-        list and responding to questions from other people, writing new code,
+    <para>We welcome your involvement in Spring Security project.
+        There are many ways of contributing, including reading the forum
+        and responding to questions from other people, writing new code,
         improving existing code, assisting with documentation, developing
         samples or tutorials, or simply making suggestions.</para>
-    
+<!-- TODO: Not currently there on SSec 2.0    
     <para>Please read our project policies web page that is available on
         Spring Security home page. This explains the path to become a
         committer, and the administration approaches we use within the
         project.</para>
+        
+        -->
 </section>
 
 <section xml:id="further-info">
@@ -48,13 +51,9 @@
         Spring Community Forum web site at  
         <uri xlink:href="http://forum.springframework.org">http://forum.springframework.org</uri>
         to discuss Spring Security with other users of the framework. 
-        Remember to use the JIRA for bug reports, as explained above.
+        Remember to use JIRA for bug reports, as explained above.
         Everyone is also welcome to join the Acegisecurity-developer mailing
-        list and participate in design discussions. It's also a good way of
-        finding out what's happening with regard to release timing, and the
-        traffic volume is quite light. Finally, our project home page (where
-        you can obtain the latest release of the project and convenient links
-        to Subversion, JIRA, mailing lists, forums etc) is at 
-        <uri xlink:href="http://static.springframework.org/spring-security/site/">http://static.springframework.org/spring-security/site/</uri>.</para>
+        list and participate in design discussions. The
+        traffic volume is very light.</para>
 </section>
 </chapter>

src/docbkx/springsecurity.xml

@@ -86,17 +86,27 @@
     <partintro>
     <para>The later parts of this guide provide an in-depth discussion of the
       framework architecture and implementation classes, an understanding of which is important
-      if you need to do any serious customization. In this part, we take a slightly
-      gentler look at how to get started using some of the features of Spring Security 2.0.
-      In particular, we'll look at namespace configuration which provides a much simpler path to securing
-      your application with little or no knowledge of the classes involved, unlike the traditional
-      Spring bean approach which required you to configure large numbers of beans.
+      if you need to do any serious customization. In this part, we'll introduce Spring Security 2.0,
+      give a brief overview of the project's history and take a slightly
+      gentler look at how to get started using the framework.
+      In particular, we'll look at namespace configuration which provides a much simpler way of securing
+      your application compared to the traditional Spring bean approach where you had to wire up all the 
+      implementation classes individually.
+    </para>
+    <para>
+      We'll also take a look at the sample applications that are available. It's worth trying to run
+      these and experimenting with them a bit even before you read the later sections - you can dip back into them
+      as your understanding of the framework increases.
     </para>
     </partintro>
     
     <xi:include href="introduction.xml" />    
     
     <xi:include href="namespace-config.xml" />
+    
+    <xi:include href="samples.xml"/>
+    
+    <xi:include href="community.xml"/>     
 
   </part>
 
@@ -187,17 +197,4 @@
     
   </part>
 
-  <part xml:id="resources">
-    <title>Other Resources</title>
-
-    <partintro>
-      <para>In addition to this reference guide, a number of other resources
-      exist to help you learn how to use Spring Security.</para>
-    </partintro>
-
-    <xi:include href="samples.xml"/>
-    
-    <xi:include href="community.xml"/>    
- 
-  </part>
 </book>