Fix for OPENDJ-313: Core docs are versioned 3.0.0-SNAPSHOT, even though the...

Mark Craig

13.17.2011 dd12a73c2157dab5e5d2dbce3180676ddb617917

Fix for OPENDJ-313: Core docs are versioned 3.0.0-SNAPSHOT, even though they pertain to 2.5.0-SNAPSHOT (nightly builds)

 opendj3/pom.xml

@@ -98,6 +98,11 @@
    <module>opendj-ldap-sdk-examples</module>
  </modules>
  <properties>
    <currentSDKversion>${project.version}</currentSDKversion>
    <stableSDKversion>version.not.defined</stableSDKversion>
    <currentServerVersion>2.5.0-SNAPSHOT</currentServerVersion>
    <stableServerVersion>2.4.3</stableServerVersion>
    <docTargetVersion>2.5.0</docTargetVersion>
    <docbkx-src>${basedir}/src/main/docbkx</docbkx-src>
    <dbstyle-dir>${basedir}/src/main/docbkx-stylesheets</dbstyle-dir>
    <docbkx-out>${basedir}/target/docbkx</docbkx-out>

 opendj3/src/main/docbkx/admin-guide/OpenDJ-Admin-Guide.xml

@@ -30,7 +30,7 @@
 xmlns:xlink='http://www.w3.org/1999/xlink'
 xmlns:xinclude='http://www.w3.org/2001/XInclude'>
 <info>
  <title>OpenDJ <?eval ${project.version}?> Administration Guide</title>
  <title>OpenDJ <?eval ${docTargetVersion}?> Administration Guide</title>
  <abstract>
   <para>Hands-on guide to configuring and using OpenDJ features. The OpenDJ
   project offers open source LDAP directory services in Java.</para>

 opendj3/src/main/docbkx/admin-guide/chap-monitoring.xml

@@ -172,7 +172,7 @@
Host Name:                localhost
Administrative Users:     cn=Directory Manager
Installation Path:        /path/to/OpenDJ
Version:                  OpenDJ <?eval ${project.version}?>
Version:                  OpenDJ <?eval ${docTargetVersion}?>
Java Version:             1.6.0_24
Administration Connector: Port 4444 (LDAPS)


 opendj3/src/main/docbkx/admin-guide/chap-troubleshooting.xml

@@ -234,7 +234,7 @@
  version number and also a build time stamp.</para>
  
  <screen>$ dsconfig --version
OpenDJ <?eval ${project.version}?>
OpenDJ <?eval ${docTargetVersion}?>
Build <replaceable>yyyymmddhhmmss</replaceable>Z</screen>
  
  <itemizedlist>

 opendj3/src/main/docbkx/dev-guide/OpenDJ-Dev-Guide.xml

@@ -30,7 +30,7 @@
 xmlns:xlink='http://www.w3.org/1999/xlink'
 xmlns:xinclude='http://www.w3.org/2001/XInclude'>
 <info>
  <title>OpenDJ <?eval ${project.version}?> SDK Developer's Guide</title>
  <title>OpenDJ <?eval ${currentSDKversion}?> SDK Developer's Guide</title>
  <abstract>
   <para>Hands-on guide to developing applications with the OpenDJ SDK. The
   OpenDJ project offers open source LDAP directory services in Java.</para>

 opendj3/src/main/docbkx/dev-guide/chap-get-sdk.xml

@@ -93,40 +93,44 @@
    (javadoc).</para>
   </step>
   <step>
    <para>Unzip the bundle, <filename>opendj-ldap-toolkit-<?eval
    ${project.version} ?>.zip</filename>, where you want to install the
    SDK.</para>
    <screen>$ unzip opendj-ldap-toolkit-<?eval ${project.version} ?>.zip</screen>
    <para>Unzip the bundle,
    <filename>opendj-ldap-toolkit-<?eval ${currentSDKversion} ?>.zip</filename>,
    where you want to install the SDK.</para>
    <screen>$ unzip opendj-ldap-toolkit-<?eval ${currentSDKversion} ?>.zip</screen>
   </step>
   <step>
    <para>Unpack the OpenDJ LDAP SDK documentation, <filename>opendj-ldap-sdk-<?eval
    ${project.version} ?>-javadoc.jar</filename>, under the SDK install
    directory.</para>
    <screen>$ mkdir opendj-ldap-toolkit-<?eval ${project.version} ?>/javadoc
