First step towards XML: Use correct syntax

(This used to be commit 06f641bcb59f932c994e6023d400df18b54c2067)

1 files changed, 41 insertions, 29 deletions

diff --git a/docs/docbook/manpages/wbinfo.1.sgml b/docs/docbook/manpages/wbinfo.1.sgml
index a6ca244243..5003c847a4 100644
--- a/docs/docbook/manpages/wbinfo.1.sgml
+++ b/docs/docbook/manpages/wbinfo.1.sgml
@@ -1,5 +1,5 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<refentry id="wbinfo">
+<refentry id="wbinfo.1">
 
 <refmeta>
 	<refentrytitle>wbinfo</refentrytitle>
@@ -37,14 +37,15 @@
 <refsect1>
 	<title>DESCRIPTION</title>
 
-	<para>This tool is part of the <ulink url="samba.7.html">
-	Samba</ulink> suite.</para>
+	<para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
+	<manvolnum>7</manvolnum></citerefentry> suite.</para>
 	
 	<para>The <command>wbinfo</command> program queries and returns information 
-	created and used by the <ulink url="winbindd.8.html"><command>
-	winbindd(8)</command></ulink> daemon. </para>
+	created and used by the <citerefentry><refentrytitle>winbindd</refentrytitle>
+	<manvolnum>8</manvolnum></citerefentry> daemon. </para>
 
-	<para>The <command>winbindd(8)</command> daemon must be configured 
+	<para>The <citerefentry><refentrytitle>winbindd</refentrytitle>
+	<manvolnum>8</manvolnum></citerefentry> daemon must be configured 
 	and running for the <command>wbinfo</command> program to be able 
 	to return information.</para>
 </refsect1>
@@ -56,27 +57,30 @@
 		<varlistentry>
 		<term>-u</term>
 		<listitem><para>This option will list all users available 
-		in the Windows NT domain for which the <command>winbindd(8)
-		</command> daemon is operating in. Users in all trusted domains 
+		in the Windows NT domain for which the <citerefentry><refentrytitle>winbindd</refentrytitle>
+		<manvolnum>8</manvolnum></citerefentry> daemon is operating in. Users in all trusted domains 
 		will also be listed.  Note that this operation does not assign 
-		user ids to any users that have not already been seen by 
-		<command>winbindd(8)</command>.</para></listitem>
+		user ids to any users that have not already been seen by <citerefentry>
+		<refentrytitle>winbindd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+		.</para></listitem>
 		</varlistentry>
 		
 		<varlistentry>
 		<term>-g</term>
 		<listitem><para>This option will list all groups available 
-		in the Windows NT domain for which the <command>winbindd(8)
-		</command> daemon is operating in. Groups in all trusted domains
+		in the Windows NT domain for which the <citerefentry><refentrytitle>Samba</refentrytitle>
+		<manvolnum>7</manvolnum></citerefentry> daemon is operating in. Groups in all trusted domains
 		will also be listed.  Note that this operation does not assign 
-		group ids to any groups that have not already been seen by
-		<command>winbindd(8)</command>. </para></listitem>
+		group ids to any groups that have not already been 
+		seen by <citerefentry><refentrytitle>winbindd</refentrytitle>
+		<manvolnum>8</manvolnum></citerefentry>. </para></listitem>
 		</varlistentry>
 		
 		<varlistentry>
 		<term>-N name</term>
 		<listitem><para>The <parameter>-N</parameter> option 
-		queries <command>winbindd(8)</command> to query the WINS
+		queries <citerefentry><refentrytitle>winbindd</refentrytitle>
+		<manvolnum>8</manvolnum></citerefentry> to query the WINS
 		server for the IP address associated with the NetBIOS name
 		specified by the <parameter>name</parameter> parameter.
 		</para></listitem>
@@ -86,7 +90,8 @@
 		<varlistentry>
 		<term>-I ip</term>
 		<listitem><para>The <parameter>-I</parameter> option 
