INN commit: trunk (11 files)

INN Commit Russ_Allbery at isc.org
Mon Aug 20 10:28:35 UTC 2007


    Date: Monday, August 20, 2007 @ 03:28:34
  Author: iulius
Revision: 7651

Use "man page" instead of "manpage" since it seems to be the
default spelling everywhere except for the ones I introduced
in samples and documentation.  Also fix it in three other files.

Modified:
  trunk/TODO
  trunk/doc/pod/actsync.pod
  trunk/doc/pod/checklist.pod
  trunk/doc/pod/install.pod
  trunk/innd/cc.c
  trunk/lib/snprintf.c
  trunk/samples/actsync.cfg
  trunk/samples/actsync.ign
  trunk/samples/buffindexed.conf.in
  trunk/samples/cycbuff.conf
  trunk/samples/storage.conf

-----------------------------+
 TODO                        |    2 +-
 doc/pod/actsync.pod         |   13 ++++++++-----
 doc/pod/checklist.pod       |    8 ++++----
 doc/pod/install.pod         |    4 ++--
 innd/cc.c                   |    4 ++--
 lib/snprintf.c              |    2 +-
 samples/actsync.cfg         |    4 +++-
 samples/actsync.ign         |    2 +-
 samples/buffindexed.conf.in |    2 +-
 samples/cycbuff.conf        |    4 ++--
 samples/storage.conf        |    2 +-
 11 files changed, 26 insertions(+), 21 deletions(-)

Modified: TODO
===================================================================
--- TODO	2007-08-20 10:08:33 UTC (rev 7650)
+++ TODO	2007-08-20 10:28:34 UTC (rev 7651)
@@ -351,7 +351,7 @@
 * SIGPIPE handling in nnrpd calls all sorts of functions that shouldn't be
   called from inside a signal handler.
 
-* Someone should go through the BUGS sections of all of the manpages and
+* Someone should go through the BUGS sections of all of the man pages and
   fix those for which the current behavior is unacceptable.
 
 * The ovdb server utilities don't handle unclean shutdowns very well.

Modified: doc/pod/actsync.pod
===================================================================
--- doc/pod/actsync.pod	2007-08-20 10:08:33 UTC (rev 7650)
+++ doc/pod/actsync.pod	2007-08-20 10:28:34 UTC (rev 7651)
@@ -638,6 +638,7 @@
 
     # Don't sync test groups, except for ones that are
     # moderated or that are under the gnu hierarchy.
+    #
     i       *.test
     c       *.test  m       # check moderated test groups
     c       gnu.*.test
@@ -646,13 +647,13 @@
 Automatic processing may be set up by using the following F<actsync.cfg>
 file:
 
-    # host to sync off of (host2)
+    # Host to sync off of (host2).
     host=news.uu.net
 
-    # location of the ignore file
+    # Location of the ignore file.
     ignore_file=<pathetc in inn.conf>/actsync.ign
 
-    # where news articles are kept
+    # Where news articles are kept.
     spool=<patharticles in inn.conf>
 
     # actsync(8) flags
@@ -678,10 +679,12 @@
 To check only the major hierarchies against news.uu,net, use the following
 F<actsync.ign> file:
 
-    # by default, ignore everything
+    # By default, ignore everything.
+    #
     i       *
 
-    # check the major groups
+    # Check the major groups.
+    #
     c       alt.*
     c       comp.*
     c       gnu.*

Modified: doc/pod/checklist.pod
===================================================================
--- doc/pod/checklist.pod	2007-08-20 10:08:33 UTC (rev 7650)
+++ doc/pod/checklist.pod	2007-08-20 10:28:34 UTC (rev 7651)
@@ -42,11 +42,11 @@
 =item *
 
 If necessary, add F<~news/bin> to the news user's path and F<~news/share/man>
-to the news user's manpath in your shell config files.  (You may want to
+to the news user's MANPATH in your shell config files.  (You may want to
 do this, especially the second part, on your regular account; the
-manpages are very useful.)
+man pages are very useful.)
 
-You can do this now or later, but you will certainly want the manpages
+You can do this now or later, but you will certainly want the man pages
 to help with configuring INN.
 
 For bash, try:
@@ -63,7 +63,7 @@
 
 although if you don't already have MANPATH set, the above may give an
 error or override your defaults (making it so you can only read the news
-manpages); if C<echo $MANPATH> does not give some reasonable path,
+man pages); if C<echo $MANPATH> does not give some reasonable path,
 you'll need to look up what the default is for your system (such as
 F</usr/man> or F</usr/share/man>).
 

Modified: doc/pod/install.pod
===================================================================
--- doc/pod/install.pod	2007-08-20 10:08:33 UTC (rev 7650)
+++ doc/pod/install.pod	2007-08-20 10:28:34 UTC (rev 7651)
@@ -783,7 +783,7 @@
 F<newsfeeds> determines how incoming articles are redistributed to your
 peers and to other INN processes.  F<newsfeeds> is very versatile and
 contains dozens of options; we will touch on just the basics here.
-The manpage contains more detailed information.
+The man page contains more detailed information.
 
 F<newsfeeds> is organized as a series of feed entries.  Each feed entry is
 composed of four fields separated by colons.  Entries may span multiple