$ cd opendj-ldap-toolkit-<?eval ${project.version} ?>/javadoc
$ jar -xf /path/to/opendj-ldap-sdk-<?eval ${project.version} ?>-javadoc.jar</screen>
    <para>Unpack the OpenDJ LDAP SDK documentation,
    <filename>opendj-ldap-sdk-<?eval ${currentSDKversion} ?>-javadoc.jar</filename>,
    under the SDK install directory.</para>
    <screen>$ mkdir opendj-ldap-toolkit-<?eval ${currentSDKversion} ?>/javadoc
$ cd opendj-ldap-toolkit-<?eval ${currentSDKversion} ?>/javadoc
$ jar -xf /path/to/opendj-ldap-sdk-<?eval ${currentSDKversion} ?>-javadoc.jar</screen>
    </step>
    <step>
     <para>Add the tools to your PATH.</para>
     <screen>(UNIX)
$ export PATH=/path/to/opendj-ldap-toolkit-<?eval ${project.version} ?>/bin:$PATH</screen>
$ export PATH=/path/to/opendj-ldap-toolkit-<?eval ${currentSDKversion} ?>/bin:$PATH</screen>
        <screen>(Windows)
C:\>set PATH=\\path\to\opendj-ldap-toolkit-<?eval ${project.version} ?>\bat:%PATH%</screen>
C:\>set PATH=\\path\to\opendj-ldap-toolkit-<?eval ${currentSDKversion} ?>\bat:%PATH%</screen>
    </step>
    <step>
     <para> Add the OpenDJ LDAP SDK for the APIs,the I18N core library and Grizzly framework for the
     transport to your CLASSPATH, typically found under
     <filename>opendj-ldap-toolkit-<?eval ${project.version}
      ?>/lib/</filename>.</para>
     <para> Add the OpenDJ LDAP SDK for the APIs, the I18N core library,
     Grizzly I/O framework for the transport, and GlassFish management APIs
     to your CLASSPATH, typically found under
     <filename>opendj-ldap-toolkit-<?eval ${currentSDKversion} ?>/lib/</filename>.</para>
     <screen>(UNIX)
$ export CLASSPATH=/path/to/lib/gmbal-api-only-3.0.0-b023.jar:$CLASSPATH
$ export CLASSPATH=/path/to/lib/grizzly-framework-2.1.2.jar:$CLASSPATH
$ export CLASSPATH=/path/to/lib/i18n-core-1.2.0.jar:$CLASSPATH
$ export CLASSPATH=/path/to/lib/opendj-ldap-sdk-<?eval ${project.version} ?>.jar:$CLASSPATH
$ export CLASSPATH=/path/to/lib/management-api-3.0.0-b012.jar:$CLASSPATH
$ export CLASSPATH=/path/to/lib/opendj-ldap-sdk-<?eval ${currentSDKversion} ?>.jar:$CLASSPATH
     </screen>
     <screen>(Windows)
C:\>set CLASSPATH=\\path\to\lib\gmbal-api-only-3.0.0-b023.jar:%CLASSPATH%
C:\>set CLASSPATH=\\path\to\lib\grizzly-framework-2.1.2.jar:%CLASSPATH%
C:\>set CLASSPATH=\\path\to\lib\i18n-core-1.2.0.jar:%CLASSPATH%
C:\>set CLASSPATH=\\path\to\lib\opendj-ldap-sdk-<?eval ${project.version} ?>.jar:%CLASSPATH%</screen>
C:\>set CLASSPATH=\\path\to\lib\management-api-3.0.0-b012.jar:%CLASSPATH%
C:\>set CLASSPATH=\\path\to\lib\opendj-ldap-sdk-<?eval ${currentSDKversion} ?>.jar:%CLASSPATH%</screen>
    </step>
  </procedure>

