--- doc/cfengine-Reference.texinfo.orig	2005-02-01 18:52:21.000000000 -0600
+++ doc/cfengine-Reference.texinfo	2005-02-01 18:54:21.000000000 -0600
@@ -774,7 +774,7 @@
 (@code{--use-env}) Causes cfengine to generate an environment variable
 @samp{CFALLCLASSES} which can be read by child processes (scripts). This
 variable contains a summary of all the currently defined classes at any
-given time. This option causes some system 5 systems to generate a Bus
+given time. This option causes some System V systems to generate a Bus
 Error or segmentation fault. The same information is available from the
 cfengine built-in variable @code{$(allclasses)} and can be passed as a
 parameter to scripts.
@@ -1645,7 +1645,7 @@
 
 @end smallexample
 @noindent
-and these will be displayed. For example, solaris 2.4 systems
+and these will be displayed. For example, Solaris 2.4 systems
 generate the additional classes @code{sunos_5_4} and @code{sunos_sun4m},
 @code{sunos_sun4m_5_4}.
 
@@ -1757,7 +1757,7 @@
 interpret the entries: should a file's ACLs be overwritten or only
 adjusted?  Since the filesystems from different developers all use
 different models for ACLs, you must also tell cfengine what kind of
-filesystem the file resides on. Currently only solaris and DCE/DFS ACLs
+filesystem the file resides on. Currently only Solaris and DCE/DFS ACLs
 are implemented.
 
 NOTE: if you set both file permissions and ACLs the file permissions
@@ -1792,7 +1792,7 @@
 For an explanation of ACL types and their use, refer to your local
 manual page.  However, note that for each type of filesystem, there are
 certain entries which must exist in an ACL. If you are creating a new
-ACL from scratch, you must specify these.  For example, in solaris ACLs
+ACL from scratch, you must specify these.  For example, in Solaris ACLs
 you must have entries for @code{user}, @code{group} and @code{other}.
 Under DFS you need what DFS calls a @code{user_obj}, @code{group_obj}
 and an @code{other_obj}, and in some cases @code{mask_obj}. In cfengine
@@ -5043,7 +5043,7 @@
 is a directory containing master configuration files (for instance, @file{services},
 @file{aliases}, @file{passwd}...). Each of the files in @file{backup-etc}
 is installed or updated under @file{/etc}. Finally, a global
-@file{nsswitch.conf} file is kept up to date for solaris systems.
+@file{nsswitch.conf} file is kept up to date for Solaris systems.
 
 The @code{home} directive can be used as a destination, in which
 case cfengine will copy files to every user on the system. This is
@@ -7972,7 +7972,7 @@
 Cfengine will not create hard links to directories or other special files.
 This is always a slightly dubious practice and is best avoided anyway.
 POSIX says that the hard link can be on a different device to the file
-it points to, but both BSD and System 5 restrict hard links to be on
+it points to, but both BSD and System V restrict hard links to be on
 the same device as their predecessors. Cfengine has no policy on this,
 but---in the theoretical case in which the hard link and the predecessor
 were on different file systems---it becomes near impossible to determine
@@ -8661,7 +8661,7 @@
 @cindex umask
 
 By default, the options sent to ps are "-aux" for BSD systems and "-ef"
-for system 5.  You can use the @code{SetOptionString} command to redefine
+for System V.  You can use the @code{SetOptionString} command to redefine
 the option string. Cfengine assumes only that the first identifiable number
 on each line is the process identifier for the processes, so you must not
 choose options for ps which change this basic requirement (this is not a
@@ -8837,7 +8837,7 @@
 
 @noindent
 Here is a second example which may be used to restart the nameservice
-on a solaris system:
+on a Solaris system:
 
 @smallexample
 
@@ -11319,7 +11319,7 @@
       # Make sure anonymous ftp areas have the correct
       # protection, or logins won't be able to read
       # files - or perhaps a security risk. This is
-      # solaris 2 specific...
+      # Solaris 2 specific...
       #
 
       $(ftp)/pub        mode=755 o=ftp  g=ftp  r=inf act=fixall
@@ -11386,7 +11386,7 @@
    PasswdServer::
 
       # Build and install the BSD compatible passwd file
-      # from the master passwd/shadow file on solaris
+      # from the master passwd/shadow file on Solaris
 
       "/local/iu/bin/BuildPasswdFiles"
       "/local/iu/bin/BuildGroupFiles"
@@ -11762,7 +11762,7 @@
 #
 # cf.solaris - for iu.hioslo.no
 #
-# This file contains solaris specific patches
+# This file contains Solaris specific patches
 #
 #################################################################
 
@@ -11820,7 +11820,7 @@
   #
   # Our named server uses a newer BIND
   # Put this here so that it will be preserved under
-  # solaris reinstallation
+  # Solaris reinstallation
   #
 
   NameServers::
@@ -11935,7 +11935,7 @@
 
       #
       # A painless way to add an rc.local script to the rc files
-      # under solaris without having to fight though inittab
+      # under Solaris without having to fight though inittab
       #
 
       @{ /etc/rc3.d/S15nfs.server