directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r985103 - in /directory/sandbox/felixk/apacheds-docs/src/docbkx: basic_user_guide.xml book.xml chapter-how-to-begin.xml chapter_basic_security.xml chapter_integrating_apacheds_with_other_programs.xml
Date Fri, 13 Aug 2010 06:24:27 GMT
Author: felixk
Date: Fri Aug 13 06:24:27 2010
New Revision: 985103

URL: http://svn.apache.org/viewvc?rev=985103&view=rev
Log:
Replace docbook 4 tags (at least I hope so ...)

Modified:
    directory/sandbox/felixk/apacheds-docs/src/docbkx/basic_user_guide.xml
    directory/sandbox/felixk/apacheds-docs/src/docbkx/book.xml
    directory/sandbox/felixk/apacheds-docs/src/docbkx/chapter-how-to-begin.xml
    directory/sandbox/felixk/apacheds-docs/src/docbkx/chapter_basic_security.xml
    directory/sandbox/felixk/apacheds-docs/src/docbkx/chapter_integrating_apacheds_with_other_programs.xml

Modified: directory/sandbox/felixk/apacheds-docs/src/docbkx/basic_user_guide.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-docs/src/docbkx/basic_user_guide.xml?rev=985103&r1=985102&r2=985103&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-docs/src/docbkx/basic_user_guide.xml (original)
+++ directory/sandbox/felixk/apacheds-docs/src/docbkx/basic_user_guide.xml Fri Aug 13 06:24:27 2010
@@ -2,6 +2,7 @@
 <chapter
   version="5.0"
   xmlns="http://docbook.org/ns/docbook"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:ns5="http://www.w3.org/2000/svg"
   xmlns:ns4="http://www.w3.org/1998/Math/MathML"
@@ -15,8 +16,8 @@
     you find here are work in progress but should be valid for ApacheDS 1.5.5. In the
     meantime you can have a look at
     the
-    <ulink
-      url="http://directory.apache.org/apacheds/1.0/apacheds-v10-basic-users-guide.html">ApacheDS 1.0 Basic User's Guide</ulink>
+    <link
+      xlink:href="http://directory.apache.org/apacheds/1.0/apacheds-v10-basic-users-guide.html">ApacheDS 1.0 Basic User's Guide</link>
     , which is currently more complete.
   </warning>
   <section>
@@ -39,8 +40,12 @@
       We are quite interested to improve the content of this guide. Feel free to provide us feedback:
     </para>
     <para>
-      <graphic
-        fileref="images/email.png" />
+      <mediaobject>
+        <imageobject>
+          <imagedata
+            fileref="images/email.png" />
+        </imageobject>
+      </mediaobject>
       <email>users@directory.apache.org</email>
     </para>
   </section>

Modified: directory/sandbox/felixk/apacheds-docs/src/docbkx/book.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-docs/src/docbkx/book.xml?rev=985103&r1=985102&r2=985103&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-docs/src/docbkx/book.xml (original)
+++ directory/sandbox/felixk/apacheds-docs/src/docbkx/book.xml Fri Aug 13 06:24:27 2010
@@ -40,7 +40,7 @@ to you under the Apache License, Version
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-  <ulink url="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</ulink>
+  <link xlink:href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</link>
 
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an

Modified: directory/sandbox/felixk/apacheds-docs/src/docbkx/chapter-how-to-begin.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-docs/src/docbkx/chapter-how-to-begin.xml?rev=985103&r1=985102&r2=985103&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-docs/src/docbkx/chapter-how-to-begin.xml (original)
+++ directory/sandbox/felixk/apacheds-docs/src/docbkx/chapter-how-to-begin.xml Fri Aug 13 06:24:27 2010
@@ -16,8 +16,7 @@
     <para>
       This section describes what Apache Directory Server (abbreviated ApacheDS) is, and where it comes from.
     </para>
-    <itemizedlist
-      mark='bullet'>
+    <itemizedlist>
       <listitem>
         <para>
           <xref
@@ -94,13 +93,18 @@
         Native installers are available for Windows, MacOS and Solaris (both SPARC and intel platform), but in fact the
         set of possible targets is by far more extensive.
       </para>
-      <section id="Architectural overview">
+      <section
+        id="Architectural overview">
         <title>Architectural overview</title>
         <figure
           id="50k FT Architecture">
           <title>50k FT Architecture</title>
-          <graphic
-            fileref="images/50k-ft-architecture.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/50k-ft-architecture.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
       </section>
     </section>
@@ -122,14 +126,14 @@
       </para>
       <para>
         In October 2002 Alex Karasulu founded and registered the
-        <ulink
-          url="http://sourceforge.net/projects/ldapd">LDAPd</ulink>
+        <link
+          xlink:href="http://sourceforge.net/projects/ldapd">LDAPd</link>
         project at SourceForge.net. LDAPd was a a
         pure Java embeddable LDAP v3 protocol daemon built on the Avalon
         framework. Alex donated the code to the Apache
         Software Foundation and the code entered the
-        <ulink
-          url="http://incubator.apache.org/">Apache Incubator</ulink>
+        <link
+          xlink:href="http://incubator.apache.org/">Apache Incubator</link>
         in October 2003. One year later in October of
         2004,
         the Apache Directory Top Level Project (TLP) was formed after
@@ -149,19 +153,18 @@
     <section
       id="Resources">
       <title>Resources</title>
-      <itemizedlist
-        mark="bullet">
+      <itemizedlist>
         <listitem>
           <para>
-            <ulink
-              url="http://directory.apache.org/community%26resources/proposal-for-an-apache-directory-project.html">Proposal for an Apache Directory Project</ulink>
+            <link
+              xlink:href="http://directory.apache.org/community%26resources/proposal-for-an-apache-directory-project.html">Proposal for an Apache Directory Project</link>
             the original proposal for incubation, September 2003.
           </para>
         </listitem>
         <listitem>
           <para>
