Merge remote-tracking branch 'tor-gitlab/merge-requests/48'

src/app/config/config.c

@@ -27,7 +27,7 @@
  *   <li>The option_vars_ array below in this module, which configures
  *       the names of the torrc options, their types, their multiplicities,
  *       and their mappings to fields in or_options_t.
- *   <li>The manual in doc/tor.1.txt, to document what the new option
+ *   <li>The manual in doc/man/tor.1.txt, to document what the new option
  *       is, and how it works.
  * </ul>
  *

src/app/config/testnet.inc

@@ -1,5 +1,5 @@
 // When modifying, don't forget to update the defaults
-// for 'TestingTorNetwork' in 'doc/tor.1.txt'
+// for 'TestingTorNetwork' in 'doc/man/tor.1.txt'
 { "DirAllowPrivateAddresses", "1" },
 { "EnforceDistinctSubnets", "0" },
 { "AuthDirMaxServersPerAddr", "0" },

src/lib/log/log.c

@@ -1308,7 +1308,7 @@ log_level_to_string(int level)
 /** NULL-terminated array of names for log domains such that domain_list[dom]
  * is a description of <b>dom</b>.
  *
- * Remember to update doc/tor.1.txt if you modify this list.
+ * Remember to update doc/man/tor.1.txt if you modify this list.
  * */
 static const char *domain_list[] = {
   "GENERAL", "CRYPTO", "NET", "CONFIG", "FS", "PROTOCOL", "MM",