A lot of syntax updates, consistency when using certain tags and converting ASCII -> XML

(This used to be commit 85434d3144656e6fe587637276d6a2667df1857f)

1 files changed, 54 insertions, 55 deletions

diff --git a/docs/docbook/projdoc/winbind.xml b/docs/docbook/projdoc/winbind.xml
index b588d162d1..f78f74f780 100644
--- a/docs/docbook/projdoc/winbind.xml
+++ b/docs/docbook/projdoc/winbind.xml
@@ -10,7 +10,6 @@
 		</affiliation>
 	</author>
 	&author.tridge;
-	&author.jht;
 	<author>
 		<firstname>Naag</firstname><surname>Mummaneni</surname>
 		<affiliation>
@@ -224,7 +223,9 @@
 		of that service should be tried and in what order. If the passwd 
 		config line is:</para>
 
-		<para><command>passwd: files example</command></para>
+		<para><programlisting>
+passwd: files example
+		</programlisting></para>
 
 		<para>then the C library will first load a module called 
 		<filename>/lib/libnss_files.so</filename> followed by
@@ -429,17 +430,15 @@ install the development packages in <filename>pam-devel-0.74-22</filename>.
 
 <para>
 Before starting, it is probably best to kill off all the SAMBA 
-related daemons running on your server.  Kill off all <command>smbd</command>, 
-<command>nmbd</command>, and <command>winbindd</command> processes that may 
+related daemons running on your server.  Kill off all &smbd;, 
+&nmbd;, and &winbindd; processes that may 
 be running.  To use PAM, you will want to make sure that you have the 
 standard PAM package (for RedHat) which supplies the <filename>/etc/pam.d</filename> 
 directory structure, including the pam modules are used by pam-aware 
 services, several pam libraries, and the <filename>/usr/doc</filename> 
 and <filename>/usr/man</filename> entries for pam.  Winbind built better 
 in SAMBA if the pam-devel package was also installed.  This package includes 
-the header files needed to compile pam-aware applications. For instance, 
-my RedHat system has both <filename>pam-0.74-22</filename> and
-<filename>pam-devel-0.74-22</filename> RPMs installed.
+the header files needed to compile pam-aware applications. 
 </para>
 
 <sect3>
@@ -451,14 +450,14 @@ The first three steps may not be necessary depending upon
 whether or not you have previously built the Samba binaries.
 </para>
 
-<para><programlisting>
-<prompt>root#</prompt> <command>autoconf</command>
-<prompt>root#</prompt> <command>make clean</command>
-<prompt>root#</prompt> <command>rm config.cache</command>
-<prompt>root#</prompt> <command>./configure</command>
-<prompt>root#</prompt> <command>make</command>
-<prompt>root#</prompt> <command>make install</command>
-</programlisting></para>
+<para><screen>
+&rootprompt;<command>autoconf</command>
+&rootprompt;<command>make clean</command>
+&rootprompt;<command>rm config.cache</command>
+&rootprompt;<command>./configure</command>
+&rootprompt;<command>make</command>
+&rootprompt;<command>make install</command>
+</screen></para>
 
 
 <para>
@@ -474,12 +473,14 @@ It will also build the winbindd executable and libraries.
 winbind libraries on Linux and Solaris</title>
 
 <para>
-The libraries needed to run the <command>winbindd</command> daemon 
+The libraries needed to run the &winbindd; daemon 
 through nsswitch need to be copied to their proper locations, so
 </para>
 
 <para>
-<prompt>root#</prompt> <command>cp ../samba/source/nsswitch/libnss_winbind.so /lib</command>
+<screen>
+&rootprompt;<userinput>cp ../samba/source/nsswitch/libnss_winbind.so /lib</userinput>
+</screen>
 </para>
 
 <para>
@@ -487,19 +488,19 @@ I also found it necessary to make the following symbolic link:
 </para>
 
 <para>
-<prompt>root#</prompt> <command>ln -s /lib/libnss_winbind.so /lib/libnss_winbind.so.2</command>
+&rootprompt; <userinput>ln -s /lib/libnss_winbind.so /lib/libnss_winbind.so.2</userinput>
 </para>
 
 <para>And, in the case of Sun solaris:</para>
