diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-07-16 11:21:20 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-07-16 11:21:20 -0400 |
| commit | 9ad5b2593004c55d4223d59a150898b48d04737a (patch) | |
| tree | 5c8dddbec5bf7f4ebfba2100fed2fb8b7b1a3c83 | |
| parent | 5ddb9b3134b30da0c4ae8857bc15ddaa7c29a4b1 (diff) | |
| download | tor-9ad5b2593004c55d4223d59a150898b48d04737a.tar.gz tor-9ad5b2593004c55d4223d59a150898b48d04737a.zip | |
Improve Alternate*Authority docs. Bug 6387.
| -rw-r--r-- | changes/bug6387 | 3 | ||||
| -rw-r--r-- | doc/tor.1.txt | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/changes/bug6387 b/changes/bug6387 new file mode 100644 index 0000000000..73fc4f7cfe --- /dev/null +++ b/changes/bug6387 @@ -0,0 +1,3 @@ + o Documentation: + - Clarify the documentation for the Alternate*Authority options. + Fixes bug 6387. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a4a0ed7da9..78c34874c5 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -319,11 +319,14 @@ GENERAL OPTIONS **AlternateHSAuthority** [__nickname__] [**flags**] __address__:__port__ __fingerprint__ + **AlternateBridgeAuthority** [__nickname__] [**flags**] __address__:__port__ __ fingerprint__:: - As DirServer, but replaces less of the default directory authorities. Using + These options behave as DirServer, but they replace fewer of the + default directory authorities. Using AlternateDirAuthority replaces the default Tor directory authorities, but - leaves the hidden service authorities and bridge authorities in place. - Similarly, Using AlternateHSAuthority replaces the default hidden service - authorities, but not the directory or bridge authorities. + leaves the default hidden service authorities and bridge authorities in + place. Similarly, AlternateHSAuthority replaces the default hidden + service authorities, but not the directory or bridge authorities; and + AlternateBridgeAuthority replaces the default bridge authority, + but leaves the directory and hidden service authorities alone. **DisableAllSwap** **0**|**1**:: If set to 1, Tor will attempt to lock all current and future memory pages, |