summaryrefslogtreecommitdiff
path: root/docs/docbook/projdoc
diff options
context:
space:
mode:
Diffstat (limited to 'docs/docbook/projdoc')
-rw-r--r--docs/docbook/projdoc/ADS-HOWTO.sgml15
-rw-r--r--docs/docbook/projdoc/AdvancedNetworkAdmin.sgml89
-rw-r--r--docs/docbook/projdoc/Browsing-Quickguide.sgml10
-rw-r--r--docs/docbook/projdoc/Browsing.sgml7
-rw-r--r--docs/docbook/projdoc/Bugs.sgml5
-rw-r--r--docs/docbook/projdoc/CUPS-printing.sgml77
-rw-r--r--docs/docbook/projdoc/Compiling.sgml1
-rw-r--r--docs/docbook/projdoc/DOMAIN_MEMBER.sgml22
-rw-r--r--docs/docbook/projdoc/Diagnosis.sgml80
-rw-r--r--docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml4
-rw-r--r--docs/docbook/projdoc/Integrating-with-Windows.sgml13
-rw-r--r--docs/docbook/projdoc/NT4Migration.sgml4
-rw-r--r--docs/docbook/projdoc/NT_Security.sgml10
-rw-r--r--docs/docbook/projdoc/Other-Clients.sgml17
-rw-r--r--docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml16
-rw-r--r--docs/docbook/projdoc/PolicyMgmt.sgml63
-rw-r--r--docs/docbook/projdoc/Portability.sgml4
-rw-r--r--docs/docbook/projdoc/ProfileMgmt.sgml12
-rw-r--r--docs/docbook/projdoc/SWAT.sgml4
-rw-r--r--docs/docbook/projdoc/Samba-BDC-HOWTO.sgml9
-rw-r--r--docs/docbook/projdoc/Samba-PDC-HOWTO.sgml15
-rw-r--r--docs/docbook/projdoc/ServerType.sgml8
-rw-r--r--docs/docbook/projdoc/Speed.sgml7
-rw-r--r--docs/docbook/projdoc/UNIX_INSTALL.sgml7
-rw-r--r--docs/docbook/projdoc/VFS.sgml4
-rw-r--r--docs/docbook/projdoc/passdb.sgml55
-rw-r--r--docs/docbook/projdoc/printer_driver2.sgml30
-rw-r--r--docs/docbook/projdoc/samba-doc.sgml29
-rw-r--r--docs/docbook/projdoc/securing-samba.sgml5
-rw-r--r--docs/docbook/projdoc/security_level.sgml9
-rw-r--r--docs/docbook/projdoc/unicode.sgml8
-rw-r--r--docs/docbook/projdoc/upgrading-to-3.0.sgml11
-rw-r--r--docs/docbook/projdoc/winbind.sgml24
33 files changed, 227 insertions, 447 deletions
diff --git a/docs/docbook/projdoc/ADS-HOWTO.sgml b/docs/docbook/projdoc/ADS-HOWTO.sgml
index a98fe14e31..a0bba36e99 100644
--- a/docs/docbook/projdoc/ADS-HOWTO.sgml
+++ b/docs/docbook/projdoc/ADS-HOWTO.sgml
@@ -1,9 +1,7 @@
<chapter id="ADS">
<chapterinfo>
- <author>
- <firstname>Andrew</firstname><surname>Tridgell</surname>
- </author>
+ &author.tridge;
<pubdate>2002</pubdate>
</chapterinfo>
@@ -33,11 +31,12 @@ In case samba can't figure out your ads server using your realm name, use the
</programlisting>
</para>
-<para>You do *not* need a smbpasswd file, and older clients will
- be authenticated as if "security = domain", although it won't do any harm
+<note><para>You do *not* need a smbpasswd file, and older clients will
+ be authenticated as if <command>security = domain</command>,
+ although it won't do any harm
and allows you to have local users not in the domain.
I expect that the above required options will change soon when we get better
- active directory integration.</para>
+ active directory integration.</para></note>
</sect1>
@@ -56,7 +55,7 @@ In case samba can't figure out your ads server using your realm name, use the
<para>Test your config by doing a "kinit USERNAME@REALM" and making sure that
your password is accepted by the Win2000 KDC. </para>
-<para>NOTE: The realm must be uppercase. </para>
+<note><para>The realm must be uppercase. </para></note>
<para>
You also must ensure that you can do a reverse DNS lookup on the IP
@@ -87,7 +86,7 @@ support for smbd and winbindd.
<para>
As a user that has write permission on the Samba private directory
(usually root) run:
-<command>net ads join</command>
+<userinput>net ads join</userinput>
</para>
<sect2>
diff --git a/docs/docbook/projdoc/AdvancedNetworkAdmin.sgml b/docs/docbook/projdoc/AdvancedNetworkAdmin.sgml
index fe0774810b..525ab6dd37 100644
--- a/docs/docbook/projdoc/AdvancedNetworkAdmin.sgml
+++ b/docs/docbook/projdoc/AdvancedNetworkAdmin.sgml
@@ -1,15 +1,7 @@
<chapter id="AdvancedNetworkManagement">
<chapterinfo>
- <author>
- <firstname>John H</firstname><surname>Terpstra</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address>
- <email>jht@samba.org</email>
- </address>
- </affiliation>
- </author>
- <pubdate>April 3 2003</pubdate>
+ &author.jht;
+ <pubdate>April 3 2003</pubdate>
</chapterinfo>
<title>Advanced Network Manangement</title>
@@ -61,19 +53,18 @@ Server Manager is shipped with Windows NT4 Server products but not with Windows
You can obtain the NT Server Manager for MS Windows NT4 Workstation from Microsoft - see details below.
</para>
-<para>
-Instructions:
-</para>
-
- <para>
- Launch the NT4 Server Manager, click on the Samba server you want to administer, then from the menu
- select Computer, then click on the Shared Directories entry.
- </para>
+<procedure>
+<title>Instructions</title>
+<step><para>
+Launch the NT4 Server Manager, click on the Samba server you want to administer, then from the menu
+select Computer, then click on the Shared Directories entry.
+</para></step>
- <para>
+<step><para>
Now click on the share that you wish to manage, then click on the Properties tab, next click on
the Permissions tab. Now you can Add or change access control settings as you wish.
- </para>
+</para></step>
+</procedure>
</sect3>
@@ -93,37 +84,37 @@ Microsoft Management Console (MMC). This tool is located by clicking on <filenam
Administrative Tools -> Computer Management</filename>.
</para>
-<para>
-Instructions:
-</para>
- <para>
+<procedure>
+<title>Instructions</title>
+<step><para>
After launching the MMC with the Computer Management snap-in, click on the menu item 'Action',
select 'Connect to another computer'. If you are not logged onto a domain you will be prompted
to enter a domain login user identifier and a password. This will authenticate you to the domain.
If you where already logged in with administrative privilidge this step is not offered.
- </para>
-
- <para>
- If the Samba server is not shown in the Select Computer box, then type in the name of the target
- Samba server in the field 'Name:'. Now click on the [+] next to 'System Tools', then on the [+]
- next to 'Shared Folders' in the left panel.
- </para>
-
- <para>
- Now in the right panel, double-click on the share you wish to set access control permissions on.
- Then click on the tab 'Share Permissions'. It is now possible to add access control entities
- to the shared folder. Do NOT forget to set what type of access (full control, change, read) you
- wish to assign for each entry.
- </para>
-
- <note>
- <para>
- Be careful. If you take away all permissions from the Everyone user without removing this user
- then effectively no user will be able to access the share. This is a result of what is known as
- ACL precidence. ie: Everyone with NO ACCESS means that MaryK who is part of the group Everyone
- will have no access even if this user is given explicit full control access.
- </para>
- </note>
+</para></step>
+
+<step><para>
+If the Samba server is not shown in the Select Computer box, then type in the name of the target
+Samba server in the field 'Name:'. Now click on the [+] next to 'System Tools', then on the [+]
+next to 'Shared Folders' in the left panel.
+</para></step>
+
+<step><para>
+Now in the right panel, double-click on the share you wish to set access control permissions on.
+Then click on the tab 'Share Permissions'. It is now possible to add access control entities
+to the shared folder. Do NOT forget to set what type of access (full control, change, read) you
+wish to assign for each entry.
+</para></step>
+</procedure>
+
+<warning>
+<para>
+Be careful. If you take away all permissions from the Everyone user without removing this user
+then effectively no user will be able to access the share. This is a result of what is known as
+ACL precidence. ie: Everyone with NO ACCESS means that MaryK who is part of the group Everyone
+will have no access even if this user is given explicit full control access.
+</para>
+</warning>
</sect3>
</sect2>
@@ -148,9 +139,7 @@ systems. The tools set includes:
<itemizedlist>
<listitem><para>Server Manager</para></listitem>
-
<listitem><para>User Manager for Domains</para></listitem>
-
<listitem><para>Event Viewer</para></listitem>
</itemizedlist>
@@ -171,7 +160,7 @@ from <ulink url="ftp://ftp.microsoft.com/Softlib/MSLFILES/SRVTOOLS.EXE">ftp://ft
<para>
This section needs work. Volunteer contributions most welcome. Please send your patches or updates
-to jht@samba.org.
+to <ulink url="mailto:jht@samba.org">John Terpstra</ulink>.
</para>
</chapter>
diff --git a/docs/docbook/projdoc/Browsing-Quickguide.sgml b/docs/docbook/projdoc/Browsing-Quickguide.sgml
index adf20b7386..3a26ebcb21 100644
--- a/docs/docbook/projdoc/Browsing-Quickguide.sgml
+++ b/docs/docbook/projdoc/Browsing-Quickguide.sgml
@@ -1,8 +1,6 @@
<chapter id="Browsing-Quick">
<chapterinfo>
- <author>
- <firstname>John H</firstname><surname>Terpstra</surname>
- </author>
+ &author.jht;
<pubdate>July 5, 1998</pubdate>
<pubdate>Updated: March 15, 2003</pubdate>
</chapterinfo>
@@ -17,10 +15,10 @@ of NetBIOS names to IP addesses. WINS is NOT involved in browse list handling
except by way of name to address mapping.
</para>
-<para>
-Note: MS Windows 2000 and later can be configured to operate with NO NetBIOS
+<note><para>
+MS Windows 2000 and later can be configured to operate with NO NetBIOS
over TCP/IP. Samba-3 and later also supports this mode of operation.
-</para>
+</para></note>
<sect1>
diff --git a/docs/docbook/projdoc/Browsing.sgml b/docs/docbook/projdoc/Browsing.sgml
index 60512c3cd1..2de0f446a6 100644
--- a/docs/docbook/projdoc/Browsing.sgml
+++ b/docs/docbook/projdoc/Browsing.sgml
@@ -6,7 +6,6 @@
</affiliation>
</author>
-
<pubdate> (5 July 1998) </pubdate>
</chapterinfo>
@@ -69,15 +68,15 @@ regardless of whether it is NT, Samba or any other type of domain master
that is providing this service.
</para>
-<para>
-[Note that nmbd can be configured as a WINS server, but it is not
+<note><para>
+Nmbd can be configured as a WINS server, but it is not
necessary to specifically use samba as your WINS server. MS Windows
NT4, Server or Advanced Server 2000 or 2003 can be configured as
your WINS server. In a mixed NT/2000/2003 server and samba environment on
a Wide Area Network, it is recommended that you use the Microsoft
WINS server capabilities. In a samba-only environment, it is
recommended that you use one and only one Samba server as your WINS server.
-</para>
+</para></note>
<para>
To get browsing to work you need to run nmbd as usual, but will need
diff --git a/docs/docbook/projdoc/Bugs.sgml b/docs/docbook/projdoc/Bugs.sgml
index a9493b07d4..4e4f7b9084 100644
--- a/docs/docbook/projdoc/Bugs.sgml
+++ b/docs/docbook/projdoc/Bugs.sgml
@@ -1,6 +1,7 @@
<chapter id="bugreport">
<chapterinfo>
+ &author.jelmer;
<author>
<affiliation>
<orgname>Samba Team</orgname>
@@ -15,7 +16,7 @@
<title>Introduction</title>
<para>
-The email address for bug reports for stable releases is <ulink url="samba@samba.org">samba@samba.org</ulink>.
+The email address for bug reports for stable releases is <ulink url="mailto:samba@samba.org">samba@samba.org</ulink>.
Bug reports for alpha releases should go to <ulink url="mailto:samba-technical@samba.org">samba-technical@samba.org</ulink>.
</para>
@@ -61,7 +62,7 @@ file for correct syntax.
</para>
<para>
-Have you run through the <ulink url="Diagnosis.html">diagnosis</ulink>?
+Have you run through the <link linkend="Diagnosis">diagnosis</link>?
This is very important.
</para>
diff --git a/docs/docbook/projdoc/CUPS-printing.sgml b/docs/docbook/projdoc/CUPS-printing.sgml
index 65f18dc385..eb59695b04 100644
--- a/docs/docbook/projdoc/CUPS-printing.sgml
+++ b/docs/docbook/projdoc/CUPS-printing.sgml
@@ -2,15 +2,7 @@
<chapterinfo>
- <author>
- <firstname>John H</firstname><surname>Terpstra</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address>
- <email>jht@samba.org</email>
- </address>
- </affiliation>
- </author>
+ &author.jht;
<author>
<firstname>Kurt</firstname><surname>Pfeifle</surname>
<affiliation>
@@ -1310,7 +1302,7 @@ It is *not* working for Win9x/ME clients. But it:
</para>
<simplelist>
- <member>>it guarantees to not write an PJL-header</member>
+ <member>it guarantees to not write an PJL-header</member>
<member>it guarantees to still read and support all PJL-options named in the driver PPD with its own means</member>
<member>it guarantees the file going thru the "pstops" filter on the CUPS/Samba server</member>
<member>it guarantees to page-count correctly the printfile</member>
@@ -1326,29 +1318,30 @@ current with CUPS 1.1.16).
These are the items CUPS logs in the "page_log" for every single *page* of a job:
</para>
-<para><programlisting>
- * Printer name
- * User name
- * Job ID
- * Time of printing
- * the page number
- * the number of copies
- * a billing info string (optional)
-</programlisting></para>
+<para><simplelist>
+<member>Printer name</member>
+<member>User name</member>
+<member>Job ID</member>
+<member>Time of printing</member>
+<member>the page number</member>
+<member>the number of copies</member>
+<member>a billing info string (optional)</member>
+</simplelist>
+</para>
<para>
Here is an extract of my CUPS server's page_log file to illustrate
the format and included items:
</para>
-<para><programlisting>
+<para><computeroutput>
infotec_IS2027 kurt 40 [22/Nov/2002:13:18:03 +0100] 1 2 #marketing
infotec_IS2027 kurt 40 [22/Nov/2002:13:18:03 +0100] 2 2 #marketing
infotec_IS2027 kurt 40 [22/Nov/2002:13:18:03 +0100] 3 2 #marketing
infotec_IS2027 kurt 40 [22/Nov/2002:13:18:03 +0100] 4 2 #marketing
infotec_IS2027 kurt 40 [22/Nov/2002:13:18:03 +0100] 5 2 #marketing
infotec_IS2027 kurt 40 [22/Nov/2002:13:18:03 +0100] 6 2 #marketing
-</programlisting></para>
+</computeroutput></para>
<para>
This was Job ID "40", printed on "infotec_IS2027" by user "kurt", a 6-page job
@@ -1397,7 +1390,7 @@ huge improvements under development:
<simplelist>
<member>page counting will go into the "backends" (these talk
directly to the printer and will increase the count in sync with the
- actual printing process -- a jam at the 5th sheet will lead to a stop in the counting)</member>
+ actual printing process -- a jam at the 5th sheet will lead to a stop in the counting)</member>
<member>quotas will be handled more flexibly</member>
@@ -1421,13 +1414,13 @@ the files:
</para>
<para>
- <programlisting>
+ <computeroutput>
cups-samba.install
cups-samba.license
cups-samba.readme
cups-samba.remove
cups-samba.ss
- </programlisting>
+ </computeroutput>
</para>
<para>
@@ -1438,26 +1431,24 @@ into <filename>/usr/share/cups/drivers/</filename>. Its contents are 3 files:
</para>
<para>
- <programlisting>
+ <computeroutput>
cupsdrvr.dll
cupsui.dll
cups.hlp
- </programlisting>
+ </computeroutput>
</para>
-<note><para>
-ATTENTION: due to a bug one CUPS release puts the <filename>cups.hlp</filename>
+<caution><para>
+Due to a bug one CUPS release puts the <filename>cups.hlp</filename>
into <filename>/usr/share/drivers/</filename> instead of
<filename>/usr/share/cups/drivers/</filename>. To work around this, copy/move
the file after running the "./cups-samba.install" script manually to the right place:
</para>
<para>
- <programlisting>
- cp /usr/share/drivers/cups.hlp /usr/share/cups/drivers/
- </programlisting>
- </para>
-</note>
+ <userinput> cp /usr/share/drivers/cups.hlp /usr/share/cups/drivers/
+ </userinput>
+ </para></caution>
<note>
<para>
@@ -1485,19 +1476,19 @@ Win NT/2k/XP clients.
<note><para>
- NOTE 1: Win 9x/ME clients won't work with this driver. For these you'd
+ Win 9x/ME clients won't work with this driver. For these you'd
still need to use the ADOBE*.* drivers as previously.
</para></note>
<note><para>
- NOTE 2: It is not harming if you've still the ADOBE*.* driver files from
+ It is not harming if you've still the ADOBE*.* driver files from
previous installations in the "/usr/share/cups/drivers/" directory.
The new cupsaddsmb (from 1.1.16) will automatically use the
"newest" installed driver (which here then is the CUPS drivers).
</para></note>
<note><para>
- NOTE 3: Should your Win clients have had the old ADOBE*.* files and the
+ Should your Win clients have had the old ADOBE*.* files and the
Adobe PostScript drivers installed, the download and installation
of the new CUPS PostScript driver for Windows NT/2k/XP will fail
at first.
@@ -1685,11 +1676,11 @@ it is most likely the Samba part.
For the CUPS part, you may want to consult:
</para>
-<programlisting>
- http://localhost:631/sam.html#PreserveJobFiles and
- http://localhost:631/sam.html#PreserveJobHistory and
- http://localhost:631/sam.html#MaxJobs
-</programlisting>
+<simplelist>
+<member>http://localhost:631/sam.html#PreserveJobFiles</member>
+<member>http://localhost:631/sam.html#PreserveJobHistory</member>
+<member>http://localhost:631/sam.html#MaxJobs</member>
+</simplelist>
<para>
There are the settings described for your CUPS daemon, which could lead to completed
@@ -1773,10 +1764,10 @@ If you have more problems, post the output of these commands:
</para>
<para>
-<programlisting>
+<userinput>
grep -v ^# /etc/cups/cupsd.conf | grep -v ^$
grep -v ^# /etc/samba/smb.conf | grep -v ^$ | grep -v "^;"
-</programlisting>
+</userinput>
</para>
<para>
diff --git a/docs/docbook/projdoc/Compiling.sgml b/docs/docbook/projdoc/Compiling.sgml
index ac98f34a32..a5ff783244 100644
--- a/docs/docbook/projdoc/Compiling.sgml
+++ b/docs/docbook/projdoc/Compiling.sgml
@@ -5,6 +5,7 @@
<orgname>Samba Team</orgname>
</affiliation>
</author>
+ &author.jelmer;
<pubdate> (22 May 2001) </pubdate>
<pubdate> 18 March 2003 </pubdate>
diff --git a/docs/docbook/projdoc/DOMAIN_MEMBER.sgml b/docs/docbook/projdoc/DOMAIN_MEMBER.sgml
index 8ac3520384..1a97e6f5a8 100644
--- a/docs/docbook/projdoc/DOMAIN_MEMBER.sgml
+++ b/docs/docbook/projdoc/DOMAIN_MEMBER.sgml
@@ -1,26 +1,8 @@
<chapter id="domain-security">
<chapterinfo>
- <author>
- <firstname>Jeremy</firstname><surname>Allison</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address>
- <email>samba@samba.org</email>
- </address>
- </affiliation>
- </author>
- <author>
- <firstname>Jerry</firstname><surname>Carter</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address>
- <email>jerry@samba.org</email>
- </address>
- </affiliation>
- </author>
-
-
+ &author.jeremy;
+ &author.jerry;
<pubdate>16 Apr 2001</pubdate>
</chapterinfo>
diff --git a/docs/docbook/projdoc/Diagnosis.sgml b/docs/docbook/projdoc/Diagnosis.sgml
index 1e2e6d7598..2a771c23d1 100644
--- a/docs/docbook/projdoc/Diagnosis.sgml
+++ b/docs/docbook/projdoc/Diagnosis.sgml
@@ -1,19 +1,7 @@
<chapter id="diagnosis">
<chapterinfo>
- <author>
- <firstname>Andrew</firstname><surname>Tridgell</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address><email>tridge@samba.org</email></address>
- </affiliation>
- </author>
- <author>
- <firstname>Jelmer</firstname><surname>Vernooij</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address><email>jelmer@samba.org</email></address>
- </affiliation>
- </author>
+ &author.tridge;
+ &author.jelmer;
<pubdate>Wed Jan 15</pubdate>
</chapterinfo>
@@ -92,10 +80,11 @@ best way to check this is with "testparm smb.conf"
</sect1>
<sect1>
-<title>Tests</title>
+<title>The tests</title>
+<procedure>
+<title>Diagnosing your samba server</title>
-<sect2>
-<title>Test 1</title>
+<step performance="required">
<para>
In the directory in which you store your smb.conf file, run the command
"testparm smb.conf". If it reports any errors then your smb.conf
@@ -106,11 +95,9 @@ configuration file is faulty.
Note: Your smb.conf file may be located in: <filename>/etc/samba</filename>
Or in: <filename>/usr/local/samba/lib</filename>
</para>
-</sect2>
-
-<sect2>
-<title>Test 2</title>
+</step>
+<step performance="required">
<para>
Run the command "ping BIGSERVER" from the PC and "ping ACLIENT" from
the unix box. If you don't get a valid response then your TCP/IP
@@ -135,11 +122,9 @@ software. You will need to relax the rules to let in the workstation
in question, perhaps by allowing access from another subnet (on Linux
this is done via the ipfwadm program.)
</para>
-</sect2>
-
-<sect2>
-<title>Test 3</title>
+</step>
+<step performance="required">
<para>
Run the command "smbclient -L BIGSERVER" on the unix box. You
should get a list of available shares back.
@@ -218,10 +203,9 @@ network interface IP Address / Broadcast Address / Subnet Mask settings are
correct and that Samba has correctly noted these in the log.nmb file.
</para>
-</sect2>
+</step>
-<sect2>
-<title>Test 4</title>
+<step performance="required">
<para>
Run the command "nmblookup -B BIGSERVER __SAMBA__". You should get the
@@ -241,10 +225,9 @@ one-line script that contains the right parameters and run that from
inetd.
</para>
-</sect2>
+</step>
-<sect2>
-<title>Test 5</title>
+<step performance="required">
<para>run the command <command>nmblookup -B ACLIENT '*'</command></para>
@@ -259,10 +242,9 @@ If ACLIENT doesn't resolve via DNS then use the IP address of the
client in the above test.
</para>
-</sect2>
+</step>
-<sect2>
-<title>Test 6</title>
+<step performance="required">
<para>
Run the command <command>nmblookup -d 2 '*'</command>
@@ -296,10 +278,9 @@ This test will probably fail if your subnet mask and broadcast address are
not correct. (Refer to TEST 3 notes above).
</para>
-</sect2>
+</step>
-<sect2>
-<title>Test 7</title>
+<step performance="required">
<para>
Run the command <command>smbclient //BIGSERVER/TMP</command>. You should
@@ -369,10 +350,9 @@ especially check that the amount of free disk space shown is correct
when you type <command>dir</command>.
</para>
-</sect2>
+</step>
-<sect2>
-<title>Test 8</title>
+<step performance="required">
<para>
On the PC type the command <command>net view \\BIGSERVER</command>. You will
@@ -429,10 +409,9 @@ Check to see if the host is running tcp wrappers, and if so add an entry in
the hosts.allow file for your client (or subnet, etc.)
</para>
-</sect2>
+</step>
-<sect2>
-<title>Test 9</title>
+<step performance="required">
<para>
Run the command <command>net use x: \\BIGSERVER\TMP</command>. You should
@@ -456,10 +435,9 @@ and you have <command>encrypt passwords = no</command> in <filename>smb.conf</fi
Turn it back on to fix.
</para>
-</sect2>
+</step>
-<sect2>
-<title>Test 10</title>
+<step performance="required">
<para>
Run the command <command>nmblookup -M TESTGROUP</command> where
@@ -476,10 +454,9 @@ sure you have <command>preferred master = yes</command> to ensure that
an election is held at startup.
</para>
-</sect2>
+</step>
-<sect2>
-<title>Test 11</title>
+<step performance="required">
<para>
From file manager try to browse the server. Your samba server should
@@ -495,7 +472,8 @@ smb.conf file, or enable encrypted passwords AFTER compiling in support
for encrypted passwords (refer to the Makefile).
</para>
-</sect2>
+</step>
+</procedure>
</sect1>
<sect1>
@@ -507,7 +485,7 @@ sniff the problem. The official samba mailing list can be reached at
<ulink url="mailto:samba@samba.org">samba@samba.org</ulink>. To find
out more about samba and how to subscribe to the mailing list check
out the samba web page at
-<ulink url="http://samba.org/samba">http://samba.org/samba</ulink>
+<ulink url="http://samba.org/samba">http://samba.org/samba/</ulink>
</para>
<para>
diff --git a/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml b/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml
index a2d16541ef..8aea87fe24 100644
--- a/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml
+++ b/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml
@@ -57,7 +57,7 @@ domadm:x:502:joe,john,mary
<listitem><para>Map this domadm group to the <command>domain admins</command> group by running the command:</para>
-<para><command>smbgroupedit -c "Domain Admins" -u domadm</command></para></listitem>
+<para><userinput>smbgroupedit -c "Domain Admins" -u domadm</userinput></para></listitem>
</orderedlist>
@@ -74,6 +74,6 @@ your samba PDC. Flag that group as a domain group by running:
<para><command>smbgroupedit -a unixgroup -td</command></para>
<para>You can list the various groups in the mapping database like this</para>
-<para><command>smbgroupedit -v</command></para>
+<para><userinput>smbgroupedit -v</userinput></para>
</chapter>
diff --git a/docs/docbook/projdoc/Integrating-with-Windows.sgml b/docs/docbook/projdoc/Integrating-with-Windows.sgml
index 8a5c0c40f2..b48fc3b305 100644
--- a/docs/docbook/projdoc/Integrating-with-Windows.sgml
+++ b/docs/docbook/projdoc/Integrating-with-Windows.sgml
@@ -1,18 +1,7 @@
<chapter id="integrate-ms-networks">
-
<chapterinfo>
- <author>
- <firstname>John</firstname><surname>Terpstra</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address>
- <email>jht@samba.org</email>
- </address>
- </affiliation>
- </author>
-
-
+ &author.jht;
<pubdate> (Jan 01 2001) </pubdate>
</chapterinfo>
diff --git a/docs/docbook/projdoc/NT4Migration.sgml b/docs/docbook/projdoc/NT4Migration.sgml
index 1a4499038d..253de8aea0 100644
--- a/docs/docbook/projdoc/NT4Migration.sgml
+++ b/docs/docbook/projdoc/NT4Migration.sgml
@@ -1,8 +1,6 @@
<chapter id="NT4Migration">
<chapterinfo>
- <author>
- <firstname>John H</firstname><surname>Terpstra</surname>
- </author>
+ &author.jht;
<pubdate>April 3, 2003</pubdate>
</chapterinfo>
diff --git a/docs/docbook/projdoc/NT_Security.sgml b/docs/docbook/projdoc/NT_Security.sgml
index c5e3b9b9f9..65072ef4ff 100644
--- a/docs/docbook/projdoc/NT_Security.sgml
+++ b/docs/docbook/projdoc/NT_Security.sgml
@@ -1,14 +1,6 @@
<chapter id="unix-permissions">
<chapterinfo>
- <author>
- <firstname>Jeremy</firstname><surname>Allison</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address>
- <email>samba@samba.org</email>
- </address>
- </affiliation>
- </author>
+ &author.jeremy;
<pubdate>12 Apr 1999</pubdate>
</chapterinfo>
diff --git a/docs/docbook/projdoc/Other-Clients.sgml b/docs/docbook/projdoc/Other-Clients.sgml
index e4d7e34185..6177b4dcb6 100644
--- a/docs/docbook/projdoc/Other-Clients.sgml
+++ b/docs/docbook/projdoc/Other-Clients.sgml
@@ -1,16 +1,7 @@
<chapter id="Other-Clients">
<chapterinfo>
- <author>
- <firstname>Jim</firstname><surname>McDonough</surname>
- <affiliation>
- <orgname>IBM</orgname>
- </affiliation>
- <firstname>Jelmer</firstname><surname>Vernooij</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address>jelmer@samba.org</address>
- </affiliation>
- </author>
+ &author.jmcd;
+ &author.jelmer;
<pubdate>5 Mar 2001</pubdate>
</chapterinfo>
@@ -334,8 +325,8 @@ for the profile. This default ACL includes
<para><command>DOMAIN\user "Full Control"</command></para>
-<para><emphasis>NOTE : This bug does not occur when using winbind to
-create accounts on the Samba host for Domain users.</emphasis></para>
+<note><para>This bug does not occur when using winbind to
+create accounts on the Samba host for Domain users.</para></note>
</sect1>
diff --git a/docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml b/docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml
index f2a6fc06ac..e13a81eac5 100644
--- a/docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml
+++ b/docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml
@@ -1,15 +1,7 @@
<chapter id="pam">
<chapterinfo>
- <author>
- <firstname>John</firstname><surname>Terpstra</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address>
- <email>jht@samba.org</email>
- </address>
- </affiliation>
- </author>
- <pubdate> (Jun 21 2001) </pubdate>
+ &author.jht;
+ <pubdate> (Jun 21 2001) </pubdate>
</chapterinfo>
<title>PAM Configuration for Centrally Managed Authentication</title>
@@ -80,8 +72,8 @@ PAM allows use of replacable modules. Those available on a
sample system include:
</para>
-<para><programlisting>
- $ /bin/ls /lib/security
+<para><prompt>$</prompt><userinput>/bin/ls /lib/security</userinput>
+<programlisting>
pam_access.so pam_ftp.so pam_limits.so
pam_ncp_auth.so pam_rhosts_auth.so pam_stress.so
pam_cracklib.so pam_group.so pam_listfile.so
diff --git a/docs/docbook/projdoc/PolicyMgmt.sgml b/docs/docbook/projdoc/PolicyMgmt.sgml
index 1dc4dd435d..9dee288b1f 100644
--- a/docs/docbook/projdoc/PolicyMgmt.sgml
+++ b/docs/docbook/projdoc/PolicyMgmt.sgml
@@ -1,15 +1,7 @@
<chapter id="PolicyMgmt">
<chapterinfo>
- <author>
- <firstname>John H</firstname><surname>Terpstra</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address>
- <email>jht@samba.org</email>
- </address>
- </affiliation>
- </author>
- <pubdate>April 3 2003</pubdate>
+ &author.jht;
+ <pubdate>April 3 2003</pubdate>
</chapterinfo>
<title>System and Account Policies</title>
@@ -203,40 +195,33 @@ exists with NT4 style policy files.
<sect3>
<title>Administration of Win2K / XP Policies</title>
+<procedure>
+<title>Instructions</title>
<para>
Instead of using the tool called "The System Policy Editor", commonly called Poledit (from the
executable name poledit.exe), GPOs are created and managed using a Microsoft Management Console
-(MMC) snap-in as follows:
-</para>
+(MMC) snap-in as follows:</para>
-<itemizedlist>
- <listitem>
- <para>
- Go to the Windows 200x / XP menu <filename>Start->Programs->Administrative Tools</filename>
+<step>
+<para>
+Go to the Windows 200x / XP menu <filename>Start->Programs->Administrative Tools</filename>
and select the MMC snap-in called "Active Directory Users and Computers"
- <para>
- </listitem>
-
- <listitem>
- <para>
- Select the domain or organizational unit (OU) that you wish to manage, then right click
- to open the context menu for that object, select the properties item.
- </para>
- </listitem>
-
- <listitem>
- <para>
- Now left click on the Group Policy tab, then left click on the New tab. Type a name
- for the new policy you will create.
- </para>
- </listitem>
-
- <listitem>
- <para>
- Now left click on the Edit tab to commence the steps needed to create the GPO.
- </para>
- </listitem>
-</itemizedlist>
+<para></step>
+
+<step><para>
+Select the domain or organizational unit (OU) that you wish to manage, then right click
+to open the context menu for that object, select the properties item.
+</para></step>
+
+<step><para>
+Now left click on the Group Policy tab, then left click on the New tab. Type a name
+for the new policy you will create.
+</para></step>
+
+<step><para>
+Now left click on the Edit tab to commence the steps needed to create the GPO.
+</para></step>
+</procedure>
<para>
All policy configuration options are controlled through the use of policy administrative
diff --git a/docs/docbook/projdoc/Portability.sgml b/docs/docbook/projdoc/Portability.sgml
index dae267e8b5..61a694e130 100644
--- a/docs/docbook/projdoc/Portability.sgml
+++ b/docs/docbook/projdoc/Portability.sgml
@@ -1,8 +1,6 @@
<chapter id="Portability">
<chapterinfo>
- <author>
- <firstname>Jelmer</firstname><surname>Vernooij</surname>
- </author>
+ &author.jelmer;
</chapterinfo>
<title>Portability</title>
diff --git a/docs/docbook/projdoc/ProfileMgmt.sgml b/docs/docbook/projdoc/ProfileMgmt.sgml
index 72eac8635a..9d11c80ffb 100644
--- a/docs/docbook/projdoc/ProfileMgmt.sgml
+++ b/docs/docbook/projdoc/ProfileMgmt.sgml
@@ -1,15 +1,7 @@
<chapter id="ProfileMgmt">
<chapterinfo>
- <author>
- <firstname>John H</firstname><surname>Terpstra</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address>
- <email>jht@samba.org</email>
- </address>
- </affiliation>
- </author>
- <pubdate>April 3 2003</pubdate>
+ &author.jht;
+ <pubdate>April 3 2003</pubdate>
</chapterinfo>
<title>Desktop Profile Management</title>
diff --git a/docs/docbook/projdoc/SWAT.sgml b/docs/docbook/projdoc/SWAT.sgml
index 9df94b9aee..7326a49874 100644
--- a/docs/docbook/projdoc/SWAT.sgml
+++ b/docs/docbook/projdoc/SWAT.sgml
@@ -1,8 +1,6 @@
<chapter id="SWAT">
<chapterinfo>
- <author>
- <firstname>John H</firstname><surname>Terpstra</surname>
- </author>
+ &author.jht;
<pubdate>April 3, 2003</pubdate>
</chapterinfo>
diff --git a/docs/docbook/projdoc/Samba-BDC-HOWTO.sgml b/docs/docbook/projdoc/Samba-BDC-HOWTO.sgml
index 46e69e4ba9..8dbc007e4f 100644
--- a/docs/docbook/projdoc/Samba-BDC-HOWTO.sgml
+++ b/docs/docbook/projdoc/Samba-BDC-HOWTO.sgml
@@ -1,14 +1,7 @@
<chapter id="samba-bdc">
-
<chapterinfo>
- <author>
- <firstname>Volker</firstname><surname>Lendecke</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address><email>Volker.Lendecke@SerNet.DE</email></address>
- </affiliation>
- </author>
+ &author.vl;
<pubdate> (26 Apr 2001) </pubdate>
</chapterinfo>
diff --git a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml b/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
index 7aabca948f..451ab02762 100644
--- a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
+++ b/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
@@ -2,23 +2,14 @@
<chapterinfo>
+ &author.jerry;
+ &author.jht;
<author>
- <firstname>Gerald (Jerry)</firstname><surname>Carter</surname>
- <affiliation>
- <orgname>VA Linux Systems/Samba Team</orgname>
- <address><email>jerry@samba.org</email></address>
- </affiliation>
<firstname>David</firstname><surname>Bannon</surname>
<affiliation>
<orgname>Samba Team</orgname>
<address><email>dbannon@samba.org</email></address>
</affiliation>
- <firstname>John H</firstname><surname>Terpstra</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address><email>jht@samba.org</email></address>
- </affiliation>
-
</author>
<pubdate> (26 Apr 2001) </pubdate>
</chapterinfo>
@@ -243,7 +234,7 @@ There are a couple of points to emphasize in the above configuration.
<itemizedlist>
<listitem><para>
Encrypted passwords must be enabled. For more details on how
- to do this, refer to <ulink url="ENCRYPTION.html">ENCRYPTION.html</ulink>.
+ to do this, refer to <link linkend="passdb">ENCRYPTION.html</link>.
</para></listitem>
<listitem><para>
diff --git a/docs/docbook/projdoc/ServerType.sgml b/docs/docbook/projdoc/ServerType.sgml
index 239880160e..7df1eb03fc 100644
--- a/docs/docbook/projdoc/ServerType.sgml
+++ b/docs/docbook/projdoc/ServerType.sgml
@@ -1,12 +1,6 @@
<chapter id="ServerType">
<chapterinfo>
- <author>
- <firstname>John H</firstname><surname>Terpstra</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address><email>jht@samba.org</email></address>
- </affiliation>
- </author>
+ &author.jht;
</chapterinfo>
<title>Nomenclature of Server Types</title>
diff --git a/docs/docbook/projdoc/Speed.sgml b/docs/docbook/projdoc/Speed.sgml
index 55d8b9492b..78b5935a9c 100644
--- a/docs/docbook/projdoc/Speed.sgml
+++ b/docs/docbook/projdoc/Speed.sgml
@@ -2,18 +2,13 @@
<chapterinfo>
<author>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address><email>samba@samba.org</email></address>
- </affiliation>
- </author>
- <author>
<firstname>Paul</firstname><surname>Cochrane</surname>
<affiliation>
<orgname>Dundee Limb Fitting Centre</orgname>
<address><email>paulc@dth.scot.nhs.uk</email></address>
</affiliation>
</author>
+ &author.jelmer;
</chapterinfo>
<title>Samba performance issues</title>
diff --git a/docs/docbook/projdoc/UNIX_INSTALL.sgml b/docs/docbook/projdoc/UNIX_INSTALL.sgml
index 5d0d388c08..df038510af 100644
--- a/docs/docbook/projdoc/UNIX_INSTALL.sgml
+++ b/docs/docbook/projdoc/UNIX_INSTALL.sgml
@@ -1,4 +1,11 @@
<chapter id="install">
+<chapterinfo>
+ &author.tridge;
+ &author.jelmer;
+ <author><firstname>Karl</firstname><surname>Auer</surname></author>
+ <!-- Isn't some of this written by others as well? -->
+
+</chapterinfo>
<title>How to Install and Test SAMBA</title>
diff --git a/docs/docbook/projdoc/VFS.sgml b/docs/docbook/projdoc/VFS.sgml
index 7aa280f4ef..0a88543c6e 100644
--- a/docs/docbook/projdoc/VFS.sgml
+++ b/docs/docbook/projdoc/VFS.sgml
@@ -1,10 +1,10 @@
<chapter id="VFS">
<chapterinfo>
- <author><firstname>Jelmer</firstname><surname>Vernooij</surname></author>
+ &author.jelmer;
+ &author.jht;
<author><firstname>Alexander</firstname><surname>Bokovoy</surname></author>
<author><firstname>Tim</firstname><surname>Potter</surname></author>
<author><firstname>Simo</firstname><surname>Sorce</surname></author>
- <author><firstname>John H</firstname><surname>Terpstra</surname></author>
</chapterinfo>
<title>Stackable VFS modules</title>
diff --git a/docs/docbook/projdoc/passdb.sgml b/docs/docbook/projdoc/passdb.sgml
index 7e4b9bcbd0..362cf97064 100644
--- a/docs/docbook/projdoc/passdb.sgml
+++ b/docs/docbook/projdoc/passdb.sgml
@@ -1,19 +1,9 @@
<chapter id="passdb">
<chapterinfo>
- <author>
- <firstname>Jelmer</firstname><surname>Vernooij</surname>
- <affiliation>
- <orgname>The Samba Team</orgname>
- <address><email>jelmer@samba.org</email></address>
- </affiliation>
- </author>
- <author>
- <firstname>Gerald (Jerry)</firstname><surname>Carter</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address><email>jerry@samba.org</email></address>
- </affiliation>
- </author>
+ &author.jelmer;
+ &author.jerry;
+ &author.jeremy;
+ &author.jht;
<author>
<firstname>Olivier (lem)</firstname><surname>Lemaire</surname>
<affiliation>
@@ -21,24 +11,6 @@
<address><email>olem@IDEALX.org</email></address>
</affiliation>
</author>
- <author>
- <firstname>Jeremy</firstname><surname>Allison</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address>
- <email>jra@samba.org</email>
- </address>
- </affiliation>
- </author>
- <author>
- <firstname>John H</firstname><surname>Terpstra</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address>
- <email>jht@samba.org</email>
- </address>
- </affiliation>
- </author>
<pubdate>February 2003</pubdate>
</chapterinfo>
@@ -137,13 +109,9 @@
<simplelist>
<member>Windows NT 3.5x</member>
-
<member>Windows NT 4.0</member>
-
<member>Windows 2000 Professional</member>
-
<member>Windows 200x Server/Advanced Server</member>
-
<member>Windows XP Professional</member>
</simplelist>
@@ -393,6 +361,8 @@ the details of configuring these packages are beyond the scope of this document.
<sect2>
<title>Supported LDAP Servers</title>
+<!-- FIXME: This is outdated for 3.0 -->
+
<para>
The LDAP samdb code in 2.2.3 (and later) has been developed and tested
using the OpenLDAP 2.0 server and client libraries.
@@ -400,8 +370,8 @@ The same code should be able to work with Netscape's Directory Server
and client SDK. However, due to lack of testing so far, there are bound
to be compile errors and bugs. These should not be hard to fix.
If you are so inclined, please be sure to forward all patches to
-<ulink url="samba-patches@samba.org">samba-patches@samba.org</ulink> and
-<ulink url="jerry@samba.org">jerry@samba.org</ulink>.
+<ulink url="mailto:samba-patches@samba.org">samba-patches@samba.org</ulink> and
+<ulink url="mailto:jerry@samba.org">jerry@samba.org</ulink>.
</para>
</sect2>
@@ -430,7 +400,7 @@ The samba.schema file has been formatted for OpenLDAP 2.0. The OID's are
owned by the Samba Team and as such is legal to be openly published.
If you translate the schema to be used with Netscape DS, please
submit the modified schema file as a patch to <ulink
-url="jerry@samba.org">jerry@samba.org</ulink>
+url="mailto:jerry@samba.org">jerry@samba.org</ulink>
</para>
<para>
@@ -470,7 +440,7 @@ server, first copy the samba.schema file to slapd's configuration directory.
</para>
<para>
-<prompt>root# </prompt><command>cp samba.schema /etc/openldap/schema/</command>
+<prompt>root# </prompt><userinput>cp samba.schema /etc/openldap/schema/</userinput>
</para>
<para>
@@ -525,7 +495,6 @@ index rid eq
<sect3>
<title>Configuring Samba</title>
-<!--lem: <title>smb.conf LDAP parameters</title> -->
<para>
The following parameters are available in smb.conf only with <parameter>--with-ldapsam</parameter>
@@ -972,14 +941,14 @@ Or, set 'identifier:workstations column' to :
<para>The usage of pdb_xml is pretty straightforward. To export data, use:
-<command>pdbedit -e xml:filename</command>
+<userinput>pdbedit -e xml:filename</userinput>
(where filename is the name of the file to put the data in)
</para>
<para>
To import data, use:
-<command>pdbedit -i xml:filename -e current-pdb</command>
+<userinput>pdbedit -i xml:filename -e current-pdb</userinput>
Where filename is the name to read the data from and current-pdb to put it in.
</para>
diff --git a/docs/docbook/projdoc/printer_driver2.sgml b/docs/docbook/projdoc/printer_driver2.sgml
index 8d15e437b2..da3eb838f2 100644
--- a/docs/docbook/projdoc/printer_driver2.sgml
+++ b/docs/docbook/projdoc/printer_driver2.sgml
@@ -1,16 +1,7 @@
<chapter id="printing">
-
<chapterinfo>
- <author>
- <firstname>Gerald (Jerry)</firstname><surname>Carter</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address>
- <email>jerry@samba.org</email>
- </address>
- </affiliation>
- </author>
+ &author.jerry;
<author>
<firstname>Patrick</firstname><surname>Powell</surname>
<affiliation>
@@ -183,14 +174,14 @@ Samba follows this model as well.</para>
<para>Next create the directory tree below the [print$] share
for each architecture you wish to support.</para>
-<para><programlisting>
+<para><computeroutput>
[print$]-----
|-W32X86 ; "Windows NT x86"
|-WIN40 ; "Windows 95/98"
|-W32ALPHA ; "Windows NT Alpha_AXP"
|-W32MIPS ; "Windows NT R4000"
|-W32PPC ; "Windows NT PowerPC"
-</programlisting></para>
+</computeroutput></para>
<warning>
<title>ATTENTION! REQUIRED PERMISSIONS</title>
@@ -302,8 +293,9 @@ setdriver command</command></ulink> can be used to set the driver
associated with an installed driver. The following is example
of how this could be accomplished:</para>
-<para><programlisting>
-<prompt>$ </prompt>rpcclient pogo -U root%secret -c "enumdrivers"
+<para>
+<prompt>$ </prompt><userinput>rpcclient pogo -U root%secret -c "enumdrivers"</userinput>
+<programlisting>
Domain=[NARNIA] OS=[Unix] Server=[Samba 2.2.0-alpha3]
[Windows NT x86]
@@ -315,16 +307,18 @@ Printer Driver Info 1:
Printer Driver Info 1:
Driver Name: [HP LaserJet 4Si/4SiMX PS]
-
-<prompt>$ </prompt>rpcclient pogo -U root%secret -c "enumprinters"
+</programlisting>
+<prompt>$ </prompt><userinput>rpcclient pogo -U root%secret -c "enumprinters"</userinput>
+<programlisting>
Domain=[NARNIA] OS=[Unix] Server=[Samba 2.2.0-alpha3]
flags:[0x800000]
name:[\\POGO\hp-print]
description:[POGO\\POGO\hp-print,NO DRIVER AVAILABLE FOR THIS PRINTER,]
comment:[]
-<prompt>$ </prompt>rpcclient pogo -U root%secret \
-<prompt>&gt; </prompt> -c "setdriver hp-print \"HP LaserJet 4000 Series PS\""
+</programlisting>
+<prompt>$ </prompt><userinput>rpcclient pogo -U root%secret -c "setdriver hp-print \"HP LaserJet 4000 Series PS\""</userinput>
+<programlisting>
Domain=[NARNIA] OS=[Unix] Server=[Samba 2.2.0-alpha3]
Successfully set hp-print to driver HP LaserJet 4000 Series PS.
</programlisting></para>
diff --git a/docs/docbook/projdoc/samba-doc.sgml b/docs/docbook/projdoc/samba-doc.sgml
index 7a8c4b6d06..9c3861b8c3 100644
--- a/docs/docbook/projdoc/samba-doc.sgml
+++ b/docs/docbook/projdoc/samba-doc.sgml
@@ -1,4 +1,5 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
<!ENTITY UNIX-INSTALL SYSTEM "UNIX_INSTALL.sgml">
<!ENTITY MS-Dfs-Setup SYSTEM "msdfs_setup.sgml">
<!ENTITY PRINTER-DRIVER2 SYSTEM "printer_driver2.sgml">
@@ -34,23 +35,20 @@
]>
<book id="Samba-HOWTO-Collection">
-
<title>SAMBA Project Documentation</title>
<bookinfo>
<author>
- <surname>SAMBA Team</surname>
+ <othername>SAMBA Team</othername>
+ <affiliation><address><email>samba@samba.org</email></address></affiliation>
</author>
- <address><email>samba@samba.org</email></address>
-</bookinfo>
-
-<dedication>
-<title>Abstract</title>
+ <editor>&person.jht;</editor>
+ <editor>&person.jelmer;</editor>
+ <editor>&person.jerry;</editor>
-<para>
-<emphasis>Last Update</emphasis> : Wed Jan 15
-</para>
+ <pubdate>Friday 4 April</pubdate>
+<abstract>
<para>
This book is a collection of HOWTOs added to Samba documentation over the years.
I try to ensure that all are current, but sometimes the is a larger job
@@ -61,18 +59,17 @@ url="mailto:jerry@samba.org">jerry@samba.org</ulink> or
<ulink url="mailto:jelmer@samba.org">jelmer@samba.org</ulink>.
</para>
+</abstract>
+<legalnotice>
<para>
This documentation is distributed under the GNU General Public License (GPL)
version 2. A copy of the license is included with the Samba source
distribution. A copy can be found on-line at <ulink
url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</ulink>
</para>
+</legalnotice>
+</bookinfo>
-<para>
-Cheers, jerry
-</para>
-
-</dedication>
<!-- Chapters -->
<part id="introduction">
@@ -140,5 +137,3 @@ part each cover one specific feature.</para>
&BUGS;
&Diagnosis;
</part>
-
-
diff --git a/docs/docbook/projdoc/securing-samba.sgml b/docs/docbook/projdoc/securing-samba.sgml
index bfedc5456f..03d0c3d9e7 100644
--- a/docs/docbook/projdoc/securing-samba.sgml
+++ b/docs/docbook/projdoc/securing-samba.sgml
@@ -1,10 +1,7 @@
<chapter id="securing-samba">
<chapterinfo>
- <author>
- <firstname>Andrew</firstname><surname>Tridgell</surname>
- <affiliation><orgname>Samba Team</orgname></affiliation>
- </author>
+ &author.tridge;
<pubdate>17 March 2003</pubdate>
</chapterinfo>
diff --git a/docs/docbook/projdoc/security_level.sgml b/docs/docbook/projdoc/security_level.sgml
index e3d7c6ac1f..1c4c3f61ca 100644
--- a/docs/docbook/projdoc/security_level.sgml
+++ b/docs/docbook/projdoc/security_level.sgml
@@ -1,12 +1,7 @@
<chapter id="securitylevels">
<chapterinfo>
- <author>
- <firstname>Andrew</firstname><surname>Tridgell</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address><email>samba@samba.org</email></address>
- </affiliation>
- </author>
+ &author.tridge;
+ &author.jelmer;
</chapterinfo>
<title>Samba as Stand-Alone Server</title
diff --git a/docs/docbook/projdoc/unicode.sgml b/docs/docbook/projdoc/unicode.sgml
index 7d8f0a03be..705a389e41 100644
--- a/docs/docbook/projdoc/unicode.sgml
+++ b/docs/docbook/projdoc/unicode.sgml
@@ -1,12 +1,6 @@
<chapter id="unicode">
<chapterinfo>
- <author>
- <firstname>Jelmer</firstname><surname>Vernooij</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address><email>jelmer@samba.org</email></address>
- </affiliation>
- </author>
+ &author.jelmer;
<pubdate>25 March 2003</pubdate>
</chapterinfo>
diff --git a/docs/docbook/projdoc/upgrading-to-3.0.sgml b/docs/docbook/projdoc/upgrading-to-3.0.sgml
index cd0ec2064d..ec4b29386a 100644
--- a/docs/docbook/projdoc/upgrading-to-3.0.sgml
+++ b/docs/docbook/projdoc/upgrading-to-3.0.sgml
@@ -1,9 +1,6 @@
<chapter id="upgrading-to-3.0">
<chapterinfo>
- <author>
- <firstname>Jelmer</firstname><surname>Vernooij</surname>
- <affiliation>Samba Team</affiliation>
- </author>
+ &author.jelmer;
<pubdate>25 October 2002</pubdate>
</chapterinfo>
@@ -12,7 +9,11 @@
<sect1>
<title>Charsets</title>
-FIXME
+<para>You might experience problems with special characters
+when communicating with old DOS clients. Codepage
+support has changed in samba 3.0. Read the chapter
+Unicode support for details.
+</para>
</sect1>
diff --git a/docs/docbook/projdoc/winbind.sgml b/docs/docbook/projdoc/winbind.sgml
index 2d38ea44d4..460038aea9 100644
--- a/docs/docbook/projdoc/winbind.sgml
+++ b/docs/docbook/projdoc/winbind.sgml
@@ -1,6 +1,5 @@
<chapter id="winbind">
-
<chapterinfo>
<authorgroup>
<author>
@@ -10,32 +9,15 @@
<address><email>tpot@linuxcare.com.au</email></address>
</affiliation>
</author>
- <author>
- <firstname>Andrew</firstname><surname>Tridgell</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address><email>tridge@linuxcare.com.au</email></address>
- </affiliation>
- </author>
- <author>
- <firstname>John</firstname><surname>Trostel</surname>
- <affiliation>
- <orgname>Snapserver</orgname>
- <address><email>jtrostel@snapserver.com</email></address>
- </affiliation>
- </author>
+ &author.tridge;
+ &author.jht;
<author>
<firstname>Naag</firstname><surname>Mummaneni</surname>
<affiliation>
<address><email>getnag@rediffmail.com</email></address>
</affiliation>
</author>
- <author>
- <firstname>Jelmer</firstname><surname>Vernooij</surname>
- <affiliation>
- <address><email>jelmer@nl.linux.org</email></address>
- </affiliation>
- </author>
+ &author.jelmer;
</authorgroup>
<pubdate>27 June 2002</pubdate>
</chapterinfo>