-            <ulink
-              url="http://directory.apache.org/community%26resources/ldap-renaissance.html">Architecting the Modern LDAP Renaissance: The Apache Directory Vision</ulink>
+            <link
+              xlink:href="http://directory.apache.org/community%26resources/ldap-renaissance.html">Architecting the Modern LDAP Renaissance: The Apache Directory Vision</link>
             , Paper for 1st International Conference on LDAP, September 2007.
           </para>
         </listitem>
@@ -176,8 +179,7 @@
       links to different resources (books, online resources, ...), which may act as introduction to the topic. If you
       are
       already an LDAP expert, you'll probably skip this section.</para>
-    <itemizedlist
-      mark="bullet">
+    <itemizedlist>
       <listitem>
         <para>
           <xref
@@ -214,8 +216,7 @@
         structured storage and efficient retrieval of objects
         which are often derived from the real world (e.g. persons,
         IT equipment). Characteristic:
-        <itemizedlist
-          mark="bullet">
+        <itemizedlist>
           <listitem>
             <para>
               all data is stored in so called
@@ -253,15 +254,16 @@
         both directory services and relational databases are actually used. Read how Vikas Mahajan
         describes directories
         and databases as complementary, not competitive, solutions in his excellent article
-        <ulink
-          url="http://support.novell.com/techcenter/articles/ana20011101.html">"Should I Use a Directory, a Database, or Both?"</ulink>
+        <link
+          xlink:href="http://support.novell.com/techcenter/articles/ana20011101.html">"Should I Use a Directory, a Database, or Both?"</link>
         .
       </para>
     </section>
     <section
       id="ldapTheLightWeightDirectoryAccessProtocol">
       <title>LDAP – the Lightweight Directory Access Protocol</title>
-      <section id="What is it? Some history">
+      <section
+        id="What is it? Some history">
         <title>What is it? Some history</title>
         <para>
           The comprehensive standard
@@ -303,11 +305,16 @@
         <figure
           id="From X500 to LDAP">
           <title>From X500 to LDAP</title>
-          <graphic
-            fileref="images/fromX500toLDAP.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/fromX500toLDAP.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
       </section>
-      <section id="Information model primer">
+      <section
+        id="Information model primer">
         <title>Information model primer</title>
         <para>
           Within the information model of LDAP, data is stored in entries, which build up a hierarchical, tree like
@@ -351,7 +358,8 @@
           get extended according to special requirements.
         </para>
       </section>
-      <section id="Common applications of LDAP based directories">
+      <section
+        id="Common applications of LDAP based directories">
         <title>Common applications of LDAP based directories</title>
         <para>LDAP operations include entry creation, modification, deletion and search. As a general rule, LDAP
           directories are optimized for read and search operations, at the cost of write performance. Data, which will
@@ -369,19 +377,23 @@
           this
           case - most average users probably don't know.</para>
       </section>
-      <section id="Examples of software components which support LDAP">
+      <section
+        id="Examples of software components which support LDAP">
         <title>Examples of software components which support LDAP</title>
         <figure
           id="LDAP-Tools">
           <title>LDAP-Tools</title>
-          <graphic
-            fileref="images/ldap-tools.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/ldap-tools.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
         <para>
           Very different types of software products may act as LDAP clients, consuming data for authentication,
           authorization or data presentation etc.
-          <itemizedlist
-            mark="bullet">
+          <itemizedlist>
             <listitem>
               <para>E-Mail clients (e.g. Mozilla Thunderbird)</para>
             </listitem>
@@ -406,7 +418,8 @@
     <section
       id="ldapResources">
       <title>LDAP resources</title>
-      <section id="Books">
+      <section
+        id="Books">
         <title>Books</title>
         <para>There are several good LDAP books available. Here are two examples which provide sample chapters on their
           homepages.</para>
@@ -415,74 +428,92 @@
           <figure
             id="Cover Understanding and Deploying LDAP Directory Services">
             <title>Cover Understanding and Deploying LDAP Directory Services</title>
-            <graphic
-              fileref="images/cover_howes_100.gif" />
+            <mediaobject>
+              <imageobject>
+                <imagedata
+                  fileref="images/cover_howes_100.gif" />
+              </imageobject>
+            </mediaobject>
           </figure>
           Understanding and Deploying LDAP Directory Services (2nd Edition)
           by Timothy A. Howes, Mark C. Smith, Gordon S.
           Good, Tim Howes
           Addison-Wesley Professional, 2nd Edition 2003
           ISBN: 0-672323-16-8
-          <ulink
-            url="http://awprofessional.com/title/0672323168">Book's Homepage (Howes)</ulink>
+          <link
+            xlink:href="http://awprofessional.com/title/0672323168">Book's Homepage (Howes)</link>
         </para>
         <para>
           LDAP fuer Java-Entwickler
           <figure
             id="Cover LDAP fuer Java-Entwickler">
             <title>Cover LDAP fuer Java-Entwickler</title>
-            <graphic
-              fileref="images/cover_zoerner_100.gif" />
+            <mediaobject>
+              <imageobject>
+                <imagedata
+                  fileref="images/cover_zoerner_100.gif" />
+              </imageobject>
+            </mediaobject>
           </figure>
           LDAP fuer Java-Entwickler – Einstieg und Integration.
-          <graphic
-            fileref="images/de.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/de.png" />
+            </imageobject>
+          </mediaobject>
           von Stefan Zoerner
           Software und Support Verlag, 3. aktualisierte Auflage 2007
           ISBN: 978-3-939084-07-5
-          <ulink
-            url="http://www.entwickler-press.de/buecher/ldap/">Webseite zum Buch (Zoerner)</ulink>
+          <link
+            xlink:href="http://www.entwickler-press.de/buecher/ldap/">Webseite zum Buch (Zoerner)</link>
         </para>
       </section>
-      <section id="Articles, forums, blogs and other online resources">
+      <section
+        id="Articles, forums, blogs and other online resources">
         <title>Articles, forums, blogs and other online resources</title>
-        <section id="Blogs">
+        <section
+          id="Blogs">
           <title>Blogs</title>
           <itemizedlist>
             <listitem>
               <para>
