[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  e6b33a5 s3-docs: Fix typos.
      from  3d2c591 s3:smb2_server: SMB2_OP_CANCEL requests don't have to be signed

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit e6b33a5a3f83272d7e6dea66b1f15db4b19d3170
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Jun 6 19:58:22 2011 +0200

    s3-docs: Fix typos.
    
    Thanks to Samba-JP oota <ribbon at samba.gr.jp> for reporting!
    
    Karolin
    
    Autobuild-User: Karolin Seeger <kseeger at samba.org>
    Autobuild-Date: Fri Sep 30 23:12:35 CEST 2011 on sn-devel-104
    (cherry picked from commit 5c569a97ab477a324a96aae7f58770ccbe2572de)

-----------------------------------------------------------------------

Summary of changes:
 .../Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml  |    2 +-
 docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml    |    2 +-
 docs-xml/Samba3-HOWTO/TOSHARG-Unicode.xml          |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml b/docs-xml/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml
index 2ecfa4b..a6c1af0 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml
@@ -265,7 +265,7 @@ is the best tool in your network environment.
 	<para>
 <indexterm><primary>LAN</primary></indexterm>
 <indexterm><primary>thin client</primary></indexterm>
-	ThinLinc an be used both in the LAN environment to implement a Thin Client strategy for an organization, and as
+	ThinLinc can be used both in the LAN environment to implement a Thin Client strategy for an organization, and as
 	secure remote access solution for people working from remote locations, even over smallband connections.
 	ThinLinc is free to use for a single concurrent user.
 	</para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml b/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
index 7058112..bb05de4 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
@@ -3716,7 +3716,7 @@ Just put it in a frame and bolt it to the wall with the heading "MY FIRST RPCCLI
 <para>
 <indexterm><primary>adddriver</primary></indexterm>
 The setdriver command will fail if in Samba's mind the queue is not
-already there. A successful installation displys the promising message that the:
+already there. A successful installation displays the promising message that the:
 <screen>
 Printer Driver ABC successfully installed.
 </screen>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Unicode.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Unicode.xml
index d431899..440498f 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Unicode.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Unicode.xml
@@ -366,7 +366,7 @@ Setting up Japanese charsets is quite difficult. This is mainly because:
 			In addition, although it is not directly concerned with Samba, since
 			there is a delicate difference between the iconv() function, which is
 			generally used on UNIX, and the functions used on other platforms,
-			such as Windows and Java, so far is concerens the conversion between
+			such as Windows and Java, so far is concerns the conversion between
 			Shift_JIS and Unicode UTF-8 must be done with care and recognition
 			of the limitations involved in the process.
 			</para>


-- 
Samba Shared Repository