The branch, v3-2-test has been updated
via 07835177469d7699a478014f7a4a556684705bb6 (commit)
from 148aa12c89df78718addd7b72c79a8005e680509 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 07835177469d7699a478014f7a4a556684705bb6
Author: Karolin Seeger <ksee...@samba.org>
Date: Sun May 3 09:55:46 2009 +0200
s3/docs: Fix typos.
That fixes bug #4247. Thanks to David McNeill <davemc [at] mcpond.co.nz>
for reporting!
Karolin
(cherry picked from commit eaf949947c2eb03363c4b6f588f87b70110d6ff7)
(cherry picked from commit cea79d1fbf44b0d5bff5aa12962fb3d3cb61c367)
(cherry picked from commit 226620d0ed221da983b4f662fcef14906588f1bd)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Samba3-HOWTO/TOSHARG-Install.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml
b/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml
index 9894ed2..c0ffc05 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml
@@ -467,7 +467,7 @@
and thus the need to keep this file small goes against good
documentation wisdom. One solution that may
be adopted is to do all documentation and configuration in a file that
has another name, such as
<filename>smb.conf.master</filename>. The <command>testparm</command>
utility can be used to generate a
- fully optimized &smb.conf; file from this master configuration and
documtenation file as shown here:
+ fully optimized &smb.conf; file from this master configuration and
documentation file as shown here:
<screen>
&rootprompt; testparm -s smb.conf.master > smb.conf
</screen>
@@ -484,8 +484,7 @@
<para>
<indexterm><primary>swat</primary></indexterm>
SWAT is a Web-based interface that can be used to facilitate the
configuration of Samba. SWAT might not
- be available in the Samba package that shipped with your platform, but
in a separate package. If it is
- necesaary to built SWAT please read the SWAT man page regarding
compilation, installation, and
+ be available in the Samba package that shipped with your platform, but
in a separate package. If you need to build SWAT please read the SWAT man page
regarding compilation, installation, and
configuration of SWAT from the source code.
</para>
@@ -498,10 +497,12 @@
<para>
SWAT can be used from a browser on any IP-connected machine, but be
aware that connecting from a remote
- machine leaves your connection open to password sniffing because
passwords will be sent over the wire in the clear.
+ machine leaves your connection open to password sniffing because
passwords will be sent over the wire in the clear.
</para>
<para>
+ Please note that re-writing the configuration file using SWAT will
+ remove all comments!
More information about SWAT can be found in <link linkend="SWAT">The
Samba Web Administration Tool</link>.
</para>
--
Samba Shared Repository
