CR-7770 OPENDJ-2195 Move hand-written server docs

Mark Craig

30.49.2015 9e25366b81193070c5d1553b35481d8ddc52beab

CR-7770 OPENDJ-2195 Move hand-written server docs

 docs/pom.xml

@@ -32,7 +32,7 @@
  <parent>
    <groupId>org.forgerock</groupId>
    <artifactId>forgerock-parent</artifactId>
    <version>2.0.0</version>
    <version>2.0.2</version>
  </parent>
  <groupId>org.forgerock.opendj</groupId>
  <artifactId>opendj-docs</artifactId>
@@ -74,7 +74,7 @@
  </scm>
  <ciManagement>
    <system>jenkins</system>
    <url>https://builds.forgerock.org/view/Docs/job/OpenDJ%20Community%20Site%20(core%20docs)/</url>
    <url>https://builds.forgerock.org/view/Docs/job/OpenDJ_site/</url>
    <notifiers>
      <notifier>
        <type>mail</type>
@@ -102,19 +102,18 @@

    <!-- START Documentation properties -->
    <shortProductName>OpenDJ</shortProductName>
    <docTargetVersion>${project.version}</docTargetVersion><!-- Reset before final publication -->
    <docTargetVersion>${project.version}</docTargetVersion>
    <docPreviousVersion>2.6.0</docPreviousVersion>
    <sdkDocTargetVersion>${docTargetVersion}</sdkDocTargetVersion>
    <sdkDocTargetVersion>${project.version}</sdkDocTargetVersion>

    <frDocPluginVersion>3.0.0</frDocPluginVersion>
    <gaId>UA-23412190-8</gaId>

    <siteDistributionURL>scp://forgerock.org/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>
    <siteDistributionURL>scp://community.internal.forgerock.com/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>

    <!--
      Release date and publication date are set at release build time.
        -D"releaseDate=Software release date: January 1, 1970"
        -D"pubDate=Publication date: December 31, 1969"
        -D"releaseDate=1970-01-01" -D"pubDate=1969-12-31"
      At all other times, the dates should be empty.
    -->
    <releaseDate />
@@ -124,7 +123,7 @@

    <!-- Permit doc build to override relative locations of non DocBook content -->
    <coreDocBase>http://opendj.forgerock.org/doc/bootstrap/</coreDocBase>
    <serverDocBase>http://opendj.forgerock.org/opendj-server/doc/bootstrap/</serverDocBase>
    <serverDocBase>http://opendj.forgerock.org/doc/bootstrap/</serverDocBase>
    <serverJavadocBase>http://opendj.forgerock.org/opendj-server/javadoc/</serverJavadocBase>
    <sdkJavadocBase>http://opendj.forgerock.org/opendj-core/apidocs/</sdkJavadocBase>
    <!-- END Documentation properties -->
@@ -136,13 +135,14 @@
        <inherited>false</inherited>
        <executions>
          <execution>
            <id>unpack-sdk-doc-prerequisites</id>
            <id>unpack-doc-prerequisites</id>
            <phase>pre-site</phase>
            <goals>
              <goal>unpack</goal>
            </goals>
            <configuration>
              <artifactItems>
                <!-- For SDK docs -->
                <artifactItem>
                  <groupId>org.forgerock.opendj</groupId>
                  <artifactId>opendj-ldap-sdk-examples</artifactId>
@@ -164,29 +164,28 @@
                  <classifier>man-pages</classifier>
                  <outputDirectory>${project.build.directory}/docbkx-sources</outputDirectory>
                </artifactItem>
                <!-- For both -->
                <artifactItem>
                  <groupId>org.forgerock.opendj</groupId>
                  <artifactId>opendj-server-legacy</artifactId>
                  <version>${project.version}</version>
                  <classifier>generated-doc-sources</classifier>
                  <outputDirectory>${project.build.directory}/docbkx-sources/shared</outputDirectory>
                </artifactItem>
                <!-- For server docs -->
                <artifactItem>
                  <groupId>org.forgerock.opendj</groupId>
                  <artifactId>opendj-server-legacy</artifactId>
                  <version>${project.version}</version>
                  <classifier>server-man-page-sources</classifier>
                  <outputDirectory>${project.build.directory}/docbkx-sources/server-man-pages</outputDirectory>
                </artifactItem>
              </artifactItems>
            </configuration>
          </execution>
        </executions>
      </plugin>
      <plugin>
        <groupId>org.forgerock.opendj</groupId>
        <artifactId>opendj-doc-maven-plugin</artifactId>
        <executions>
          <execution>
            <id>generate-result-code-doc</id>
            <phase>pre-site</phase>
            <goals>
              <goal>generate-result-code-doc</goal>
            </goals>
            <configuration>
              <resultCodeSource>${project.build.directory}/core-sources/org/forgerock/opendj/ldap/ResultCode.java</resultCodeSource>
              <xmlFile>${project.build.directory}/docbkx-sources/dev-guide/appendix-ldap-result-codes.xml</xmlFile>
            </configuration>
          </execution>
        </executions>
      </plugin>
      <plugin>
        <groupId>org.forgerock.commons</groupId>
        <artifactId>forgerock-doc-maven-plugin</artifactId>
        <configuration>
