summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>2005-04-15 16:54:19 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:46:28 -0500
commit2cec124937cac1cb19764440b16de536d32b0bf7 (patch)
treec1d429fe5a6a6585491c66f0d9e92ab43d0c8aae
parent7bd0a9eb2637a134ae5abdac77dcb9fc1622cfe4 (diff)
downloadsamba-2cec124937cac1cb19764440b16de536d32b0bf7.tar.gz
samba-2cec124937cac1cb19764440b16de536d32b0bf7.tar.bz2
samba-2cec124937cac1cb19764440b16de536d32b0bf7.zip
Small fixups.
(This used to be commit b6f6f37fd516ff883140cc4fb201f8d64e009c2e)
-rw-r--r--docs/Samba-Guide/SBE-MigrateNT4Samba3.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/Samba-Guide/SBE-MigrateNT4Samba3.xml b/docs/Samba-Guide/SBE-MigrateNT4Samba3.xml
index 7a090f74c0..3affe3259c 100644
--- a/docs/Samba-Guide/SBE-MigrateNT4Samba3.xml
+++ b/docs/Samba-Guide/SBE-MigrateNT4Samba3.xml
@@ -161,6 +161,7 @@
<para>
<indexterm><primary>strategic</primary></indexterm>
+ <indexterm><primary>active directory</primary></indexterm>
Migration of an NT4 Domain user and group database to Samba-3 involves a certain strategic
element. Many sites have asked for instructions regarding merging of multiple different NT4
Domains into one Samba-3 LDAP database. It would appear that this is viewed as a significant
@@ -1492,7 +1493,7 @@ Users Ordinary users
</para>
<para>
- If you elect to create the Posix account also, the entire UNIX account is copied to the
+ If you elect to create the POSIX account also, the entire UNIX account is copied to the
LDAP backend. The same occurs with NT groups and UNIX groups. At the conclusion of
migration to the LDAP database, the accounts may be removed from the UNIX database files.
In short then, all UNIX and Windows networking accounts, both in tdbsam as well as in