summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/FAQ3
-rw-r--r--doc/tor-spec.txt4
2 files changed, 3 insertions, 4 deletions
diff --git a/doc/FAQ b/doc/FAQ
index 87a70719d1..e0bf40a6c2 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -48,9 +48,8 @@ for you.]
The same executable ("or") functions as both client and server, depending
on which ports are specified in the configuration file. You can specify:
-* APPort: client applications (eg privoxy, Mozilla) can speak socks to
+* SocksPort: client applications (eg privoxy, Mozilla) can speak socks to
this port.
-* OPPort: onion proxies (client onion routers) connect to this port.
* ORPort: other onion routers connect to this port
* DirPort: onion proxies and onion routers speak http to this port, to
pull down a directory of which nodes are currently available.
diff --git a/doc/tor-spec.txt b/doc/tor-spec.txt
index 5536a1c76b..7a0542afb5 100644
--- a/doc/tor-spec.txt
+++ b/doc/tor-spec.txt
@@ -442,7 +442,7 @@ which reveals the downstream node.
(Unless otherwise noted, tokens on the same line are space-separated.)
Router ::= Router-Line Date-Line Onion-Key Link-Key Signing-Key Exit-Policy Router-Signature NL
-Router-Line ::= "router" nickname address ORPort APPort DirPort bandwidth NL
+Router-Line ::= "router" nickname address ORPort SocksPort DirPort bandwidth NL
Date-Line ::= "published" YYYY-MM-DD HH:MM:SS NL
Onion-key ::= "onion-key" NL a public key in PEM format NL
Link-key ::= "link-key" NL a public key in PEM format NL
@@ -454,7 +454,7 @@ Signature ::= "-----BEGIN SIGNATURE-----" NL
Base-64-encoded-signature NL "-----END SIGNATURE-----" NL
ORport ::= port where the router listens for routers/proxies (speaking cells)
-APPort ::= where the router listens for applications (speaking socks)
+SocksPort ::= where the router listens for applications (speaking socks)
DirPort ::= where the router listens for directory download requests
bandwidth ::= maximum bandwidth, in bytes/s