@@ -195,6 +194,43 @@
           <jCiteSourcePath>${project.build.directory}/docbkx-sources/resources</jCiteSourcePath>
         </jCiteSourcePaths>
         <copyResourceFiles>true</copyResourceFiles>
         <!-- Use conditional text to exclude local-db related elements in hand-written docs.
           <exclusions>
             <condition>local-db</condition>
           </exclusions>
         -->
         <artifactItems>
           <!-- For SDK docs -->
<!-- Not built at present, see OPENDJ-2229
           <artifactItem>
             <groupId>org.forgerock.opendj</groupId>
             <artifactId>opendj-core</artifactId>
             <version>${project.version}</version>
             <classifier>javadoc</classifier>
             <outputDirectory>sdk-javadoc</outputDirectory>
             <title>OpenDJ LDAP SDK Javadoc</title>
           </artifactItem>
-->
           <!-- For server docs -->
           <artifactItem>
             <groupId>org.forgerock.opendj</groupId>
             <artifactId>opendj-server-legacy</artifactId>
             <version>${project.version}</version>
             <classifier>config-ref</classifier>
             <outputDirectory>configref</outputDirectory>
             <title>OpenDJ Configuration Reference</title>
           </artifactItem>
<!-- Not built at present, see OPENDJ-2229
           <artifactItem>
             <groupId>org.forgerock.opendj</groupId>
             <artifactId>opendj-server-legacy</artifactId>
             <version>${project.version}</version>
             <classifier>javadoc</classifier>
             <outputDirectory>server-javadoc</outputDirectory>
             <title>OpenDJ Directory Server Javadoc</title>
           </artifactItem>
-->
         </artifactItems>
        </configuration>
        <executions>
          <execution>
@@ -222,7 +258,7 @@
            <id>layout-release</id>
            <phase>site</phase>
            <goals>
              <goal>release</goal>
              <goal>backstage</goal>
            </goals>
          </execution>
        </executions>

 docs/src/main/docbkx/README.txt

@@ -1,2 +1,7 @@
DocBook XML source for OpenDJ core user documentation. Java API and
configuration reference documentation is generated from OpenDJ source code.
DocBook XML source for hand-written OpenDJ core user documentation.
Javadoc and generated reference documentation are taken as artifacts
from OpenDJ server and SDK projects.