@@ -179,21 +183,22 @@
   </step>
   <step>
    <para>Unzip the tools and libraries included in the file,
    <filename>opendj3/opendj-ldap-toolkit/target/opendj-ldap-toolkit-<?eval
   ${project.version} ?>.zip</filename>.</para>
    <filename>opendj3/opendj-ldap-toolkit/target/opendj-ldap-toolkit-<?eval ${currentSDKversion} ?>.zip</filename>.</para>
   </step>
   <step>
    <para>Add the <filename>opendj-ldap-toolkit-<?eval ${project.version}?>/bin</filename>
    (UNIX) or <filename>opendj-ldap-toolkit-<?eval
    ${project.version} ?>\bat</filename> (Windows) directory to your
    <para>Add the <filename>opendj-ldap-toolkit-<?eval ${currentSDKversion}?>/bin</filename>
    (UNIX) or <filename>opendj-ldap-toolkit-<?eval ${currentSDKversion} ?>\bat</filename>
    (Windows) directory to your
    PATH.</para>
   </step>
   <step>
    <para>Set your CLASSPATH to include the OpenDJ LDAP SDK library,
    <filename>opendj-ldap-sdk-<?eval ${project.version} ?>.jar</filename>, 
    the I18N core library, <filename>i18n-core-1.2.0.jar</filename>, and the Grizzly
    framework, <filename>grizzly-framework-2.1.2.jar</filename>,
    under <filename>opendj-ldap-toolkit-<?eval ${project.version} ?>/lib/</filename>.</para>
    <filename>opendj-ldap-sdk-<?eval ${currentSDKversion} ?>.jar</filename>, 
    the I18N core library, <filename>i18n-core-1.2.0.jar</filename>, the Grizzly
    framework, <filename>grizzly-framework-2.1.2.jar</filename>, and the
    GlassFish management APIs, <filename>gmbal-api-only-3.0.0-b023.jar</filename>
    &amp; <filename>management-api-3.0.0-b012.jar</filename>
    under <filename>opendj-ldap-toolkit-<?eval ${currentSDKversion} ?>/lib/</filename>.</para>
   </step>
   <step>
    <para>Find the OpenDJ LDAP SDK documentation under <link

 opendj3/src/main/docbkx/install-guide/OpenDJ-Install-Guide.xml

@@ -30,7 +30,7 @@
 xmlns:xlink='http://www.w3.org/1999/xlink'
 xmlns:xinclude='http://www.w3.org/2001/XInclude'>
 <info>
  <title>OpenDJ <?eval ${project.version}?> Installation Guide</title>
  <title>OpenDJ <?eval ${docTargetVersion}?> Installation Guide</title>
  <abstract>
   <para>This guide shows you how to install OpenDJ directory services. The
   OpenDJ project offers open source LDAP directory services in Java.</para>

 opendj3/src/main/docbkx/install-guide/chap-install-cli.xml

@@ -63,7 +63,7 @@
     >OpenDJ download page</link>.</para>
   <variablelist>
    <varlistentry>
     <term>OpenDJ-<?eval ${project.version}?>.zip</term>
     <term>OpenDJ-<?eval ${docTargetVersion}?>.zip</term>
     <listitem>
      <para>Cross-platform OpenDJ directory server installation files</para>
     </listitem>
@@ -75,7 +75,7 @@
     </listitem>
    </varlistentry>
    <varlistentry>
     <term>OpenDJ-<?eval ${project.version}?>-DSML.war</term>
     <term>OpenDJ-<?eval ${docTargetVersion}?>-DSML.war</term>
     <listitem>
      <para>Cross-platform OpenDJ DSML gateway web archive</para>
     </listitem>
@@ -124,7 +124,7 @@
  <title>To Install OpenDJ Directory Server</title>
  <indexterm><primary>Command-line installation</primary></indexterm>
  <step>
   <para>Unzip <filename>OpenDJ-<?eval ${project.version}?>.zip</filename>
   <para>Unzip <filename>OpenDJ-<?eval ${docTargetVersion}?>.zip</filename>
   in the file system directory where you want to install the server.</para>

   <para>Unlike the web-based Quick Setup install, the <command>setup</command>
