Fix backwards compatibility bug in named ACL variables.

[users/jgh/exim.git] / doc / doc-docbook / x2man

diff --git a/doc/doc-docbook/x2man b/doc/doc-docbook/x2man
index a9812239ecbc342d77f9cc834b17d88dd888132b..430d7d62788b271680102ed54db748328bd7f8ef 100755 (executable)
--- a/doc/doc-docbook/x2man
+++ b/doc/doc-docbook/x2man
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
 #! /usr/bin/perl -w
 

-# $Cambridge: exim/doc/doc-docbook/x2man,v 1.1 2005/06/16 10:32:31 ph10 Exp $
+# $Cambridge: exim/doc/doc-docbook/x2man,v 1.5 2006/09/12 10:15:11 ph10 Exp $

 
 # Script to find the command line options in the DocBook source of the Exim
 # spec, and turn them into a man page, because people like that.
 
 # Script to find the command line options in the DocBook source of the Exim
 # spec, and turn them into a man page, because people like that.


@@ -41,6 +41,16 @@ the reference manual. This man page contains only a description of the command
 line options. It has been automatically generated from the reference manual
 source, hopefully without too much mangling.
 
 line options. It has been automatically generated from the reference manual
 source, hopefully without too much mangling.
 

+.SH DEFAULT ACTION
+.rs
+.sp
+If no options are present that require a specific action (such as starting the
+daemon or a queue runner, testing an address, receiving a message in a specific
+format, or listing the queue), and there is at least one command line argument,
+then \fB-bm\fR (accept a local message on the standard input, with the
+arguments specifying the recipients) is assumed. Otherwise, Exim outputs a
+brief message about itself and exits.
+

 .SH SETTING OPTIONS BY PROGRAM NAME
 .rs
 .TP 10
 .SH SETTING OPTIONS BY PROGRAM NAME
 .rs
 .TP 10


@@ -96,11 +106,11 @@ while ($next)
 
   # Start of new option
 
 
   # Start of new option
 

-  if (/^<term>$/)
+  if (/^<term>(?=<option>-)(.*?)<\/term>$/)

     {
     print OUT ".TP 10\n";
     {
     print OUT ".TP 10\n";

+    $_ = "$1\n";

     $optstart = 1;
     $optstart = 1;

-    next;

     }
 
   # If a line contains text that is not in <>, read subsequent lines of the
     }
 
   # If a line contains text that is not in <>, read subsequent lines of the


@@ -192,11 +202,9 @@ while ($next)
   s/&lt;/</g;
   s/&gt;/>/g;
 
   s/&lt;/</g;
   s/&gt;/>/g;
 

-  s/&#x002d;/-/g;
-  s/&#x00a0;/ /g;
-  s/&#x2013;/-/g;
+  s/&nbsp;/ /g;
+  s/&ndash;/-/g;

   s/&#x2019;/'/g;
   s/&#x2019;/'/g;

-  s/&#8230;/.../g;    # Sic - no x

 
   # Escape hyphens to prevent unwanted hyphenation
 
 
   # Escape hyphens to prevent unwanted hyphenation