fix documentation bug regarding ~/.sbopkg.conf

Document the fact that (since 0.25.0) settings in the system
configuration file can be overridden with a private configuration file.
Thanks to Bill Kirkpatrick on sbopkg-users for raising this issue.

Also catch up on the NEWS file while adding this item.

src/usr/doc/NEWS

@@ -2,6 +2,21 @@ SBOPKG NEWS
 
 sbopkg xxxVERSIONxxx (xxxDATExxx)
 
+    MODIFICATIONS
+
+        * Updated French man pages. Thanks to Marie-Claude Collilieux.
+
+    BUGFIXES
+
+        * Fixed an issue where URL redirects and SSL certificate check
+          failures could combine to cause a download failure. Thanks to
+          vbatts for raising this issue.
+
+        * Fixed a documentation bug where the ability to keep a
+          ~/.sbopkg.conf file to override the system config file (since
+          0.25.0) wasn't documented anywhere other than this file. It's
+          now in both manuals. Thanks to Bill Kirkpatrick for raising
+          this issue.
 
 sbopkg 0.34.1 (2011-02-05 04:20 UTC)
 

src/usr/doc/THANKS

@@ -71,3 +71,4 @@ apologize. Thank you!
  850 greinze (bug report)
  853 Pablo Castano Fernandez (translations)
  863 vbatts (bug report)
+ 864 Bill Kirkpatrick (bug report)

src/usr/man/man5/sbopkg.conf.5

@@ -14,7 +14,12 @@ collection of third-party SlackBuild scripts to build Slackware
 packages.
 The default configuration file is installed at
 .IR /etc/sbopkg/sbopkg.conf .
-Also, please see the subsection below about
+The user may override any settings in that file by creating
+.IR ~/.sbopkg.conf .
+.PP
+Please see the
+.B NOTES
+section for more information about variables, including
 .BR ARCH .
 .PP
 All boolean options require a
@@ -542,6 +547,9 @@ settings if this is required for the build.
 .I /etc/sbopkg/sbopkg.conf
 File to specify configuration options.
 .TP
+.I ~/.sbopkg.conf
+File to override system configuration options.
+.TP
 .I /etc/sbopkg/renames.d/50-default
 Default file that lists software in the SBo repository that has been
 renamed.

src/usr/man/man8/sbopkg.8

@@ -29,14 +29,16 @@ about SlackBuilds is strongly advised.
 In order for
 .B sbopkg
 to be used, a configuration file must exist at
-.IR /etc/sbopkg/sbopkg.conf .
+.I /etc/sbopkg/sbopkg.conf
-An initial install will provide the user with that file while upgrades
+and/or
-will add an
+.IR ~/.sbopkg.conf .
+An initial install will provide the user with the system file while
+upgrades will add an
 .I /etc/sbopkg/sbopkg.conf.new
 file with which the user may merge or replace the older version.
 See
 .BR sbopkg.conf (5)
-for more information about the configuration file.
+for more information about the configuration files.
 .PP
 .B Sbopkg
 must be run as the root user (since the SBo SlackBuilds are written with
@@ -116,9 +118,7 @@ Finally, if
 .B KEEPLOG
 is set to
 .B YES
-in the
+in a configuration file, a permanent log of the build process is saved.
-.I sbopkg.conf
-file then a permanent log of the build process is saved.
 See
 .BR sbopkg.conf (5)
 under
@@ -460,6 +460,9 @@ on stdout.
 .I /etc/sbopkg/sbopkg.conf
 Default system-wide file to specify configuration options.
 .TP
+.I ~/.sbopkg.conf
+File to override system configuration options.
+.TP
 .I /etc/sbopkg/renames.d/50-default
 Default file that lists software in the SBo repositories that has been
 renamed.