-		queries <command>winbindd(8)</command> to send a node status
+		queries <citerefentry><refentrytitle>winbindd</refentrytitle>
+		<manvolnum>8</manvolnum></citerefentry> to send a node status
 		request to get the NetBIOS name associated with the IP address
 		specified by the <parameter>ip</parameter> parameter.
 		</para></listitem>
@@ -96,13 +101,15 @@
 		<varlistentry>
 		<term>-n name</term>
 		<listitem><para>The <parameter>-n</parameter> option 
-		queries <command>winbindd(8)</command> for the SID 		
+		queries <citerefentry><refentrytitle>winbindd</refentrytitle>
+		<manvolnum>8</manvolnum></citerefentry> for the SID 		
 		associated with the name specified. Domain names can be specified 
 		before the user name by using the winbind separator character.  
 		For example CWDOM1/Administrator refers to the Administrator
 		user in the domain CWDOM1.  If no domain is specified then the 
-		domain used is the one specified in the <filename>smb.conf</filename>
-		<parameter>workgroup</parameter> parameter. </para></listitem>
+		domain used is the one specified in the <citerefentry><refentrytitle>smb.conf</refentrytitle>
+		<manvolnum>5</manvolnum></citerefentry>	<parameter>workgroup
+		</parameter> parameter. </para></listitem>
 		</varlistentry>
 
 
@@ -135,16 +142,18 @@
 		<varlistentry>
 		<term>-S sid</term>
 		<listitem><para>Convert a SID to a UNIX user id.  If the SID 
-		does not correspond to a UNIX user mapped by <command>
-		winbindd(8)</command> then the operation will fail. </para></listitem>
+		does not correspond to a UNIX user mapped by <citerefentry>
+		<refentrytitle>winbindd</refentrytitle><manvolnum>8</manvolnum>
+		</citerefentry> then the operation will fail. </para></listitem>
 		</varlistentry>
 
 
 		<varlistentry>
 		<term>-Y sid</term>
 		<listitem><para>Convert a SID to a UNIX group id.  If the SID 
-		does not correspond to a UNIX group mapped by <command>
-		winbindd(8)</command> then the operation will fail. </para></listitem>
+		does not correspond to a UNIX group mapped by <citerefentry>
+		<refentrytitle>winbindd</refentrytitle><manvolnum>8</manvolnum></citerefentry> then 
+		the operation will fail. </para></listitem>
 		</varlistentry>
 
 
@@ -160,7 +169,8 @@
 		<varlistentry>
 		<term>-m</term>
 		<listitem><para>Produce a list of domains trusted by the 
-		Windows NT server <command>winbindd(8)</command> contacts 
+		Windows NT server <citerefentry><refentrytitle>winbindd</refentrytitle>
+		<manvolnum>8</manvolnum></citerefentry> contacts 
 		when resolving names.  This list does not include the Windows 
 		NT domain the server is a Primary Domain Controller for.
 		</para></listitem>
@@ -201,8 +211,9 @@
 	<title>EXIT STATUS</title>
 
 	<para>The wbinfo program returns 0 if the operation 
-	succeeded, or 1 if the operation failed.  If the <command>winbindd(8)
-	</command> daemon is not working <command>wbinfo</command> will always return 
+	succeeded, or 1 if the operation failed.  If the <citerefentry>
+	<refentrytitle>winbindd</refentrytitle><manvolnum>8</manvolnum>
+	</citerefentry> daemon is not working <command>wbinfo</command> will always return 
 	failure. </para>
 </refsect1>
 
@@ -216,8 +227,8 @@
 
 <refsect1>
 	<title>SEE ALSO</title>
-	<para><ulink url="winbindd.8.html"><command>winbindd(8)</command>
-	</ulink></para>
+	<para><citerefentry><refentrytitle>winbindd</refentrytitle>
+	<manvolnum>8</manvolnum></citerefentry></para>
 </refsect1>
 
 <refsect1>
@@ -232,7 +243,8 @@
 	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>