X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=doc%2Fdoc-docbook%2Fx2man;h=474d068a3fb8113adbf5b3e2fb291b173fdeb3f0;hb=765b530f2cd79d66221ba9c3d33fe94040d6748c;hp=a9812239ecbc342d77f9cc834b17d88dd888132b;hpb=168e428fc4dfcf7f4d377d137743d8332784fa35;p=exim.git

diff --git a/doc/doc-docbook/x2man b/doc/doc-docbook/x2man
index a9812239e..474d068a3 100755
--- a/doc/doc-docbook/x2man
+++ b/doc/doc-docbook/x2man
@@ -1,6 +1,6 @@
 #! /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.3 2006/04/04 14:03:49 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.
@@ -96,11 +96,11 @@ while ($next)
 
   # Start of new option
 
-  if (/^<term>$/)
+  if (/^<term>(?=<option>-)(.*?)<\/term>$/)
     {
     print OUT ".TP 10\n";
+    $_ = "$1\n";
     $optstart = 1;
-    next;
     }
 
   # If a line contains text that is not in <>, read subsequent lines of the
@@ -192,11 +192,9 @@ while ($next)
   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/&#8230;/.../g;    # Sic - no x
 
   # Escape hyphens to prevent unwanted hyphenation