summaryrefslogtreecommitdiff
path: root/docs/docbook
diff options
context:
space:
mode:
Diffstat (limited to 'docs/docbook')
-rw-r--r--docs/docbook/projdoc/ADS-HOWTO.xml (renamed from docs/docbook/projdoc/ADS-HOWTO.sgml)0
-rw-r--r--docs/docbook/projdoc/AdvancedNetworkAdmin.xml (renamed from docs/docbook/projdoc/AdvancedNetworkAdmin.sgml)0
-rw-r--r--docs/docbook/projdoc/Bugs.xml (renamed from docs/docbook/projdoc/Bugs.sgml)0
-rw-r--r--docs/docbook/projdoc/CUPS-printing.xml (renamed from docs/docbook/projdoc/CUPS-printing.sgml)73
-rw-r--r--docs/docbook/projdoc/Compiling.xml (renamed from docs/docbook/projdoc/Compiling.sgml)35
-rw-r--r--docs/docbook/projdoc/DOMAIN_MEMBER.xml (renamed from docs/docbook/projdoc/DOMAIN_MEMBER.sgml)0
-rw-r--r--docs/docbook/projdoc/Diagnosis.xml (renamed from docs/docbook/projdoc/Diagnosis.sgml)0
-rw-r--r--docs/docbook/projdoc/GROUP-MAPPING-HOWTO.xml (renamed from docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml)0
-rw-r--r--docs/docbook/projdoc/Integrating-with-Windows.xml (renamed from docs/docbook/projdoc/Integrating-with-Windows.sgml)0
-rw-r--r--docs/docbook/projdoc/InterdomainTrusts.xml (renamed from docs/docbook/projdoc/InterdomainTrusts.sgml)0
-rw-r--r--docs/docbook/projdoc/IntroSMB.xml (renamed from docs/docbook/projdoc/IntroSMB.sgml)0
-rw-r--r--docs/docbook/projdoc/NT4Migration.xml (renamed from docs/docbook/projdoc/NT4Migration.sgml)12
-rw-r--r--docs/docbook/projdoc/NT_Security.xml (renamed from docs/docbook/projdoc/NT_Security.sgml)0
-rw-r--r--docs/docbook/projdoc/NetworkBrowsing.xml (renamed from docs/docbook/projdoc/NetworkBrowsing.sgml)0
-rw-r--r--docs/docbook/projdoc/Other-Clients.xml (renamed from docs/docbook/projdoc/Other-Clients.sgml)0
-rw-r--r--docs/docbook/projdoc/PAM-Authentication-And-Samba.xml (renamed from docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml)0
-rw-r--r--docs/docbook/projdoc/PolicyMgmt.xml (renamed from docs/docbook/projdoc/PolicyMgmt.sgml)0
-rw-r--r--docs/docbook/projdoc/Portability.xml (renamed from docs/docbook/projdoc/Portability.sgml)0
-rw-r--r--docs/docbook/projdoc/Problems.xml (renamed from docs/docbook/projdoc/Problems.sgml)0
-rw-r--r--docs/docbook/projdoc/ProfileMgmt.xml (renamed from docs/docbook/projdoc/ProfileMgmt.sgml)0
-rw-r--r--docs/docbook/projdoc/SWAT.xml (renamed from docs/docbook/projdoc/SWAT.sgml)0
-rw-r--r--docs/docbook/projdoc/Samba-BDC-HOWTO.xml (renamed from docs/docbook/projdoc/Samba-BDC-HOWTO.sgml)0
-rw-r--r--docs/docbook/projdoc/Samba-PDC-HOWTO.xml (renamed from docs/docbook/projdoc/Samba-PDC-HOWTO.sgml)11
-rw-r--r--docs/docbook/projdoc/ServerType.xml (renamed from docs/docbook/projdoc/ServerType.sgml)0
-rw-r--r--docs/docbook/projdoc/Speed.xml (renamed from docs/docbook/projdoc/Speed.sgml)0
-rw-r--r--docs/docbook/projdoc/UNIX_INSTALL.xml (renamed from docs/docbook/projdoc/UNIX_INSTALL.sgml)0
-rw-r--r--docs/docbook/projdoc/VFS.xml (renamed from docs/docbook/projdoc/VFS.sgml)0
-rw-r--r--docs/docbook/projdoc/locking.xml (renamed from docs/docbook/projdoc/locking.sgml)0
-rw-r--r--docs/docbook/projdoc/msdfs_setup.xml (renamed from docs/docbook/projdoc/msdfs_setup.sgml)0
-rw-r--r--docs/docbook/projdoc/passdb.xml (renamed from docs/docbook/projdoc/passdb.sgml)0
-rw-r--r--docs/docbook/projdoc/printer_driver2.xml (renamed from docs/docbook/projdoc/printer_driver2.sgml)0
-rw-r--r--docs/docbook/projdoc/samba-doc.xml (renamed from docs/docbook/projdoc/samba-doc.sgml)12
-rw-r--r--docs/docbook/projdoc/securing-samba.xml (renamed from docs/docbook/projdoc/securing-samba.sgml)0
-rw-r--r--docs/docbook/projdoc/security_level.xml (renamed from docs/docbook/projdoc/security_level.sgml)0
-rw-r--r--docs/docbook/projdoc/unicode.xml (renamed from docs/docbook/projdoc/unicode.sgml)0
-rw-r--r--docs/docbook/projdoc/upgrading-to-3.0.xml (renamed from docs/docbook/projdoc/upgrading-to-3.0.sgml)0
-rw-r--r--docs/docbook/projdoc/winbind.xml (renamed from docs/docbook/projdoc/winbind.sgml)26
37 files changed, 90 insertions, 79 deletions
diff --git a/docs/docbook/projdoc/ADS-HOWTO.sgml b/docs/docbook/projdoc/ADS-HOWTO.xml
index c89a0e4f87..c89a0e4f87 100644
--- a/docs/docbook/projdoc/ADS-HOWTO.sgml
+++ b/docs/docbook/projdoc/ADS-HOWTO.xml
diff --git a/docs/docbook/projdoc/AdvancedNetworkAdmin.sgml b/docs/docbook/projdoc/AdvancedNetworkAdmin.xml
index dc2a78f5a6..dc2a78f5a6 100644
--- a/docs/docbook/projdoc/AdvancedNetworkAdmin.sgml
+++ b/docs/docbook/projdoc/AdvancedNetworkAdmin.xml
diff --git a/docs/docbook/projdoc/Bugs.sgml b/docs/docbook/projdoc/Bugs.xml
index d782920457..d782920457 100644
--- a/docs/docbook/projdoc/Bugs.sgml
+++ b/docs/docbook/projdoc/Bugs.xml
diff --git a/docs/docbook/projdoc/CUPS-printing.sgml b/docs/docbook/projdoc/CUPS-printing.xml
index 57faebdcd6..7e302000e6 100644
--- a/docs/docbook/projdoc/CUPS-printing.sgml
+++ b/docs/docbook/projdoc/CUPS-printing.xml
@@ -1177,7 +1177,6 @@ Summary - You need:
<para>
<simplelist>
-
<member>A "foomatic+<replaceable>something</replaceable>" PPD is not enough to print with CUPS (but it is *one* important component)</member>
<member>The "cupsomatic" filter script (Perl) in <filename>/usr/lib/cups/filters/</filename></member>
<member>Perl to make cupsomatic run</member>
@@ -1427,15 +1426,15 @@ download is "cups-samba-1.1.16.tar.gz". Upon untar-/unzip-ping it will reveal
the files:
</para>
- <para>
- <computeroutput>
- cups-samba.install
- cups-samba.license
- cups-samba.readme
- cups-samba.remove
- cups-samba.ss
- </computeroutput>
- </para>
+<para>
+<computeroutput>
+ cups-samba.install
+ cups-samba.license
+ cups-samba.readme
+ cups-samba.remove
+ cups-samba.ss
+</computeroutput>
+</para>
<para>
These have been packaged with the ESP meta packager software "EPM". The
@@ -1444,13 +1443,13 @@ These have been packaged with the ESP meta packager software "EPM". The
into <filename>/usr/share/cups/drivers/</filename>. Its contents are 3 files:
</para>
- <para>
- <computeroutput>
- cupsdrvr.dll
- cupsui.dll
- cups.hlp
- </computeroutput>
- </para>
+<para>
+<computeroutput>
+ cupsdrvr.dll
+ cupsui.dll
+ cups.hlp
+</computeroutput>
+</para>
<caution><para>
Due to a bug one CUPS release puts the <filename>cups.hlp</filename>
@@ -1460,8 +1459,8 @@ the file after running the "./cups-samba.install" script manually to the right p
</para>
<para>
- <userinput> cp /usr/share/drivers/cups.hlp /usr/share/cups/drivers/
- </userinput>
+<userinput> cp /usr/share/drivers/cups.hlp /usr/share/cups/drivers/
+</userinput>
</para></caution>
<note>
@@ -1535,16 +1534,16 @@ as compared to the Adobe drivers?
</para>
<para>
-<itemizedlist>
- <listitem><para>
+<simplelist>
+ <member><para>
no hassle with the Adobe EULA
- </para></listitem>
+ </para></member>
- <listitem><para>
+ <member><para>
no hassle with the question "where do I get the ADOBE*.* driver files from?"
- </para></listitem>
+ </para></member>
- <listitem><para>
+ <member><para>
the Adobe drivers (depending on the printer PPD associated with them)
often put a PJL header in front of the core PostScript part of the print
file (thus the file starts with "<replaceable>1B</replaceable>%-12345X"
@@ -1557,47 +1556,47 @@ as compared to the Adobe drivers?
leads to the page accounting in "/var/log/cups/page_log" not receiving
the exact mumber of pages; instead the dummy page number of "1" is
logged in a standard setup)
- </para></listitem>
+ </para></member>
- <listitem><para>
+ <member><para>
the Adobe driver has more options to "mis-configure" the PostScript
generated by it (like setting it inadvertedly to "Optimize for Speed",
instead of "Optimize for Portability", which could lead to CUPS being
unable to process it)
- </para></listitem>
+ </para></member>
- <listitem><para>
+ <member><para>
the CUPS PostScript driver output sent by Windows clients to the CUPS
server will be guaranteed to be auto-typed as generic MIME type
"application/postscript", thusly passing thru the CUPS "pstops" filter
and logging the correct number of pages in the page_log for accounting
and quota purposes
- </para></listitem>
+ </para></member>
- <listitem><para>
+ <member><para>
the CUPS PostScript driver supports the sending of additional print
options by the Win NT/2k/XP clients, such as naming the CUPS standard
banner pages (or the custom ones, should they be installed at the time
of driver download), using the CUPS "page-label" option, setting a
job-priority and setting the scheduled time of printing (with the option
to support additional useful IPP job attributes in the future).
- </para></listitem>
+ </para></member>
- <listitem><para>
+ <member><para>
the CUPS PostScript driver supports the inclusion of the new
"*cupsJobTicket" comments at the beginnig of the PostScript file (which
could be used in the future for all sort of beneficial extensions on
the CUPS side, but which will not disturb any other application as those
will regard it as a comment and simply ignore it).
- </para></listitem>
+ </para></member>
- <listitem><para>
+ <member><para>
the CUPS PostScript driver will be the heart of the fully fledged CUPS
IPP client for Windows NT/2k/XP to be released soon (probably alongside
the first Beta release for CUPS 1.2).
- </para></listitem>
+ </para></member>
-</itemizedlist>
+</simplelist>
</para>
</sect1>
diff --git a/docs/docbook/projdoc/Compiling.sgml b/docs/docbook/projdoc/Compiling.xml
index 664975779c..9638663dde 100644
--- a/docs/docbook/projdoc/Compiling.sgml
+++ b/docs/docbook/projdoc/Compiling.xml
@@ -276,11 +276,16 @@ you would not want to see would be:
<title>Compiling samba with Active Directory support</title>
<para>In order to compile samba with ADS support, you need to have installed
- on your system:
- <simplelist>
- <member>the MIT kerberos development libraries (either install from the sources or use a package). The heimdal libraries will not work.</member>
- <member>the OpenLDAP development libraries.</member>
-</simplelist></para>
+ on your system:</para>
+ <itemizedlist>
+
+ <listitem><para>the MIT kerberos development libraries
+ (either install from the sources or use a package). The
+ heimdal libraries will not work.</para></listitem>
+
+ <listitem><para>the OpenLDAP development libraries.</para></listitem>
+
+ </itemizedlist>
<para>If your kerberos libraries are in a non-standard location then
remember to add the configure option --with-krb5=DIR.</para>
@@ -290,7 +295,7 @@ you would not want to see would be:
<para><programlisting>
#define HAVE_KRB5 1
#define HAVE_LDAP 1
- </programlisting></para>
+</programlisting></para>
<para>If it doesn't then configure did not find your krb5 libraries or
your ldap libraries. Look in config.log to figure out why and fix
@@ -301,10 +306,10 @@ you would not want to see would be:
<para>On Debian you need to install the following packages:</para>
<para>
- <simplelist>
- <member>libkrb5-dev</member>
- <member>krb5-user</member>
- </simplelist>
+ <itemizedlist>
+ <listitem>libkrb5-dev</listitem>
+ <listitem>krb5-user</listitem>
+ </itemizedlist>
</para>
</sect3>
@@ -313,11 +318,11 @@ you would not want to see would be:
<para>On RedHat this means you should have at least: </para>
<para>
- <simplelist>
- <member>krb5-workstation (for kinit)</member>
- <member>krb5-libs (for linking with)</member>
- <member>krb5-devel (because you are compiling from source)</member>
- </simplelist>
+ <itemizedlist>
+ <listitem>krb5-workstation (for kinit)</listitem>
+ <listitem>krb5-libs (for linking with)</listitem>
+ <listitem>krb5-devel (because you are compiling from source)</listitem>
+ </itemizedlist>
</para>
<para>in addition to the standard development environment.</para>
diff --git a/docs/docbook/projdoc/DOMAIN_MEMBER.sgml b/docs/docbook/projdoc/DOMAIN_MEMBER.xml
index a5921e8ce3..a5921e8ce3 100644
--- a/docs/docbook/projdoc/DOMAIN_MEMBER.sgml
+++ b/docs/docbook/projdoc/DOMAIN_MEMBER.xml
diff --git a/docs/docbook/projdoc/Diagnosis.sgml b/docs/docbook/projdoc/Diagnosis.xml
index 150f071b78..150f071b78 100644
--- a/docs/docbook/projdoc/Diagnosis.sgml
+++ b/docs/docbook/projdoc/Diagnosis.xml
diff --git a/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml b/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.xml
index af6ddff9bf..af6ddff9bf 100644
--- a/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml
+++ b/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.xml
diff --git a/docs/docbook/projdoc/Integrating-with-Windows.sgml b/docs/docbook/projdoc/Integrating-with-Windows.xml
index 9f0de0a56a..9f0de0a56a 100644
--- a/docs/docbook/projdoc/Integrating-with-Windows.sgml
+++ b/docs/docbook/projdoc/Integrating-with-Windows.xml
diff --git a/docs/docbook/projdoc/InterdomainTrusts.sgml b/docs/docbook/projdoc/InterdomainTrusts.xml
index 2c492d4ac0..2c492d4ac0 100644
--- a/docs/docbook/projdoc/InterdomainTrusts.sgml
+++ b/docs/docbook/projdoc/InterdomainTrusts.xml
diff --git a/docs/docbook/projdoc/IntroSMB.sgml b/docs/docbook/projdoc/IntroSMB.xml
index 4ead422fb8..4ead422fb8 100644
--- a/docs/docbook/projdoc/IntroSMB.sgml
+++ b/docs/docbook/projdoc/IntroSMB.xml
diff --git a/docs/docbook/projdoc/NT4Migration.sgml b/docs/docbook/projdoc/NT4Migration.xml
index 7b1d2f20b3..585cfe6a47 100644
--- a/docs/docbook/projdoc/NT4Migration.sgml
+++ b/docs/docbook/projdoc/NT4Migration.xml
@@ -340,14 +340,14 @@ based solution fit into three basic categories.
</para>
<table frame="all"><title>The 3 Major Site Types</title>
-<tgroup cols="2" align="center">
+<tgroup cols="2">
<thead>
- <row><entry align="center">Number of Users</entry><entry>Description</entry></row>
+ <row><entry>Number of Users</entry><entry>Description</entry></row>
</thead>
<tbody>
- <row><entry align="center">&lt; 50</entry><entry><para>Want simple conversion with NO pain</para></entry></row>
- <row><entry align="center">50 - 250</entry><entry><para>Want new features, can manage some in-house complexity</para></entry></row>
- <row><entry align="center">&gt; 250</entry><entry><para>Solution/Implementation MUST scale well, complex needs. Cross departmental decision process. Local expertise in most areas</para></entry></row>
+ <row><entry>&lt; 50</entry><entry><para>Want simple conversion with NO pain</para></entry></row>
+ <row><entry>50 - 250</entry><entry><para>Want new features, can manage some in-house complexity</para></entry></row>
+ <row><entry>&gt; 250</entry><entry><para>Solution/Implementation MUST scale well, complex needs. Cross departmental decision process. Local expertise in most areas</para></entry></row>
</tbody>
</tgroup>
</table>
@@ -397,7 +397,7 @@ No matter what choice you make, the following rules will minimise down-stream pr
</itemizedlist>
<table frame="top"><title>Nature of the Conversion Choices</title>
-<tgroup cols="3" align="center">
+<tgroup cols="3">
<thead>
<row><entry>Simple</entry><entry>Upgraded</entry><entry>Redesign</entry></row>
</thead>
diff --git a/docs/docbook/projdoc/NT_Security.sgml b/docs/docbook/projdoc/NT_Security.xml
index 9bff25337c..9bff25337c 100644
--- a/docs/docbook/projdoc/NT_Security.sgml
+++ b/docs/docbook/projdoc/NT_Security.xml
diff --git a/docs/docbook/projdoc/NetworkBrowsing.sgml b/docs/docbook/projdoc/NetworkBrowsing.xml
index 29768ea42a..29768ea42a 100644
--- a/docs/docbook/projdoc/NetworkBrowsing.sgml
+++ b/docs/docbook/projdoc/NetworkBrowsing.xml
diff --git a/docs/docbook/projdoc/Other-Clients.sgml b/docs/docbook/projdoc/Other-Clients.xml
index 068b9c0b32..068b9c0b32 100644
--- a/docs/docbook/projdoc/Other-Clients.sgml
+++ b/docs/docbook/projdoc/Other-Clients.xml
diff --git a/docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml b/docs/docbook/projdoc/PAM-Authentication-And-Samba.xml
index 4b5179acc7..4b5179acc7 100644
--- a/docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml
+++ b/docs/docbook/projdoc/PAM-Authentication-And-Samba.xml
diff --git a/docs/docbook/projdoc/PolicyMgmt.sgml b/docs/docbook/projdoc/PolicyMgmt.xml
index 2ae3fa5ea7..2ae3fa5ea7 100644
--- a/docs/docbook/projdoc/PolicyMgmt.sgml
+++ b/docs/docbook/projdoc/PolicyMgmt.xml
diff --git a/docs/docbook/projdoc/Portability.sgml b/docs/docbook/projdoc/Portability.xml
index 72c3d20547..72c3d20547 100644
--- a/docs/docbook/projdoc/Portability.sgml
+++ b/docs/docbook/projdoc/Portability.xml
diff --git a/docs/docbook/projdoc/Problems.sgml b/docs/docbook/projdoc/Problems.xml
index eb43b63b63..eb43b63b63 100644
--- a/docs/docbook/projdoc/Problems.sgml
+++ b/docs/docbook/projdoc/Problems.xml
diff --git a/docs/docbook/projdoc/ProfileMgmt.sgml b/docs/docbook/projdoc/ProfileMgmt.xml
index 82897808b2..82897808b2 100644
--- a/docs/docbook/projdoc/ProfileMgmt.sgml
+++ b/docs/docbook/projdoc/ProfileMgmt.xml
diff --git a/docs/docbook/projdoc/SWAT.sgml b/docs/docbook/projdoc/SWAT.xml
index f238e8e1b0..f238e8e1b0 100644
--- a/docs/docbook/projdoc/SWAT.sgml
+++ b/docs/docbook/projdoc/SWAT.xml
diff --git a/docs/docbook/projdoc/Samba-BDC-HOWTO.sgml b/docs/docbook/projdoc/Samba-BDC-HOWTO.xml
index 2f3b568471..2f3b568471 100644
--- a/docs/docbook/projdoc/Samba-BDC-HOWTO.sgml
+++ b/docs/docbook/projdoc/Samba-BDC-HOWTO.xml
diff --git a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml b/docs/docbook/projdoc/Samba-PDC-HOWTO.xml
index 0bb3ccbfb7..6a3bcacf17 100644
--- a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
+++ b/docs/docbook/projdoc/Samba-PDC-HOWTO.xml
@@ -368,10 +368,7 @@ There are two ways to create machine trust accounts:
account is automatically created by Samba at the time the client
is joined to the domain. (For security, this is the
recommended method.) The corresponding Unix account may be
- created automatically or manually. This option requires that the
- administrator configures in smb.conf [globals] the <emphasis>add machine script</emphasis>
- parameter entry.
- </para>
+ created automatically or manually. </para>
</listitem>
</itemizedlist>
@@ -469,20 +466,20 @@ is joined to the domain. </para>
<para>Since each Samba machine trust account requires a corresponding
Unix account, a method for automatically creating the
Unix account is usually supplied; this requires configuration of the
-<ulink url="smb.conf.5.html#ADDMACHINESCRIPT">add machine script</ulink>
+<ulink url="smb.conf.5.html#ADDUSERSCRIPT">add user script</ulink>
option in <filename>smb.conf</filename>. This
method is not required, however; corresponding Unix accounts may also
be created manually.
</para>
-<para>Below is an example for a Red Hat Linux system.
+<para>Below is an example for a RedHat 6.2 Linux system.
</para>
<para><programlisting>
[global]
# &lt;...remainder of parameters...&gt;
- add machine script = /usr/sbin/useradd -d /dev/null -g 100 -s /bin/false -M %u
+ add user script = /usr/sbin/useradd -d /dev/null -g 100 -s /bin/false -M %u
</programlisting></para>
</sect2>
diff --git a/docs/docbook/projdoc/ServerType.sgml b/docs/docbook/projdoc/ServerType.xml
index 7229a50201..7229a50201 100644
--- a/docs/docbook/projdoc/ServerType.sgml
+++ b/docs/docbook/projdoc/ServerType.xml
diff --git a/docs/docbook/projdoc/Speed.sgml b/docs/docbook/projdoc/Speed.xml
index 2509883916..2509883916 100644
--- a/docs/docbook/projdoc/Speed.sgml
+++ b/docs/docbook/projdoc/Speed.xml
diff --git a/docs/docbook/projdoc/UNIX_INSTALL.sgml b/docs/docbook/projdoc/UNIX_INSTALL.xml
index 3ad83c1f9d..3ad83c1f9d 100644
--- a/docs/docbook/projdoc/UNIX_INSTALL.sgml
+++ b/docs/docbook/projdoc/UNIX_INSTALL.xml
diff --git a/docs/docbook/projdoc/VFS.sgml b/docs/docbook/projdoc/VFS.xml
index 225411b427..225411b427 100644
--- a/docs/docbook/projdoc/VFS.sgml
+++ b/docs/docbook/projdoc/VFS.xml
diff --git a/docs/docbook/projdoc/locking.sgml b/docs/docbook/projdoc/locking.xml
index adb4356497..adb4356497 100644
--- a/docs/docbook/projdoc/locking.sgml
+++ b/docs/docbook/projdoc/locking.xml
diff --git a/docs/docbook/projdoc/msdfs_setup.sgml b/docs/docbook/projdoc/msdfs_setup.xml
index a86cd74235..a86cd74235 100644
--- a/docs/docbook/projdoc/msdfs_setup.sgml
+++ b/docs/docbook/projdoc/msdfs_setup.xml
diff --git a/docs/docbook/projdoc/passdb.sgml b/docs/docbook/projdoc/passdb.xml
index cc497f7d93..cc497f7d93 100644
--- a/docs/docbook/projdoc/passdb.sgml
+++ b/docs/docbook/projdoc/passdb.xml
diff --git a/docs/docbook/projdoc/printer_driver2.sgml b/docs/docbook/projdoc/printer_driver2.xml
index da3eb838f2..da3eb838f2 100644
--- a/docs/docbook/projdoc/printer_driver2.sgml
+++ b/docs/docbook/projdoc/printer_driver2.xml
diff --git a/docs/docbook/projdoc/samba-doc.sgml b/docs/docbook/projdoc/samba-doc.xml
index a729caf99f..e06ce2901e 100644
--- a/docs/docbook/projdoc/samba-doc.sgml
+++ b/docs/docbook/projdoc/samba-doc.xml
@@ -1,4 +1,5 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book SYSTEM "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
]>
@@ -24,9 +25,9 @@ documentation represents a major revision or layout as well as contents.
The most recent version of this document can be found at
<ulink url="http://www.samba.org/">http://www.samba.org/</ulink>
on the "Documentation" page. Please send updates to
-<ulink url="mailto:jelmer@samba.org">jelmer@samba.org</ulink>,
-<ulink url="mailto:jht@samba.org">jht@samba.org</ulink> or
-<ulink url="mailto:jerry@samba.org">jerry@samba.org</ulink>.
+<ulink url="mailto:jelmer@samba.org">Jelmer Venrooij</ulink>,
+<ulink url="mailto:jht@samba.org">John Terpstra</ulink> or
+<ulink url="mailto:jerry@samba.org">Gerald (Jerry) Carter</ulink>.
</para>
<para>
@@ -50,6 +51,8 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u
</legalnotice>
</bookinfo>
+<!-- Contents -->
+<toc/>
<!-- Chapters -->
<part id="introduction">
@@ -126,4 +129,5 @@ Samba has several features that you might want or might not want to use. The cha
&SWAT;
&SPEED;
</part>
+
</book>
diff --git a/docs/docbook/projdoc/securing-samba.sgml b/docs/docbook/projdoc/securing-samba.xml
index d320767a77..d320767a77 100644
--- a/docs/docbook/projdoc/securing-samba.sgml
+++ b/docs/docbook/projdoc/securing-samba.xml
diff --git a/docs/docbook/projdoc/security_level.sgml b/docs/docbook/projdoc/security_level.xml
index 528c87c52c..528c87c52c 100644
--- a/docs/docbook/projdoc/security_level.sgml
+++ b/docs/docbook/projdoc/security_level.xml
diff --git a/docs/docbook/projdoc/unicode.sgml b/docs/docbook/projdoc/unicode.xml
index 2351668e56..2351668e56 100644
--- a/docs/docbook/projdoc/unicode.sgml
+++ b/docs/docbook/projdoc/unicode.xml
diff --git a/docs/docbook/projdoc/upgrading-to-3.0.sgml b/docs/docbook/projdoc/upgrading-to-3.0.xml
index 3dc4816664..3dc4816664 100644
--- a/docs/docbook/projdoc/upgrading-to-3.0.sgml
+++ b/docs/docbook/projdoc/upgrading-to-3.0.xml
diff --git a/docs/docbook/projdoc/winbind.sgml b/docs/docbook/projdoc/winbind.xml
index 962e81b863..d46c32c2e4 100644
--- a/docs/docbook/projdoc/winbind.sgml
+++ b/docs/docbook/projdoc/winbind.xml
@@ -543,16 +543,21 @@ should be named WINBIND. A stanza like the following:
WINBIND:
program = /usr/lib/security/WINBIND
options = authonly
-<programlisting></para>
+</programlisting></para>
-<para>can then be added to <filename>/usr/lib/security/methods.cfg</filename>.
-This module only supports identification, but there have been success reports
-using the standard winbind pam module for authentication. Use caution
-configuring loadable authentication modules as it is possible to make
-it impossible to logon to the system. More information about the AIX
-authentication module API can be found at
-<link url="http://publibn.boulder.ibm.com/doc_link/en_US/a_doc_lib/aixprggd/kernextc/sec_load_mod.htm"/> and more information on administering the
-modules at <link url="http://publibn.boulder.ibm.com/doc_link/en_US/a_doc_lib/aixbman/baseadmn/iandaadmin.htm"/>.
+<para>can then be added to
+<filename>/usr/lib/security/methods.cfg</filename>. This module only
+supports identification, but there have been success reports using the
+standard winbind pam module for authentication. Use caution configuring
+loadable authentication modules as it is possible to make it impossible
+to logon to the system. More information about the AIX authentication
+module API can be found at &quot;Kernel Extensions and Device Support
+Programming Concepts for AIX&quot;: <link
+url="http://publibn.boulder.ibm.com/doc_link/en_US/a_doc_lib/aixprggd/kernextc/sec_load_mod.htm">
+Chapter 18. Loadable Authentication Module Programming Interface</link>
+and more information on administering the modules at <link
+url="http://publibn.boulder.ibm.com/doc_link/en_US/a_doc_lib/aixbman/baseadmn/iandaadmin.htm">
+&quot;System Management Guide: Operating System and Devices&quot;</link>.
</para>
</sect3>
@@ -563,7 +568,8 @@ modules at <link url="http://publibn.boulder.ibm.com/doc_link/en_US/a_doc_lib/ai
Several parameters are needed in the smb.conf file to control
the behavior of <command>winbindd</command>. Configure
<filename>smb.conf</filename> These are described in more detail in
-the <ulink url="winbindd.8.html">winbindd(8)</ulink> man page. My
+the <citerefentry><refentrytitle>winbindd</refentrytitle>
+<manvolnum>8</manvolnum></citerefentry> man page. My
<filename>smb.conf</filename> file was modified to
include the following entries in the [global] section:
</para>