-                <ulink
-                  url="http://blogs.sun.com/roller/page/DirectoryManager">cn=Directory Manager - All about Directory Server</ulink>
+                <link
+                  xlink:href="http://blogs.sun.com/roller/page/DirectoryManager">cn=Directory Manager - All about Directory Server</link>
                 , Sun Blog
               </para>
             </listitem>
           </itemizedlist>
         </section>
-        <section id="Articles and other online resources">
+        <section
+          id="Articles and other online resources">
           <title>Articles and other online resources</title>
-          <itemizedlist
-            mark="bullet">
+          <itemizedlist>
             <listitem>
               <para>
-                <ulink
-                  url="http://www.redbooks.ibm.com/abstracts/SG244986.html?Open">Understanding LDAP - Design and Implementation</ulink>
+                <link
+                  xlink:href="http://www.redbooks.ibm.com/abstracts/SG244986.html?Open">Understanding LDAP - Design and Implementation</link>
                 , IBM RedBook, July 2006
               </para>
             </listitem>
             <listitem>
               <para>
-                <ulink
-                  url="http://www.oreillynet.com/pub/a/sysadmin/2006/07/27/demystifying-ldap.html">Demystifying LDAP</ulink>
+                <link
+                  xlink:href="http://www.oreillynet.com/pub/a/sysadmin/2006/07/27/demystifying-ldap.html">Demystifying LDAP</link>
                 by Brian K. Jones, O'Reilly Network
               </para>
             </listitem>
             <listitem>
               <para>
-                <ulink
-                  url="http://www.mitlinx.de/ldap/">LDAP verstehen mit linx</ulink>
+                <link
+                  xlink:href="http://www.mitlinx.de/ldap/">LDAP verstehen mit linx</link>
                 , by Petra Haberer
-                <graphic
-                  fileref="images/de.png" />
+                <mediaobject>
+                  <imageobject>
+                    <imagedata
+                      fileref="images/de.png" />
+                  </imageobject>
+                </mediaobject>
               </para>
             </listitem>
           </itemizedlist>
@@ -495,8 +526,7 @@
     id="Installing and starting the server">
     <title>Installing and starting the server</title>
     <para>This section describes how ApacheDS can be installed and started on different platforms.</para>
-    <itemizedlist
-      mark="bullet">
+    <itemizedlist>
       <listitem>
         <para>
           <xref
@@ -531,16 +561,15 @@
     <section
       id="prerequisites">
       <title>Prerequisites</title>
-      <itemizedlist
-        mark="bullet">
+      <itemizedlist>
         <listitem>
           <para>
             <emphasis
               role="bold">Java 5.0</emphasis>
             . We recommend using
-            <ulink
-              url="http://java.sun.com/javase/downloads/index.jsp">
-              Sun's JDK</ulink>
+            <link
+              xlink:href="http://java.sun.com/javase/downloads/index.jsp">
+              Sun's JDK</link>
             , but the server has also been successfully tested
             with JRockit 5.0 and with IBM Java 5.0.
             You can check your
