[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Tue Nov 19 06:41:06 MST 2013
The branch, master has been updated
via c0bdd80 docs: remove duplicate "used" from smb.conf manpage.
via 344c59f docs: remove duplicate "line" from smb.conf manpage.
via 8d1ff1d docs: remove duplicate "must" from smb.conf manpage.
via 0cf92d4 docs: remove duplicate "on" from smb.conf manpage.
via 59a2405 docs: remove duplicate "or" from smb.conf manpage.
via ced1210 docs: remove duplicate "not" from smb.conf manpage.
via 2557727 docs: remove duplicate "to" from smb.conf manpage.
via b55b563 docs: remove duplicate "the" from smb.conf manpage.
via 7a587e7 docs: remove duplicate "a" from vfs_cacheprime manpage.
from 19d1a7a docs: document remaining undocumented options in net manpage.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c0bdd8011cc14a03bbddb7ad894219c649a609d9
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 19 12:36:53 2013 +0100
docs: remove duplicate "used" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Tue Nov 19 14:40:40 CET 2013 on sn-devel-104
commit 344c59f99996d4e6a23c2cc914377536ea7e9eee
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 19 12:34:54 2013 +0100
docs: remove duplicate "line" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 8d1ff1d73f43d0fd4c2290496389c006afb2de93
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 19 12:34:33 2013 +0100
docs: remove duplicate "must" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 0cf92d476feabb870f67061d38d1027ebc59a852
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 19 12:34:05 2013 +0100
docs: remove duplicate "on" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 59a240513c7d48afb337b102466c539af3f880f3
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 19 12:33:33 2013 +0100
docs: remove duplicate "or" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit ced12107e0af429af088cd63b86c8b8b21e83a1a
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 19 12:20:12 2013 +0100
docs: remove duplicate "not" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 25577278211f82a353477c48ea1381cdd16b3b63
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 19 12:18:57 2013 +0100
docs: remove duplicate "to" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit b55b56351d71bb4a4517d857959c7c9d9d2b768c
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 19 12:17:19 2013 +0100
docs: remove duplicate "the" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 7a587e715ae413ce0f44be4c6f63a9e30fe697e5
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 19 12:14:45 2013 +0100
docs: remove duplicate "a" from vfs_cacheprime manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/vfs_cacheprime.8.xml | 2 +-
docs-xml/smbdotconf/filename/manglingmethod.xml | 2 +-
.../smbdotconf/misc/directorynamecachesize.xml | 2 +-
.../smbdotconf/misc/fakedirectorycreatetimes.xml | 2 +-
docs-xml/smbdotconf/misc/rpcserver.xml | 2 +-
.../smbdotconf/protocol/aclallowexecutealways.xml | 2 +-
docs-xml/smbdotconf/protocol/ntaclsupport.xml | 2 +-
docs-xml/smbdotconf/security/aclgroupcontrol.xml | 2 +-
docs-xml/smbdotconf/security/smbencrypt.xml | 2 +-
docs-xml/smbdotconf/security/usernamemapscript.xml | 2 +-
docs-xml/smbdotconf/winbind/idmapconfig.xml | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/vfs_cacheprime.8.xml b/docs-xml/manpages/vfs_cacheprime.8.xml
index b490ba6..b92a6c1 100644
--- a/docs-xml/manpages/vfs_cacheprime.8.xml
+++ b/docs-xml/manpages/vfs_cacheprime.8.xml
@@ -84,7 +84,7 @@
<refsect1>
<title>CAVEATS</title>
- <para><command>cacheprime</command> is not a a substitute for
+ <para><command>cacheprime</command> is not a substitute for
a general-purpose readahead mechanism. It is intended for use
only in very specific environments where disk operations must
be aligned and sized to known values (as much as that is possible).
diff --git a/docs-xml/smbdotconf/filename/manglingmethod.xml b/docs-xml/smbdotconf/filename/manglingmethod.xml
index f6e2eda..347dc56 100644
--- a/docs-xml/smbdotconf/filename/manglingmethod.xml
+++ b/docs-xml/smbdotconf/filename/manglingmethod.xml
@@ -6,7 +6,7 @@
<description>
<para> controls the algorithm used for the generating
the mangled names. Can take two different values, "hash" and
- "hash2". "hash" is the algorithm that was used
+ "hash2". "hash" is the algorithm that was
used in Samba for many years and was the default in Samba 2.2.x "hash2" is
now the default and is newer and considered a better algorithm (generates less collisions) in
the names. Many Win32 applications store the mangled names and so
diff --git a/docs-xml/smbdotconf/misc/directorynamecachesize.xml b/docs-xml/smbdotconf/misc/directorynamecachesize.xml
index 1064b7e..d02c4f5 100644
--- a/docs-xml/smbdotconf/misc/directorynamecachesize.xml
+++ b/docs-xml/smbdotconf/misc/directorynamecachesize.xml
@@ -5,7 +5,7 @@
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
- This parameter specifies the the size of the directory name cache.
+ This parameter specifies the size of the directory name cache.
It will be needed to turn this off for *BSD systems.
</para>
diff --git a/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml b/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml
index 974b6f0..54e7b87 100644
--- a/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml
+++ b/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml
@@ -20,7 +20,7 @@
timestamp than the object files it contains.</para>
<para>However, Unix time semantics mean that the create time
- reported by Samba will be updated whenever a file is created or
+ reported by Samba will be updated whenever a file is created
or deleted in the directory. NMAKE finds all object files in
the object directory. The timestamp of the last one built is then
compared to the timestamp of the object directory. If the
diff --git a/docs-xml/smbdotconf/misc/rpcserver.xml b/docs-xml/smbdotconf/misc/rpcserver.xml
index 4372eea..9a22939 100644
--- a/docs-xml/smbdotconf/misc/rpcserver.xml
+++ b/docs-xml/smbdotconf/misc/rpcserver.xml
@@ -59,7 +59,7 @@
Currently in Samba3 we support three daemons, spoolssd, epmd and
lsasd. These daemons can be enabled using the
<emphasis>rpc_daemon</emphasis> option. For spoolssd you have
- to to enable the daemon and proxy the named pipe with:
+ to enable the daemon and proxy the named pipe with:
</para>
<para>
diff --git a/docs-xml/smbdotconf/protocol/aclallowexecutealways.xml b/docs-xml/smbdotconf/protocol/aclallowexecutealways.xml
index 49d2c48..0c9588e 100644
--- a/docs-xml/smbdotconf/protocol/aclallowexecutealways.xml
+++ b/docs-xml/smbdotconf/protocol/aclallowexecutealways.xml
@@ -17,7 +17,7 @@
If this parameter is set to "True", Samba does not check execute permissions on
"open for execution", thus re-establishing the behaviour of Samba 3.6.
This can be useful to smoothen upgrades from older Samba versions to 4.0 and newer.
- This setting is not not meant to be used as a permanent setting, but as a temporary relief:
+ This setting is not meant to be used as a permanent setting, but as a temporary relief:
It is recommended to fix the permissions in the ACLs and reset this parameter to the
default after a certain transition period.
</para>
diff --git a/docs-xml/smbdotconf/protocol/ntaclsupport.xml b/docs-xml/smbdotconf/protocol/ntaclsupport.xml
index 1e9cedf..451d5d8 100644
--- a/docs-xml/smbdotconf/protocol/ntaclsupport.xml
+++ b/docs-xml/smbdotconf/protocol/ntaclsupport.xml
@@ -7,7 +7,7 @@
<para>This boolean parameter controls whether <citerefentry><refentrytitle>smbd</refentrytitle>
<manvolnum>8</manvolnum></citerefentry> will attempt to map
UNIX permissions into Windows NT access control lists. The UNIX
- permissions considered are the the traditional UNIX owner and
+ permissions considered are the traditional UNIX owner and
group permissions, as well as POSIX ACLs set on any files or
directories. This parameter was formally a global parameter in
releases prior to 2.2.2.</para>
diff --git a/docs-xml/smbdotconf/security/aclgroupcontrol.xml b/docs-xml/smbdotconf/security/aclgroupcontrol.xml
index e62216a..279a57b 100644
--- a/docs-xml/smbdotconf/security/aclgroupcontrol.xml
+++ b/docs-xml/smbdotconf/security/aclgroupcontrol.xml
@@ -24,7 +24,7 @@
<para>
This parameter is best used with the <smbconfoption name="inherit owner"/> option and also
- on on a share containing directories with the UNIX <emphasis>setgid bit</emphasis> set
+ on a share containing directories with the UNIX <emphasis>setgid bit</emphasis> set
on them, which causes new files and directories created within it to inherit the group
ownership from the containing directory.
</para>
diff --git a/docs-xml/smbdotconf/security/smbencrypt.xml b/docs-xml/smbdotconf/security/smbencrypt.xml
index d556166..51079ae 100644
--- a/docs-xml/smbdotconf/security/smbencrypt.xml
+++ b/docs-xml/smbdotconf/security/smbencrypt.xml
@@ -21,7 +21,7 @@
and <emphasis>disabled</emphasis>. This may be set on a per-share
basis, but clients may chose to encrypt the entire session, not
just traffic to a specific share. If this is set to mandatory
- then all traffic to a share <emphasis>must</emphasis> must
+ then all traffic to a share <emphasis>must</emphasis>
be encrypted once the connection has been made to the share.
The server would return "access denied" to all non-encrypted
requests on such a share. Selecting encrypted traffic reduces
diff --git a/docs-xml/smbdotconf/security/usernamemapscript.xml b/docs-xml/smbdotconf/security/usernamemapscript.xml
index 6df134c..9e2e1a5 100644
--- a/docs-xml/smbdotconf/security/usernamemapscript.xml
+++ b/docs-xml/smbdotconf/security/usernamemapscript.xml
@@ -8,7 +8,7 @@
<smbconfoption name="username map"/> parameter. This parameter
specifies and external program or script that must accept a single
command line option (the username transmitted in the authentication
- request) and return a line line on standard output (the name to which
+ request) and return a line on standard output (the name to which
the account should mapped). In this way, it is possible to store
username map tables in an LDAP or NIS directory services.
</para>
diff --git a/docs-xml/smbdotconf/winbind/idmapconfig.xml b/docs-xml/smbdotconf/winbind/idmapconfig.xml
index 5d3605a..30925a2 100644
--- a/docs-xml/smbdotconf/winbind/idmapconfig.xml
+++ b/docs-xml/smbdotconf/winbind/idmapconfig.xml
@@ -17,7 +17,7 @@
<para>
The idmap configuration is hence divided into groups, one group
- for each domain to be configured, and one group with the the
+ for each domain to be configured, and one group with the
asterisk instead of a proper domain name, which specifies the
default configuration that is used to catch all domains that do
not have an explicit idmap configuration of their own.
--
Samba Shared Repository
More information about the samba-cvs
mailing list