Merge branch 'bug25581_033_v2_asn_squashed' into maint-0.3.3

1 files changed, 10 insertions, 10 deletions

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index af2ac090c6..9aad3af98d 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1534,7 +1534,7 @@ The following options are useful only for clients (that is, if
     If no nodes in Tor2webRendezvousPoints are currently available for
     use, Tor will choose a random node when building HS circuits.
 
-[[_HSLayer2Nodes]] **_HSLayer2Nodes** __node__,__node__,__...__::
+[[HSLayer2Nodes]] **HSLayer2Nodes** __node__,__node__,__...__::
     A list of identity fingerprints, nicknames, country codes, and
     address patterns of nodes that are allowed to be used as the
     second hop in all client or service-side Onion Service circuits.
@@ -1544,7 +1544,7 @@ The following options are useful only for clients (that is, if
     (Default: Any node in the network may be used in the second hop.)
  +
     (Example:
-    _HSLayer2Nodes ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) +
+    HSLayer2Nodes ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) +
  +
     When this is set, the resulting hidden service paths will
     look like:
@@ -1561,7 +1561,7 @@ The following options are useful only for clients (that is, if
     Rend, HSDir, and Intro point selection is not affected by this
     option.
  +
-    This option may be combined with _HSLayer3Nodes to create
+    This option may be combined with HSLayer3Nodes to create
     paths of the form:
  +
         C - G - L2 - L3 - Rend +
@@ -1571,7 +1571,7 @@ The following options are useful only for clients (that is, if
         S - G - L2 - L3 - HSDir +
         S - G - L2 - L3 - Intro +
  +
-    ExcludeNodes have higher priority than _HSLayer2Nodes,
+    ExcludeNodes have higher priority than HSLayer2Nodes,
     which means that nodes specified in ExcludeNodes will not be
     picked.
  +
@@ -1579,10 +1579,10 @@ The following options are useful only for clients (that is, if
     https://github.com/mikeperry-tor/vanguards that selects and
     updates this set of nodes for you. Hence it does not do load
     balancing if fewer than 20 nodes are selected, and if no nodes in
-    _HSLayer2Nodes are currently available for use, Tor will not work.
+    HSLayer2Nodes are currently available for use, Tor will not work.
     Please use extreme care if you are setting this option manually.
 
-[[_HSLayer3Nodes]] **_HSLayer3Nodes** __node__,__node__,__...__::
+[[HSLayer3Nodes]] **HSLayer3Nodes** __node__,__node__,__...__::
     A list of identity fingerprints, nicknames, country codes, and
     address patterns of nodes that are allowed to be used as the
     third hop in all client and service-side Onion Service circuits.
@@ -1592,7 +1592,7 @@ The following options are useful only for clients (that is, if
     (Default: Any node in the network may be used in the third hop.)
  +
     (Example:
-    _HSLayer3Nodes ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) +
+    HSLayer3Nodes ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) +
  +
     When this is set by itself, the resulting hidden service paths
     will look like: +
@@ -1608,7 +1608,7 @@ The following options are useful only for clients (that is, if
     option.
  +
     While it is possible to use this option by itself, it should be
-    combined with _HSLayer2Nodes to create paths of the form:
+    combined with HSLayer2Nodes to create paths of the form:
  +
         C - G - L2 - L3 - Rend +
         C - G - L2 - L3 - M - HSDir +
@@ -1617,7 +1617,7 @@ The following options are useful only for clients (that is, if
         S - G - L2 - L3 - HSDir +
         S - G - L2 - L3 - Intro +
  +
-    ExcludeNodes have higher priority than _HSLayer3Nodes,
+    ExcludeNodes have higher priority than HSLayer3Nodes,
     which means that nodes specified in ExcludeNodes will not be
     picked.
   +
@@ -1625,7 +1625,7 @@ The following options are useful only for clients (that is, if
     https://github.com/mikeperry-tor/vanguards that selects and
     updates this set of nodes for you. Hence it does not do load
     balancing if fewer than 20 nodes are selected, and if no nodes in
-    _HSLayer3Nodes are currently available for use, Tor will not work.
+    HSLayer3Nodes are currently available for use, Tor will not work.
     Please use extreme care if you are setting this option manually.
 
 [[UseMicrodescriptors]] **UseMicrodescriptors** **0**|**1**|**auto**::