[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Tue Nov 19 04:06:04 MST 2013
The branch, master has been updated
via 19d1a7a docs: document remaining undocumented options in net manpage.
via 49ab592 docs: add net registry import specific options in net manpage.
via 5726967 docs: add net rpc registry check specific options in net manpage.
via cb90d1e docs: add net groupmap set specific options in net manpage.
via e73493c docs: add net rpc share migrate specific options in net manpage.
via f1e03c2 docs: add net idmap specific options in net manpage.
via 7c8dcc5 docs: add net rpc vampire specific options in net manpage.
via 0b24a42 docs: mention more options in net manpage.
via 0815f11 docs: use popt.autohelp entity in samba.8 manpage.
via b649d63 docs: use popt.autohelp entity in smbd manpage.
via 25eace3 docs: use popt.autohelp entity in winbindd manpage.
via b04375e docs: use popt.autohelp entity in nmbd manpage.
via 177c2c9 docs: fix ntlm_auth manpage.
via 91d2530 docs: fix smbcontrol manpage.
via a0d8cb8 docs: use &popt.autohelp entity in pdbedit manpage.
via 0674ef7 docs: fix testparm manpage.
via f9cdbfb docs: use popt.autohelp entity in dbwrap-tools manpage.
via db62a58 docs: document all long option names in nmblookup manpage.
via fb051ee docs: remove unsupported -h option and use popt.autohelp entity in rpcclient manpage.
via 94b26e6 docs: mention --sddl and --domain-sid in smbcacls manpage.
via c7a4fea docs: mention --query-security-info|--set-security-info in smbcacls manpage.
via 019deb1 docs: remove duplicate -e option from smbcacls manpage.
via 559073e docs: use popt.autohelp entity in smbcacls manpage.
via 26da51a docs: remove unsupported -h option from smbcacls manpage.
via a2899b1 docs: use popt.autohelp and remove duplicate -e option from smbclient manpage.
via 5cab201 docs: better document -e|--encrypt option globally.
via 0a7eff9 docs: mention -B|--browse to smbclient manpage.
via 51fa780 docs: mention more long option names in smbcquotas manpage.
via def43ad docs: mention --update and --encrypt in smbget manpage.
via 1e4fb44 docs: use popt.autohelp in smbtree manpage.
via ca6776d docs: use popt.samba.common entity in profiles manpage.
via c71fd4a docs: mention --change-sid|--new-sid in profiles manpage.
via deacd68 docs: add new popt.autohelp entity.
via 743e9a8 docs: remove more duplicate options from samba-regedit manpage.
via 23516cf docs: add missing &popt.common.connection entity to smbcacls manpage.
via 8a4d846 docs: add missing &popt.common.samba entity to smbcontrol manpage.
via 7173604 docs: remove now duplicate mention for 4 credential options in samba-regedit manpage.
via 22fcc53 docs: bring samba entity popt.common.credentials in line with popt_common_credentials.
via ffe94e3 docs: mention -p in dbwrap-tool manpage.
via d692389 docs: mention -V|--viewsddl in sharesec manpage.
via 9dcbc77 docs: mention -S|--setsddl in sharesec manpage.
via 5f606e7 docs: mention -R|--profile-rates in smbstatus manpage.
via 7c473ac docs: mention --numeric in smbstatus manpage.
via ad46b66 docs: mention many more options in smbd options.
via 792ff00 docs: remove unsupported options from smbd manpage.
via d6a0771 docs: mention --port in nmbd manpage.
via 548d9da docs: mention --no-process-group in nmbd manpage.
via a624426 docs: mention --log-stdout in nmbd manpage.
via ea99d8a docs: mention --interactive in nmbd manpage.
via fd8d8b9 docs: mention --hosts in nmbd manpage.
via 28758de docs: mention --foreground in nmbd manpage.
via 77eae60 docs: mention --daemon in nmbd manpage.
via dac7817 docs: remove unsupported options from nmbd manpage.
via c55315a docs: mention --sids-to-unix-ids in wbinfo manpage.
via 87e6b5b docs: mention --sequence in wbinfo manpage.
via 80ab6ea docs: mention --set-gid-mapping/--set-uid-mapping in wbinfo manpage.
via 27d49ba docs: mention --remove-gid-mapping/--remove-uid-mapping in wbinfo manpage.
via 7d41f1c docs: mention --pam-logon in wbinfo manpage.
via 7c4c668 docs: mention --lookup-sids in wbinfo manpage.
via fa47e42 docs: mention logoff options in wbinfo manpage.
via 824c468 docs: mention --krb5ccname option in wbinfo manpage.
via 4f790b1 docs: mention --dc-info in wbinfo manpage.
via b5fa113 docs: mention --no-process-group in winbindd manpage.
via 05db55a docs: mention more options in winbindd manpage.
via 93f32c7 docs: remove duplicate word "the" from net manpage.
via a2a7991 docs: remove duplicate word "trust" from net manpage.
via 56cff0b docs: remove duplicate mention of "smbta-util" in smbta-util manpage.
via e003650 docs: remove duplicate mention of "ntdbtool" in ntdbtool manpage.
via 6a0b75f docs: remove duplicate mention of "smbtorture" in smbtorture manpage.
via d33ca79 docs: remove duplicate word "the" in winbindd manpage.
via e320d57 docs: remove duplicate arguments listing in regdiff manpage.
via 4112eb0 docs: remove duplicate word "name" in nmblookup4 manpage.
via f17f61a docs: remove duplicate word "name" in nmblookup manpage.
via 16a873b docs: remove duplicate word "the" in idmap_ad manpage.
from 2bb0954 torture3: Use tevent_req_nterror properly
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 19d1a7abcf5ceaf2577952b90ca77eb776bc95d2
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 17:26:28 2013 +0100
docs: document remaining undocumented options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Tue Nov 19 12:05:56 CET 2013 on sn-devel-104
commit 49ab592097a235d31355bf4e58d2957ee56c5a3c
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 17:15:57 2013 +0100
docs: add net registry import specific options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 57269672d1b52c5a1318619f5b6ccdfb757c161f
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 17:11:31 2013 +0100
docs: add net rpc registry check specific options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit cb90d1eb8f1ea0fd23f7af4aa1a21447d4772a1e
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 16:28:10 2013 +0100
docs: add net groupmap set specific options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit e73493c64af9f76fa41b56c154ea973619e97cb0
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 16:22:52 2013 +0100
docs: add net rpc share migrate specific options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit f1e03c2bc1bb34d1918b232035c25cc9e0e6811d
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 16:17:32 2013 +0100
docs: add net idmap specific options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 7c8dcc5e0f61577becf1954b6abfb72e4689eab2
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 16:08:19 2013 +0100
docs: add net rpc vampire specific options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 0b24a4236c2b865a0cf318fcabb3ce64b93d9409
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 16:00:39 2013 +0100
docs: mention more options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 0815f114fbe99144061dc1c8c326fb0ee71f4a76
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 15:53:49 2013 +0100
docs: use popt.autohelp entity in samba.8 manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit b649d631793bdd83ff1f3935a45f1617c1a4c3e8
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 15:53:29 2013 +0100
docs: use popt.autohelp entity in smbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 25eace39266edcac85c7d65a68dfbb632453b6f6
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 15:53:08 2013 +0100
docs: use popt.autohelp entity in winbindd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit b04375e725edfd419fa65c96d524b9fb351d5efc
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 15:52:35 2013 +0100
docs: use popt.autohelp entity in nmbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 177c2c9c0ffe1ee434afc9d22d4bba12ae55d312
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 14:45:51 2013 +0100
docs: fix ntlm_auth manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 91d25302b92e01fdba3fa4bc22fea9a8381ae19e
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 13:52:59 2013 +0100
docs: fix smbcontrol manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit a0d8cb8f536620a6dbf1fab0093c715c9efaba65
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 13:46:06 2013 +0100
docs: use &popt.autohelp entity in pdbedit manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 0674ef7c5b3551564894ee7b8810ee3c18857922
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 13:45:38 2013 +0100
docs: fix testparm manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit f9cdbfb27325d4e84d866fdee2a7bc729c25e24e
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:55:02 2013 +0100
docs: use popt.autohelp entity in dbwrap-tools manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit db62a5841a4892dc2d45ff027cac346c0e67c5aa
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:51:42 2013 +0100
docs: document all long option names in nmblookup manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit fb051ee29a55c6d72739bc895f05add50f2054d5
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:39:00 2013 +0100
docs: remove unsupported -h option and use popt.autohelp entity in rpcclient manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 94b26e6d7b22396ad220ddd1ed359376fc151458
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:35:16 2013 +0100
docs: mention --sddl and --domain-sid in smbcacls manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit c7a4feaaf1236dce8de546b5019058efba047e31
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:25:12 2013 +0100
docs: mention --query-security-info|--set-security-info in smbcacls manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 019deb1e1acedb6ec522baad85592c17f2f78268
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:21:24 2013 +0100
docs: remove duplicate -e option from smbcacls manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 559073e711cad5f895707385cc355440e21513d5
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:18:34 2013 +0100
docs: use popt.autohelp entity in smbcacls manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 26da51a94ea329aa78e2d69fc8190954e61e0b26
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:17:36 2013 +0100
docs: remove unsupported -h option from smbcacls manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit a2899b157f6096fd48e0c9a16a8cb7c848736ea4
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:16:00 2013 +0100
docs: use popt.autohelp and remove duplicate -e option from smbclient manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 5cab201a16663e9d91e4501124d6aeeaaa71e189
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:12:23 2013 +0100
docs: better document -e|--encrypt option globally.
This is taken from smbclient manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 0a7eff9cd77516368a1b1b7578bed64c3768b0da
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:10:29 2013 +0100
docs: mention -B|--browse to smbclient manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 51fa7800d3b9f84b962d396270391a8cfd4d5a84
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 11:59:54 2013 +0100
docs: mention more long option names in smbcquotas manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit def43ad250168790fe3db868c0f688ff04f0fefa
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 11:51:55 2013 +0100
docs: mention --update and --encrypt in smbget manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 1e4fb44c97eddb28aad903ddbfe0f05229f5802e
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 11:44:28 2013 +0100
docs: use popt.autohelp in smbtree manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit ca6776d341a5e98b30a9c544c91e89ad062291b3
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 11:41:00 2013 +0100
docs: use popt.samba.common entity in profiles manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit c71fd4a9f49bf5cf2cef7874789e95b0603bbaa4
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 11:40:35 2013 +0100
docs: mention --change-sid|--new-sid in profiles manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit deacd68cce662d0780eaa255fd51fc4f5f5ee629
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 16:57:52 2013 +0100
docs: add new popt.autohelp entity.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 743e9a847e1014e2722c650f94d99fa277d7fa9a
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 16:40:36 2013 +0100
docs: remove more duplicate options from samba-regedit manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 23516cfbdde6d38fc710fd3a47fdc155e657dc47
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 16:08:10 2013 +0100
docs: add missing &popt.common.connection entity to smbcacls manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 8a4d846f1dca6ecbc7d9411f3e26d79a8622e5c4
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 16:07:41 2013 +0100
docs: add missing &popt.common.samba entity to smbcontrol manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 7173604e9e20ee4826622f8f1dd3e3194ee3588f
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 16:06:36 2013 +0100
docs: remove now duplicate mention for 4 credential options in samba-regedit manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 22fcc536a568283b0d2c8b1772399fef7bc63406
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 15:15:41 2013 +0100
docs: bring samba entity popt.common.credentials in line with popt_common_credentials.
This adds documentation of the following parameters to all manpages of binaries that
actually use popt_common_credentials:
-S|--signing
-e|--encrypt
-P|--machinepass
--pw-nt-hash
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit ffe94e363375aa47cd72d715309f6568067482fe
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 13:03:20 2013 +0100
docs: mention -p in dbwrap-tool manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit d692389ea57724bd71caadb62e0231993188d34f
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 12:59:49 2013 +0100
docs: mention -V|--viewsddl in sharesec manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 9dcbc77f5a79d148a7346c361ad2790ab8a40555
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 12:57:06 2013 +0100
docs: mention -S|--setsddl in sharesec manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 5f606e7e9ccd11949ae78a0a44f47be578116f89
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 12:11:21 2013 +0100
docs: mention -R|--profile-rates in smbstatus manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 7c473ac293a44896181d9d2619b922815433c77d
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 12:07:48 2013 +0100
docs: mention --numeric in smbstatus manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit ad46b6689d999651732894968e5e49d045591203
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:49:58 2013 +0100
docs: mention many more options in smbd options.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 792ff0029c790fe8b225134b19d320e8392c5895
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:37:05 2013 +0100
docs: remove unsupported options from smbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit d6a07717a7f2febdd4591fc0c3c1fe8b719963e9
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:31:50 2013 +0100
docs: mention --port in nmbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 548d9daeffc83191ea1e6ea51ce63aacffe98c41
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:31:10 2013 +0100
docs: mention --no-process-group in nmbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit a624426d86cf2da69ba2e03506b5f252d32adb11
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:29:37 2013 +0100
docs: mention --log-stdout in nmbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit ea99d8a256df7faaedc5b8903fe183f4dcbde296
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:28:15 2013 +0100
docs: mention --interactive in nmbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit fd8d8b95f8b5b21b4e46836dc6becef480737dc2
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:27:28 2013 +0100
docs: mention --hosts in nmbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 28758deda94f28bd0bd188f8277807b8d2ccf829
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:25:52 2013 +0100
docs: mention --foreground in nmbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 77eae60bd9a6b7e1d5248b5b0984d38a54de9c3e
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:25:04 2013 +0100
docs: mention --daemon in nmbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit dac78176f3e28a1cbc513bb77a3454570f7de4e1
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:23:23 2013 +0100
docs: remove unsupported options from nmbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit c55315a3a26ced194e553b5aa8e97f3a41a308ca
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:18:40 2013 +0100
docs: mention --sids-to-unix-ids in wbinfo manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 87e6b5b7fb22c8cf26ae00a315b3e73987f49d55
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:13:38 2013 +0100
docs: mention --sequence in wbinfo manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 80ab6eaa973df8874567306d1488a813801ab39c
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 16:42:56 2013 +0100
docs: mention --set-gid-mapping/--set-uid-mapping in wbinfo manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 27d49babb19759e0d3ef93a2290c049e1ba6aaa3
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 16:40:56 2013 +0100
docs: mention --remove-gid-mapping/--remove-uid-mapping in wbinfo manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 7d41f1c4d30eef9fa20a7741be1cb50e566b40cb
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 16:36:21 2013 +0100
docs: mention --pam-logon in wbinfo manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 7c4c66853f4f0fa426d11d01bc4732186501d6ec
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 16:33:19 2013 +0100
docs: mention --lookup-sids in wbinfo manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit fa47e425132f6022cd41118e2c6ac34181adc4a6
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 16:29:10 2013 +0100
docs: mention logoff options in wbinfo manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 824c468261a3d61732fea88a5d6cfb9aa5c7ed94
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 16:23:20 2013 +0100
docs: mention --krb5ccname option in wbinfo manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 4f790b10d5a6737f1b5978fca27d78a0b27aa75d
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 16:23:03 2013 +0100
docs: mention --dc-info in wbinfo manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit b5fa1139a4e9ef7bd79ace6efe7bf06af595daa4
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 15:19:59 2013 +0100
docs: mention --no-process-group in winbindd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 05db55af943e50bd8f7b29f8210f32350239ea59
Author: Günther Deschner <gd at samba.org>
Date: Tue Oct 15 15:11:33 2013 +0200
docs: mention more options in winbindd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 93f32c777c1a36d9d4dc91b6aa1e9e14ee13fb91
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 18:03:14 2013 +0200
docs: remove duplicate word "the" from net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit a2a7991624fa273b01898a26c86f951b928525e6
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 18:02:47 2013 +0200
docs: remove duplicate word "trust" from net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 56cff0b3f40b98c0d00323eb94a2204af6c48fed
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 18:00:02 2013 +0200
docs: remove duplicate mention of "smbta-util" in smbta-util manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit e003650f5cf0b9581da00ad39b0784aab074119b
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 17:59:22 2013 +0200
docs: remove duplicate mention of "ntdbtool" in ntdbtool manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 6a0b75f901052234f35d4ba596754e7714af7e87
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 17:58:45 2013 +0200
docs: remove duplicate mention of "smbtorture" in smbtorture manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit d33ca796071a2a6f8bf65d6eed2fe159a75de8c5
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 17:55:03 2013 +0200
docs: remove duplicate word "the" in winbindd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit e320d57ed6a4d732980656eb01a5f777357f9715
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 17:50:28 2013 +0200
docs: remove duplicate arguments listing in regdiff manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 4112eb0529780113716c6032561504196be8235f
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 17:45:21 2013 +0200
docs: remove duplicate word "name" in nmblookup4 manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit f17f61a4c0d5c13a273eae0b72521e464b1d3d8f
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 17:44:12 2013 +0200
docs: remove duplicate word "name" in nmblookup manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 16a873bf7c5c3d236e4bc107953dc6f3159764a2
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 17:42:06 2013 +0200
docs: remove duplicate word "the" in idmap_ad manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/build/DTD/samba.entities | 64 +++++++-
docs-xml/manpages/dbwrap_tool.1.xml | 6 +-
docs-xml/manpages/idmap_ad.8.xml | 2 +-
docs-xml/manpages/net.8.xml | 278 +++++++++++++++++++++++++++++---
docs-xml/manpages/nmbd.8.xml | 36 +++--
docs-xml/manpages/nmblookup.1.xml | 43 +++---
docs-xml/manpages/ntlm_auth.1.xml | 42 ++++-
docs-xml/manpages/pdbedit.8.xml | 2 +-
docs-xml/manpages/profiles.1.xml | 10 +-
docs-xml/manpages/rpcclient.1.xml | 3 +-
docs-xml/manpages/samba-regedit.8.xml | 27 +---
docs-xml/manpages/samba.8.xml | 2 +-
docs-xml/manpages/sharesec.1.xml | 18 ++-
docs-xml/manpages/smbcacls.1.xml | 46 ++++--
docs-xml/manpages/smbclient.1.xml | 18 +--
docs-xml/manpages/smbcontrol.1.xml | 14 +-
docs-xml/manpages/smbcquotas.1.xml | 32 ++--
docs-xml/manpages/smbd.8.xml | 33 +++--
docs-xml/manpages/smbget.1.xml | 9 +
docs-xml/manpages/smbstatus.1.xml | 20 ++-
docs-xml/manpages/smbta-util.8.xml | 4 -
docs-xml/manpages/smbtree.1.xml | 2 +-
docs-xml/manpages/testparm.1.xml | 38 +++--
docs-xml/manpages/wbinfo.1.xml | 97 +++++++++++
docs-xml/manpages/winbindd.8.xml | 31 +++--
lib/ntdb/man/ntdbtool.8.xml | 4 -
libcli/nbt/man/nmblookup4.1.xml | 2 +-
source4/lib/registry/man/regdiff.1.xml | 3 -
source4/torture/man/smbtorture.1.xml | 4 -
29 files changed, 672 insertions(+), 218 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities
index c9c6744..1e852ec 100644
--- a/docs-xml/build/DTD/samba.entities
+++ b/docs-xml/build/DTD/samba.entities
@@ -464,13 +464,44 @@ Try to use the credentials cached by winbind.
</varlistentry>
'>
+<!ENTITY stdarg.signing '
+<varlistentry>
+<term>-S|--signing on|off|required</term>
+<listitem><para>Set the client signing state.
+</para></listitem>
+</varlistentry>
+'>
-<!ENTITY stdarg.help '
+<!ENTITY stdarg.machinepass '
<varlistentry>
-<term>-?|--help</term>
-<listitem><para>Print a summary of command line options.
+<term>-P|--machine-pass</term>
+<listitem><para>Use stored machine account password.
</para></listitem>
-</varlistentry>'>
+</varlistentry>
+'>
+
+<!ENTITY stdarg.encrypt '
+<varlistentry>
+<term>-e|--encrypt</term>
+<listitem><para>
+This command line parameter requires the remote
+server support the UNIX extensions or that the SMB3 protocol has been selected.
+Requests that the connection be encrypted. Negotiates SMB encryption using either
+SMB3 or POSIX extensions via GSSAPI. Uses the given credentials for
+the encryption negotiation (either kerberos or NTLMv1/v2 if given
+domain/username/password triple. Fails the connection if encryption
+cannot be negotiated.
+</para></listitem>
+</varlistentry>
+'>
+
+<!ENTITY stdarg.pwnthash '
+<varlistentry>
+<term>--pw-nt-hash</term>
+<listitem><para>The supplied password is the NT hash.
+</para></listitem>
+</varlistentry>
+'>
<!ENTITY popt.common.credentials '
&stdarg.nopass;
@@ -478,6 +509,31 @@ Try to use the credentials cached by winbind.
&stdarg.useccache;
&stdarg.authfile;
&stdarg.username;
+&stdarg.signing;
+&stdarg.machinepass;
+&stdarg.encrypt;
+&stdarg.pwnthash;
+'>
+
+<!ENTITY stdarg.help '
+<varlistentry>
+<term>-?|--help</term>
+<listitem><para>Print a summary of command line options.
+</para></listitem>
+</varlistentry>
+'>
+
+<!ENTITY stdarg.usage '
+<varlistentry>
+<term>--usage</term>
+<listitem><para>Display brief usage message.
+</para></listitem>
+</varlistentry>
+'>
+
+<!ENTITY popt.autohelp '
+&stdarg.help;
+&stdarg.usage;
'>
<!-- Entities for the various programs -->
diff --git a/docs-xml/manpages/dbwrap_tool.1.xml b/docs-xml/manpages/dbwrap_tool.1.xml
index 07d42be..8e979f6 100644
--- a/docs-xml/manpages/dbwrap_tool.1.xml
+++ b/docs-xml/manpages/dbwrap_tool.1.xml
@@ -19,7 +19,7 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>dbwrap_tool</command>
- <arg choice="opt">--persistent</arg>
+ <arg choice="opt">-p|--persistent</arg>
<arg choice="opt">-d <debug level></arg>
<arg choice="opt">-s <config file></arg>
<arg choice="opt">-l <log file base></arg>
@@ -70,14 +70,14 @@
<variablelist>
<varlistentry>
- <term>--persistent</term>
+ <term>-p|--persistent</term>
<listitem><para>Open the database as a persistent database.
If this option is not specified, the database is opened as
non-persistent.
</para></listitem>
</varlistentry>
&popt.common.samba.client;
- &stdarg.help;
+ &popt.autohelp;
</variablelist>
</refsect1>
diff --git a/docs-xml/manpages/idmap_ad.8.xml b/docs-xml/manpages/idmap_ad.8.xml
index 2ae490b..56378c1 100644
--- a/docs-xml/manpages/idmap_ad.8.xml
+++ b/docs-xml/manpages/idmap_ad.8.xml
@@ -31,7 +31,7 @@
<para>
Currently, the <parameter>ad</parameter> backend
- does not work as the the default idmap backend, but one has
+ does not work as the default idmap backend, but one has
to configure it separately for each domain for which one wants
to use it, using disjoint ranges. One usually needs to configure
a writeable default idmap range, using for example the
diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml
index 2f04deb..49cab42 100644
--- a/docs-xml/manpages/net.8.xml
+++ b/docs-xml/manpages/net.8.xml
@@ -22,20 +22,25 @@
<cmdsynopsis>
<command>net</command>
<arg choice="req"><ads|rap|rpc></arg>
- <arg choice="opt">-h</arg>
- <arg choice="opt">-w workgroup</arg>
- <arg choice="opt">-W myworkgroup</arg>
- <arg choice="opt">-U user</arg>
- <arg choice="opt">-I ip-address</arg>
- <arg choice="opt">-p port</arg>
+ <arg choice="opt">-h|--help</arg>
+ <arg choice="opt">-w|--workgroup workgroup</arg>
+ <arg choice="opt">-W|--myworkgroup myworkgroup</arg>
+ <arg choice="opt">-U|--user user</arg>
+ <arg choice="opt">-I|--ipaddress ip-address</arg>
+ <arg choice="opt">-p|--port port</arg>
<arg choice="opt">-n myname</arg>
<arg choice="opt">-s conffile</arg>
- <arg choice="opt">-S server</arg>
- <arg choice="opt">-l</arg>
- <arg choice="opt">-P</arg>
+ <arg choice="opt">-S|--server server</arg>
+ <arg choice="opt">-l|--long</arg>
+ <arg choice="opt">-v|--verbose</arg>
+ <arg choice="opt">-f|--force</arg>
+ <arg choice="opt">-P|--machine-pass</arg>
<arg choice="opt">-d debuglevel</arg>
<arg choice="opt">-V</arg>
<arg choice="opt">--request-timeout seconds</arg>
+ <arg choice="opt">-t|--timeout seconds</arg>
+ <arg choice="opt">-i|--stdin</arg>
+ <arg choice="opt">--tallocreport</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -64,7 +69,7 @@
&stdarg.kerberos;
<varlistentry>
- <term>-w target-workgroup</term>
+ <term>-w|--workgroup target-workgroup</term>
<listitem><para>
Sets target workgroup or domain. You have to specify
either this option or the IP address or the name of a server.
@@ -72,21 +77,21 @@
</varlistentry>
<varlistentry>
- <term>-W workgroup</term>
+ <term>-W|--myworkgroup workgroup</term>
<listitem><para>
Sets client workgroup or domain
</para></listitem>
</varlistentry>
<varlistentry>
- <term>-U user</term>
+ <term>-U|--user user</term>
<listitem><para>
User name to use
</para></listitem>
</varlistentry>
<varlistentry>
- <term>-I ip-address</term>
+ <term>-I|--ipaddress ip-address</term>
<listitem><para>
IP address of target server to use. You have to
specify either this option or a target workgroup or
@@ -95,7 +100,7 @@
</varlistentry>
<varlistentry>
- <term>-p port</term>
+ <term>-p|--port port</term>
<listitem><para>
Port on the target server to connect to (usually 139 or 445).
Defaults to trying 445 first, then 139.
@@ -106,7 +111,7 @@
&stdarg.configfile;
<varlistentry>
- <term>-S server</term>
+ <term>-S|--server server</term>
<listitem><para>
Name of target server. You should specify either
this option or a target workgroup or a target IP address.
@@ -114,14 +119,28 @@
</varlistentry>
<varlistentry>
- <term>-l</term>
+ <term>-l|--long</term>
<listitem><para>
When listing data, give more information on each item.
</para></listitem>
</varlistentry>
<varlistentry>
- <term>-P</term>
+ <term>-v|--verbose</term>
+ <listitem><para>
+ When listing data, give more verbose information on each item.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-f|--force</term>
+ <listitem><para>
+ Enforcing a net command.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-P|--machine-pass</term>
<listitem><para>
Make queries to the external server using the machine account of the local server.
</para></listitem>
@@ -135,7 +154,226 @@
</para></listitem>
</varlistentry>
- &stdarg.server.debug;
+ <varlistentry>
+ <term>-t|--timeout 30</term>
+ <listitem><para>
+ Set timeout for client operations to 30 seconds.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--use-ccache</term>
+ <listitem><para>
+ Try to use the credentials cached by winbind.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-i|--stdin</term>
+ <listitem><para>
+ Take input for net commands from standard input.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--tallocreport</term>
+ <listitem><para>
+ Generate a talloc report while processing a net
+ command.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-T|--test</term>
+ <listitem><para>Only test command sequence, dry-run.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-F|--flags FLAGS</term>
+ <listitem><para>Pass down integer flags to a net subcommand.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-C|--comment COMMENT</term>
+ <listitem><para>Pass down a comment string to a net subcommand.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-n|--myname MYNAME</term>
+ <listitem><para>Use MYNAME as a requester name for a net subcommand.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-c|--container CONTAINER</term>
+ <listitem><para>Use a specific AD container for net ads operations.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-M|--maxusers MAXUSERS</term>
+ <listitem><para>Fill in the maxusers field in net rpc share operations.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-r|--reboot</term>
+ <listitem><para>Reboot a remote machine after a command has been successfully executed (e.g. in remote join operations).
+ </para></listitem>
+ </varlistentry>
+
+ <!-- Options for net rpc vampire -->
+
+ <varlistentry>
+ <term>--force-full-repl</term>
+ <listitem><para>
+ When calling "net rpc vampire keytab" this option
+ enforces a full re-creation of the generated keytab file.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--single-obj-repl</term>
+ <listitem><para>
+ When calling "net rpc vampire keytab" this option
+ allows to replicate just a single object to the generated keytab file.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--clean-old-entries</term>
+ <listitem><para>
+ When calling "net rpc vampire keytab" this option
+ allows to cleanup old entries from the generated keytab file.
+ </para></listitem>
+ </varlistentry>
+
+ <!-- Options for net idmap -->
+
+ <varlistentry>
+ <term>--db</term>
+ <listitem><para>Define dbfile for "net idmap" commands.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--lock</term>
+ <listitem><para>Activates locking of the dbfile for "net idmap check" command.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-a|--auto</term>
+ <listitem><para>Activates noninteractive mode in "net idmap check".
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--repair</term>
+ <listitem><para>Activates repair mode in "net idmap check".
+ </para></listitem>
+ </varlistentry>
+
+ <!-- Options for net rpc share migrate -->
+
+ <varlistentry>
+ <term>--acls</term>
+ <listitem><para>Includes ACLs to be copied in "net rpc share migrate".
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--attrs</term>
+ <listitem><para>Includes file attributes to be copied in "net rpc share migrate".
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--timestamps</term>
+ <listitem><para>Includes timestamps to be copied in "net rpc share migrate".
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-X|--exclude DIRECTORY</term>
+ <listitem><para>Allows to exclude directories when copying with "net rpc share migrate".
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--destination SERVERNAME</term>
+ <listitem><para>Defines the target servername of migration process (defaults to localhost).
+ </para></listitem>
+ </varlistentry>
+
+ <!-- Options for net groupmap set -->
+
+ <varlistentry>
+ <term>-L|--local</term>
+ <listitem><para>Sets the type of group mapping to local
+ (used in "net groupmap set").
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-D|--domain</term>
+ <listitem><para>Sets the type of group mapping to domain
+ (used in "net groupmap set").
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-N|--ntname NTNAME</term>
+ <listitem><para>Sets the ntname of a group mapping
+ (used in "net groupmap set").
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-R|--rid RID</term>
+ <listitem><para>Sets the rid of a group mapping
+ (used in "net groupmap set").
+ </para></listitem>
+ </varlistentry>
+
+ <!-- Options for net registry check -->
+
+ <varlistentry>
+ <term>--reg-version REG_VERSION</term>
+ <listitem><para>Assume database version {n|1,2,3}
+ (used in "net registry check").
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-o|--output FILENAME</term>
+ <listitem><para>Output database file
+ (used in "net registry check").
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--wipe</term>
+ <listitem><para>Createa a new database from scratch
+ (used in "net registry check").
+ </para></listitem>
+ </varlistentry>
+
+ <!-- Options for net registry import -->
+
+ <varlistentry>
+ <term>--precheck PRECHECK_DB_FILENAME</term>
+ <listitem><para>Defines filename for database prechecking
+ (used in "net registry import").
+ </para></listitem>
+ </varlistentry>
+
+ &stdarg.encrypt;
+ &popt.common.samba.client;
+
</variablelist>
</refsect1>
@@ -877,7 +1115,7 @@ net rpc trust create \
<refsect3>
<title>RPC TRUST DELETE</title>
-<para>Delete a trust trust object by calling lsaDeleteTrustedDomain.
+<para>Delete a trust object by calling lsaDeleteTrustedDomain.
The can be done on a single server or on two servers at once.</para>
<variablelist><title>Options:</title>
@@ -1737,7 +1975,7 @@ shares created by other users.
<para>Starting with version 3.2.0, a Samba server can be configured by data
stored in registry. This configuration data can be edited with the new "net
conf" commands. There is also the possibility to configure a remote Samba server
-by enabling the RPC conf mode and specifying the the address of the remote server.
+by enabling the RPC conf mode and specifying the address of the remote server.
</para>
<para>
diff --git a/docs-xml/manpages/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml
index f1ab3e3..d83fb8f 100644
--- a/docs-xml/manpages/nmbd.8.xml
+++ b/docs-xml/manpages/nmbd.8.xml
--
Samba Shared Repository
More information about the samba-cvs
mailing list