1 files changed, 8 insertions, 30 deletions
diff --git a/spec/glossary.md b/spec/glossary.md
index 8f62ff7..908686c 100644
--- a/spec/glossary.md
+++ b/spec/glossary.md
@@ -1,4 +1,4 @@
-Glossary
+# Glossary
 
 The Tor Project
 
@@ -10,28 +10,6 @@ This glossary is not a design document; it is only a reference.
 This glossary is a work-in-progress; double-check its definitions before
 citing them authoritatively. ;)
 
-Table of Contents
-
-```text
-    0. Preliminaries
-    1.0. Commonly used Tor configuration terms
-    2.0. Tor network components
-        2.1. Relays, aka OR (onion router)
-            2.1.1. Specific roles
-        2.2. Client, aka OP (onion proxy)
-        2.3. Authorities
-        2.4. Hidden Service
-        2.5. Circuit
-        2.6. Edge connection
-        2.7. Consensus
-        2.8. Descriptor
-    3.0. Tor network protocols
-        3.1. Link handshake
-        3.2. Circuit handshake
-        3.3. Hidden Service Protocol
-        3.4. Directory Protocol
-    4.0. General network definitions
-```
 
 <a id="glossary.txt-0"></a>
 
@@ -44,24 +22,24 @@ RFC 2119.
 
 <a id="glossary.txt-1.0"></a>
 
-## Commonly used Tor configuration terms
+## Commonly used Tor configuration terms { #configuration }
 
 ORPort  - Onion Router Port
 DirPort - Directory Port
 
 <a id="glossary.txt-2.0"></a>
 
-## Tor network components
+## Tor network components { #network-compoennts }
 
 <a id="glossary.txt-2.1"></a>
 
-## Relays, aka OR (onion router)
+## Relays, aka OR (onion router) { #relay}
 
 \[Style guide: prefer the term "Relay"\]
 
 <a id="glossary.txt-2.1.1"></a>
 
-### Specific roles
+### Specific roles { #roles }
 
 Exit relay: The final hop in an exit circuit before traffic leaves
 the Tor network to connect to external servers.
@@ -91,13 +69,13 @@ rendezvous point.
 
 <a id="glossary.txt-2.2"></a>
 
-## Client, aka OP (onion proxy)
+## Client, aka OP (onion proxy) { #client }
 
 \[Style: the "OP" and "onion proxy" terms are deprecated.\]
 
 <a id="glossary.txt-2.3"></a>
 
-## Authorities
+## Authorities { #authorities }
 
 Directory Authority: Nine total in the Tor network, operated by
 trusted individuals. Directory authorities define and serve the
@@ -117,7 +95,7 @@ information it has.)
 
 <a id="glossary.txt-2.4"></a>
 
-## Hidden Service
+## Hidden Service { #hidden-service }
 
 A hidden service is a server that will only accept incoming
 connections via the hidden service protocol. Connection