syncing up docs, examples, & packaging from 3.0

(This used to be commit dd1348c566b4700ea01bd89639e2d3330c878167)

1 files changed, 44 insertions, 40 deletions

diff --git a/docs/docbook/projdoc/Portability.xml b/docs/docbook/projdoc/Portability.xml
index 50cc8b4c7c..90cb8e2d4b 100644
--- a/docs/docbook/projdoc/Portability.xml
+++ b/docs/docbook/projdoc/Portability.xml
@@ -1,35 +1,35 @@
 <chapter id="Portability">
 <chapterinfo>
 	&author.jelmer;
-	<!-- Some other people as well, but there were no author names in the text files
-	this file is based on-->
+	&author.jht;
+	<!-- Some other people as well, but there were no author names in the text files this file is based on-->
 </chapterinfo>
 
 <title>Portability</title>
 
 <para>Samba works on a wide range of platforms but the interface all the 
 platforms provide is not always compatible. This chapter contains 
-platform-specific information about compiling and using samba.</para>
+platform-specific information about compiling and using Samba.</para>
 
 <sect1>
 <title>HPUX</title>
 
 <para>
-HP's implementation of supplementary groups is, er, non-standard (for
-hysterical reasons).  There are two group files, <filename>/etc/group</filename> and
+HP's implementation of supplementary groups is non-standard (for
+historical reasons). There are two group files, <filename>/etc/group</filename> and
 <filename>/etc/logingroup</filename>; the system maps UIDs to numbers using the former, but
-initgroups() reads the latter.  Most system admins who know the ropes
+initgroups() reads the latter. Most system admins who know the ropes
 symlink <filename>/etc/group</filename> to <filename>/etc/logingroup</filename>
