diff --git a/docs/anonymity-roadmap.rst b/docs/anonymity-roadmap.rst
index f99033d5b..197caaee3 100644
--- a/docs/anonymity-roadmap.rst
+++ b/docs/anonymity-roadmap.rst
@@ -1,42 +1,62 @@
 .. -*- coding: utf-8-with-signature; fill-column: 77 -*-
 
-=============================
+==============================
 Anonymity Development Roadmap
-=============================
+==============================
+
 
 
 Development phases
 ==================
 
-1. Use Tor for network connectivity and to protect identity of client
 
-**note:** Client side is endpoint agnostic and server side has TCP endpoint support.
+Phase 1. Use Tor for network connectivity and to protect identity of client
+---------------------------------------------------------------------------
 
-**Dependencies** ::
- * txsocksx: get this merged upstream -->> https://github.com/david415/txsocksx/tree/endpoint_parsers_retry_socks
- * foolscap#203
- * #1010
- * #517
+**note:** Client side is endpoint agnostic and server side has TCP endpoint support only.
+
+**Dependencies**
+
+* txsocksx: get this merged upstream -->> https://github.com/david415/txsocksx/tree/endpoint_parsers_retry_socks - *client Twisted endpoint for Tor*
+* `Foolscap trac ticket 203`_: *switch to using Twisted Endpoints*
+* `Tahoe-LAFS trac ticket 1010`_: *anonymous client mode*
+* `Tahoe-LAFS trac ticket 517`_: *make tahoe Tor- and I2P-friendly*
+
+.. _`Foolscap trac ticket 203`: http://foolscap.lothar.com/trac/ticket/203
+.. _`Tahoe-LAFS trac ticket 1010`: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1010
+.. _`Tahoe-LAFS trac ticket 517`: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/517
 
 
-2. Use I2p for network connectivity and to protect identity of client
-
-**Dependencies** ::
- * new Tahoe-LAFS trac ticket regarding client endpoint string parameter concatenation
- * txi2p
-
-3. endpoint-agnostic Foolscap server side
-
-Completing these two tickets will make Foolscap endpoint agnostic on the server side. Therefore any Twisted server endpoint/parser can be used with Foolscap
-
-* teach twisted to serialize a listeningPort into a client endpoint descriptor - https://twistedmatrix.com/trac/ticket/7603
-
-* new foolscap ticket - Add getClientEndpoint() to use the feature from twisted trac ticket 7603
 
 
-4. Integrated Tor Hidden Service feature for storage servers
+Phase 2. Use I2p for network connectivity and to protect identity of client
+---------------------------------------------------------------------------
 
-* teach tor to create Hidden Service directories with group rx perms https://trac.torproject.org/projects/tor/ticket/11291
+**Dependencies**
 
-* new txtorcon ticket - Teach endpoint to use control port feature from tor trac ticket 11291
+#. Tahoe-LAFS trac ticket regarding client endpoint string parameter concatenation
+#. txi2p
+
+
+
+Phase 3. endpoint-agnostic Foolscap server side
+-----------------------------------------------
+
+Completing these two tickets will make Foolscap endpoint agnostic
+on the server side. Therefore any Twisted server endpoint/parser
+can be used with Foolscap
+
+#. Teach twisted to serialize a listeningPort into a client endpoint
+   descriptor - https://twistedmatrix.com/trac/ticket/7603
+#. open new foolscap ticket - Add getClientEndpoint() to use the feature
+   from twisted trac ticket 7603
+
+
+Phase 4. Integrated Tor Hidden Service feature for storage servers
+------------------------------------------------------------------
+
+#. teach tor to create Hidden Service directories with group
+   rx perms https://trac.torproject.org/projects/tor/ticket/11291
+#. open new txtorcon ticket - Teach endpoint to use control port feature
+   from tor trac ticket 11291