diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-12-03 17:47:39 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-12-03 17:47:39 +1100 |
| commit | a226d86dcec393b2cd657d5441c3041dfdf5cd8f (patch) | |
| tree | 03ef7f3207607a4e5351bf50892b0a39dcf6f219 /docs-xml | |
| parent | 30eff4f31b497ac94d8ee02ee2ec24bc8865ce0d (diff) | |
| parent | 85b8cccab072bab263061654b677bc84826646c9 (diff) | |
| download | samba-a226d86dcec393b2cd657d5441c3041dfdf5cd8f.tar.gz samba-a226d86dcec393b2cd657d5441c3041dfdf5cd8f.tar.bz2 samba-a226d86dcec393b2cd657d5441c3041dfdf5cd8f.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'docs-xml')
| -rw-r--r-- | docs-xml/manpages-3/net.8.xml | 2 | ||||
| -rw-r--r-- | docs-xml/manpages-3/wbinfo.1.xml | 27 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/security/writeable.xml | 2 |
3 files changed, 30 insertions, 1 deletions
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 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; 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> |