From 6e8c8114e2d9601933f1db031b3442f31f9accfc Mon Sep 17 00:00:00 2001
From: Ulrik Sandberg <ulrik.sandberg@jayway.com>
Date: Sun, 28 Nov 2010 14:55:37 +0000
Subject: [PATCH] Some minor documentation fixes.

---
 src/site/apt/downloads/releases.apt |  2 +-
 src/site/site.xml                   |  2 +-
 src/site/xdoc/index.xml             | 32 +++++++++++++++++++----------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/site/apt/downloads/releases.apt b/src/site/apt/downloads/releases.apt
index 2c79b3e9..cd633b0d 100644
--- a/src/site/apt/downloads/releases.apt
+++ b/src/site/apt/downloads/releases.apt
@@ -10,7 +10,7 @@ Downloads
 
 		* {{{http://www.springsource.com/download/community?project=Spring%20LDAP}Download}} | {{{http://static.springframework.org/spring-ldap/docs/1.3.x/changelog.txt}Changelog}} | {{{http://static.springframework.org/spring-ldap/docs/1.3.x/reference/html/}Documentation (HTML)}} | {{{http://static.springframework.org/spring-ldap/docs/1.3.x/reference/pdf/spring-ldap-reference.pdf}Documentation (PDF)}} | {{{http://static.springframework.org/spring-ldap/docs/1.3.x/apidocs/}API}}
 	
-	* <<Spring LDAP 1.3.1 is the upcoming production release>>
+	* <<Spring LDAP 1.3.2 is the upcoming production release>>
 
 		* {{{./snapshots.html}Download nightly snapshots}}
 
diff --git a/src/site/site.xml b/src/site/site.xml
index fd1e3350..36f6e504 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -37,7 +37,7 @@
             <item name="Support Forums" href="http://forum.springframework.org/forumdisplay.php?f=40"/>
             <item name="JIRA" href="http://jira.springframework.org/browse/LDAP"/>
             <item name="Road Map"
-                  href="http://jira.springframework.org/browse/LDAP?report=com.atlassian.jira.plugin.system.project:roadmap-panel"/>
+		    href="https://jira.springframework.org/browse/LDAP?report=com.atlassian.jira.plugin.system.project:roadmap-panel#selectedTab=com.atlassian.jira.plugin.system.project%3Aroadmap-panel"/>
         </menu>
         <menu ref="reports" name="Reports"/>
     </body>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 2d72cfbd..949aa4ac 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -10,18 +10,28 @@
 		</p>
         <h2>Key Features</h2>
         <ul>
-			<li><b>Simplifies Coding:</b> The LdapTemplate class encapsulates all the
-				plumbing work involved in traditional LDAP programming, such as
-				creating a DirContext, looping through NamingEnumerations, handling
-				exceptions and cleaning up resources. This leaves the programmer to
-				handle the important stuff - where to find data (DNs and Filters) and
-				what do do with it (map to and from domain objects, bind, modify,
-				unbind, etc.), in the same way that JdbcTemplate relieves the
-				programmer of all but the actual SQL and how the data maps to the
-				domain model.</li>
+	    <li><b>Simplifies Coding:</b> The LdapTemplate class encapsulates all the
+		plumbing work involved in traditional LDAP programming, such as
+		creating a DirContext, looping through NamingEnumerations, handling
+		exceptions and cleaning up resources. This leaves the programmer to
+		handle the important stuff - where to find data (DNs and Filters) and
+		what do do with it (map to and from domain objects, bind, modify,
+		unbind, etc.), in the same way that JdbcTemplate relieves the
+		programmer of all but the actual SQL and how the data maps to the
+		domain model.</li>
             <li><b>Pooling Library:</b> The built-in JNDI pooling support is very
             	limited, and actually has a few deficiencies. Spring LDAP provides a
             	much more flexible and powerful pooling library.</li>
+	    <li><b>LDIF Parsing Library:</b> The LDIF parsing library provides an LDIF
+		parser utility compliant with "RFC 2849 : The LDAP Data Interchange
+		Format (LDIF) - Technical Specification". It also includes classes
+		for using the LDIF parser with the
+		<a href="http://static.springsource.org/spring-batch/">Spring Batch</a>
+		framework.</li>
+            <li><b>Object-Directory Mapping (ODM) Framework:</b> The ODM framework
+		provides the ability to use annotations to map LDAP entities and
+		attributes to Java objects, similar to what relational mapping
+		frameworks like Hibernate and JPA have offered for some time.</li>
             <li><b>Reuses your Spring expertise:</b> Spring LDAP uses Spring application
             	contexts for all configuration, which should help Spring developers get
             	up-to-speed nice and quickly. Also, the architecture of Spring LDAP
@@ -29,11 +39,11 @@
             <li><b>Supports Transactions:</b> The LDAP standard does not specify transaction support.
             	Spring LDAP provides a client-side compensating transaction library to fill the void.</li>
             <li><b>Integrates with Spring Security:</b> The authentication system of Spring LDAP provides
-                integration with <a href="http://www.springframework.org/spring-security/">Spring Security</a>.
+		integration with <a href="http://static.springsource.org/spring-security/site/">Spring Security</a>.
                 In fact, Spring Security uses Spring LDAP for its LDAP integration.</li>
             <li><b>Built by Maven:</b> This assists you in effectively reusing the Spring LDAP artifacts
                 in your own Maven-based projects.</li>
             <li><b>Apache license.</b> You can confidently use Spring LDAP in your project.</li>
         </ul>
   </body>
-</document>
\ No newline at end of file
+</document>