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

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  73df1d5... docs: fix xml tag in the pdbedit manpage
       via  2812d75... s3-docs: mention -K option in pdbedit manpage.
      from  d1f6739... Fix bug #7036 - net rpc getsid fails in hardened windows environments.

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


- Log -----------------------------------------------------------------
commit 73df1d5e6a6eb09df5392656bd9ad5b94a3933a2
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jan 12 12:29:14 2010 +0100

    docs: fix xml tag in the pdbedit manpage
    
    Michael
    (cherry picked from commit 3b58b2ac39a91c0c9f074abf079f700c7e886841)
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    
    Fix bug #7041.

commit 2812d7547b87d60509a30e2955acc78084ed7466
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 8 10:38:46 2010 +0100

    s3-docs: mention -K option in pdbedit manpage.
    
    Guenther
    (cherry picked from commit 9bdd3d6c1b1aec536d87fb2e2d4e8495b3c88ee6)
    
    Signed-off-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 docs-xml/manpages-3/pdbedit.8.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/pdbedit.8.xml b/docs-xml/manpages-3/pdbedit.8.xml
index eaafb97..d139ff5 100644
--- a/docs-xml/manpages-3/pdbedit.8.xml
+++ b/docs-xml/manpages-3/pdbedit.8.xml
@@ -32,6 +32,7 @@
 		<arg choice="opt">-h homedir</arg>
 		<arg choice="opt">-i passdb-backend</arg>
 		<arg choice="opt">-I domain</arg>
+		<arg choice="opt">-K</arg>
 		<arg choice="opt">-L </arg>
 		<arg choice="opt">-m</arg>
 		<arg choice="opt">-M SID|RID</arg>


-- 
Samba Shared Repository