@@ -136,7 +136,7 @@
  
  <step>
   <para>Run the <command>setup --cli</command> command found in the
   <filename>OpenDJ-<?eval ${project.version}?></filename> directory.</para>
   <filename>OpenDJ-<?eval ${docTargetVersion}?></filename> directory.</para>

   <para>This command starts the setup program in interactive mode on the
   command line, prompting you for each option. Alternatively, use
@@ -155,9 +155,9 @@
   GUI installer with your local version of software, as does
   Java WebStart with a remote version of the software.</para>

   <screen>$ /path/to/OpenDJ-<?eval ${project.version}?>/setup --cli
   <screen>$ /path/to/OpenDJ-<?eval ${docTargetVersion}?>/setup --cli

OpenDJ <?eval ${project.version}?>
OpenDJ <?eval ${docTargetVersion}?>
Please wait while the setup program initializes...

What would you like to use as the initial root user DN for the Directory
@@ -221,7 +221,7 @@
Starting Directory Server ........... Done.

To see basic server configuration status and configuration you can launch \
/path/to/OpenDJ-<?eval ${project.version}?>/bin/status</screen>
/path/to/OpenDJ-<?eval ${docTargetVersion}?>/bin/status</screen>

   <variablelist>
    <para>Some notes on the options follow.</para>
@@ -333,7 +333,7 @@
   <para>Run the <command>status</command> command to make sure your OpenDJ
   server is working as expected.</para>

   <screen>$ /path/to/OpenDJ-<?eval ${project.version}?>/bin/status
   <screen>$ /path/to/OpenDJ-<?eval ${docTargetVersion}?>/bin/status

>>>> Specify OpenDJ LDAP connection parameters

@@ -348,8 +348,8 @@
          --- Server Details ---
Host Name:                opendj.example.com
Administrative Users:     cn=Directory Manager
Installation Path:        /path/to/OpenDJ-<?eval ${project.version}?>
Version:                  OpenDJ <?eval ${project.version}?>
Installation Path:        /path/to/OpenDJ-<?eval ${docTargetVersion}?>
Version:                  OpenDJ <?eval ${docTargetVersion}?>
Java Version:             1.6.0_24
Administration Connector: Port 4444 (LDAPS)

@@ -388,7 +388,7 @@
  file.</para>

  <step>
   <para>Deploy <filename>OpenDJ-<?eval ${project.version}?>-DSML.war</filename>
   <para>Deploy <filename>OpenDJ-<?eval ${docTargetVersion}?>-DSML.war</filename>
   according to the instructions for your application server.</para>
  </step>


 opendj3/src/main/docbkx/install-guide/chap-install-gui.xml

@@ -59,12 +59,12 @@
  installer.</para>

 <screen>$ export PATH=/path/to/sun-java6/bin:$PATH
$ javaws http://www.forgerock.org/downloads/opendj/<?eval ${project.version}?>/install/QuickSetup.jnlp</screen>
$ javaws http://www.forgerock.org/downloads/opendj/<?eval ${docTargetVersion}?>/install/QuickSetup.jnlp</screen>

 <para>The WebStart installer corresponds to what you start if you download
 OpenDJ-<?eval ${project.version}?>.zip, unzip the file, and then run
 OpenDJ-<?eval ${project.version}?>/setup (UNIX), OpenDJ-<?eval
 ${project.version}?>\setup.bat (Windows), or QuickSetup.app (Mac OS X).</para>
 OpenDJ-<?eval ${docTargetVersion}?>.zip, unzip the file, and then run
 OpenDJ-<?eval ${docTargetVersion}?>/setup (UNIX), OpenDJ-<?eval
 ${docTargetVersion}?>\setup.bat (Windows), or QuickSetup.app (Mac OS X).</para>
 </note>

 <para>Java WebStart launches the the QuickSetup wizard, and soon the
