diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-28 12:00:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-28 12:00:50 -0400 |
| commit | 9b825ffc4ffbff946a1fc7f5a4cfedf8e5317e79 (patch) | |
| tree | b4209f96d7494bdf2dbb9af74549ed83d291579e /doc | |
| parent | 78b431d3e30def3641f25707197c55a1c7200269 (diff) | |
| parent | 703ad69587b512088f178da52494d7767f521c38 (diff) | |
| download | tor-9b825ffc4ffbff946a1fc7f5a4cfedf8e5317e79.tar tor-9b825ffc4ffbff946a1fc7f5a4cfedf8e5317e79.tar.gz | |
Merge branch 'bug8966_v5'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/HACKING | 4 | ||||
| -rw-r--r-- | doc/tor.1.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/HACKING b/doc/HACKING index 28d4c5e6c..2156f7ca1 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -122,7 +122,7 @@ Running gcov for unit test coverage make make check mkdir coverage-output - ./contrib/coverage coverage-output + ./scripts/test/coverage coverage-output ----- (On OSX, you'll need to start with "--enable-coverage CC=clang".) @@ -142,7 +142,7 @@ If you have two different "coverage-output" directories, and you want to see a meaningful diff between them, you can run: ----- - ./contrib/cov-diff coverage-output1 coverage-output2 | less + ./scripts/test/cov-diff coverage-output1 coverage-output2 | less ----- In this diff, any lines that were visited at least once will have coverage diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 94c7d40a6..79368f56e 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1782,7 +1782,7 @@ if DirPort is non-zero): When this option is set, it takes an HTML file and publishes it as "/" on the DirPort. Now relay operators can provide a disclaimer without needing to set up a separate webserver. There's a sample disclaimer in - contrib/tor-exit-notice.html. + contrib/operator-tools/tor-exit-notice.html. [[V3AuthoritativeDirectory]] **V3AuthoritativeDirectory** **0**|**1**:: When this option is set in addition to **AuthoritativeDirectory**, Tor |