Note to writers:
Do not use Olinks between SDK docs and server docs
because the SDK docs and server docs can be delivered separately.

 docs/src/main/docbkx/admin-guide/chap-account-lockout.xml

 docs/src/main/docbkx/admin-guide/chap-admin-tools.xml

 docs/src/main/docbkx/admin-guide/chap-attribute-uniqueness.xml

 docs/src/main/docbkx/admin-guide/chap-backup-restore.xml

 docs/src/main/docbkx/admin-guide/chap-chaining.xml

 docs/src/main/docbkx/admin-guide/chap-change-certs.xml

 docs/src/main/docbkx/admin-guide/chap-connection-handlers.xml

 docs/src/main/docbkx/admin-guide/chap-failover.xml

 docs/src/main/docbkx/admin-guide/chap-import-export.xml

 docs/src/main/docbkx/admin-guide/chap-indexing.xml

 docs/src/main/docbkx/admin-guide/chap-load-balancing.xml

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

 docs/src/main/docbkx/admin-guide/chap-mv-servers.xml

 docs/src/main/docbkx/admin-guide/chap-privileges-acis.xml

 docs/src/main/docbkx/admin-guide/chap-pta.xml

 docs/src/main/docbkx/admin-guide/chap-pwd-policy.xml

 docs/src/main/docbkx/admin-guide/chap-replication.xml

 docs/src/main/docbkx/admin-guide/chap-resource-limits.xml

 docs/src/main/docbkx/admin-guide/chap-samba.xml

 docs/src/main/docbkx/admin-guide/chap-schema.xml

 docs/src/main/docbkx/admin-guide/chap-server-process.xml

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

 docs/src/main/docbkx/admin-guide/chap-tuning.xml

 docs/src/main/docbkx/admin-guide/chap-understanding-ldap.xml

 docs/src/main/docbkx/admin-guide/images/JXplorer-dsml.png

 docs/src/main/docbkx/admin-guide/images/Manage-Entries.png

 docs/src/main/docbkx/admin-guide/images/Manage-Schema.png

 docs/src/main/docbkx/admin-guide/images/OpenDJ-Control-Panel.png

 docs/src/main/docbkx/admin-guide/images/create-vlv-index.png

 docs/src/main/docbkx/admin-guide/images/custom-attrtype.png

 docs/src/main/docbkx/admin-guide/images/custom-objclass.png

 docs/src/main/docbkx/admin-guide/images/data-organization.png

 docs/src/main/docbkx/admin-guide/images/keystores.png

 docs/src/main/docbkx/admin-guide/images/repl-topologies-right.png

 docs/src/main/docbkx/admin-guide/images/repl-topologies-wrong.png

 docs/src/main/docbkx/admin-guide/images/standalone-repl.png

 docs/src/main/docbkx/admin-guide/index.xml

 docs/src/main/docbkx/admin-guide/preface.xml

 docs/src/main/docbkx/dev-guide/index.xml

@@ -130,7 +130,7 @@
  </xinclude:include>
 </reference>

 <xinclude:include href="appendix-ldap-result-codes.xml">
 <xinclude:include href="../shared/appendix-ldap-result-codes.xml">
  <xinclude:fallback>
   <appendix>
    <title>LDAP Result Codes Missing</title>

 docs/src/main/docbkx/install-guide/chap-install.xml

 docs/src/main/docbkx/install-guide/chap-jvm-opts.xml

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

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

 docs/src/main/docbkx/install-guide/images/OpenDJ-Control-Panel.png

 docs/src/main/docbkx/install-guide/index.xml

 docs/src/main/docbkx/install-guide/preface.xml

 docs/src/main/docbkx/man-pages/ldapmodify-examples.xml

@@ -106,7 +106,8 @@
  to the new user's entry.
 </para>

 <screen>$ <userinput>cat newdesc.ldif</userinput>
 <screen>
$ <userinput>cat newdesc.ldif</userinput>
<computeroutput>dn: uid=newuser,ou=People,dc=example,dc=com
changetype: modify
add: description
@@ -140,7 +141,8 @@
  The following example demonstrates deleting the new user's entry.
 </para>

 <screen>$ <userinput>cat deluser.ldif</userinput>
 <screen>
$ <userinput>cat deluser.ldif</userinput>
<computeroutput>dn: uid=newuser,ou=People,dc=example,dc=com
changetype: delete</computeroutput>


 docs/src/main/docbkx/man-pages/ldappasswordmodify-examples.xml

@@ -31,7 +31,7 @@
 <title>Examples</title>

 <para>
  The following example demonstrates a user changing the password for an entry.
   The following example demonstrates a user changing their own password.
 </para>

 <screen>

 docs/src/main/docbkx/man-pages/ldifmodify-examples.xml

@@ -35,7 +35,7 @@
 </para>

 <screen>
$ cat <userinput>/path/to/newuser.ldif</userinput>
$ <userinput>cat /path/to/newuser.ldif</userinput>
<computeroutput>dn: uid=newuser,ou=People,dc=example,dc=com
uid: newuser
objectClass: person

 docs/src/main/docbkx/man-pages/variablelist-ldap-controls.xml

@@ -124,3 +124,4 @@
  </listitem>
 </varlistentry>