@@ -129,8 +129,8 @@
   <imagedata fileref="images/QuickSetup-cpstart.png" format="PNG" />
  </imageobject>
  <caption><para>Run <command>OpenDJ-<?eval
  ${project.version}?>/bin/control-panel</command> (UNIX), double-click
  <command>OpenDJ-<?eval ${project.version}?>\bat\control-panel.bat</command>
  ${docTargetVersion}?>/bin/control-panel</command> (UNIX), double-click
  <command>OpenDJ-<?eval ${docTargetVersion}?>\bat\control-panel.bat</command>
  (Windows), or bin/Control Panel.app (Mac OS X) to launch the Control Panel
  again later.</para></caption>
 </mediaobject>

 opendj3/src/main/docbkx/install-guide/chap-uninstall.xml

@@ -39,11 +39,11 @@
  <title>To Uninstall OpenDJ From the Graphical Uninstaller</title>
  <step>
   <para>(UNIX) Run
   <command>OpenDJ-<?eval ${project.version}?>\uninstall</command>.</para>
   <command>OpenDJ-<?eval ${docTargetVersion}?>\uninstall</command>.</para>
   <para>(Windows) Double-click
   <filename>OpenDJ-<?eval ${project.version}?>\uninstall.bat</filename>.</para>
   <filename>OpenDJ-<?eval ${docTargetVersion}?>\uninstall.bat</filename>.</para>
   <para>(Mac OS X) Double-click
   <filename>OpenDJ-<?eval ${project.version}?>\Uninstall.app</filename>.</para>
   <filename>OpenDJ-<?eval ${docTargetVersion}?>\Uninstall.app</filename>.</para>

   <mediaobject>
    <imageobject>
@@ -75,7 +75,7 @@
  </step>
  
  <step>
   <para>Run the <command>OpenDJ-<?eval ${project.version}?>/uninstall
   <para>Run the <command>OpenDJ-<?eval ${docTargetVersion}?>/uninstall
   --cli</command> command.</para>
   
   <para>This command starts the removal program in interactive mode on the
@@ -83,7 +83,7 @@
   <command>uninstall</command> options to specify choices for the options.
   See <command>uninstall --help</command> for more information.</para>
   
   <screen>$ cd /path/to/OpenDJ-<?eval ${project.version}?>
   <screen>$ cd /path/to/OpenDJ-<?eval ${docTargetVersion}?>
$ ./uninstall --cli
Do you want to remove all components of the server or select the components to
remove?
@@ -105,7 +105,7 @@
The Uninstall Completed Successfully.
To complete the uninstallation, you must delete manually the following files
and directories:
/path/to/OpenDJ-<?eval ${project.version}?>/lib
/path/to/OpenDJ-<?eval ${docTargetVersion}?>/lib
See /var/....log for a detailed log of this operation.</screen>
  </step>

@@ -113,7 +113,7 @@
   <para>If the command output tells you to delete files manually, then remove
   those remaining files to complete the process.</para>
 
   <screen>$ rm -rf /path/to/OpenDJ-<?eval ${project.version}?></screen>
   <screen>$ rm -rf /path/to/OpenDJ-<?eval ${docTargetVersion}?></screen>
  </step>
 </procedure>
</chapter>

 opendj3/src/main/docbkx/install-guide/chap-upgrade.xml

@@ -29,7 +29,7 @@
 xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
 xmlns:xlink='http://www.w3.org/1999/xlink'
 xmlns:xinclude='http://www.w3.org/2001/XInclude'>
 <title>Upgrading to OpenDJ <?eval ${project.version}?></title>
 <title>Upgrading to OpenDJ <?eval ${docTargetVersion}?></title>
 <indexterm><primary>Upgrading</primary></indexterm>
 
 <para>You can upgrade from an earlier version of OpenDJ either directly
@@ -119,15 +119,15 @@
    <itemizedlist>
     <listitem>
      <para>(WebStart) <link>http://www.forgerock.org/downloads/opendj/<?eval
      ${project.version}?>/install/QuickSetup.jnlp</link></para>
      ${docTargetVersion}?>/install/QuickSetup.jnlp</link></para>
     </listitem>
     <listitem>
      <para>(UNIX) Run <command>OpenDJ-<?eval
      ${project.version}?>/setup</command>.</para>
      ${docTargetVersion}?>/setup</command>.</para>
     </listitem>
     <listitem>
      <para>(Windows) Double-click <filename>OpenDJ-<?eval
      ${project.version}?>\setup.bat</filename></para>
      ${docTargetVersion}?>\setup.bat</filename></para>
     </listitem>
    </itemizedlist>
   </step>
