[SCM] Samba Shared Repository - branch master updated

Simo Sorce idra at samba.org
Wed Jul 10 08:46:02 MDT 2013

The branch, master has been updated
       via  1573638 Fix typos in man-pages
      from  e6a58d3 s4:rpc_server: make sure we don't terminate a connection with pending requests (bug #9820)


- Log -----------------------------------------------------------------
commit 1573638212a9733a44939a4d38a226f38dca36f1
Author: Michele Baldessari <michele at acksyn.org>
Date:   Tue Jul 9 23:23:33 2013 +0200

    Fix typos in man-pages
    Fix some typos in the man-pages.
    Signed-off-by: Michele Baldessari <michele at acksyn.org>
    Reviewed-by: Simo Sorce <idra at samba.org>
    Autobuild-User(master): Simo Sorce <idra at samba.org>
    Autobuild-Date(master): Wed Jul 10 16:45:07 CEST 2013 on sn-devel-104


Summary of changes:
 docs-xml/manpages/dbwrap_tool.1.xml              |    2 +-
 docs-xml/manpages/idmap_autorid.8.xml            |    2 +-
 docs-xml/manpages/net.8.xml                      |    2 +-
 docs-xml/manpages/pdbedit.8.xml                  |    2 +-
 docs-xml/manpages/samba.7.xml                    |    2 +-
 docs-xml/manpages/smbclient.1.xml                |    2 +-
 docs-xml/manpages/smbpasswd.5.xml                |    2 +-
 docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/dbwrap_tool.1.xml b/docs-xml/manpages/dbwrap_tool.1.xml
index e2b2cee..a1a2f97 100644
--- a/docs-xml/manpages/dbwrap_tool.1.xml
+++ b/docs-xml/manpages/dbwrap_tool.1.xml
@@ -49,7 +49,7 @@
 		<listitem><para>fetch: fetch a record</para></listitem>
 		<listitem><para>store: create or modify a record</para></listitem>
 		<listitem><para>delete: remove a record</para></listitem>
-		<listitem><para>exists: test for existance of a record</para></listitem>
+		<listitem><para>exists: test for existence of a record</para></listitem>
 		<listitem><para>erase: remove all records</para></listitem>
 		<listitem><para>listkeys: list all available records</para></listitem>
 		<listitem><para>listwatchers: list processes, which are waiting for changes in a record</para></listitem>
diff --git a/docs-xml/manpages/idmap_autorid.8.xml b/docs-xml/manpages/idmap_autorid.8.xml
index c35f903..7446d53 100644
--- a/docs-xml/manpages/idmap_autorid.8.xml
+++ b/docs-xml/manpages/idmap_autorid.8.xml
@@ -109,7 +109,7 @@
 		This example shows you the minimal configuration that will
-		work for the principial domain and 19 trusted domains / range
+		work for the principal domain and 19 trusted domains / range
diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml
index dd5b3ab..0df2e07 100644
--- a/docs-xml/manpages/net.8.xml
+++ b/docs-xml/manpages/net.8.xml
@@ -1671,7 +1671,7 @@ shares created by other users.
 <para>Starting with version 3.2.0, a Samba server can be configured by data
 stored in registry. This configuration data can be edited with the new "net
-conf" commands. There is also the possiblity to configure a remote Samba server
+conf" commands. There is also the possibility to configure a remote Samba server
 by enabling the RPC conf mode and specifying the the address of the remote server.
diff --git a/docs-xml/manpages/pdbedit.8.xml b/docs-xml/manpages/pdbedit.8.xml
index 4bb3751..c5d6b23 100644
--- a/docs-xml/manpages/pdbedit.8.xml
+++ b/docs-xml/manpages/pdbedit.8.xml
@@ -289,7 +289,7 @@ retype new password
-		<note><para>pdbedit does not call the unix password syncronisation 
+		<note><para>pdbedit does not call the unix password synchronization 
 				script if <smbconfoption name="unix password sync"/>
 				has been set. It only updates the data in the Samba 
 				user database. 
diff --git a/docs-xml/manpages/samba.7.xml b/docs-xml/manpages/samba.7.xml
index 9299660..cedb4e4 100644
--- a/docs-xml/manpages/samba.7.xml
+++ b/docs-xml/manpages/samba.7.xml
@@ -91,7 +91,7 @@
 		<listitem><para>The <command>samba-tool</command>
 		is the main Samba Administration tool regarding
-		Acitive Directory services.</para>
+		Active Directory services.</para>
diff --git a/docs-xml/manpages/smbclient.1.xml b/docs-xml/manpages/smbclient.1.xml
index 328fd50..b222c56 100644
--- a/docs-xml/manpages/smbclient.1.xml
+++ b/docs-xml/manpages/smbclient.1.xml
@@ -564,7 +564,7 @@
 		sent to the server on directory listings and file opens. If
 		the "backup intent" flag is true, the server will try and
 		bypass some file system checks if the user has been granted
-		SE_BACKUP or SE_RESTORE privilages. This state is useful when
+		SE_BACKUP or SE_RESTORE privileges. This state is useful when
 		performing a backup or restore operation.
diff --git a/docs-xml/manpages/smbpasswd.5.xml b/docs-xml/manpages/smbpasswd.5.xml
index fc512b8..986dedb 100644
--- a/docs-xml/manpages/smbpasswd.5.xml
+++ b/docs-xml/manpages/smbpasswd.5.xml
@@ -39,7 +39,7 @@
 	<para>The format of the smbpasswd file used by Samba 2.2 
 	is very similar to the familiar Unix <filename>passwd(5)</filename> 
 	file. It is an ASCII file containing one line for each user. Each field 
-	ithin each line is separated from the next by a colon. Any entry 
+	within each line is separated from the next by a colon. Any entry 
 	beginning with '#' is ignored. The smbpasswd file contains the 
 	following information for each user: </para>
diff --git a/docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml
index 0daafc6..38644e7 100644
--- a/docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml
+++ b/docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml
@@ -139,7 +139,7 @@
 		The module now can identify itself against the receiver with a sub-release number, where
 		the receiver may run with a different sub-release number than the module. However, as
 		long as both run on the V2.x protocol, the receiver will not crash, even if the module
-		uses features only implemented in the newer subrelease. Ultimatively, if the module uses
+		uses features only implemented in the newer subrelease. Ultimately, if the module uses
 		a new feature from a newer subrelease, and the receiver runs an older protocol, it is just
 		ignoring the functionality. Of course it is best to have both the receiver and the module
 		running the same subrelease of the protocol.

Samba Shared Repository

More information about the samba-cvs mailing list