summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid O'Neill <dmo@samba.org>2000-12-04 16:57:17 +0000
committerDavid O'Neill <dmo@samba.org>2000-12-04 16:57:17 +0000
commit52572000db551de50de3c457c0bcadc3c55488bc (patch)
tree3194a90202c55f17c368ab5080ebe6faf80f1695
parentd7a502f5a8f532367bca51b584fd028957df9197 (diff)
downloadsamba-52572000db551de50de3c457c0bcadc3c55488bc.tar.gz
samba-52572000db551de50de3c457c0bcadc3c55488bc.tar.bz2
samba-52572000db551de50de3c457c0bcadc3c55488bc.zip
Changes from APPLIANCE_HEAD:
- clean up yodl doc for the -U changes, update man and html versions (docs/yodldocs/smbclient.1.yo docs/htmldocs/smbclient.1.html docs/manpages/smbclient.1) (This used to be commit 3483be1d76fe0dae770bdf8ad97bab81645e5fbf)
-rw-r--r--docs/htmldocs/smbclient.1.html1
-rw-r--r--docs/manpages/smbclient.13
-rw-r--r--docs/yodldocs/smbclient.1.yo6
3 files changed, 7 insertions, 3 deletions
diff --git a/docs/htmldocs/smbclient.1.html b/docs/htmldocs/smbclient.1.html
index 69d29ab07c..f0a6ced61b 100644
--- a/docs/htmldocs/smbclient.1.html
+++ b/docs/htmldocs/smbclient.1.html
@@ -228,6 +228,7 @@ user <code>"fred"</code> with password <code>"secret"</code>, you would specify.
<p><br><code>-U fred%secret</code> <br>
<p><br>on the command line. Note that there are no spaces around the percent
symbol.
+<p><br>You can specify a domain name as part of the username by using a username of the form "DOMAIN/user" or "DOMAIN\user".
<p><br>If you specify the password as part of username then the <a href="smbclient.1.html#minusN"><strong>-N</strong></a> option
(suppress password prompt) is assumed.
<p><br>If you specify the password as a parameter <em>AND</em> as part of username
diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index 7f01392f18..260cb58c73 100644
--- a/docs/manpages/smbclient.1
+++ b/docs/manpages/smbclient.1
@@ -259,6 +259,9 @@ to set the environment variable to be \f(CWUSER=username%password\fP so
that a password is not passed on the command line (where it may be
seen by the ps command)\&.
.IP
+You can specify a domain name as part of the username by using a
+username of the form "DOMAIN/user" or "DOMAIN\euser"\&.
+.IP
If the service you are connecting to requires a password, it can be
supplied using the \fB-U\fP option, by appending a percent symbol ("%")
then the password to username\&. For example, to attach to a service as
diff --git a/docs/yodldocs/smbclient.1.yo b/docs/yodldocs/smbclient.1.yo
index 01cc9ee6fc..8b42f281ff 100644
--- a/docs/yodldocs/smbclient.1.yo
+++ b/docs/yodldocs/smbclient.1.yo
@@ -263,14 +263,14 @@ to set the environment variable to be tt(USER=username%password) so
that a password is not passed on the command line (where it may be
seen by the ps command).
+You can specify a domain name as part of the username by using a
+username of the form "DOMAIN/user" or "DOMAIN\user".
+
If the service you are connecting to requires a password, it can be
supplied using the link(bf(-U))(minusU) option, by appending a percent symbol ("%")
then the password to username. For example, to attach to a service as
user tt("fred") with password tt("secret"), you would specify. nl()
-You can specify a domain name as part of the username by using a
-username of the form "DOMAIN/user" or "DOMAIN\user".
-
tt(-U fred%secret) nl()
on the command line. Note that there are no spaces around the percent