From 5e5ccab372035a4e46e83775f40fca1ae5542ada Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Mon, 17 Nov 2008 08:37:21 +0100
Subject: net: Fix net rap printq info documentation (bug #5892)

Carsten Dumke <carsten@cdumke.de> reported and provided a patch
for v3.0 and v3.2. (See 0a7fb721cdc)

This fixes the same issue in v3.3 and also changes the auto-generated usage
information to give better help about net rap printq info.
---
 docs-xml/manpages-3/net.8.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs-xml')

diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index 31fe69d8d3..75f85e1c55 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -395,7 +395,7 @@ current network.</para>
 <title>RAP PRINTQ</title>
 
 <refsect3>
-<title>RAP PRINTQ LIST <replaceable>QUEUE_NAME</replaceable></title>
+<title>RAP PRINTQ INFO <replaceable>QUEUE_NAME</replaceable></title>
 
 <para>Lists the specified print queue and print jobs on the server.
 If the <replaceable>QUEUE_NAME</replaceable> is omitted, all 
-- 
cgit 


From 6216e5cbd7da928cfbfd501393fbe91ac72bbd3f Mon Sep 17 00:00:00 2001
From: Karolin Seeger <kseeger@samba.org>
Date: Wed, 19 Nov 2008 13:08:41 +0100
Subject: manpages: Document new wbinfo idmapping options.

--set-uid/gid-mapping
--remove-uid/gid-mapping

Karolin
(cherry picked from commit c9965d544f615fea1ba3609d7348407130ab1ec9)
---
 docs-xml/manpages-3/wbinfo.1.xml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'docs-xml')

diff --git a/docs-xml/manpages-3/wbinfo.1.xml b/docs-xml/manpages-3/wbinfo.1.xml
index 72a2380dde..abb1c7f53f 100644
--- a/docs-xml/manpages-3/wbinfo.1.xml
+++ b/docs-xml/manpages-3/wbinfo.1.xml
@@ -39,10 +39,14 @@
 		<arg choice="opt">--own-domain</arg>
 		<arg choice="opt">-p</arg>
 		<arg choice="opt">-r user</arg>
+		<arg choice="opt">--remove-uid-mapping uid,sid</arg>
+		<arg choice="opt">--remove-gid-mapping gid,sid</arg>
 		<arg choice="opt">-s sid</arg>
 		<arg choice="opt">--separator</arg>
 		<arg choice="opt">--sequence</arg>
 		<arg choice="opt">--set-auth-user user%password</arg>
+		<arg choice="opt">--set-uid-mapping uid,sid</arg>
+		<arg choice="opt">--set-gid-mapping gid,sid</arg>
 		<arg choice="opt">-S sid</arg>
 		<arg choice="opt">-t</arg>
 		<arg choice="opt">-u</arg>
@@ -333,6 +337,29 @@
 		the operation will fail. </para></listitem>
 		</varlistentry>
 
+		<varlistentry>
+		<term>--remove-uid-mapping uid,sid</term>
+		<listitem><para>Remove an existing uid to sid mapping
+		entry from the IDmap backend.</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>--remove-gid-mapping gid,sid</term>
+		<listitem><para>Remove an existing gid to sid
+		mapping entry from the IDmap backend.</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>--set-uid-mapping uid,sid</term>
+		<listitem><para>Create a new or modify an existing uid to sid
+		mapping in the IDmap backend.</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>--set-gid-mapping gid,sid</term>
+		<listitem><para>Create a new or modify an existing gid to sid
+		mapping in the IDmap backend.</para></listitem>
+		</varlistentry>
 
 		&stdarg.version;
 		&stdarg.help;
-- 
cgit 


From c09e04ac83365333605b7b1db3d07ccfd451a667 Mon Sep 17 00:00:00 2001
From: Karolin Seeger <kseeger@samba.org>
Date: Tue, 2 Dec 2008 20:50:02 +0100
Subject: docs: Add default value for "writeable" to man smb.conf.

Karolin
---
 docs-xml/smbdotconf/security/writeable.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs-xml')

diff --git a/docs-xml/smbdotconf/security/writeable.xml b/docs-xml/smbdotconf/security/writeable.xml
index f811c47e5c..99678a9fce 100644
--- a/docs-xml/smbdotconf/security/writeable.xml
+++ b/docs-xml/smbdotconf/security/writeable.xml
@@ -6,4 +6,6 @@
 <description>
     <para>Inverted synonym for <smbconfoption name="read only"/>.</para>
 </description>
+
+<value type="default">no</value>
 </samba:parameter>
-- 
cgit