First step towards XML: Use correct syntax

(This used to be commit 06f641bcb59f932c994e6023d400df18b54c2067)

1 files changed, 45 insertions, 41 deletions

diff --git a/docs/docbook/manpages/winbindd.8.sgml b/docs/docbook/manpages/winbindd.8.sgml
index ccef2fa623..68f41afead 100644
--- a/docs/docbook/manpages/winbindd.8.sgml
+++ b/docs/docbook/manpages/winbindd.8.sgml
@@ -1,5 +1,5 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<refentry id="winbindd">
+<refentry id="winbindd.8">
 
 <refmeta>
 	<refentrytitle>winbindd</refentrytitle>
@@ -29,8 +29,8 @@
 <refsect1>
 	<title>DESCRIPTION</title>
 
-	<para>This program is part of the <ulink url="samba.7.html">
-	Samba</ulink> suite.</para>
+	<para>This program is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
+	<manvolnum>7</manvolnum></citerefentry> suite.</para>
 
 	<para><command>winbindd</command> is a daemon that provides 
 	a service for the Name Service Switch capability that is present 
@@ -88,12 +88,11 @@
 	<filename>/etc/nsswitch.conf</filename> file can be used to initially 
 	resolve user and group information from <filename>/etc/passwd
 	</filename> and <filename>/etc/group</filename> and then from the 
-	Windows NT server. </para>
-
-	<para><programlisting>
+	Windows NT server.
+<programlisting>
 passwd:         files winbind
 group:          files winbind
-	</programlisting></para>  
+</programlisting></para>  
 
 	<para>The following simple configuration in the
 	<filename>/etc/nsswitch.conf</filename> file can be used to initially
@@ -172,7 +171,8 @@ group:          files winbind
 		<varlistentry>
 		<term>-s|--conf=smb.conf</term>
 		<listitem><para>Specifies the location of the all-important
-		<filename>smb.conf</filename> file. </para></listitem>
+		<citerefentry><refentrytitle>smb.conf</refentrytitle>
+		<manvolnum>5</manvolnum></citerefentry> file. </para></listitem>
 		</varlistentry>
 	</variablelist>
 </refsect1>
@@ -208,8 +208,9 @@ group:          files winbind
 	<title>CONFIGURATION</title>
 
 	<para>Configuration of the <command>winbindd</command> daemon 
-	is done through configuration parameters in the <filename>smb.conf(5)
-	</filename> file.  All parameters should be specified in the 
+	is done through configuration parameters in the <citerefentry>
+	<refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum>
+	</citerefentry> file.  All parameters should be specified in the 
 	[global] section of smb.conf. </para>
 
 	<itemizedlist>
@@ -243,27 +244,24 @@ group:          files winbind
 	following setup. This was tested on a RedHat 6.2 Linux box. </para>
 
 	<para>In <filename>/etc/nsswitch.conf</filename> put the 
-	following:</para>
-
-	<para><programlisting>
+	following:
+<programlisting>
 passwd:     files winbind
 group:      files winbind
