summaryrefslogtreecommitdiff
path: root/docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-06-13 15:29:53 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:46:47 -0500
commit2757cde29e2b49c988bcf1d5140bae22f8f0bab2 (patch)
tree656515558d378c68c34b1ef3e6fd5722a7f322d8 /docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml
parent789fda4de0ea8427e3a40e91bf1fd1d0f7cb2d85 (diff)
downloadsamba-2757cde29e2b49c988bcf1d5140bae22f8f0bab2.tar.gz
samba-2757cde29e2b49c988bcf1d5140bae22f8f0bab2.tar.bz2
samba-2757cde29e2b49c988bcf1d5140bae22f8f0bab2.zip
Put Johns' changes back in again.
(This used to be commit d5a730fc097311f498dd7c3fb2516a1fc0fa1fe7)
Diffstat (limited to 'docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml')
-rw-r--r--docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml b/docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml
index bcc1181f34..548aee69ea 100644
--- a/docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml
+++ b/docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml
@@ -120,7 +120,7 @@
Do not forget to validate the security descriptors in the profiles share as well as network logon
scripts. Feedback from sites that are migrating to Samba-3 suggests that many are using this
as a good time to update desktop systems also. In all, the extra effort should constitute no
- real disruption to users, but rather, with due diligence and care should make their network experience
+ real disruption to users, but rather, with due diligence and care, should make their network experience
a much happier one.
</para>
@@ -683,7 +683,7 @@ Storing SID S-1-5-21-1385457007-882775198-1210191635 \
Install the Idealx <command>smbldap-tools</command> software package, following
the instructions given in <link linkend="sbeidealx"/>. The resulting perl scripts
should be located in the <filename>/opt/IDEALX/sbin</filename> directory.
- Change into that location, or whereever the scripts have been installed. Execute the
+ Change into that location, or wherever the scripts have been installed. Execute the
<filename>configure.pl</filename> script to configure the Idealx package for use.
Note: Use the domain SID obtained from the step above. The following is
an example configuration session:
@@ -1525,7 +1525,7 @@ Users Ordinary users
<para>
When migrating a <filename>smbpasswd</filename> file to an LDAP backend, the
UID of each account is taken together with the account information in the
- <filename>/etc/passwd,</filename> and both sets of data are used to create the account
+ <filename>/etc/passwd</filename>, and both sets of data are used to create the account
entry in the LDAP database.
</para>