summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/manpages-3/smbmount.8.xml2
-rw-r--r--docs/smbdotconf/base/displaycharset.xml10
-rw-r--r--docs/smbdotconf/browse/oslevel.xml9
-rw-r--r--docs/smbdotconf/vfs/msdfsproxy.xml2
4 files changed, 13 insertions, 10 deletions
diff --git a/docs/manpages-3/smbmount.8.xml b/docs/manpages-3/smbmount.8.xml
index db30f423ba..e5ecac7d8d 100644
--- a/docs/manpages-3/smbmount.8.xml
+++ b/docs/manpages-3/smbmount.8.xml
@@ -70,7 +70,7 @@
<listitem><para>
specifies the SMB password. If this option is not given then the environment
variable <literal>PASSWD</literal> is used. If it can find no password
- <command>smbmount</command> will prompt for a passeword, unless the guest option is given.
+ <command>smbmount</command> will prompt for a password, unless the guest option is given.
</para>
<para>
diff --git a/docs/smbdotconf/base/displaycharset.xml b/docs/smbdotconf/base/displaycharset.xml
index 6ee4311965..5bace5b6b0 100644
--- a/docs/smbdotconf/base/displaycharset.xml
+++ b/docs/smbdotconf/base/displaycharset.xml
@@ -4,10 +4,12 @@
advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
- <para>Specifies the charset that samba will use
- to print messages to stdout and stderr and SWAT will use.
- Should generally be the same as the <smbconfoption name="unix charset"/>.
-</para>
+ <para>
+ Specifies the charset that samba will use to print messages to stdout and stderr.
+ The default value is "LOCALE", which means automatically set, depending on the
+ current locale. The value should generally be the same as the value of the parameter
+ <smbconfoption name="unix charset"/>.
+ </para>
</description>
<value type="default">"LOCALE" or "ASCII" (depending on the system)</value>
diff --git a/docs/smbdotconf/browse/oslevel.xml b/docs/smbdotconf/browse/oslevel.xml
index 74dc7654a2..b147996cd8 100644
--- a/docs/smbdotconf/browse/oslevel.xml
+++ b/docs/smbdotconf/browse/oslevel.xml
@@ -4,11 +4,12 @@
basic="1" advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
- <para>This integer value controls what level Samba
- advertises itself as for browse elections. The value of this
+ <para>
+ This integer value controls what level Samba advertises itself as for browse elections. The value of this
parameter determines whether <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>
-has a chance of becoming a local master browser for the <smbconfoption name="workgroup"/> in the local broadcast area.</para>
+ <manvolnum>8</manvolnum></citerefentry> has a chance of becoming a local master browser for the <smbconfoption
+ name="workgroup"/> in the local broadcast area.
+</para>
<para><emphasis>
Note :</emphasis>By default, Samba will win a local master browsing election over all Microsoft operating
diff --git a/docs/smbdotconf/vfs/msdfsproxy.xml b/docs/smbdotconf/vfs/msdfsproxy.xml
index 5117bae224..bec685cbca 100644
--- a/docs/smbdotconf/vfs/msdfsproxy.xml
+++ b/docs/smbdotconf/vfs/msdfsproxy.xml
@@ -14,5 +14,5 @@
options to find out how to set up a Dfs root share.</para>
</description>
-<value type="example">\otherserver\someshare</value>
+<value type="example">\\otherserver\someshare</value>
</samba:parameter>