diff options
author | John Terpstra <jht@samba.org> | 2005-04-23 18:12:55 +0000 |
---|---|---|
committer | Gerald W. Carter <jerry@samba.org> | 2008-04-23 08:46:30 -0500 |
commit | b65d0c8892a74ce12a1159dd724fda0a611d6924 (patch) | |
tree | bd2b407c5c060ee73fce4b8efa9e98fdee4d602f | |
parent | 5275fcb04add614aed8c029abdcd236eda30ff62 (diff) | |
download | samba-b65d0c8892a74ce12a1159dd724fda0a611d6924.tar.gz samba-b65d0c8892a74ce12a1159dd724fda0a611d6924.tar.bz2 samba-b65d0c8892a74ce12a1159dd724fda0a611d6924.zip |
Fixup preface.
(This used to be commit faff3eb54eb4ac4c8ca47159c741464d8d0f3dd8)
-rw-r--r-- | docs/Samba-Guide/SBE-Appendix1.xml | 2 | ||||
-rw-r--r-- | docs/Samba-Guide/SBE-preface.xml | 50 |
2 files changed, 26 insertions, 26 deletions
diff --git a/docs/Samba-Guide/SBE-Appendix1.xml b/docs/Samba-Guide/SBE-Appendix1.xml index 1b573648de..5c6233d9af 100644 --- a/docs/Samba-Guide/SBE-Appendix1.xml +++ b/docs/Samba-Guide/SBE-Appendix1.xml @@ -98,7 +98,7 @@ </indexterm><indexterm> <primary>DNS</primary> </indexterm> - The screen capture shown in <link linkend="wxpp007"/> has a button labeled <guimenu>More...</guimenu>. This button opens a + The screen capture shown in <link linkend="swxpp007"/> has a button labeled <guimenu>More...</guimenu>. This button opens a panel in which you can set (or change) the Primary DNS suffix of the computer. This is a parameter that mainly affects members of Microsoft Active Directory. Active Directory is heavily oriented around the DNS name space. </para> diff --git a/docs/Samba-Guide/SBE-preface.xml b/docs/Samba-Guide/SBE-preface.xml index ae1f84e001..98fd455381 100644 --- a/docs/Samba-Guide/SBE-preface.xml +++ b/docs/Samba-Guide/SBE-preface.xml @@ -433,7 +433,29 @@ </varlistentry> <varlistentry> - <term>Chapter 7 &smbmdash; Updating Samba-3</term><listitem> + <term>Chapter 7 &smbmdash; Adding UNIX/Linux Servers and Clients</term><listitem> + <para> + Well done, Bob, your team has achieved much. Now help Abmas integrate the entire network. + You want central control and central support and you need to cut costs. How can you reduce administrative + overheads and yet get better control of the network? + </para> + + <para> + This chapter has been contributed by Mark Taylor <email>mark.taylor@siriusit.co.uk</email> + and is based on a live site. For further information regarding this example case, + please contact Mark directly. + </para> + + <para><emphasis>TechInfo</emphasis> &smbmdash; It is time to consider how to add Samba servers + and UNIX and Linux network clients. Users who convert to Linux want to be able to log on + using Windows network accounts. You explore nss_ldap, pam_ldap, winbind, and a few neat + techniques for taking control. Are you ready for this? + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term>Chapter 8 &smbmdash; Updating Samba-3</term><listitem> <para> This chapter is the result of repeated requests for better documentation of the steps that must be followed when updating or upgrading a Samba server. It attempts to cover @@ -450,7 +472,7 @@ </varlistentry> <varlistentry> - <term>Chapter 8 &smbmdash; Migrating NT4 Domain to Samba-3</term><listitem> + <term>Chapter 9 &smbmdash; Migrating NT4 Domain to Samba-3</term><listitem> <para> Another six months have <?latex \linebreak ?> passed. Abmas has acquired yet another company. You will find a @@ -467,7 +489,7 @@ </varlistentry> <varlistentry> - <term>Chapter 9 &smbmdash; Migrating NetWare 4.11 Server to Samba</term><listitem> + <term>Chapter 10 &smbmdash; Migrating NetWare 4.11 Server to Samba</term><listitem> <para> Misty Stanley-Jones has contributed information that summarizes her experience at migration from a NetWare server to Samba-3. @@ -481,28 +503,6 @@ </varlistentry> <varlistentry> - <term>Chapter 10 &smbmdash; Adding UNIX/Linux Servers and Clients</term><listitem> - <para> - Well done, Bob, your team has achieved much. Now help Abmas integrate the entire network. - You want central control and central support and you need to cut costs. How can you reduce administrative - overheads and yet get better control of the network? - </para> - - <para> - This chapter has been contributed by Mark Taylor <email>mark.taylor@siriusit.co.uk</email> - and is based on a live site. For further information regarding this example case, - please contact Mark directly. - </para> - - <para><emphasis>TechInfo</emphasis> &smbmdash; It is time to consider how to add Samba servers - and UNIX and Linux network clients. Users who convert to Linux want to be able to log on - using Windows network accounts. You explore nss_ldap, pam_ldap, winbind, and a few neat - techniques for taking control. Are you ready for this? - </para> - </listitem> - </varlistentry> - - <varlistentry> <term>Chapter 11 &smbmdash; Active Directory, Kerberos and Security</term><listitem> <para> Abmas has acquired another company that has just migrated to running Windows Server 2003 and |