aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDamian Johnson <atagar@torproject.org>2017-11-05 12:21:28 -0800
committerDamian Johnson <atagar@torproject.org>2017-11-05 12:21:28 -0800
commit3563a2c8194ebe9430603803a53b073e181ce773 (patch)
tree9716a77968bd23077ed1de363d6b09d67bdb34a2 /doc
parent9f650b24e97c69216b0d85d20b8363ce1a2488de (diff)
downloadtor-3563a2c8194ebe9430603803a53b073e181ce773.tar.gz
tor-3563a2c8194ebe9430603803a53b073e181ce773.zip
Fix manual formatting
Few issues... * Malformed ReducedExitPolicy, causing brackets to appear. * ExitPolicyDefault wasn't actually listed, instead it munged the description into the ExitPolicy description. * Extra plus signs in the ExitPolicy and ReducedExitPolicy entries. After an hour of struggling with asciidoc couldn't figure out how to format it as 'paragraph => example => paragraph with same indentation' so just rearranging the ExitPolicy entry. Patches welcome if someone strongly prefers having the paragraph after the example. https://trac.torproject.org/projects/tor/ticket/24147
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt27
1 files changed, 14 insertions, 13 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 3b881d08f9..725baaa643 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1763,8 +1763,15 @@ is non-zero):
write your IPv6 rules using accept6/reject6 \*6, and your IPv4 rules using
accept/reject \*4. If you want to \_replace_ the default exit policy, end
your exit policy with either a reject \*:* or an accept \*:*. Otherwise,
- you're \_augmenting_ (prepending to) the default exit policy. The default
- exit policy is: +
+ you're \_augmenting_ (prepending to) the default exit policy. +
+ +
+ If you want to use a reduced exit policy rather than the default exit
+ policy, set "ReducedExitPolicy 1". If you want to _replace_ the default
+ exit policy with your custom exit policy, end your exit policy with either
+ a reject *:* or an accept *:*. Otherwise, you’re _augmenting_ (prepending
+ to) the default or reduced exit policy. +
+ +
+ The default exit policy is:
reject *:25
reject *:119
@@ -1776,15 +1783,9 @@ is non-zero):
reject *:6346-6429
reject *:6699
reject *:6881-6999
- accept *:* +
- +
- If you want to use a reduced exit policy rather than the default exit
- policy, set "ReducedExitPolicy 1". If you want to _replace_ the default
- exit policy with your custom exit policy, end your exit policy with either
- a reject *:* or an accept *:*. Otherwise, you’re _augmenting_ (prepending
- to) the default or reduced exit policy.
+ accept *:*
-[[ExitPolicyDefault]]::
+[[ExitPolicyDefault]] **ExitPolicyDefault**::
Since the default exit policy uses accept/reject *, it applies to both
IPv4 and IPv6 addresses.
@@ -1806,7 +1807,7 @@ is non-zero):
to disclose.
(Default: 0)
-[[ReducedExitPolicy] **ReducedExitPolicy** **0**|**1**::
+[[ReducedExitPolicy]] **ReducedExitPolicy** **0**|**1**::
If set, use a reduced exit policy rather than the default one. +
+
The reduced exit policy is an alternative to the default exit policy. It
@@ -1895,8 +1896,8 @@ is non-zero):
accept *:19638
accept *:50002
accept *:64738
- reject *:* +
- +
+ reject *:*
+
(Default: 0)
[[IPv6Exit]] **IPv6Exit** **0**|**1**::