-	</programlisting></para>  
-
-	<para>In <filename>/etc/pam.d/*</filename> replace the 
-	<parameter>auth</parameter> lines with something like this: </para>
+</programlisting></para>  
 
- 
-	<para><programlisting>
+	<para>In <filename>/etc/pam.d/*</filename> replace the <parameter>
+	auth</parameter> lines with something like this:
+<programlisting>
 auth       required	/lib/security/pam_securetty.so
 auth       required	/lib/security/pam_nologin.so
 auth       sufficient	/lib/security/pam_winbind.so
 auth       required     /lib/security/pam_pwdb.so use_first_pass shadow nullok
-	</programlisting></para>
+</programlisting></para>
   
 
-	<para>Note in particular the use of the <parameter>sufficient</parameter> 
-	keyword and the <parameter>use_first_pass</parameter> keyword. </para>
+	<para>Note in particular the use of the <parameter>sufficient
+	</parameter> keyword and the <parameter>use_first_pass</parameter> keyword. </para>
 
 	<para>Now replace the account lines with this: </para> 
 	
@@ -282,17 +280,17 @@ auth       required     /lib/security/pam_pwdb.so use_first_pass shadow nullok
 	for "PDC".</para>
 
 	<para>Next copy <filename>libnss_winbind.so</filename> to 
-	<filename>/lib</filename> and <filename>pam_winbind.so</filename>
-	to <filename>/lib/security</filename>.  A symbolic link needs to be
+	<filename>/lib</filename> and <filename>pam_winbind.so
+	</filename> to <filename>/lib/security</filename>.  A symbolic link needs to be
 	made from <filename>/lib/libnss_winbind.so</filename> to
 	<filename>/lib/libnss_winbind.so.2</filename>.  If you are using an
 	older version of glibc then the target of the link should be
 	<filename>/lib/libnss_winbind.so.1</filename>.</para>
 
-	<para>Finally, setup a <filename>smb.conf</filename> containing directives like the 
-	following:  </para> 
-
-	<para><programlisting>
+	<para>Finally, setup a <citerefentry><refentrytitle>smb.conf</refentrytitle>
+	<manvolnum>5</manvolnum></citerefentry> containing directives like the 
+	following:
+<programlisting>
 [global]
 	winbind separator = +
         winbind cache time = 10
@@ -303,7 +301,7 @@ auth       required     /lib/security/pam_pwdb.so use_first_pass shadow nullok
         workgroup = DOMAIN
         security = domain
         password server = *
-	</programlisting></para>
+</programlisting></para>
   
 
 	<para>Now start winbindd and you should find that your user and 
@@ -321,9 +319,10 @@ auth       required     /lib/security/pam_pwdb.so use_first_pass shadow nullok
 	<para>The following notes are useful when configuring and 
 	running <command>winbindd</command>: </para>
 
-	<para><command>nmbd</command> must be running on the local machine 
-	for <command>winbindd</command> to work. <command>winbindd</command>
-	queries the list of trusted domains for the Windows NT server
+	<para><citerefentry><refentrytitle>nmbd</refentrytitle>
+	<manvolnum>8</manvolnum></citerefentry> must be running on the local machine 
+	for <command>winbindd</command> to work. <command>winbindd</command> queries
+	the list of trusted domains for the Windows NT server
 	on startup and when a SIGHUP is received.  Thus, for a running <command>
 	winbindd</command> to become aware of new trust relationships between 
 	servers, it must be sent a SIGHUP signal. </para>
@@ -357,8 +356,9 @@ auth       required     /lib/security/pam_pwdb.so use_first_pass shadow nullok
 	<variablelist>
 		<varlistentry>
 		<term>SIGHUP</term>
-		<listitem><para>Reload the <filename>smb.conf(5)</filename>
-		file and apply any parameter changes to the running 
+		<listitem><para>Reload the <citerefentry><refentrytitle>smb.conf</refentrytitle>
+		<manvolnum>5</manvolnum></citerefentry> file and 
+		apply any parameter changes to the running 
 		version of winbindd.  This signal also clears any cached 
 		user and group information.  The list of other domains trusted 
 		by winbindd is also reloaded.  </para></listitem>
@@ -431,10 +431,13 @@ auth       required     /lib/security/pam_pwdb.so use_first_pass shadow nullok
 <refsect1>
 	<title>SEE ALSO</title>
 	
-	<para><filename>nsswitch.conf(5)</filename>,
-	<ulink url="samba.7.html">samba(7)</ulink>,
-	<ulink url="wbinfo.1.html">wbinfo(1)</ulink>,
-	<ulink url="smb.conf.5.html">smb.conf(5)</ulink></para>
+	<para><filename>nsswitch.conf(5)</filename>, <citerefentry>
+	<refentrytitle>Samba</refentrytitle>
+	<manvolnum>7</manvolnum></citerefentry>, <citerefentry>
+	<refentrytitle>wbinfo</refentrytitle>
+	<manvolnum>8</manvolnum></citerefentry>, <citerefentry>
+	<refentrytitle>smb.conf</refentrytitle>
+	<manvolnum>5</manvolnum></citerefentry></para>
 </refsect1>
 
 <refsect1>
@@ -445,11 +448,12 @@ auth       required     /lib/security/pam_pwdb.so use_first_pass shadow nullok
 	by the Samba Team as an Open Source project similar 
 	to the way the Linux kernel is developed.</para>
 	
-	<para><command>wbinfo</command> and <command>winbindd</command>
-	were written by Tim Potter.</para>
+	<para><command>wbinfo</command> and <command>winbindd</command> were 
+	written by Tim Potter.</para>
 	
 	<para>The conversion to DocBook for Samba 2.2 was done 
-	by Gerald Carter</para>
+	by Gerald Carter. The conversion to DocBook XML 4.2 for
+	Samba 3.0 was done by Alexander Bokovoy.</para>
 </refsect1>
 
 </refentry>