5 files changed, 33 insertions, 19 deletions
diff --git a/docs/yodldocs/make_smbcodepage.1.yo b/docs/yodldocs/make_smbcodepage.1.yo
index fbf9c0f3af..16d9cd9957 100644
--- a/docs/yodldocs/make_smbcodepage.1.yo
+++ b/docs/yodldocs/make_smbcodepage.1.yo
@@ -69,6 +69,10 @@ them to email(samba-bugs@samba.anu.edu.au). All codepage files in the
 Samba em(source/codepages) directory are compiled and installed when a
 em('make install') command is issued there.
 
+The client codepage used by the url(bf(smbd))(smbd.8.html) server is
+configured using the url(bf(client code page))(smb.conf.5.html#client
+code page) parameter in the url(bf(smb.conf))(smb.conf.5.html) file.
+
 label(FILES)
 manpagefiles()
 
diff --git a/docs/yodldocs/nmblookup.1.yo b/docs/yodldocs/nmblookup.1.yo
index 22216a518c..20316ad3c6 100644
--- a/docs/yodldocs/nmblookup.1.yo
+++ b/docs/yodldocs/nmblookup.1.yo
@@ -54,8 +54,9 @@ dit(bf(-h)) Print a help (usage) message.
 dit(bf(-B broadcast address)) Send the query to the given broadcast
 address. Without this option the default behavior of nmblookup is to
 send the query to the broadcast address of the primary network
-interface as either auto-detected or defined in the url(bf(smb.conf
-(5)))(smb.conf.5.html) file.
+interface as either auto-detected or defined in the 
+url(bf(interfaces))(smb.conf.5.html#interfaces) parameter of the 
+url(bf(smb.conf (5)))(smb.conf.5.html) file.
 
 dit(bf(-U unicast address)) Do a unicast query to the specified
 address or host tt("unicast address"). This option (along with the
diff --git a/docs/yodldocs/smbclient.1.yo b/docs/yodldocs/smbclient.1.yo
index 07aff0921a..6892132cf8 100644
--- a/docs/yodldocs/smbclient.1.yo
+++ b/docs/yodldocs/smbclient.1.yo
@@ -41,7 +41,7 @@ which may or may not be the same as the IP hostname of the machine
 running the server.
 
 The server name is looked up according to the url(bf(name resolve
-order))(smbclient.1.html#name_resolve_order) parameter in the smb.conf
+order))(smbclient.1.html#name resolve order) parameter in the smb.conf
 file, allowing an administrator to change the order and methods by
 which server names are looked up.
 
@@ -106,12 +106,14 @@ endit()
 
 If this parameter is not set then the name resolver order defined
 in the url(bf(smb.conf))(smb.conf.5.html) file parameter 
-url((bf(name resolve order))(smb.conf.5.html#name resolve order)
+url((bf(name resolve order)))(smb.conf.5.html#name resolve order)
 will be used.
 
 The default order is lmhosts, host, wins, bcast and without this
-parameter or any entry in the url(bf(smb.conf))(smb.conf.5.html) 
-file the name resolution methods will be attempted in this order.
+parameter or any entry in the url(bf("name resolve
+order"))(smb.conf.5.html#name resolve order) parameter of the
+url(bf(smb.conf))(smb.conf.5.html) file the name resolution methods
+will be attempted in this order.
 
 dit(bf(-M NetBIOS name)) This options allows you to send messages,
 using the "WinPopup" protocol, to another computer. Once a connection
@@ -135,8 +137,9 @@ will send the message in the file em(mymessage.txt) to the machine FRED.
 You may also find the bf(-U) and bf(-I) options useful, as they allow
 you to control the FROM and TO parts of the message.
 
-See the message command section of bf(smb.conf (5)) for a description
-of how to handle incoming WinPopup messages in Samba.
+See the url(bf(message command))(smb.conf.5.html#message command)
+parameter in the bf(smb.conf (5)) for a description of how to handle
+incoming WinPopup messages in Samba.
 
 Note: Copy WinPopup into the startup group on your WfWg PCs if you
 want them to always be able to receive messages.
@@ -316,9 +319,10 @@ it() NT1
 
 endit()
 
-dit(bf(-W WORKGROUP)) Override the default workgroup specified in
-smb.conf for this connection. This may be needed to connect to some
-servers.
+dit(bf(-W WORKGROUP)) Override the default workgroup specified in the
+url(bf(workgroup))(smb.conf.5.html#workgroup) parameter of the
+url(bf(smb.conf))(smb.conf.5.html) file for this connection. This may
+be needed to connect to some servers.
 
 label(minusT) dit(bf(-T tar options)) smbclient may be used to create
 bf(tar (1)) compatible backups of all the files on an SMB/CIFS
diff --git a/docs/yodldocs/smbd.8.yo b/docs/yodldocs/smbd.8.yo
index 43568dfc16..8cf8832829 100644
--- a/docs/yodldocs/smbd.8.yo
+++ b/docs/yodldocs/smbd.8.yo
@@ -81,14 +81,17 @@ should only be used when investigating a problem. Levels above 3 are
 designed for use only by developers and generate HUGE amounts of log
 data, most of which is extremely cryptic.
 
-dit(bf(-l log file)) If specified, em(logfile) specifies a log filename
-into which informational and debug messages from the running server
-will be logged. The log file generated is never removed by the server
-although its size may be controlled by an bf(smb.conf (5)) option.
-The default log file name is specified at compile time.
-
-dit(bf(-O socket options)) See the socket options section of bf(smb.conf
-(5)) for details.
+dit(bf(-l log file)) If specified, em(logfile) specifies a log
+filename into which informational and debug messages from the running
+server will be logged. The log file generated is never removed by the
+server although its size may be controlled by the url(bf(max log
+size))(smb.conf.5.html#max log size) option in the url(bf(smb.conf
+(5)))(smb.conf.5.html) file.  The default log file name is specified
+at compile time.
+
+dit(bf(-O socket options)) See the url(bf(socket
+options))(smb.conf.5.html#socket options) parameter in the
+url(bf(smb.conf (5)))(smb.conf.5.html) file for details.
 
 dit(bf(-p port number)) port number is a positive integer value.  The
 default value if this parameter is not specified is 139.
diff --git a/docs/yodldocs/smbpasswd.8.yo b/docs/yodldocs/smbpasswd.8.yo
index cc1845be50..0526824bde 100644
--- a/docs/yodldocs/smbpasswd.8.yo
+++ b/docs/yodldocs/smbpasswd.8.yo
@@ -229,6 +229,8 @@ This option is only available when running bf(smbpasswd) as root.
 label(minusU)
 dit(bf(-U username))
 
+HERE !!!!
+
 .RE
 .I username