From a659e90b33e7f560898e7daf7c741d57bb501b53 Mon Sep 17 00:00:00 2001
From: John Terpstra <jht@samba.org>
Date: Sun, 1 Jun 2003 03:47:32 +0000
Subject: More minor edits. (This used to be commit
 dcc3ed1a8037c0872383bdbeba511322f55c12c5)

---
 docs/docbook/projdoc/Backup.xml           | 19 +++++++++++++++++++
 docs/docbook/projdoc/SWAT.xml             |  2 +-
 docs/docbook/projdoc/unicode.xml          | 26 ++++++++++++++++++++++++++
 docs/docbook/projdoc/upgrading-to-3.0.xml | 26 +++++++++++++++++++++++++-
 4 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/docs/docbook/projdoc/Backup.xml b/docs/docbook/projdoc/Backup.xml
index 53e90e8ec0..b3c37aba53 100644
--- a/docs/docbook/projdoc/Backup.xml
+++ b/docs/docbook/projdoc/Backup.xml
@@ -11,7 +11,26 @@
 <para>
 This chapter did not make it into this release.
 It is planned for the published release of this document.
+If you have something to contribute for this section please email it to
+<link url="mail://jht@samba.org">jht@samba.org</link>/
 </para>
 
 </sect1>
+
+<sect1>
+<title>Features and Benefits</title>
+
+<para>
+We need feedback from people who are backing up samba servers.
+We would like to know what software tools you are using to backup
+your samba server/s.
+</para>
+
+<para>
+In particular, if you have any success and / or failure stories you could
+share with other users this would be appreciated.
+</para>
+
+</sect1>
+
 </chapter>
diff --git a/docs/docbook/projdoc/SWAT.xml b/docs/docbook/projdoc/SWAT.xml
index e03c41ce39..8619d888a4 100644
--- a/docs/docbook/projdoc/SWAT.xml
+++ b/docs/docbook/projdoc/SWAT.xml
@@ -17,7 +17,7 @@ management.
 </para>
 
 <sect1>
-<title>SWAT Features and Benefits</title>
+<title>Features and Benefits</title>
 
 <para>
 There are network administrators who believe that it is a good idea to write systems
diff --git a/docs/docbook/projdoc/unicode.xml b/docs/docbook/projdoc/unicode.xml
index c222c2bdc1..cb55c084c4 100644
--- a/docs/docbook/projdoc/unicode.xml
+++ b/docs/docbook/projdoc/unicode.xml
@@ -12,6 +12,32 @@
 
 <title>Unicode/Charsets</title>
 
+<sect1>
+<title>Features and Benefits</title>
+
+<para>
+Every industry eventually matures. One of the great areas of maturation is in
+the focus that has been given over the past decade to make it possible for anyone
+anywhere to use a computer. It has not always been that way, in fact, not so long
+ago it was common for software to be written for exclusive use in the country of
+origin.
+</para>
+
+<para>
+Of all the effort that has been brought to bear on providing native language support
+for all computer users, the efforts of the Openi18n organisation is deserving of
+special mention. For more information about Openi18n please refer to: 
+<link url="http://www.openi18n.org/">http://www.openi18n.org/</link>.
+</para>
+
+<para>
+Samba-2.x supported a single locale through a mechanism called 
+<emphasis>codepages</emphasis>. Samba-3 is destined to become a truely trans-global
+file and printer sharing platform.
+</para>
+
+</sect1>
+
 <sect1>
 <title>What are charsets and unicode?</title>
 
diff --git a/docs/docbook/projdoc/upgrading-to-3.0.xml b/docs/docbook/projdoc/upgrading-to-3.0.xml
index 7201d1e06a..63b8f6a8f6 100644
--- a/docs/docbook/projdoc/upgrading-to-3.0.xml
+++ b/docs/docbook/projdoc/upgrading-to-3.0.xml
@@ -4,7 +4,7 @@
 	<pubdate>25 October 2002</pubdate>
 </chapterinfo>
 
-<title>Issues when upgrading from 2.2 to 3.0</title>
+<title>Upgrading from Samba-2.x to Samba-3.0.0</title>
 
 <sect1>
 <title>Charsets</title>
@@ -35,4 +35,28 @@ In 3.0, the following configuration options have been removed.
 <member>vfs options</member>
 </simplelist>
 </sect1>
+
+<sect1>
+<title>Password Backend</title>
+
+<para>
+Effective with the release of samba-3 it is now imperative that the password backend
+be correctly defined in smb.conf.
+</para>
+
+<para>
+Those migrating from samba-2.x with plaintext password support need the following:
+<emphasis>passdb backend = guest</emphasis>.
+</para>
+
+<para>
+Those migrating from samba-2.x with encrypted password support should add to smb.conf
+<emphasis>passdb backend = smbpasswd, guest</emphasis>.
+</para>
+
+<para>
+LDAP using Samba-2.x systems can continue to operate with the following entry
+<emphasis>passdb backend = ldapsam_compat, guest</emphasis>.
+</para>
+
 </chapter>
-- 
cgit