Lookups: dsearch subdir with leading "..". Bug 2994

[exim.git] / doc / doc-scripts / g2t

diff --git a/doc/doc-scripts/g2t b/doc/doc-scripts/g2t
index 30c713c08f81ab105e4fae25ea73456c8e14a411..5916e91491f1c01d1f2e8bc0e9d56904892cffde 100755 (executable)
--- a/doc/doc-scripts/g2t
+++ b/doc/doc-scripts/g2t
@@ -1,5 +1,4 @@
 #! /usr/bin/perl -w
-# $Cambridge: exim/doc/doc-scripts/g2t,v 1.1 2004/10/07 15:04:35 ph10 Exp $
 
 # A Perl script to turn the SGCAL source of the Exim documentation into
 # Texinfo input, more or less...
@@ -295,7 +294,7 @@ my($new_lastwasitem) = 0;
 
 # Chapter directives just require . => @; however, dequoting the
 # line thereafter will remove the first @, so just force it back
-# afterwards. If the chapter is is one describing a driver, set
+# afterwards. If the chapter is one describing a driver, set
 # the driver name.
 
 if (/\.chapter/)
@@ -726,7 +725,7 @@ while (<>)
       # "-". If we triple it in the menu it gets displayed OK, but building
       # software complains about non-existent cross references etc.
 
-      # I have gone for the horrid kludge of turning it into "-<hyhen>"
+      # I have gone for the horrid kludge of turning it into "-<hyphen>"
       # in the menus and nodes.
 
       # Exim 4 has added --help, which has the same problem.
@@ -892,8 +891,10 @@ while (<>)
   # we sort out the menu and copy their data. This is all done in a
   # subroutine that is shared with options.
 
-  elsif (/^\.startconf/)
+  elsif (/^\.startconf\s+(.*)/)
     {
+    $confuse = $1; 
+    $confuse = &dequote($confuse); 
     handle_subsection("conf");
     next;
     }
@@ -1069,6 +1070,7 @@ $doing_filter = 0;
 $skip_else = 0;
 $in_itemize = 0;
 $lastwasitem = 0;
+$confuse = "";
 
 $chapter_number = 0;
 $section_number = 0;