@@ -160,7 +160,7 @@
   <step>
    <para>Download the OpenDJ .zip file.</para>
    <screen>$ cd /tmp
$ wget http://www.forgerock.org/downloads/opendj/<?eval ${project.version}?>/OpenDJ-<?eval ${project.version}?>.zip</screen>
$ wget http://www.forgerock.org/downloads/opendj/<?eval ${docTargetVersion}?>/OpenDJ-<?eval ${docTargetVersion}?>.zip</screen>
   </step>
   <step>
    <para>Change to the directory at the root of the server instance.</para>
@@ -168,7 +168,7 @@
   </step>
   <step>
    <para>Pass the .zip file name to the <command>upgrade</command> command.</para>
    <screen>$ ./upgrade -f /tmp/OpenDJ-<?eval ${project.version}?>.zip
    <screen>$ ./upgrade -f /tmp/OpenDJ-<?eval ${docTargetVersion}?>.zip
See /var/....log for a detailed log of this operation.

Initializing Upgrade ..... Done.
@@ -185,7 +185,7 @@
Recording Upgrade History ..... Done.
See /path/to/OpenDJ/history/log for a detailed installation history.
QuickUpgrade Completed Successfully.  The OpenDJ installation at
/path/to/OpenDJ has now been upgraded to version OpenDJ <?eval ${project.version}?> (Build ID:
/path/to/OpenDJ has now been upgraded to version OpenDJ <?eval ${docTargetVersion}?> (Build ID:
<replaceable>buildId</replaceable>).

See /var/....log for a detailed log of this operation.</screen>

 opendj3/src/main/docbkx/release-notes/OpenDJ-Release-Notes.xml

@@ -30,7 +30,7 @@
 xmlns:xlink='http://www.w3.org/1999/xlink'
 xmlns:xinclude='http://www.w3.org/2001/XInclude'>
 <info>
  <title>OpenDJ <?eval ${project.version}?> Release Notes</title>
  <title>OpenDJ <?eval ${docTargetVersion}?> Release Notes</title>
  <abstract>
   <para>Notes covering OpenDJ hardware &amp; software requirements, fixes,
   known issues. The OpenDJ project offers open source LDAP directory services
@@ -69,7 +69,7 @@
  and modify the source code to build your own version if you prefer.</para>
   
  <para>These release notes are written for everyone working with the
  OpenDJ <?eval ${project.version}?> release. Read these notes before you
  OpenDJ <?eval ${docTargetVersion}?> release. Read these notes before you
  install or upgrade OpenDJ software. These notes cover hardware and software
  prerequisites for installing and upgrading OpenDJ software. These
  notes list key features added and changed in this release. They also

 opendj3/src/main/docbkx/release-notes/chap-feedback.xml

@@ -38,7 +38,7 @@
 likely to find an answer.</para>

 <para>If you have found issues or reproducible bugs within OpenDJ
 <?eval ${project.version}?>, report them in <link
 <?eval ${docTargetVersion}?>, report them in <link
 xlink:href='https://bugster.forgerock.org'
 >https://bugster.forgerock.org</link>.</para>


 opendj3/src/main/docbkx/release-notes/chap-issues.xml

@@ -34,12 +34,13 @@
 <para>OpenDJ issues are tracked at <link
 xlink:href='https://bugster.forgerock.org/jira/browse/OPENDJ'
 >https://bugster.forgerock.org/jira/browse/OPENDJ</link>. This chapter
 covers the status of key issues at release <?eval ${project.version}?>.</para>
 covers the status of key issues at release <?eval ${docTargetVersion}?>.</para>

 <section>
  <title>Fixes Since Last Release</title>

  <para>The following issues were fixed since release 2.4.2.</para>
  <para>The following issues were fixed since release
  <?eval ${stableServerVersion} ?>.</para>

  <itemizedlist>
   <listitem>
@@ -51,7 +52,7 @@
 <section xml:id="limitations">
  <title>Limitations</title>

  <para>Release <?eval ${project.version}?> has the following limitations.</para>
  <para>Release <?eval ${docTargetVersion}?> has the following limitations.</para>

  <itemizedlist>
   <listitem>
@@ -95,7 +96,7 @@
  <title>Known Issues</title>

  <para>The following known issues remained open at the time release
  <?eval ${project.version}?> became available.</para>
  <?eval ${docTargetVersion}?> became available.</para>

  <itemizedlist>
   <listitem>

 opendj3/src/main/docbkx/release-notes/chap-testing.xml

@@ -39,7 +39,7 @@
 applications with the OpenDJ LDAP SDK, you need the Java SDK as the runtime
 environment has no compiler.</para>

 <para>That said, OpenDJ <?eval ${project.version}?> has been validated on
 <para>That said, OpenDJ <?eval ${docTargetVersion}?> has been validated on
 the following operating systems.</para>

 <itemizedlist>
@@ -57,7 +57,7 @@
  </listitem>
 </itemizedlist>

 <para>OpenDJ <?eval ${project.version}?> DSML gateway has been validated
 <para>OpenDJ <?eval ${docTargetVersion}?> DSML gateway has been validated
 on Apache Tomcat 6.</para>

</chapter>

 opendj3/src/main/docbkx/release-notes/chap-whats-new.xml

@@ -29,10 +29,11 @@
  xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
  xmlns:xlink='http://www.w3.org/1999/xlink'
  xmlns:xinclude='http://www.w3.org/2001/XInclude'>
  <title>What's New in OpenDJ <?eval ${project.version}?></title>
  <title>What's New in OpenDJ <?eval ${docTargetVersion}?></title>

  <para>Compared to the OpenDJ 2.4, OpenDJ <?eval ${project.version}?> fixes a
  number of issues, and provides the following additional features.</para>
  <para>Compared to the OpenDJ <?eval ${stableServerVersion} ?>, OpenDJ
  <?eval ${docTargetVersion}?> fixes a number of issues, and provides the
  following additional features.</para>
  
  <itemizedlist>
    <listitem>

 opendj3/src/main/docbkx/shared/man-authrate.xml

@@ -33,7 +33,7 @@
 <refmeta>
  <refentrytitle>authrate</refentrytitle><manvolnum>1</manvolnum>
  <refmiscinfo class="software">OpenDJ</refmiscinfo>
  <refmiscinfo class="version"><?eval ${project.version}?></refmiscinfo>
  <refmiscinfo class="version"><?eval ${currentSDKversion}?></refmiscinfo>
 </refmeta>
 <refnamediv>
  <refname>authrate</refname>

 opendj3/src/main/docbkx/shared/man-ldapcompare.xml

@@ -33,7 +33,7 @@
 <refmeta>
  <refentrytitle>ldapcompare</refentrytitle><manvolnum>1</manvolnum>
  <refmiscinfo class="software">OpenDJ</refmiscinfo>
  <refmiscinfo class="version"><?eval ${project.version}?></refmiscinfo>
  <refmiscinfo class="version"><?eval ${docTargetVersion}?></refmiscinfo>
 </refmeta>
 <refnamediv>
  <refname>ldapcompare</refname>

 opendj3/src/main/docbkx/shared/man-ldapmodify.xml

@@ -33,7 +33,7 @@
 <refmeta>
  <refentrytitle>ldapmodify</refentrytitle><manvolnum>1</manvolnum>
  <refmiscinfo class="software">OpenDJ</refmiscinfo>
  <refmiscinfo class="version"><?eval ${project.version}?></refmiscinfo>
  <refmiscinfo class="version"><?eval ${docTargetVersion}?></refmiscinfo>
 </refmeta>
 <refnamediv>
  <refname>ldapmodify</refname>

 opendj3/src/main/docbkx/shared/man-ldappasswordmodify.xml

@@ -33,7 +33,7 @@
 <refmeta>
  <refentrytitle>ldappasswordmodify</refentrytitle><manvolnum>1</manvolnum>
  <refmiscinfo class="software">OpenDJ</refmiscinfo>
  <refmiscinfo class="version"><?eval ${project.version}?></refmiscinfo>
  <refmiscinfo class="version"><?eval ${docTargetVersion}?></refmiscinfo>
 </refmeta>
 <refnamediv>
  <refname>ldappasswordmodify</refname>

 opendj3/src/main/docbkx/shared/man-ldapsearch.xml

@@ -33,7 +33,7 @@
 <refmeta>
  <refentrytitle>ldapsearch</refentrytitle><manvolnum>1</manvolnum>
  <refmiscinfo class="software">OpenDJ</refmiscinfo>
  <refmiscinfo class="version"><?eval ${project.version}?></refmiscinfo>
  <refmiscinfo class="version"><?eval ${docTargetVersion}?></refmiscinfo>
 </refmeta>
 <refnamediv>
  <refname>ldapsearch</refname>

 opendj3/src/main/docbkx/shared/man-modrate.xml

@@ -33,7 +33,7 @@
 <refmeta>
  <refentrytitle>modrate</refentrytitle><manvolnum>1</manvolnum>
  <refmiscinfo class="software">OpenDJ</refmiscinfo>
  <refmiscinfo class="version"><?eval ${project.version}?></refmiscinfo>
  <refmiscinfo class="version"><?eval ${currentSDKversion}?></refmiscinfo>
 </refmeta>
 <refnamediv>
  <refname>modrate</refname>

 opendj3/src/main/docbkx/shared/man-searchrate.xml

@@ -33,7 +33,7 @@
 <refmeta>
  <refentrytitle>searchrate</refentrytitle><manvolnum>1</manvolnum>
  <refmiscinfo class="software">OpenDJ</refmiscinfo>
  <refmiscinfo class="version"><?eval ${project.version}?></refmiscinfo>
  <refmiscinfo class="version"><?eval ${currentSDKversion}?></refmiscinfo>
 </refmeta>
 <refnamediv>
  <refname>searchrate</refname>

 opendj3/src/main/docbkx/shared/man-setup.xml

@@ -327,7 +327,7 @@
 -w password -h `hostname` -p 1389
 --generateSelfSignedCertificate --enableStartTLS -n 

OpenDJ <?eval ${project.version}?>
OpenDJ <?eval ${docTargetVersion}?>
Please wait while the setup program initializes...

See /var/.../opends-setup-484...561.log for a detailed log of this operation.

 opendj3/src/main/docbkx/shared/man-status.xml

@@ -216,7 +216,7 @@
Host Name:                localhost.localdomain
Administrative Users:     cn=Directory Manager
Installation Path:        /path/to/OpenDJ
Version:                  OpenDJ <?eval ${project.version}?>
Version:                  OpenDJ <?eval ${docTargetVersion}?>
Java Version:             1.6.0_24
Administration Connector: Port 4444 (LDAPS)


 opendj3/src/main/docbkx/shared/man-upgrade.xml

@@ -148,7 +148,7 @@
 <refsect1>
  <title>Examples</title>
  <para>The following example demonstrates upgrade without interaction.</para>
  <screen>$ ./OpenDJ/upgrade -f ~/Downloads/OpenDJ-<?eval ${project.version}?>.zip -n
  <screen>$ ./OpenDJ/upgrade -f ~/Downloads/OpenDJ-<?eval ${docTargetVersion}?>.zip -n
See
/var/.../opends-upgrade-5650414945123366149.log
 for a detailed log of this operation.
@@ -165,7 +165,7 @@
Recording Upgrade History ..... Done.
See /path/to/OpenDJ/history/log for a detailed installation history.
QuickUpgrade Completed Successfully.  The OpenDJ installation at
/path/to/OpenDJ has now been upgraded to version OpenDJ <?eval ${project.version}?> (Build ID:
/path/to/OpenDJ has now been upgraded to version OpenDJ <?eval ${docTargetVersion}?> (Build ID:
YYYYMMDDhhmmssZ).

See /var/.../opends-upgrade-5650414945123366149.log