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

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  495d164 s3-docs: Fix typo.
       via  0ccce6e s3-docs: Fix bug #7908.
      from  04d31e6 Bug 7551: Return error of cli_push when 'put - /some/file' is used

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


- Log -----------------------------------------------------------------
commit 495d164e8f3ac7d3064c48fe785f8d443f2f63ad
Author: Karolin Seeger <kseeger at samba.org>
Date:   Sat Oct 8 20:54:37 2011 +0200

    s3-docs: Fix typo.
    
    Karolin
    
    Autobuild-User: Karolin Seeger <kseeger at samba.org>
    Autobuild-Date: Sat Oct  8 22:27:07 CEST 2011 on sn-devel-104
    (cherry picked from commit 851d6625d5e08ac9659a6d23d105f9e0c47f9692)

commit 0ccce6e5a212859849c77f8a5e02790b8f17deaa
Author: Karolin Seeger <kseeger at samba.org>
Date:   Sat Oct 8 20:53:18 2011 +0200

    s3-docs: Fix bug #7908.
    
    Fix typo.
    
    Thanks to John Bradshaw for reporting!
    
    Karolin
    (cherry picked from commit 8aaa27754663a55f45facc18783eea458205d8a5)

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

Summary of changes:
 docs-xml/manpages-3/profiles.1.xml |    2 +-
 docs-xml/manpages-3/samba.7.xml    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/profiles.1.xml b/docs-xml/manpages-3/profiles.1.xml
index 98046fc..fb33217 100644
--- a/docs-xml/manpages-3/profiles.1.xml
+++ b/docs-xml/manpages-3/profiles.1.xml
@@ -58,7 +58,7 @@
 
 		<varlistentry>
 		<term>-c SID1 -n SID2</term>
-		<listitem><para>Change all occurences of SID1 in <filename>file</filename> by SID2.
+		<listitem><para>Change all occurrences of SID1 in <filename>file</filename> by SID2.
 		</para></listitem>
 		</varlistentry>
 
diff --git a/docs-xml/manpages-3/samba.7.xml b/docs-xml/manpages-3/samba.7.xml
index 888f75e..2a76dff 100644
--- a/docs-xml/manpages-3/samba.7.xml
+++ b/docs-xml/manpages-3/samba.7.xml
@@ -216,7 +216,7 @@
 		<term><citerefentry><refentrytitle>profiles</refentrytitle>
 		<manvolnum>1</manvolnum></citerefentry></term>
 		<listitem><para><command>profiles</command> is a command-line
-		utility that can be used to replace all occurences of 
+		utility that can be used to replace all occurrences of
 		a certain SID with another SID.
 		</para></listitem>
 		</varlistentry>


-- 
Samba Shared Repository