summaryrefslogtreecommitdiff
path: root/docs/Samba3-ByExample/SBE-SimpleOfficeServer.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-SimpleOfficeServer.xml
parent789fda4de0ea8427e3a40e91bf1fd1d0f7cb2d85 (diff)
downloadsamba-2757cde29e2b49c988bcf1d5140bae22f8f0bab2.tar.gz
Put Johns' changes back in again.
(This used to be commit d5a730fc097311f498dd7c3fb2516a1fc0fa1fe7)
Diffstat (limited to 'docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml')
-rw-r--r--docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml b/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml
index 1c41ec98111..9ba4d867dea 100644
--- a/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml
+++ b/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml
@@ -10,7 +10,7 @@
is the end of the road because their needs will have been adequately met. For others, this chapter is
the beginning of a journey that will take them well past the contents of this book. This book provides
example configurations of, for the greater part, complete networking solutions. The intent of this book
- is to help you to get your Samba installation working with least amount of pain and aggravation.
+ is to help you to get your Samba installation working with the least amount of pain and aggravation.
</para>
<sect1>
@@ -570,12 +570,12 @@ Password changed
<step><para>
Install the &smb.conf; file shown in <link linkend="charity-smbconfnew"/> in the
<filename>/etc/samba</filename> directory. This newer &smb.conf; file uses user-mode security
- and is more suited to the mode of operation of Samba-3 that the older share-mode security
+ and is more suited to the mode of operation of Samba-3 than the older share-mode security
configuration that was shown in the first edition of this book.
</para>
<para>
- Note: If you want to use the older style configuration that uses share-mode security, you
+ Note: If you want to use the older-style configuration that uses share-mode security, you
can install the file shown in <link linkend="charity-smbconf"/> in the
<filename>/etc/samba</filename> directory.
</para></step>