</variablelist>


 docs/src/main/docbkx/reference/appendix-controls.xml

 docs/src/main/docbkx/reference/appendix-extended-ops.xml

 docs/src/main/docbkx/reference/appendix-file-layout.xml

 docs/src/main/docbkx/reference/appendix-interface-stability.xml

 docs/src/main/docbkx/reference/appendix-l10n.xml

 docs/src/main/docbkx/reference/appendix-ports-used.xml

 docs/src/main/docbkx/reference/appendix-rest2ldap.xml

 docs/src/main/docbkx/reference/appendix-standards.xml

 docs/src/main/docbkx/reference/index.xml

File was renamed from opendj-server-legacy/src/main/docbkx/reference/index.xml
@@ -87,107 +87,107 @@
   </para>
  </partintro>

  <xinclude:include href='../man-pages/man-backup.xml'>
  <xinclude:include href='../server-man-pages/man-backup.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-base64.xml'>
  <xinclude:include href='../server-man-pages/man-base64.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-control-panel.xml'>
  <xinclude:include href='../server-man-pages/man-control-panel.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-create-rc-script.xml'>
  <xinclude:include href='../server-man-pages/man-create-rc-script.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-dbtest.xml'>
  <xinclude:include href='../server-man-pages/man-dbtest.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-dsconfig.xml'>
  <xinclude:include href='../server-man-pages/man-dsconfig.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-dsjavaproperties.xml'>
  <xinclude:include href='../server-man-pages/man-dsjavaproperties.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-dsreplication.xml'>
  <xinclude:include href='../server-man-pages/man-dsreplication.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-encode-password.xml'>
  <xinclude:include href='../server-man-pages/man-encode-password.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-export-ldif.xml'>
  <xinclude:include href='../server-man-pages/man-export-ldif.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-import-ldif.xml'>
  <xinclude:include href='../server-man-pages/man-import-ldif.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-ldapcompare.xml'>
  <xinclude:include href='../server-man-pages/man-ldapcompare.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-ldapdelete.xml'>
  <xinclude:include href='../server-man-pages/man-ldapdelete.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-ldapmodify.xml'>
  <xinclude:include href='../server-man-pages/man-ldapmodify.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-ldappasswordmodify.xml'>
  <xinclude:include href='../server-man-pages/man-ldappasswordmodify.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-ldapsearch.xml'>
  <xinclude:include href='../server-man-pages/man-ldapsearch.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-ldif-diff.xml'>
  <xinclude:include href='../server-man-pages/man-ldif-diff.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-ldifmodify.xml'>
  <xinclude:include href='../server-man-pages/man-ldifmodify.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-ldifsearch.xml'>
  <xinclude:include href='../server-man-pages/man-ldifsearch.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-list-backends.xml'>
  <xinclude:include href='../server-man-pages/man-list-backends.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-make-ldif.xml'>
  <xinclude:include href='../server-man-pages/man-make-ldif.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-make-ldif-template.xml' />
  <xinclude:include href='../man-pages/man-manage-account.xml'>
  <xinclude:include href='../server-man-pages/man-make-ldif-template.xml' />
  <xinclude:include href='../server-man-pages/man-manage-account.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-manage-tasks.xml'>
  <xinclude:include href='../server-man-pages/man-manage-tasks.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-rebuild-index.xml'>
  <xinclude:include href='../server-man-pages/man-rebuild-index.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-restore.xml'>
  <xinclude:include href='../server-man-pages/man-restore.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-setup.xml'>
  <xinclude:include href='../server-man-pages/man-setup.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-start-ds.xml'>
  <xinclude:include href='../server-man-pages/man-start-ds.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-status.xml'>
  <xinclude:include href='../server-man-pages/man-status.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-stop-ds.xml'>
  <xinclude:include href='../server-man-pages/man-stop-ds.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-uninstall.xml'>
  <xinclude:include href='../server-man-pages/man-uninstall.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-upgrade.xml'>
  <xinclude:include href='../server-man-pages/man-upgrade.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-verify-index.xml'>
  <xinclude:include href='../server-man-pages/man-verify-index.xml'>
   <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
  </xinclude:include>
  <xinclude:include href='../man-pages/man-windows-service.xml' />
  <xinclude:include href='../server-man-pages/man-windows-service.xml' />
 </reference>

 <xinclude:include href="../man-pages/man-dsconfig-subcommands-ref.xml">
 <xinclude:include href="../server-man-pages/man-dsconfig-subcommands-ref.xml">
  <xinclude:fallback><!-- Failed to include page --></xinclude:fallback>
 </xinclude:include>