-(hard link doesn't work for reasons too stupid to go into here).  initgroups() will complain if one of the
+(hard link does not work for reasons too obtuse to go into here). initgroups() will complain if one of the
 groups you're in in <filename>/etc/logingroup</filename> has what it considers to be an invalid
 ID, which means outside the range <constant>[0..UID_MAX]</constant>, where <constant>UID_MAX</constant> is (I think)
-60000 currently on HP-UX.  This precludes -2 and 65534, the usual <constant>nobody</constant>
+60000 currently on HP-UX. This precludes -2 and 65534, the usual <constant>nobody</constant>
 GIDs.
 </para>
 
 <para>
-If you encounter this problem, make sure that the programs that are failing 
-to initgroups() be run as users not in any groups with GIDs outside the 
+If you encounter this problem, make sure the programs that are failing 
+to initgroups() are run as users, not in any groups with GIDs outside the 
 allowed range.
 </para>
 
@@ -37,9 +37,8 @@ allowed range.
 </para>
 
 <para>
-On HPUX you must use gcc or the HP ANSI compiler. The free compiler
-that comes with HP-UX is not ANSI compliant and cannot compile
-Samba.
+On HP-UX you must use gcc or the HP ANSI compiler. The free compiler
+that comes with HP-UX is not ANSI compliant and cannot compile Samba.
 </para>
 
 </sect1>
@@ -48,9 +47,9 @@ Samba.
 <title>SCO UNIX</title>
 
 <para> 
-If you run an old version of SCO UNIX then you may need to get important 
+If you run an old version of SCO UNIX, you may need to get important 
 TCP/IP patches for Samba to work correctly. Without the patch, you may 
-encounter corrupt data transfers using samba.
+encounter corrupt data transfers using Samba.
 </para>
 
 <para>
@@ -59,6 +58,16 @@ SCO (<ulink noescape="1" url="ftp://ftp.sco.com/">ftp.sco.com</ulink>, directory
 files uod385a.Z and uod385a.ltr.Z).
 </para>
 
+<para>
+The information provided here refers to an old version of SCO UNIX. If you require
+binaries for more recent SCO UNIX products, please contact SCO to obtain packages that are
+ready to install. You should also verify with SCO that your platform is up-to-date for the
+binary packages you will install. This is important if you wish to avoid data corruption
+problems with your installation. To build Samba for SCO UNIX products  may
+require significant patching of Samba source code. It is much easier to obtain binary
+packages directly from SCO.
+</para>
+
 </sect1>
 
 <sect1>
@@ -73,17 +82,13 @@ C library for some reason.
 <para>
 For this reason Samba by default defines the macro NO_EID in the DNIX
 section of includes.h. This works around the problem in a limited way,
-but it is far from ideal, some things still won't work right.
+but it is far from ideal, and some things still will not work right.
 </para>
 
 <para> 
-To fix the problem properly you need to assemble the following two
+To fix the problem properly, you need to assemble the following two
 functions and then either add them to your C library or link them into
-Samba.
-</para>
-
-<para> 
-put this in the file <filename>setegid.s</filename>:
+Samba. Put the following in the file <filename>setegid.s</filename>:
 </para>
 
 <para><programlisting>
@@ -102,7 +107,7 @@ _setegid:
 </programlisting></para>
 
 <para>
-put this in the file <filename>seteuid.s</filename>:
+Put this in the file <filename>seteuid.s</filename>:
 </para>
 
 <para><programlisting>
@@ -121,7 +126,7 @@ _seteuid:
 </programlisting></para>
 
 <para>
-after creating the above files you then assemble them using
+After creating the above files, you then assemble them using
 </para>
 
 <screen>
@@ -135,7 +140,7 @@ that should produce the files <filename>seteuid.o</filename> and
 </para>
 
 <para>
-then you need to add these to the LIBSM line in the DNIX section of
+Then you need to add these to the LIBSM line in the DNIX section of
 the Samba Makefile. Your LIBSM line will then look something like this:
 </para>
 
@@ -151,15 +156,15 @@ You should then remove the line:
 #define NO_EID
 </programlisting></para>
 
-<para>from the DNIX section of <filename>includes.h</filename></para>
+<para>from the DNIX section of <filename>includes.h</filename>.</para>
 
 </sect1>
 
 <sect1>
-<title>RedHat Linux Rembrandt-II</title>
+<title>Red Hat Linux</title>
 
 <para>
-By default RedHat Rembrandt-II during installation adds an
+By default during installation, some versions of Red Hat Linux add an
 entry to <filename>/etc/hosts</filename> as follows:
 <programlisting>
 	127.0.0.1 loopback "hostname"."domainname"
@@ -169,13 +174,13 @@ entry to <filename>/etc/hosts</filename> as follows:
 <para>
 This causes Samba to loop back onto the loopback interface.
 The result is that Samba fails to communicate correctly with
-the world and therefor may fail to correctly negotiate who
+the world and therefore may fail to correctly negotiate who
 is the master browse list holder and who is the master browser.
 </para>
 
 <para>
-Corrective Action:	Delete the entry after the word loopback
-	in the line starting 127.0.0.1
+Corrective Action: Delete the entry after the word "loopback"
+in the line starting 127.0.0.1.
 </para>
 </sect1>
 
@@ -195,10 +200,10 @@ Samba performance significantly.
 <title>Solaris</title>
 
 <sect2>
-<title>Locking improvements</title>
+<title>Locking Improvements</title>
 
 <para>Some people have been experiencing problems with F_SETLKW64/fcntl 
-when running Samba on Solaris. The built in file locking mechanism was
+when running Samba on Solaris. The built-in file locking mechanism was
 not scalable. Performance would degrade to the point where processes would
 get into loops of trying to lock a file. It would try a lock, then fail,
 then try again. The lock attempt was failing before the grant was
@@ -213,24 +218,23 @@ has not been released yet.
 </para>
 
 <para>
-The patch revision for 2.6 is 105181-34
-for 8 is 108528-19 and for 9 is 112233-04
+The patch revision for 2.6 is 105181-34, for 8 is 108528-19 and for 9 is 112233-04.
 </para>
 
 <para>
-After the install of these patches it is recommended to reconfigure
-and rebuild samba.
+After the install of these patches, it is recommended to reconfigure
+and rebuild Samba.
 </para>
 
-<para>Thanks to Joe Meslovich for reporting</para>
+<para>Thanks to Joe Meslovich for reporting this.</para>
 
 </sect2>
 
 <sect2 id="winbind-solaris9">
 <title>Winbind on Solaris 9</title>
 <para>
-Nsswitch on Solaris 9 refuses to use the winbind nss module.  This behavior
-is fixed by Sun in patch 113476-05 which as of March 2003 is not in any
+Nsswitch on Solaris 9 refuses to use the Winbind NSS module. This behavior
+is fixed by Sun in patch 113476-05, which as of March 2003, is not in any
 roll-up packages.
 </para>
 </sect2>