revise the spec to remove the "Ports" line of the descriptor, to indicate

that putting ports on the "router" line is no longer deprecated, and
to say that SocksPort is deprecated and should always be 0.

svn:r5606

diff --git a/doc/tor-spec.txt b/doc/tor-spec.txt
index 156f4c9acf4e638d4edb40c5e361b090cbd16c29..4bb12a7121c9d95225ddebe7b7dd7fd82e9d6fda 100644 (file)
--- a/doc/tor-spec.txt
+++ b/doc/tor-spec.txt
@@ -713,21 +713,16 @@ Other than "router" and "router-signature", the items may appear in any
 order.
 
 The items' formats are as follows:
-   "router" nickname address (ORPort SocksPort DirPort)?
-
-      Indicates the beginning of a router descriptor.  "address" must be an
-      IPv4 address in dotted-quad format.  The Port values will soon be
-      deprecated; using them here is equivalent to using them in a "ports"
-      item.
-
-   "ports" ORPort SocksPort DirPort
-
-      Indicates the TCP ports at which this OR exposes functionality.
-      ORPort is a port at which this OR accepts TLS connections for the main
-      OR protocol;  SocksPort is the port at which this OR accepts SOCKS
-      connections; and DirPort is the port at which this OR accepts
-      directory-related HTTP connections.  If any port is not supported, the
-      value 0 is given instead of a port number.
+   "router" nickname address ORPort SocksPort DirPort
+
+      Indicates the beginning of a router descriptor.  "address"
+      must be an IPv4 address in dotted-quad format. The last
+      three numbers indicate the TCP ports at which this OR exposes
+      functionality. ORPort is a port at which this OR accepts TLS
+      connections for the main OR protocol; SocksPort is deprecated and
+      should always be 0; and DirPort is the port at which this OR accepts
+      directory-related HTTP connections.  If any port is not supported,
+      the value 0 is given instead of a port number.
 
    "bandwidth" bandwidth-avg bandwidth-burst bandwidth-observed