summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>2005-05-20 18:35:43 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:46:37 -0500
commit7b52b66aad51c061081b893a3441bed2aa792d49 (patch)
tree1b94866f4ee4f22a78e5662bd68dfa4939d9d79e
parentb91963bcf3f5769d7e6071a878e0feff015a9493 (diff)
downloadsamba-7b52b66aad51c061081b893a3441bed2aa792d49.tar.gz
samba-7b52b66aad51c061081b893a3441bed2aa792d49.tar.bz2
samba-7b52b66aad51c061081b893a3441bed2aa792d49.zip
Fixes from Flatfender.
(This used to be commit 83dee56ac56c5b574d30b7067cdf1347e51bb625)
-rw-r--r--docs/Samba-HOWTO-Collection/TOSHARG-PDC.xml4
-rw-r--r--docs/Samba-HOWTO-Collection/TOSHARG-Printing.xml2
-rw-r--r--docs/Samba-HOWTO-Collection/index.xml1
3 files changed, 4 insertions, 3 deletions
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-PDC.xml b/docs/Samba-HOWTO-Collection/TOSHARG-PDC.xml
index 809d353833..ee9d5155c0 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-PDC.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-PDC.xml
@@ -819,8 +819,8 @@ This is the only officially supported mode of operation.
<title><quote>$</quote> Cannot Be Included in Machine Name</title>
<para>
A machine account, typically stored in <filename>/etc/passwd</filename>, takes the form of the machine
-name with a <quote>$</quote> appended. FreeBSD (and other BSD systems) will not create a user with a
-<quote>$</quote> in the name.
+name with a <quote>$</quote> appended. Some BSD systems will not create a user with a <quote>$</quote> in the name.
+Recent versions of FreeBSD have removed this limitation, but older releases are still in common use.
</para>
<para>
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-Printing.xml b/docs/Samba-HOWTO-Collection/TOSHARG-Printing.xml
index 1d2fc8eeb6..349d64f7f9 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-Printing.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-Printing.xml
@@ -49,7 +49,7 @@ as the print subsystem underneath the Samba hood.
<para>
This chapter deals with the foundations of Samba printing as they
-are implemented by the more traditional UNIX (BSD- and System V-style)
+are implemented by the more traditional UNIX (BSD and System V-style)
printing systems. Many things covered in this chapter apply also to CUPS.
If you use CUPS, you may be tempted
to jump to the next chapter but you will certainly miss a few things if
diff --git a/docs/Samba-HOWTO-Collection/index.xml b/docs/Samba-HOWTO-Collection/index.xml
index 7ccbb834d3..fff50ef839 100644
--- a/docs/Samba-HOWTO-Collection/index.xml
+++ b/docs/Samba-HOWTO-Collection/index.xml
@@ -152,6 +152,7 @@ The chapters in this part each cover specific Samba features.
<!-- Comment out the following line to include the manpages.
*Please* do not commit with the line below enabled! -->
<!-- <xi:include href="manpages.xml"/> -->
+ <xi:include href="manpages.xml"/>
<xi:include href="http://www.gnu.org/licenses/gpl.xml"/>
<xi:include href="TOSHARG-glossary.xml"/>