-<para>
-<prompt>root#</prompt> <userinput>ln -s /usr/lib/libnss_winbind.so /usr/lib/libnss_winbind.so.1</userinput>
-<prompt>root#</prompt> <userinput>ln -s /usr/lib/libnss_winbind.so /usr/lib/nss_winbind.so.1</userinput>
-<prompt>root#</prompt> <userinput>ln -s /usr/lib/libnss_winbind.so /usr/lib/nss_winbind.so.2</userinput>
-</para>
+<screen>
+&rootprompt;<userinput>ln -s /usr/lib/libnss_winbind.so /usr/lib/libnss_winbind.so.1</userinput>
+&rootprompt;<userinput>ln -s /usr/lib/libnss_winbind.so /usr/lib/nss_winbind.so.1</userinput>
+&rootprompt;<userinput>ln -s /usr/lib/libnss_winbind.so /usr/lib/nss_winbind.so.2</userinput>
+</screen>
 
 <para>
 Now, as root you need to edit <filename>/etc/nsswitch.conf</filename> to 
-allow user and group entries to be visible from the <command>winbindd</command> 
+allow user and group entries to be visible from the &winbindd;
 daemon.  My <filename>/etc/nsswitch.conf</filename> file look like 
 this after editing:
 </para>
@@ -518,7 +519,7 @@ is faster (and you don't need to reboot) if you do it manually:
 </para>
 
 <para>
-<prompt>root#</prompt> <command>/sbin/ldconfig -v | grep winbind</command>
+&rootprompt;<userinput>/sbin/ldconfig -v | grep winbind</userinput>
 </para>
 
 <para>
@@ -567,11 +568,11 @@ url="http://publibn.boulder.ibm.com/doc_link/en_US/a_doc_lib/aixbman/baseadmn/ia
 
 <para>
 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 behavior of &winbindd;. Configure 
+&smb.conf; These are described in more detail in 
 the <citerefentry><refentrytitle>winbindd</refentrytitle>
 <manvolnum>8</manvolnum></citerefentry> man page.  My 
-<filename>smb.conf</filename> file was modified to
+&smb.conf; file was modified to
 include the following entries in the [global] section:
 </para>
 
@@ -607,7 +608,7 @@ a domain user who has administrative privileges in the domain.
 	
 
 <para>
-<prompt>root#</prompt> <command>/usr/local/samba/bin/net join -S PDC -U Administrator</command>
+&rootprompt;<userinput>/usr/local/samba/bin/net join -S PDC -U Administrator</userinput>
 </para>
 
 
@@ -632,7 +633,7 @@ command as root:
 </para>
 	
 <para>
-<prompt>root#</prompt> <command>/usr/local/samba/bin/winbindd</command>
+&rootprompt;<userinput>/usr/local/samba/bin/winbindd</userinput>
 </para>
 
 <para>
@@ -641,11 +642,11 @@ run as 2 processes. The first will answer all requests from the cache,
 thus making responses to clients faster. The other will
 update the cache for the query that the first has just responded.
 Advantage of this is that responses stay accurate and are faster. 
-You can enable dual daemon mode by adding '-B' to the commandline:
+You can enable dual daemon mode by adding <option>-B</option> to the commandline:
 </para>
 
 <para>
-<prompt>root#</prompt> <command>/usr/local/samba/bin/winbindd -B</command>
+&rootprompt;<userinput>/usr/local/samba/bin/winbindd -B</userinput>
 </para>
 
 <para>
@@ -654,14 +655,14 @@ is really running...
 </para>
 
 <para>
-<prompt>root#</prompt> <command>ps -ae | grep winbindd</command>
+&rootprompt;<userinput>ps -ae | grep winbindd</userinput>
 </para>
 <para>
 This command should produce output like this, if the daemon is running
 </para>
-<para>
+<screen>
 3025 ?        00:00:00 winbindd
-</para>
+</screen>
 
 <para>
 Now... for the real test, try to get some information about the 
@@ -669,7 +670,7 @@ users on your PDC
 </para>
 
 <para>
-<prompt>root#</prompt> <command>/usr/local/samba/bin/wbinfo -u</command>
+&rootprompt;<userinput>/usr/local/samba/bin/wbinfo -u</userinput>
 </para>
 
 <para>	
@@ -677,14 +678,14 @@ This should echo back a list of users on your Windows users on
 your PDC.  For example, I get the following response:
 </para>
 
-<para><programlisting>
+<para><screen>
 	CEO+Administrator
 	CEO+burdell
 	CEO+Guest
 	CEO+jt-ad
 	CEO+krbtgt
 	CEO+TsInternetUser
-</programlisting></para>
+</screen></para>
 
 <para>
 Obviously, I have named my domain 'CEO' and my <parameter>winbind
@@ -696,8 +697,8 @@ You can do the same sort of thing to get group information from
 the PDC:
 </para>
 
-<para><programlisting>
-<prompt>root#</prompt> <command>/usr/local/samba/bin/wbinfo -g</command>
+<para><screen>
+&rootprompt;<userinput>/usr/local/samba/bin/wbinfo -g</userinput>
 	CEO+Domain Admins
 	CEO+Domain Users
 	CEO+Domain Guests
@@ -707,7 +708,7 @@ the PDC:
 	CEO+Schema Admins
 	CEO+Enterprise Admins
 	CEO+Group Policy Creator Owners
-</programlisting></para>
+</screen></para>
 
 <para>
 The function 'getent' can now be used to get unified 
@@ -716,7 +717,7 @@ Try the following command:
 </para>
 
 <para>
-<prompt>root#</prompt> <command>getent passwd</command>
+&rootprompt;<userinput>getent passwd</userinput>
 </para>
 	
 <para>
@@ -730,7 +731,7 @@ The same thing can be done for groups with the command
 </para>
 
 <para>
-<prompt>root#</prompt> <command>getent group</command>
+&rootprompt;<userinput>getent group</userinput>
 </para>
 
 </sect3>
@@ -743,14 +744,13 @@ The same thing can be done for groups with the command
 <title>Linux</title>
 
 <para>
-The <command>winbindd</command> daemon needs to start up after the 
-<command>smbd</command> and <command>nmbd</command> daemons are running.  
+The &winbindd; daemon needs to start up after the 
+&smbd; and &nmbd; daemons are running.  
 To accomplish this task, you need to modify the startup scripts of your system.
 They are located at <filename>/etc/init.d/smb</filename> in RedHat and 
 <filename>/etc/init.d/samba</filename> in Debian.
 script to add commands to invoke this daemon in the proper sequence.  My 
-startup script starts up <command>smbd</command>, 
-<command>nmbd</command>, and <command>winbindd</command> from the 
+startup script starts up &smbd;, &nmbd;, and &winbindd; from the 
 <filename>/usr/local/samba/bin</filename> directory directly.  The 'start' 
 function in the script looks like this:
 </para>
@@ -899,8 +899,7 @@ in the script above with:
 <sect4>
 <title>Restarting</title>
 <para>
-If you restart the <command>smbd</command>, <command>nmbd</command>, 
-and <command>winbindd</command> daemons at this point, you
+If you restart the &smbd;, &nmbd;, and &winbindd; daemons at this point, you
 should be able to connect to the samba server as a domain member just as
 if you were a local user.
 </para>
@@ -925,7 +924,7 @@ by invoking the command
 </para>
 
 <para>
-<prompt>root#</prompt> <command>make nsswitch/pam_winbind.so</command>
+&rootprompt;<userinput>make nsswitch/pam_winbind.so</userinput>
 </para>
 
 <para>
@@ -937,7 +936,7 @@ modules reside in <filename>/usr/lib/security</filename>.
 </para>
 
 <para>
-<prompt>root#</prompt> <command>cp ../samba/source/nsswitch/pam_winbind.so /lib/security</command>
+&rootprompt;<userinput>cp ../samba/source/nsswitch/pam_winbind.so /lib/security</userinput>
 </para>
 
 <sect4>
@@ -982,8 +981,8 @@ For ftp services to work properly, you will also need to either
 have individual directories for the domain users already present on 
 the server, or change the home directory template to a general
 directory for all domain users.  These can be easily set using 
-the <filename>smb.conf</filename> global entry 
-<command>template homedir</command>.
+the &smb.conf; global entry 
+<parameter>template homedir</parameter>.
 </para>
 
 <para>
@@ -1023,8 +1022,8 @@ same way.  It now looks like this:
 </programlisting></para>
 
 <para>
-In this case, I added the <command>auth sufficient /lib/security/pam_winbind.so</command> 
-lines as before, but also added the <command>required pam_securetty.so</command> 
+In this case, I added the <programlisting>auth sufficient /lib/security/pam_winbind.so</programlisting> 
+lines as before, but also added the <programlisting>required pam_securetty.so</programlisting>
 above it, to disallow root logins over the network.  I also added a 
 <command>sufficient /lib/security/pam_unix.so use_first_pass</command>
 line after the <command>winbind.so</command> line to get rid of annoying