From 2317c7c95ab8574913058aa18c4de02433bc0d8f Mon Sep 17 00:00:00 2001
From: Ulrik Sandberg <ulrik.sandberg@jayway.com>
Date: Fri, 11 Apr 2008 10:24:39 +0000
Subject: [PATCH] Fixed LDAP-106
 (http://jira.springframework.org/browse/LDAP-106): Reference documentation
 still claims DataAccessException hierarchy

---
 spring-ldap/docs/reference/src/contextprocessor.xml | 2 +-
 spring-ldap/docs/reference/src/index.xml            | 4 ++--
 spring-ldap/docs/reference/src/overview.xml         | 8 ++++----
 spring-ldap/docs/reference/styles/fopdf.xsl         | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/spring-ldap/docs/reference/src/contextprocessor.xml b/spring-ldap/docs/reference/src/contextprocessor.xml
index 9f8bf51c..652b9148 100644
--- a/spring-ldap/docs/reference/src/contextprocessor.xml
+++ b/spring-ldap/docs/reference/src/contextprocessor.xml
@@ -22,7 +22,7 @@
 
     <informalexample>
       <programlisting>public void search(SearchExecutor se, NameClassPairCallbackHandler handler,
-   DirContextProcessor processor) throws DataAccessException;</programlisting>
+   DirContextProcessor processor);</programlisting>
     </informalexample>
 
     <para>Before the search operation, the <literal>preProcess</literal>
diff --git a/spring-ldap/docs/reference/src/index.xml b/spring-ldap/docs/reference/src/index.xml
index 90f5a7b4..bce53b94 100644
--- a/spring-ldap/docs/reference/src/index.xml
+++ b/spring-ldap/docs/reference/src/index.xml
@@ -20,8 +20,8 @@
 	<bookinfo>
 		<title>Spring LDAP</title>
 		<subtitle>Reference Documentation</subtitle>
-		<releaseinfo>Version 1.2.1</releaseinfo>
-		<pubdate>December 2007</pubdate>
+		<releaseinfo>Version 1.2.2-SNAPSHOT</releaseinfo>
+		<pubdate>Sometime 2008</pubdate>
 		<authorgroup>
 			<author>
 				<firstname>Mattias</firstname>
diff --git a/spring-ldap/docs/reference/src/overview.xml b/spring-ldap/docs/reference/src/overview.xml
index dbd53f14..40a1d269 100644
--- a/spring-ldap/docs/reference/src/overview.xml
+++ b/spring-ldap/docs/reference/src/overview.xml
@@ -5,16 +5,16 @@
   <sect1 id="introduction-overview">
     <title>Overview</title>
 
-    <para>Spring-LDAP (<ulink
+    <para>Spring LDAP (<ulink
     url="http://www.springframework.org/ldap">http://www.springframework.org/ldap</ulink>)
     is a library for simpler LDAP programming in Java, built on the same
     principles as the <ulink
     url="http://static.springframework.org/spring/docs/current/api/org/springframework/jdbc/core/JdbcTemplate.html">JdbcTemplate</ulink>
     in Spring JDBC. It completely eliminates the need to worry about creating
     and closing <literal>LdapContext</literal> and looping through
-    <literal>NamingEnumeration</literal>. It also provides a more
-    comprehensive unchecked Exception hierarchy, built on Spring's
-    <literal>DataAccessException</literal>. As a bonus, it also contains
+    <literal>NamingEnumeration</literal>. It also provides exception translation
+    from <literal>javax.naming.NamingException</literal> to a mirrored unchecked
+    Exception hierarchy, much like Spring JMS. As a bonus, Spring LDAP also contains
     classes for dynamically building LDAP filters and DNs (Distinguished
     Names), LDAP attribute management, and client-side LDAP transaction management.</para>
 
diff --git a/spring-ldap/docs/reference/styles/fopdf.xsl b/spring-ldap/docs/reference/styles/fopdf.xsl
index d47be44b..79980ef6 100644
--- a/spring-ldap/docs/reference/styles/fopdf.xsl
+++ b/spring-ldap/docs/reference/styles/fopdf.xsl
@@ -56,7 +56,7 @@
                     <fo:table-row>
                         <fo:table-cell text-align="center">
                             <fo:block font-family="Helvetica" font-size="12pt" padding="10mm">
-                                <xsl:text>Copyright &copyright; 2005-2006 </xsl:text>
+                                <xsl:text>Copyright &copyright; 2005-2008 </xsl:text>
                                 <xsl:for-each select="bookinfo/authorgroup/author">
                                     <xsl:if test="position() > 1">
                                         <xsl:text>, </xsl:text>