@@ -567,8 +596,8 @@ HotSpot(TM) Client VM (build 1.5.0_06-b0
             <emphasis
               role="bold">384 MB RAM</emphasis>
             for the JVM. That's the default setting, how to change that is described
-            <ulink
-              url="http://directory.apache.org/apacheds/1.5/14-basic-configuration-tasks.html#1.4.Basicconfigurationtasks-MemoryAllocation">here</ulink>
+            <link
+              xlink:href="http://directory.apache.org/apacheds/1.5/14-basic-configuration-tasks.html#1.4.Basicconfigurationtasks-MemoryAllocation">here</link>
           </para>
         </listitem>
       </itemizedlist>
@@ -602,15 +631,15 @@ HotSpot(TM) Client VM (build 1.5.0_06-b0
       </para>
       <para>
         You can download them from
-        <ulink
-          url="http://directory.apache.org/apacheds/1.5/downloads.html">here</ulink>
+        <link
+          xlink:href="http://directory.apache.org/apacheds/1.5/downloads.html">here</link>
         .
       </para>
       <para>
         option for people familiar with tools like Subversion and Maven is to built the server from the sources on their
         own. This is described
-        <ulink
-          url="http://directory.apache.org/community%26resources/sources.html">here</ulink>
+        <link
+          xlink:href="http://directory.apache.org/community%26resources/sources.html">here</link>
         .
       </para>
     </section>
@@ -623,8 +652,12 @@ HotSpot(TM) Client VM (build 1.5.0_06-b0
       <figure
         id="Windows Installer">
         <title>Windows Installer</title>
-        <graphic
-          fileref="images/Windows_Installer.png" />
+        <mediaobject>
+          <imageobject>
+            <imagedata
+              fileref="images/Windows_Installer.png" />
+          </imageobject>
+        </mediaobject>
       </figure>
       <para>
         To install the ApacheDS as Windows service you need
@@ -632,7 +665,8 @@ HotSpot(TM) Client VM (build 1.5.0_06-b0
           role="bold">Administrator</emphasis>
         privileges.
       </para>
-      <section id="Starting and stopping the server Windows">
+      <section
+        id="Starting and stopping the server Windows">
         <title>Starting and stopping the server</title>
         <para>
           The server can be started and stopped with Windows Services manager (
@@ -651,11 +685,16 @@ HotSpot(TM) Client VM (build 1.5.0_06-b0
       <figure
         id="MacOSX Installer">
         <title>MacOSX Installer</title>
-        <graphic
-          fileref="images/MacOSX_Installer.png" />
+        <mediaobject>
+          <imageobject>
+            <imagedata
+              fileref="images/MacOSX_Installer.png" />
+          </imageobject>
+        </mediaobject>
       </figure>
       <para>From there, you will be guided to install Apache DS on your system.</para>
-      <section id="Starting and stopping the server MacOSX">
+      <section
+        id="Starting and stopping the server MacOSX">
         <title>Starting and stopping the server</title>
         <para>On Mac OS X, Apache DS is installed as a launchd service and is loaded at startup time (and upon
           successful
@@ -671,8 +710,8 @@ HotSpot(TM) Client VM (build 1.5.0_06-b0
       <title>Installation on Linux and Solaris</title>
       <para>
         The installation for different installers is described on the
-        <ulink
-          url="http://directory.apache.org/apacheds/1.5/downloads.html">Apache Directory Server 1.5 Downloads</ulink>
+        <link
+          xlink:href="http://directory.apache.org/apacheds/1.5/downloads.html">Apache Directory Server 1.5 Downloads</link>
         page.
       </para>
     </section>
@@ -685,8 +724,7 @@ HotSpot(TM) Client VM (build 1.5.0_06-b0
       id="Changing the server port for LDAP">
       <title>Changing the server port for LDAP</title>
       <para>This section describes how to change to port for the LDAP protocol.</para>
-      <itemizedlist
-        mark="bullet">
+      <itemizedlist>
         <listitem>
           <para>
             <xref
@@ -732,8 +770,7 @@ HotSpot(TM) Client VM (build 1.5.0_06-b0
       <section
         id="Resources_1">
         <title>Resources</title>
-        <itemizedlist
-          mark="bullet">
+        <itemizedlist>
           <listitem>
             <para>
               <xref
@@ -761,16 +798,24 @@ HotSpot(TM) Client VM (build 1.5.0_06-b0
         <figure
           id="New LDAP Connection">
           <title>New LDAP Connection</title>
-          <graphic
-            fileref="images/NewLDAPConnection1.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/NewLDAPConnection1.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
         <para>... and in the next step, enter the admin DN uid=admin,ou=system and the current password (default is
           "secret"). Saving the password is not necessary, we will change it anyway. </para>
         <figure
           id="New LDAP Connection 2">
           <title>New LDAP Connection 2</title>
-          <graphic
-            fileref="images/NewLDAPConnection2.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/NewLDAPConnection2.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
         <para>
           Click
@@ -789,8 +834,12 @@ HotSpot(TM) Client VM (build 1.5.0_06-b0
         <figure
           id="Entry Editor">
           <title>Entry Editor</title>
-          <graphic
-            fileref="images/entryEditor.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/entryEditor.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
         <para>The Password Editor dialog shows up; enter the new password. You can optionally select a hash algorithm
           like
@@ -799,8 +848,12 @@ HotSpot(TM) Client VM (build 1.5.0_06-b0
         <figure
           id="Password Editor">
           <title>Password Editor</title>
-          <graphic
-            fileref="images/passwordEditor.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/passwordEditor.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
         <para>
           Pressing
@@ -822,8 +875,12 @@ HotSpot(TM) Client VM (build 1.5.0_06-b0
         <figure
           id="Connection Properties">
           <title>Connection Properties</title>
-          <graphic
-            fileref="images/connectionProperties.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/connectionProperties.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
         <para>
           Enter the new password and press
@@ -837,8 +894,8 @@ HotSpot(TM) Client VM (build 1.5.0_06-b0
         <itemizedlist>
           <listitem>
             <para>
-              <ulink
-                url="http://directory.apache.org/studio/">Apache Directory Studio</ulink>
+              <link
+                xlink:href="http://directory.apache.org/studio/">Apache Directory Studio</link>
               : The tool used in steps 1 and 2
             </para>
           </listitem>
@@ -885,8 +942,8 @@ HotSpot(TM) Client VM (build 1.5.0_06-b0
           particular partition are stored below some naming context called the partition suffix.</para>
         <para>
           The default implementation of partitions is based on
-          <ulink
-            url="http://jdbm.sourceforge.net/">JDBM</ulink>
+          <link
+            xlink:href="http://jdbm.sourceforge.net/">JDBM</link>
           B+Trees (but it's possible to add custom partition implementations). The ApacheDS default configuration
           contains a a data partition with the suffix "dc=example,dc=com". The image below shows the suffixes of a
           freshly installed ApacheDS within Apache Directory Studio.
@@ -894,8 +951,12 @@ HotSpot(TM) Client VM (build 1.5.0_06-b0
         <figure
           id="Partitions in Studio after install">
           <title>Partitions in Studio after install</title>
-          <graphic
-            fileref="images/partitions_in_studio_after_install.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/partitions_in_studio_after_install.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
         <para>The schema subsystem and ApacheDS itself store their information in special partitions, "ou=schema" and
           "ou=system" respectively.</para>
@@ -936,8 +997,12 @@ HotSpot(TM) Client VM (build 1.5.0_06-b0
         <figure
           id="Root DSE">
           <title>Root DSE</title>
-          <graphic
-            fileref="images/root_dse.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/root_dse.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
         <para>Before using the partition (e.g. adding entries), you have to add a context entry. If you plan to load
           LDIF data to your partition anyway, simply provide the context entry (the "root" of your partition) as a first
@@ -963,8 +1028,12 @@ description: The context entry for suffi
         <figure
           id="Partitions in Studio after adding">
           <title>Partitions in Studio after adding</title>
-          <graphic
-            fileref="images/partitions_in_studio_after_adding.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/partitions_in_studio_after_adding.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
       </section>
       <section
@@ -1098,7 +1167,8 @@ directoryService.getPartitionNexus().add
       </section>
     </section>
 
-    <section id="Configure logging">
+    <section
+      id="Configure logging">
       <title>Configure logging</title>
       <para>In order to detect and analyze problems, adjusting the log level of a server can be a valuable tool. This
         section describes how to configure logging within a standalone ApacheDS.</para>
@@ -1145,11 +1215,11 @@ directoryService.getPartitionNexus().add
         <title>ApacheDS and logging</title>
         <para>
           ApacheDS 1.5 uses
-          <ulink
-            url="http://www.slf4j.org/">SLF4J</ulink>
+          <link
+            xlink:href="http://www.slf4j.org/">SLF4J</link>
           as its logging solution. This is a simple facade for various logging APIs. The default for ApacheDS 1.5 is
-          <ulink
-            url="http://logging.apache.org/log4j/">log4j</ulink>
+          <link
+            xlink:href="http://logging.apache.org/log4j/">log4j</link>
           .
         </para>
       </section>
@@ -1160,8 +1230,8 @@ directoryService.getPartitionNexus().add
           By default, ApacheDS writes log files in the directory
           <emphasis>&lt;APACHDS_HOME&gt;/var/log/</emphasis>
           . Besides stdout, a
-          <ulink
-            url="http://logging.apache.org/log4j/docs/api/org/apache/log4j/RollingFileAppender.html">RollingFileAppender</ulink>
+          <link
+            xlink:href="http://logging.apache.org/log4j/docs/api/org/apache/log4j/RollingFileAppender.html">RollingFileAppender</link>
           is used to collect warnings and errors. It
           backups the log files when they reach a certain size.
         </para>
@@ -1257,7 +1327,8 @@ log4j.logger.org.apache.directory.shared
             <emphasis>&lt;APACHDS_HOME&gt;/var/log/</emphasis>
             , but that can be changed.
           </para>
-          <section id="Linux/MacOS/Solaris">
+          <section
+            id="Linux/MacOS/Solaris">
             <title>Linux/MacOS/Solaris</title>
             <para>
               On this systems the location of the log files is configured via an entry in
@@ -1277,7 +1348,8 @@ $APACHEDS_HOME start
               ]]></programlisting>
             </example>
           </section>
-          <section id="Windows">
+          <section
+            id="Windows">
             <title>Windows</title>
             <para>
               On Windows you can use the configuration wizard for the service as shown in the screenshot above. To
@@ -1358,8 +1430,8 @@ log4j.logger.org.apache.directory.shared
           <para>
             If the global level is switched to DEBUG, these definitions override the setting with WARN for certain areas
             and therefore keep the file a little bit smaller. Learn more about the concept of categories in the
-            <ulink
-              url="http://logging.apache.org/log4j/docs/manual.html">Short introduction to log4j</ulink>
+            <link
+              xlink:href="http://logging.apache.org/log4j/docs/manual.html">Short introduction to log4j</link>
             .
           </para>
         </section>
@@ -1428,8 +1500,8 @@ log4j.appender.R.layout.ConversionPatter
           </table>
           <para>
             The
-            <ulink
-              url="http://logging.apache.org/log4j/docs/api/org/apache/log4j/PatternLayout.html">javadoc of log4j</ulink>
+            <link
+              xlink:href="http://logging.apache.org/log4j/docs/api/org/apache/log4j/PatternLayout.html">javadoc of log4j</link>
             contains a table with all valid %-characters and their meaning.
           </para>
           <para>
@@ -1462,14 +1534,14 @@ log4j.appender.R.layout.ConversionPatter
             file appender. And you can configure logging to make it easier for you to view the messages with
             tools like
             Log Factor 5 or
-            <ulink
-              url="http://logging.apache.org/log4j/docs/chainsaw.html">Chainsaw</ulink>
+            <link
+              xlink:href="http://logging.apache.org/log4j/docs/chainsaw.html">Chainsaw</link>
             .
           </para>
           <para>
             Learn more about log4j and related tools at its
-            <ulink
-              url="http://logging.apache.org/log4j/docs/index.html">homepage</ulink>
+            <link
+              xlink:href="http://logging.apache.org/log4j/docs/index.html">homepage</link>
             .
           </para>
         </section>
@@ -1499,8 +1571,12 @@ log4j.logger.org.apache.directory.server
         <figure
           id="W32 Service Properties">
           <title>W32 Service Properties</title>
-          <graphic
-            fileref="images/w32_service_properties.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/w32_service_properties.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
         <para>You can adjust the logging level and a log path. Note that this is for the daemon only. The server itself
           is configured as described above.</para>
@@ -1511,8 +1587,8 @@ log4j.logger.org.apache.directory.server
         <itemizedlist>
           <listitem>
             <para>
-              <ulink
-                url="http://logging.apache.org/log4j/docs/manual.html">Short introduction to log4j</ulink>
+              <link
+                xlink:href="http://logging.apache.org/log4j/docs/manual.html">Short introduction to log4j</link>
             </para>
           </listitem>
         </itemizedlist>
@@ -1660,16 +1736,16 @@ log4j.logger.org.apache.directory.server
       <title>The sample data (Sailors of the seven seas)</title>
       <para>
         The file
-        <ulink
-          url="data/apache_ds_tutorial.ldif">apache_ds_tutorial.ldif</ulink>
+        <link
+          xlink:href="data/apache_ds_tutorial.ldif">apache_ds_tutorial.ldif</link>
         contains some sample data, which is used in the following sections. It is a
         text file in the so called
         <emphasis
           role="bold">LDIF</emphasis>
         format. LDIF stands for LDAP Data Interchange Format. It is widely adopted in
         the LDAP world and standardized in
-        <ulink
-          url="http://www.faqs.org/rfcs/rfc2849.html">RFC 2849</ulink>
+        <link
+          xlink:href="http://www.faqs.org/rfcs/rfc2849.html">RFC 2849</link>
         . Therefore you are able to import our sample data into other
         directory solutions as well, not only into Apache
         Directory Server.
@@ -1680,8 +1756,12 @@ log4j.logger.org.apache.directory.server
       <figure
         id="Sample LDAP tree structure">
         <title>Sample LDAP tree structure</title>
-        <graphic
-          fileref="images/sample_structure.gif" />
+        <mediaobject>
+          <imageobject>
+            <imagedata
+              fileref="images/sample_structure.gif" />
+          </imageobject>
+        </mediaobject>
       </figure>
       <para>This snippet of the file represents a single entry, just to give you an impression of how LDIF files look
         like.</para>
@@ -1720,8 +1800,8 @@ manager: cn=William Bligh,ou=people,o=se
         <listitem>
           <para>
             Import the data, for instance using
-            <ulink
-              url="http://directory.apache.org/studio/">Apache Directory Studio</ulink>
+            <link
+              xlink:href="http://directory.apache.org/studio/">Apache Directory Studio</link>
           </para>
         </listitem>
       </itemizedlist>
@@ -1732,8 +1812,8 @@ manager: cn=William Bligh,ou=people,o=se
       <itemizedlist>
         <listitem>
           <para>
-            <ulink
-              url="http://www.faqs.org/rfcs/rfc2849.html">RFC 2849</ulink>
+            <link
+              xlink:href="http://www.faqs.org/rfcs/rfc2849.html">RFC 2849</link>
             The LDAP Data Interchange Format (LDIF) – Technical Specification
           </para>
         </listitem>

Modified: directory/sandbox/felixk/apacheds-docs/src/docbkx/chapter_basic_security.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-docs/src/docbkx/chapter_basic_security.xml?rev=985103&r1=985102&r2=985103&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-docs/src/docbkx/chapter_basic_security.xml (original)
+++ directory/sandbox/felixk/apacheds-docs/src/docbkx/chapter_basic_security.xml Fri Aug 13 06:24:27 2010
@@ -269,14 +269,14 @@ public class DigestDemo {
         <para>The output is "{SHA}nU4eI71bcnBGqeO0t9tXvY1u5oQ=".</para>
         <para>
           Another option is to use command line tools to calculate the hash value; the
-          <ulink
-            url="http://www.openssl.org/">OpenSSL</ulink>
+          <link
+            xlink:href="http://www.openssl.org/">OpenSSL</link>
           project provides such
           stuff. Furthermore many UI LDAP tools allow you to store passwords automatically
           encrypted with the hash
           algorithm of your choice. See below
-          <ulink
-            url="http://directory.apache.org/studio/">Apache Directory Studio</ulink>
+          <link
+            xlink:href="http://directory.apache.org/studio/">Apache Directory Studio</link>
           as an example. The dialog automatically shows up
           if a userPassword attribute is to be manipulated (added,
           changed).
@@ -284,8 +284,12 @@ public class DigestDemo {
         <figure
           id="Password Editor figure">
           <title>Password Editor</title>
-          <graphic
-            fileref="images/password_edit_ls.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/password_edit_ls.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
       </section>
       <section
@@ -389,8 +393,8 @@ objectclass: top
         <para>
           The examples above have used a command line tool. Of course graphical tools and programmatical access (JNDI
           etc.) allow anonymous binds as well. Below is a screen shot from the configuration dialog of
-          <ulink
-            url="http://directory.apache.org/studio/">Apache Directory Studio</ulink>
+          <link
+            xlink:href="http://directory.apache.org/studio/">Apache Directory Studio</link>
           as an example. During configuration of the connection data ("New LDAP Connection", for instance), the option
           <emphasis>Anonymous Authentication</emphasis>
           leads to anonymous binds. Other UI tools offer this feature as well.
@@ -398,8 +402,12 @@ objectclass: top
         <figure
           id="Anonymous Authentication figure">
           <title>Anonymous Authentication</title>
-          <graphic
-            fileref="images/authentication_options_ls.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/authentication_options_ls.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
         <warning>
           <para>
@@ -434,8 +442,12 @@ objectclass: top
       <figure
         id="Authenticate a user by uid and password figure">
         <title>Authenticate a user by uid and password</title>
-        <graphic
-          fileref="images/confluence_logon.png" />
+        <mediaobject>
+          <imageobject>
+            <imagedata
+              fileref="images/confluence_logon.png" />
+          </imageobject>
+        </mediaobject>
       </figure>
       <para>
         Usually the ID is an attribute within the user's entry. In our sample data (Seven Seas), each user entry
@@ -632,15 +644,15 @@ dn: cn=Horatio Hornblower,ou=people,o=se
       <itemizedlist>
         <listitem>
           <para>
-            <ulink
-              url="http://www.faqs.org/rfcs/rfc2829.html">RFC 2829</ulink>
+            <link
+              xlink:href="http://www.faqs.org/rfcs/rfc2829.html">RFC 2829</link>
             Authentication Methods for LDAP
           </para>
         </listitem>
         <listitem>
           <para>
-            <ulink
-              url="http://www.secure-hash-algorithm-md5-sha-1.co.uk/">The Secure Hash Algorithm Directory</ulink>
+            <link
+              xlink:href="http://www.secure-hash-algorithm-md5-sha-1.co.uk/">The Secure Hash Algorithm Directory</link>
             MD5, SHA-1 and HMAC Resources
           </para>
         </listitem>
@@ -693,8 +705,8 @@ dn: cn=Horatio Hornblower,ou=people,o=se
         according to configuration and certain rules. This process of granting access is called authorization.</para>
       <para>
         Authorization for directory operations is not strictly standardized in the LDAP world,
-        <ulink
-          url="http://www.faqs.org/rfcs/rfc2829.html">RFC 2829</ulink>
+        <link
+          xlink:href="http://www.faqs.org/rfcs/rfc2829.html">RFC 2829</link>
         describes
         various scenarios and concepts, but does not enforce a concrete implementation. Thus each product comes
         with its
@@ -734,8 +746,8 @@ uniquemember: cn=John Fryer,ou=people,o=
           ordinary search operations. This is widely used but has nothing to do with the authorization for directory
           operations as described in this section (except that the client needs the permission to search the data).
           Learn more about best practices in this area in the article
-          <ulink
-            url="http://middleware.internet2.edu/dir/groups/docs/internet2-mace-dir-groups-best-practices-200210.htm">Practices in Directory Groups</ulink>
+          <link
+            xlink:href="http://middleware.internet2.edu/dir/groups/docs/internet2-mace-dir-groups-best-practices-200210.htm">Practices in Directory Groups</link>
           . Further examples in
           this guide are the Tomcat and Apache HTTPD integration sections.
         </para>
@@ -760,8 +772,12 @@ uniquemember: cn=John Fryer,ou=people,o=
         <figure
           id="Authorization sample entire figure">
           <title>Authorization sample entire</title>
-          <graphic
-            fileref="images/authorization_sample_entries.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/authorization_sample_entries.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
         <programlisting><![CDATA[
 dn: cn=Tori Amos,ou=users,ou=system
@@ -1053,8 +1069,8 @@ prescriptiveACI="{
         <title>LDIF for this configuration</title>
         <para>
           The following LDIF file (
-          <ulink
-            url="data/authz_sevenSeas.ldif">authz_sevenSeas.ldif</ulink>
+          <link
+            xlink:href="data/authz_sevenSeas.ldif">authz_sevenSeas.ldif</link>
           ) provides a set of changes made to directory entries in the
           "Seven Seas" data. In total it performs the steps
           described above.
@@ -1241,8 +1257,8 @@ sn: Amos
           <para>
             First we try to add a new user to the "Seven Seas" partition. The data for the entry is inspired by "Peter
             Pan" and provided by this LDIF file (
-            <ulink
-              url="data/captain_hook.ldif">captain_hook.ldif</ulink>
+            <link
+              xlink:href="data/captain_hook.ldif">captain_hook.ldif</link>
             ):
           </para>
           <programlisting><![CDATA[
@@ -1301,8 +1317,8 @@ createTimestamp: 20061203140109Z
           <para>
             As a further example which tries to write to the directory, we add a new value to the description attribute
             of the freshly created entry for Captain Hook. With a change entry in an LDIF file, it looks like this (file
-            <ulink
-              url="data/captain_hook_modify.ldif">captain_hook_modify.ldif</ulink>
+            <link
+              xlink:href="data/captain_hook_modify.ldif">captain_hook_modify.ldif</link>
             ):
           </para>
           <programlisting><![CDATA[
@@ -1343,8 +1359,8 @@ modifying entry cn=James Hook,ou=people,
           <para>
             Now it is finale time. A demonstration on how to delete the villain's entry from the directory. With an LDIF
             file (
-            <ulink
-              url="data/captain_hook_delete.ldif">captain_hook_delete.ldif</ulink>
+            <link
+              xlink:href="data/captain_hook_delete.ldif">captain_hook_delete.ldif</link>
             ) with an appropriate change entry, this can easily be accomplished, if the bind user is allowed to do so.
           </para>
           <programlisting><![CDATA[
@@ -1388,23 +1404,23 @@ $
       <itemizedlist>
         <listitem>
           <para>
-            <ulink
-              url="http://middleware.internet2.edu/dir/groups/docs/internet2-mace-dir-groups-best-practices-200210.htm">Practices in Directory Groups</ulink>
+            <link
+              xlink:href="http://middleware.internet2.edu/dir/groups/docs/internet2-mace-dir-groups-best-practices-200210.htm">Practices in Directory Groups</link>
             describes how to use groups within LDAP directories. Highly recommended.
           </para>
         </listitem>
         <listitem>
           <para>
             The
-            <ulink
-              url="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=DIRxSRVx11&amp;title=ApacheDS%20v1.0%20Advanced%20User%27s%20Guide&amp;linkCreation=true&amp;fromPageId=55244">ApacheDS v1.0 Advanced User's Guide</ulink>
+            <link
+              xlink:href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=DIRxSRVx11&amp;title=ApacheDS%20v1.0%20Advanced%20User%27s%20Guide&amp;linkCreation=true&amp;fromPageId=55244">ApacheDS v1.0 Advanced User's Guide</link>
             provides a detailed authorization chapter
           </para>
         </listitem>
         <listitem>
           <para>
-            <ulink
-              url="http://www.faqs.org/rfcs/rfc2849.html">RFC 2849</ulink>
+            <link
+              xlink:href="http://www.faqs.org/rfcs/rfc2849.html">RFC 2849</link>
             The LDAP Data Interchange Format (LDIF) is used extensively in this section
           </para>
         </listitem>
@@ -1543,8 +1559,8 @@ $
             <listitem>
               <para>
                 or you ask for a free certificate from
-                <ulink
-                  url="http://www.cacert.org/">CACERT organisation</ulink>
+                <link
+                  xlink:href="http://www.cacert.org/">CACERT organisation</link>
               </para>
             </listitem>
             <listitem>
@@ -1615,8 +1631,8 @@ $
           </table>
           <para>
             Learn more about keytool at the
-            <ulink
-              url="http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html">manpage</ulink>
+            <link
+              xlink:href="http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html">manpage</link>
             .
           </para>
           <programlisting><![CDATA[
@@ -1641,13 +1657,17 @@ $
           ]]></programlisting>
           <para>
             Another option is to use graphical tools for key creation like
-            <ulink
-              url="http://portecle.sourceforge.net/">Portecle</ulink>
+            <link
+              xlink:href="http://portecle.sourceforge.net/">Portecle</link>
             , which is basically a user-friendly front-end for keytool with comparable functionality. For a first
             impression see a screen shot below.
           </para>
-          <graphic
-            fileref="images/portecle_with_keystore.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/portecle_with_keystore.png" />
+            </imageobject>
+          </mediaobject>
         </section>
         <section
           id="Configuring ApacheDS to use this external keystore">
@@ -1733,8 +1753,12 @@ $
         <figure
           id="Studio SSL figure">
           <title>Studio SSL</title>
-          <graphic
-            fileref="images/studio_ssl.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/studio_ssl.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
         <para>Afterwards the connection behaves like LDAP does. No difference in functionality, but the transmission is
           secured by SSL.</para>
@@ -1850,8 +1874,12 @@ $
         <figure
           id="Portecle with Certificate figure">
           <title>Portecle with Certificate</title>
-          <graphic
-            fileref="images/portecle_with_certificate.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/portecle_with_certificate.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
         <para>
           Clients may use this keystore in order to connect to the server. Therefore they can configure
@@ -1916,21 +1944,21 @@ instantiated an instance of class com.su
       <itemizedlist>
         <listitem>
           <para>
-            <ulink
-              url="http://java.sun.com/products/jsse/">Java Secure Socket Extension (JSSE)</ulink>
+            <link
+              xlink:href="http://java.sun.com/products/jsse/">Java Secure Socket Extension (JSSE)</link>
           </para>
         </listitem>
         <listitem>
           <para>
-            <ulink
-              url="http://portecle.sourceforge.net/">Portecle</ulink>
+            <link
+              xlink:href="http://portecle.sourceforge.net/">Portecle</link>
             a free UI application for creating, managing and examining keystores
           </para>
         </listitem>
         <listitem>
           <para>
-            <ulink
-              url="http://wp.netscape.com/eng/ssl3/">SSL 3.0 Specification (Netscape)</ulink>
+            <link
+              xlink:href="http://wp.netscape.com/eng/ssl3/">SSL 3.0 Specification (Netscape)</link>
           </para>
         </listitem>
       </itemizedlist>

Modified: directory/sandbox/felixk/apacheds-docs/src/docbkx/chapter_integrating_apacheds_with_other_programs.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-docs/src/docbkx/chapter_integrating_apacheds_with_other_programs.xml?rev=985103&r1=985102&r2=985103&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-docs/src/docbkx/chapter_integrating_apacheds_with_other_programs.xml (original)
+++ directory/sandbox/felixk/apacheds-docs/src/docbkx/chapter_integrating_apacheds_with_other_programs.xml Fri Aug 13 06:24:27 2010
@@ -58,14 +58,14 @@
         an LDAP based directory directly and use its data as an address book. This seamless integration provides better
         user experience. One of these clients is Mozilla Thunderbird. Other E-Mail clients that support LDAP integration
         for address books include
-        <ulink
-          url="http://www.microsoft.com/windows/oe/">Microsoft Outlook Expess</ulink>
+        <link
+          xlink:href="http://www.microsoft.com/windows/oe/">Microsoft Outlook Expess</link>
         ,
-        <ulink
-          url="http://www.eudora.com/">Eudora Email</ulink>
+        <link
+          xlink:href="http://www.eudora.com/">Eudora Email</link>
         and
-        <ulink
-          url="http://www.ibm.com/software/lotus/">IBM Lotus Notes</ulink>
+        <link
+          xlink:href="http://www.ibm.com/software/lotus/">IBM Lotus Notes</link>
         .
       </para>
       <para>Technically, a mail program acts as a normal LDAP client, as described in earlier sections (i.e. the client
@@ -80,8 +80,8 @@
           Mozilla Thunderbird is a popular open source E-Mail client which supports many platforms. Actually it is more
           than just an E-Mail client (e.g. a news client as well). Features include junk mail control and RSS reading.
           Learn more about this software at the projects Homepage:
-          <ulink
-            url="http://www.mozilla.org/products/thunderbird/">Mozilla Thunderbird</ulink>
+          <link
+            xlink:href="http://www.mozilla.org/products/thunderbird/">Mozilla Thunderbird</link>
           .
         </para>
         <para>Within this lesson we use Thunderbird primarily because of its broad support for different operation
@@ -98,8 +98,8 @@
         We assume that you have Mozilla Thunderbird installed on your system (or you use another E-Mail client and are
         willing to assimilate the instructions to your situation). You may wish to download the software at the homepage
         (
-        <ulink
-          url="http://www.mozilla.org/products/thunderbird/">Mozilla Thunderbird</ulink>
+        <link
+          xlink:href="http://www.mozilla.org/products/thunderbird/">Mozilla Thunderbird</link>
         ) and install it, before proceed with this lesson.
       </para>
       <para>
@@ -159,8 +159,12 @@
         <figure
           id="Thunderbird open Adressbook figure">
           <title>Thunderbird open Adressbook</title>
-          <graphic
-            fileref="images/thunderbird_open_adressbook.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/thunderbird_open_adressbook.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
       </section>
       <section
@@ -175,8 +179,12 @@
         <figure
           id="Thunderbird LDAP Directory menu figure">
           <title>Thunderbird LDAP Directory menu</title>
-          <graphic
-            fileref="images/thunderbird_new_ldap_directory_menu.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/thunderbird_new_ldap_directory_menu.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
         <para>Thunderbird opens a dialog with three tabbed panes to provide the data of the directory.</para>
       </section>
@@ -204,8 +212,12 @@
         <figure
           id="Thunderbrid new LDAP Connection 1 figure">
           <title>Thunderbrid new LDAP Connection 1</title>
-          <graphic
-            fileref="images/thunderbird_new_ldap_1.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/thunderbird_new_ldap_1.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
         <para>In this example we do not provide a Bind DN but let Thunderbird look up the users within our directory
           anonymously. Apache Directory Server should be appropriately configured for that, or you have to provide a
@@ -216,15 +228,19 @@
         <figure
           id="Thunderbrid new LDAP Connection 2 figure">
           <title>Thunderbrid new LDAP Connection 2</title>
-          <graphic
-            fileref="images/thunderbird_new_ldap_2.png" />
+          <mediaobject>
+            <imageobject>
+              <imagedata
+                fileref="images/thunderbird_new_ldap_2.png" />
+            </imageobject>
+          </mediaobject>
         </figure>
         <para>
           You probably have noticed that the input fields in the two tabbed panes corresponds exactly to the
           parameters
           for an LDAP search operation as described in lesson
-          <ulink
-            url="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=DIRxSRVx11&amp;title=Search%20the%20directory&amp;linkCreation=true&amp;fromPageId=55542">Search the directory</ulink>
+          <link
+            xlink:href="http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=DIRxSRVx11&amp;title=Search%20the%20directory&amp;linkCreation=true&amp;fromPageId=55542">Search the directory</link>
           of this trail.
         </para>
       </section>
@@ -235,8 +251,12 @@
       <figure
         id="Thunderbird Adressbook figure">
         <title>Thunderbird Adressbook</title>
-        <graphic
-          fileref="images/thunderbird_adressbook.png" />
+        <mediaobject>
+          <imageobject>
+            <imagedata
+              fileref="images/thunderbird_adressbook.png" />
+          </imageobject>
+        </mediaobject>
       </figure>
     </section>
     <section
@@ -245,15 +265,15 @@
       <itemizedlist>
         <listitem>
           <para>
-            <ulink
-              url="http://opensourcearticles.com/articles/introduction_to_thunderbird">An introduction to Thunderbird</ulink>
+            <link
+              xlink:href="http://opensourcearticles.com/articles/introduction_to_thunderbird">An introduction to Thunderbird</link>
             , Open Source Articles
           </para>
         </listitem>
         <listitem>
           <para>
-            <ulink
-              url="http://www.mozilla.org/projects/thunderbird/specs/ldap.html">LDAP Attribute Mapping</ulink>
+            <link
+              xlink:href="http://www.mozilla.org/projects/thunderbird/specs/ldap.html">LDAP Attribute Mapping</link>
             for Mozilla Thunderbird
           </para>
         </listitem>



Mime
View raw message