@@ -1042,7 +1042,7 @@
 
 If you're having doubts, use option #2; it's easier to set up and should
 work regardless of your operating system.  More information about the
-creation of these cycbuffs can be found in cycbuff.conf(5) manpage.
+creation of these cycbuffs can be found in cycbuff.conf(5) man page.
 
 Now you need to decide on the sizes of your cycbuffs and metacycbuffs.
 You'll probably want to separate the heavy-traffic groups

Modified: innd/cc.c
===================================================================
--- innd/cc.c	2007-08-20 10:08:33 UTC (rev 7650)
+++ innd/cc.c	2007-08-20 10:28:34 UTC (rev 7651)
@@ -262,7 +262,7 @@
 	ok = InndHisWrite(msgid, Data.Arrived, Data.Posted,
 			  Data.Expires, &token);
     else {
-	/* Possible race condition, but documented in ctlinnd manpage. */
+	/* Possible race condition, but documented in ctlinnd man page. */
 	InndHisOpen();
 	ok = InndHisWrite(msgid, Data.Arrived, Data.Posted,
 			  Data.Expires, &token);
@@ -438,7 +438,7 @@
 	    return "1 Server paused";
 	if (ThrottledbyIOError)
 	    return "1 Server throttled";
-	/* Possible race condition, but documented in ctlinnd manpage. */
+	/* Possible race condition, but documented in ctlinnd man page. */
 	InndHisOpen();
 	ARTcancel(&Data, msgid, true);
 	InndHisClose();

Modified: lib/snprintf.c
===================================================================
--- lib/snprintf.c	2007-08-20 10:08:33 UTC (rev 7650)
+++ lib/snprintf.c	2007-08-20 10:28:34 UTC (rev 7651)
@@ -652,7 +652,7 @@
   size_t omitcount = 0;
   
   /* 
-   * AIX manpage says the default is 0, but Solaris says the default
+   * AIX man page says the default is 0, but Solaris says the default
    * is 6, and sprintf on AIX defaults to 6
    */
   if (max < 0)

Modified: samples/actsync.cfg
===================================================================
--- samples/actsync.cfg	2007-08-20 10:08:33 UTC (rev 7650)
+++ samples/actsync.cfg	2007-08-20 10:28:34 UTC (rev 7651)
@@ -3,7 +3,9 @@
 ##  Sample actsync configuration file.
 ##
 ##  It permits to synchronize, compare, or merge active files.
-##  See the actsync manpage for more information.
+##  It is useful for keeping the list of carried newsgroups
+##  up to date.
+##  See the actsync man page for more information.
 
 host=ftp.isc.org
 ftppath=/pub/usenet/CONFIG/active.gz

Modified: samples/actsync.ign
===================================================================
--- samples/actsync.ign	2007-08-20 10:08:33 UTC (rev 7650)
+++ samples/actsync.ign	2007-08-20 10:28:34 UTC (rev 7651)
@@ -3,7 +3,7 @@
 ##  Sample actsync ignore_file.
 ##
 ##  It defines synchronization rules.
-##  See the actsync manpage for more information.
+##  See the actsync man page for more information.
 
 ##  For now by default do not sync.
 i *

Modified: samples/buffindexed.conf.in
===================================================================
--- samples/buffindexed.conf.in	2007-08-20 10:08:33 UTC (rev 7650)
+++ samples/buffindexed.conf.in	2007-08-20 10:28:34 UTC (rev 7651)
@@ -5,7 +5,7 @@
 ##  It specifies the buffers that the buffindexed overview method
 ##  should use.  It is required if the server uses buffindexed (as
 ##  configured by the ovmethod: parameter in inn.conf).
-##  See the buffindexed.conf manpage for more information.
+##  See the buffindexed.conf man page for more information.
 ##
 ##  The order of lines in this file is not important.
 

Modified: samples/cycbuff.conf
===================================================================
--- samples/cycbuff.conf	2007-08-20 10:08:33 UTC (rev 7650)
+++ samples/cycbuff.conf	2007-08-20 10:28:34 UTC (rev 7651)
@@ -4,9 +4,9 @@
 ##
 ##  This file defines the cyclical buffers that make up the storage pools
 ##  for CNFS (Cyclic News File System).  For information about how to
-##  configure INN to use CNFS, see the storage.conf manpage; and for
+##  configure INN to use CNFS, see the storage.conf man page; and for
 ##  information about how to create the CNFS buffers, see the cycbuff.conf
-##  manpage.
+##  man page.
 ##
 ##  The order of lines in this file is not important among the same item.
 ##  But all cycbuff item should be presented before any metacycbuff item.

Modified: samples/storage.conf
===================================================================
--- samples/storage.conf	2007-08-20 10:08:33 UTC (rev 7650)
+++ samples/storage.conf	2007-08-20 10:28:34 UTC (rev 7651)
@@ -15,7 +15,7 @@
 ##          exactmatch: <bool>
 ##      }
 ##
-##  See the storage.conf manpage for more information.
+##  See the storage.conf man page for more information.
 ##
 ##  Only newsgroups, class, and (for CNFS, to specify the metacycbuff)
 ##  options are required; the other keys are optional.  If any CNFS



More information about the inn-committers mailing list