@@ -220,8 +220,8 @@

 <reference>
    <title>OpenSolaris Support Reference</title>
    <xinclude:include href='../man-pages/man-configure.xml' />
    <xinclude:include href='../man-pages/man-opendj.xml' />
    <xinclude:include href='../server-man-pages/man-configure.xml' />
    <xinclude:include href='../server-man-pages/man-opendj.xml' />
 </reference>

 <index />

 docs/src/main/docbkx/reference/preface.xml

 docs/src/main/docbkx/release-notes/chap-before-you-install.xml

 docs/src/main/docbkx/release-notes/chap-compatibility.xml

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

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

 docs/src/main/docbkx/release-notes/chap-support.xml

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

 docs/src/main/docbkx/release-notes/index.xml

 docs/src/main/docbkx/resources/captured-global-aci-edits.sh

 docs/src/main/docbkx/server-dev-guide/chap-groups.xml

 docs/src/main/docbkx/server-dev-guide/chap-ldap-operations.xml

 docs/src/main/docbkx/server-dev-guide/chap-referrals.xml

 docs/src/main/docbkx/server-dev-guide/chap-rest-operations.xml

 docs/src/main/docbkx/server-dev-guide/chap-schema.xml

 docs/src/main/docbkx/server-dev-guide/chap-virtual-attrs-collective-attrs.xml

 docs/src/main/docbkx/server-dev-guide/index.xml

 docs/src/main/docbkx/server-dev-guide/preface.xml

 docs/src/main/docbkx/shared/affiliation-fr.xml

@@ -7,8 +7,8 @@

   <orgname>ForgeRock AS</orgname>
   <address>
    <street>33 New Montgomery St.</street>
    <otheraddr>Suite 1500</otheraddr>
    <street>201 Mission St.</street>
    <otheraddr>Suite 2900</otheraddr>
    <city>San Francisco</city>, <state>CA</state> <postcode>94105</postcode>
    <country>USA</country>
    <phone>+1 415-599-1100 (US)</phone>

 docs/src/main/docbkx/shared/glossary.xml

@@ -23,12 +23,12 @@
  !
-->
<glossary xml:id='glossary'
 xmlns='http://docbook.org/ns/docbook'
 version='5.0' xml:lang='en'
 xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
 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'>
          xmlns='http://docbook.org/ns/docbook'
          version='5.0' xml:lang='en'
          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
          xsi:schemaLocation='http://docbook.org/ns/docbook
                              http://docbook.org/xml/5.0/xsd/docbook.xsd'
          xmlns:xlink='http://www.w3.org/1999/xlink'>
 <title>OpenDJ Glossary</title>

 <glossentry>
@@ -188,6 +188,26 @@
 </glossentry>

 <glossentry>
  <glossterm>Branch</glossterm>
  <glossdef>
   <para>
    The distinguished name (DN) of a non-leaf entry
    in the Directory Information Tree (DIT),
    and also that entry and all its subordinates taken together.
   </para>

   <para>
    Some administrative operations allow you to include or exclude branches
    by specifying the DN of the branch.
   </para>

   <para>
    See also <xref linkend="suffix" />.
   </para>
  </glossdef>
 </glossentry>

 <glossentry>
  <glossterm>Collective attribute</glossterm>
  <glossdef>
   <para>A standard mechanism for defining attributes that appear on all the
@@ -258,6 +278,17 @@
  </glossdef>
 </glossentry>

 <glossentry>
  <glossterm>Directory Information Tree (DIT)</glossterm>
  <glossdef>
   <para>
    A set of directory entries organized hierarchically in a tree structure,
    where the vertices are the entries
    and the arcs between vertices define relationships between entries
   </para>
  </glossdef>
 </glossentry>

 <glossentry xml:id="directory-manager">
  <glossterm>Directory manager</glossterm>
  <glossdef>
@@ -778,6 +809,19 @@
  </glossdef>
 </glossentry>

 <glossentry xml:id="suffix">
  <glossterm>Suffix</glossterm>
  <glossdef>
   <para>
    The distinguished name (DN) of a root entry
    in the Directory Information Tree (DIT),
    and also that entry and all its subordinates taken together
    as a single object of administrative tasks
    such as export, import, indexing, and replication.
   </para>
  </glossdef>
 </glossentry>

 <glossentry>
  <glossterm>Task</glossterm>
  <glossdef>

 docs/src/main/docbkx/shared/informalexample-default-indexes.xml

 docs/src/main/docbkx/shared/itemizedlist-download.xml

