Merge remote-tracking branch 'tor-gitlab/mr/590'

doc/man/tor.1.txt

@@ -335,7 +335,7 @@ forward slash (/) in the configuration file and on the command line.
     to mess with it. (Default: -1)
 
 [[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ socks4|socks5 __IP__:__PORT__::
-**ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::
+[[ClientTransportPlugin-2]] **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::
     In its first form, when set along with a corresponding Bridge line, the Tor
     client forwards its traffic to a SOCKS-speaking proxy on "IP:PORT".
     (IPv4 addresses should written as-is; IPv6 addresses should be wrapped in
@@ -3112,7 +3112,7 @@ on the public Tor network.
     is the same as for exit policies, except that you don't need to say
     "accept" or "reject", and ports are not needed.)
 
-[[AuthDirMiddleOnly]] **AuthMiddleOnly** __AddressPattern...__::
+[[AuthDirMiddleOnly]] **AuthDirMiddleOnly** __AddressPattern...__::
     Authoritative directories only. A set of address patterns for servers that
     will be listed as middle-only in any network status document this authority
     publishes, if **AuthDirListMiddleOnly** is set. +

scripts/maint/checkOptionDocs.pl.in

@@ -41,9 +41,16 @@ loadTorrc("@abs_top_srcdir@/src/config/torrc.sample.in", \%torrcSampleOptions);
 my $considerNextLine = 0;
 open(F, "@abs_top_srcdir@/doc/man/tor.1.txt") or die;
 while (<F>) {
-    if (m!^(?:\[\[([A-za-z0-9_]+)\]\] *)?\*\*([A-Za-z0-9_]+)\*\*!) {
+    if (m!^(?:\[\[([A-za-z0-9_]+)\]\] *)?\*\*([A-Za-z0-9_]+)\*\*! && $considerNextLine) {
         $manPageOptions{$2} = 1;
         print "Missing an anchor: $2\n" unless (defined $1 or $2 eq 'tor');
+        $considerNextLine = 1;
+    } elsif (m!^\s*$! or
+             m!^\s*\+\s*$! or
+             m!^\s*//!) {
+        $considerNextLine = 1;
+    } else {
+        $considerNextLine = 0;
     }
 }
 close F;