Very large number of markup fixes, layout updates, etc.

(This used to be commit 8dfbaafb843d17b865855ba1fef1e62cd38d3964)

1 files changed, 30 insertions, 22 deletions

diff --git a/docs/docbook/projdoc/InterdomainTrusts.xml b/docs/docbook/projdoc/InterdomainTrusts.xml
index ae780a4b61..416bceca3f 100644
--- a/docs/docbook/projdoc/InterdomainTrusts.xml
+++ b/docs/docbook/projdoc/InterdomainTrusts.xml
@@ -95,13 +95,15 @@ There are two steps to creating an interdomain trust relationship.
 <title>NT4 as the Trusting Domain (ie. creating the trusted account)</title>
 
 <para>
-For MS Windows NT4, all domain trust relationships are configured using the Domain User Manager.
-To affect a two way trust relationship it is necessary for each domain administrator to make
-available (for use by an external domain) it's security resources. This is done from the Domain
-User Manager Policies entry on the menu bar. From the Policy menu, select Trust Relationships, then
-next to the lower box that is labelled "Permitted to Trust this Domain" are two buttons, "Add" and
-"Remove". The "Add" button will open a panel in which needs to be entered the remote domain that
-will be able to assign user rights to your domain. In addition it is necessary to enter a password
+For MS Windows NT4, all domain trust relationships are configured using the 
+<application>Domain User Manager</application>. To affect a two way trust relationship it is 
+necessary for each domain administrator to make available (for use by an external domain) it's 
+security resources. This is done from the Domain User Manager Policies entry on the menu bar. 
+From the <guimenu>Policy</guimenu> menu, select <guimenuitem>Trust Relationships</guimenuitem>, then
+next to the lower box that is labelled <guilabel>Permitted to Trust this Domain</guilabel> are two 
+buttons, <guibutton>Add</guibutton> and <guibutton>Remove</guibutton>. The <guibutton>Add</guibutton>
+button will open a panel in which needs to be entered the remote domain that will be able to assign
+user rights to your domain. In addition it is necessary to enter a password
 that is specific to this trust relationship. The password needs to be
 typed twice (for standard confirmation).
 </para>
@@ -115,8 +117,9 @@ typed twice (for standard confirmation).
 A trust relationship will work only when the other (trusting) domain makes the appropriate connections
 with the trusted domain. To consumate the trust relationship the administrator will launch the
 Domain User Manager, from the menu select Policies, then select Trust Relationships, then click on the
-"Add" button that is next to the box that is labelled "Trusted Domains". A panel will open in
-which must be entered the name of the remote domain as well as the password assigned to that trust.
+<guibutton>Add</guibutton> button that is next to the box that is labelled 
+<guilabel>Trusted Domains</guilabel>. A panel will open in which must be entered the name of the remote 
+domain as well as the password assigned to that trust.
 </para>
 
 </sect2>
@@ -152,14 +155,14 @@ will be to issue this command from your favourite shell:
 
 <para>
 <screen>
-<prompt>deity#</prompt> <userinput>smbpasswd -a -i rumba</userinput>
+&rootprompt; <userinput>smbpasswd -a -i rumba</userinput>
 	New SMB password: XXXXXXXX
 	Retype SMB password: XXXXXXXX
 	Added user rumba$
 </screen>
 
-where <parameter>-a</parameter> means to add a new account into the
-passdb database and <parameter>-i</parameter> means: ''create this
+where <option>-a</option> means to add a new account into the
+passdb database and <option>-i</option> means: ''create this
 account with the InterDomain trust flag''
 </para>
 
@@ -178,12 +181,15 @@ the trust by establishing it from Windows NT Server.
 </para>
 
 <para>
-Open 'User Manager for Domains' and from menu 'Policies' select 'Trust Relationships...'.
-Right beside 'Trusted domains' list box press 'Add...' button. You will be prompted for
+Open <application>User Manager for Domains</application> and from menu
+<guimenu>Policies</guimenu> select <guimenuitem>Trust Relationships...</guimenuitem>.
+Right beside <guilabel>Trusted domains</guilabel> list box press the 
+<guimenu>Add...</guimenu> button. You will be prompted for
 the trusted domain name and the relationship password. Type in SAMBA, as this is
 your domain name, and the password used at the time of account creation.
-Press OK and, if everything went without incident, you will see 'Trusted domain relationship
-successfully established' message.
+Press OK and, if everything went without incident, you will see 
+<computeroutput>Trusted domain relationship successfully 
+established</computeroutput> message.
 </para>
 
 </sect2>
@@ -200,9 +206,11 @@ The very first thing requirement is to add an account for the SAMBA domain on RU
 </para>
 
 <para>
-Launch the Domain User Manager, then from the menu select 'Policies', 'Trust Relationships'.
-Now, next to 'Trusted Domains' box press the 'Add' button, and type in the name of the trusted
-domain (SAMBA) and password securing the relationship.
+Launch the <application>Domain User Manager</application>, then from the menu select
+<guimenu>Policies</guimenu>, <guimenuitem>Trust Relationships</guimenuitem>.
+Now, next to <guilabel>Trusted Domains</guilabel> box press the <guibutton>Add</guibutton>
+button, and type in the name of the trusted domain (SAMBA) and password securing
+the relationship.
 </para>
 
 <para>
@@ -216,7 +224,7 @@ Using your favourite shell while being logged in as root, issue this command:
 </para>
 
 <para>
-<prompt>deity# </prompt><userinput>net rpc trustdom establish rumba</userinput>
+&rootprompt;<userinput>net rpc trustdom establish rumba</userinput>
 </para>
 
 <para>
@@ -226,8 +234,8 @@ Do not worry if you see an error message that mentions a returned code of
 password you gave is correct and the NT4 Server says the account is
 ready for interdomain connection and not for ordinary
 connection. After that, be patient it can take a while (especially
-in large networks), you should see the 'Success' message. Congratulations! Your trust
-relationship has just been established.
+in large networks), you should see the <computeroutput>Success</computeroutput> message.
+Congratulations! Your trust relationship has just been established.
 </para>
 
 <note><para>