@@ -19,7 +19,7 @@
  !
  ! CCPL HEADER END
  !
  !      Copyright 2013-2015 ForgeRock AS
  !      Copyright 2013-2015 ForgeRock AS.
  !
-->
<itemizedlist

 docs/src/main/docbkx/shared/para-disable-anti-virus.xml

 docs/src/main/docbkx/shared/para-when-you-unzip.xml

 docs/src/main/docbkx/shared/para-write-barriers.xml

 docs/src/main/docbkx/shared/screen-upgrade.xml

 docs/src/main/docbkx/shared/sec-cli-overview.xml

 docs/src/main/docbkx/shared/sec-prerequisites-file-descriptors.xml

 docs/src/main/docbkx/shared/sec-standard-schema.xml

 docs/src/main/vectors/repl-topologies.graffle

Binary files differ

 opendj-server-legacy/src/main/docbkx/README.txt

File was deleted

 opendj-server-legacy/src/main/docbkx/legal.xml

File was deleted

 opendj-server-legacy/src/main/docbkx/man-pages/ldappasswordmodify-examples.xml

@@ -30,9 +30,9 @@
                              http://docbook.org/xml/5.0/xsd/docbook.xsd">
 <title>Examples</title>

  <para>
 <para>
   The following example demonstrates a user changing their own password.
  </para>
 </para>

 <screen>
$ <userinput>cat /tmp/currpwd.txt /tmp/newpwd.txt</userinput>

 opendj-server-legacy/src/main/docbkx/man-pages/ldifmodify-examples.xml

@@ -64,16 +64,16 @@

$ <userinput>cat neweruser.ldif</userinput>
<computeroutput>dn: uid=newuser,ou=People,dc=example,dc=com
objectClass: person
objectClass: inetOrgPerson
objectClass: organizationalPerson
objectClass: top
uid: newuser
description: A new description.
objectClass: person
objectClass: organizationalPerson
objectClass: inetOrgPerson
objectClass: top
cn: New User
sn: User
userPassword: secret12
ou: People
mail: newuser@example.com
ou: People</computeroutput>
userPassword: secret12
description: A new description.</computeroutput>
 </screen>
</refsect1>

 opendj-server-legacy/src/main/docbkx/man-pages/variablelist-ldap-controls.xml

@@ -44,7 +44,7 @@
   </para>
  </listitem>
 </varlistentry>
 

 <varlistentry>
  <term><literal>authzid</literal></term>
  <term><literal>authorizationidentity</literal></term>
@@ -124,3 +124,4 @@
  </listitem>
 </varlistentry>
</variablelist>


 opendj-server-legacy/src/main/docbkx/resources/Example.ldif

File was deleted

 opendj-server-legacy/src/main/docbkx/shared/affiliation-fr.xml

File was deleted

 opendj-server-legacy/src/main/docbkx/shared/glossary.xml

File was deleted

 opendj-server-legacy/src/main/docbkx/shared/images/caution.png

Binary files differ

 opendj-server-legacy/src/main/docbkx/shared/images/forgerock-opendj-logo.png

Binary files differ

 opendj-server-legacy/src/main/docbkx/shared/images/important.png

Binary files differ

 opendj-server-legacy/src/main/docbkx/shared/images/note.png

Binary files differ

 opendj-server-legacy/src/main/docbkx/shared/images/tip.png

Binary files differ

 opendj-server-legacy/src/main/docbkx/shared/images/warning.png

Binary files differ

 opendj-server-legacy/src/main/docbkx/shared/itemizedlist-download.xml

File was deleted

 opendj-server-legacy/src/main/docbkx/shared/mediaobject-fr-logo.xml

File was deleted

 opendj-server-legacy/src/main/docbkx/shared/sec-accessing-doc-online.xml

File was deleted

 opendj-server-legacy/src/main/docbkx/shared/sec-formatting-conventions.xml

File was deleted

 opendj-server-legacy/src/main/docbkx/shared/sec-interface-stability.xml

File was deleted

 opendj-server-legacy/src/main/docbkx/shared/sec-joining-the-community.xml

File was deleted

 opendj-server-legacy/src/main/docbkx/shared/sec-release-levels.xml

File was deleted

 opendj-server-legacy/src/main/docbkx/shared/table-filter-operators.xml

File was deleted