Improve redirect URLs

For those that are already correct, list the correct URL on the main
site, and mark them as "implicit" so we can double-check them.

For those that remain, remove all old links to gitweb.tpo, and
link to gitlab.tpo instead.

2 files changed, 53 insertions, 31 deletions

diff --git a/mdbook/spec/book.toml b/mdbook/spec/book.toml
index bd9aa80..5c4a582 100644
--- a/mdbook/spec/book.toml
+++ b/mdbook/spec/book.toml
@@ -17,11 +17,11 @@ build-dir = "../../html"
 [output.html.redirect]
 
 # BEGIN AUTO-GENERATED REDIRECTS
-"/collector-protocol.html" = "https://gitweb.torproject.org/collector.git/tree/src/main/resources/docs/PROTOCOL"
-"/rend-spec-v2.html" = "https://gitweb.torproject.org/torspec.git/tree/attic/rend-spec-v2.txt"
-"/rend-spec-v3.html" = "https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt"
-"/tor-fw-helper-spec.html" = "https://gitweb.torproject.org/torspec.git/tree/attic/tor-fw-helper-spec.txt"
+"/collector-protocol.html" = "https://gitlab.torproject.org/tpo/network-health/metrics/collector/-/blob/master/src/main/resources/docs/PROTOCOL?ref_type=heads"
+"/rend-spec-v2.html" = "https://gitlab.torproject.org/tpo/core/torspec/-/blob/main/attic/rend-spec-v2.txt?ref_type=heads"
+"/rend-spec-v3.html" = "https://spec.torproject.org/rend-spec"
+"/tor-fw-helper-spec.html" = "https://gitlab.torproject.org/tpo/core/torspec/-/blob/main/attic/tor-fw-helper-spec.txt?ref_type=heads"
 "/torbrowser-design.html" = "https://2019.www.torproject.org/projects/torbrowser/design/"
 "/tor-design.html" = "https://svn.torproject.org/svn/projects/design-paper/tor-design.pdf"
-"/walking-onions.html" = "https://github.com/nmathewson/walking-onions-wip/tree/master/specs"
+"/walking-onions.html" = "https://spec.torproject.org/proposals/323-walking-onions-full.html"
 # END AUTO-GENERATED REDIRECTS
diff --git a/mdbook/spec/spec-redirects.yaml b/mdbook/spec/spec-redirects.yaml
index 26310a7..567b1db 100644
--- a/mdbook/spec/spec-redirects.yaml
+++ b/mdbook/spec/spec-redirects.yaml
@@ -4,76 +4,98 @@
 # temporary redirect, or a redirect that is not a documentated
 # permanent link, do not add it here!
 
+# A permalink is marked as "implicit" below if it already has the
+# right URL, and no further redirect HTML needs to be created in the
+# mdbook configuration.
+
 redirects:
   'address-spec':
-    target: https://gitweb.torproject.org/torspec.git/tree/address-spec.txt
+    target: https://spec.torproject.org/address-spec
     description: Special Hostnames in Tor
+    implicit: yes
   'bandwidth-file-spec':
-    target: https://gitweb.torproject.org/torspec.git/tree/bandwidth-file-spec.txt
+    target: https://spec.torproject.org/bandwidth-file-spec
     description: Directory Authority Bandwidth File spec
+    implicit: yes
   'bridgedb-spec':
-    target: https://gitweb.torproject.org/torspec.git/tree/bridgedb-spec.txt
+    target: https://spec.torproject.org/bridgedb-spec
     description: BridgeDB specification
+    implicit: yes
   'cert-spec':
-    target: https://gitweb.torproject.org/torspec.git/tree/cert-spec.txt
+    target: https://spec.torproject.org/cert-spec
     description: Ed25519 certificates in Tor
+    implicit: yes
   'collector-protocol':
-    target: https://gitweb.torproject.org/collector.git/tree/src/main/resources/docs/PROTOCOL
+    target: https://gitlab.torproject.org/tpo/network-health/metrics/collector/-/blob/master/src/main/resources/docs/PROTOCOL?ref_type=heads
     description: Protocol of CollecTor's File Structure
   'control-spec':
-    target: https://gitweb.torproject.org/torspec.git/tree/control-spec.txt
+    target: https://spec.torproject.org/control-spec
     description: Tor control protocol, version 1
+    implicit: yes
   'dir-spec':
-    target: https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt
+    target: https://spec.torproject.org/dir-spec
     description: Tor directory protocol, version 3
+    implicit: yes
   'dir-list-spec':
-    target: https://gitweb.torproject.org/torspec.git/tree/dir-list-spec.txt
+    target: https://spec.torproject.org/dir-list-spec
     description: Tor Directory List file format
+    implicit: yes
   'ext-orport-spec':
-    target: https://gitweb.torproject.org/torspec.git/tree/ext-orport-spec.txt
+    target:  https://spec.torproject.org/ext-orport-spec
     description: Extended ORPort for pluggable transports
+    implicit: yes
   'gettor-spec':
-    target: https://gitweb.torproject.org/torspec.git/tree/gettor-spec.txt
+    target: https://spec.torproject.org/gettor-spec
     description: GetTor specification
+    implicit: yes
   'padding-spec':
-    target: https://gitweb.torproject.org/torspec.git/tree/padding-spec.txt
+    target: https://spec.torproject.org/padding-spec
     description: Tor Padding Specification
+    implicit: yes
   'path-spec':
-    target: https://gitweb.torproject.org/torspec.git/tree/path-spec.txt
+    target: https://spec.torproject.org/path-spec
     description: Tor Path Specification
+    implicit: yes
   'pt-spec':
-    target: https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt
+    target: https://spec.torproject.org/pt-spec
     description: Tor Pluggable Transport Specification, version 1
+    implicit: yes
   'rend-spec':
-    target: https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt
-    description: Tor Onion Service Rendezvous Specification, Version 2
+    target: https://spec.torproject.org/rend-spec
+    description: Tor Onion Service Rendezvous Specification, latest version
+    implicit: yes
   'rend-spec-v2':
-    target: https://gitweb.torproject.org/torspec.git/tree/attic/rend-spec-v2.txt
-    description: Tor Onion Service Rendezvous Specification, Version 2
+    target: https://gitlab.torproject.org/tpo/core/torspec/-/blob/main/attic/rend-spec-v2.txt?ref_type=heads
+    description: Tor Onion Service Rendezvous Specification, Version 2 (Obsolete)
   'rend-spec-v3':
-    target: https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt
-    description: Tor Onion Service Rendezvous Specification, Version 3
+    target: https://spec.torproject.org/rend-spec
+    description: Tor Onion Service Rendezvous Specification, Version 3 (Latest)
+    implicit: no
   'socks-extensions':
-    target: https://gitweb.torproject.org/torspec.git/tree/socks-extensions.txt
+    target: https://spec.torproject.org/socks-extensions
     description: "Tor's extensions to the SOCKS protocol"
+    implicit: yes
   'srv-spec':
-    target: https://gitweb.torproject.org/torspec.git/tree/srv-spec.txt
+    target: https://spec.torproject.org/srv-spec
     description: Tor Shared Random Subsystem Specification
+    implicit: yes
   'tor-fw-helper-spec':
-    target: https://gitweb.torproject.org/torspec.git/tree/attic/tor-fw-helper-spec.txt
+    target: https://gitlab.torproject.org/tpo/core/torspec/-/blob/main/attic/tor-fw-helper-spec.txt?ref_type=heads
     description: "Tor's (little) Firewall Helper specification"
   'tor-spec':
-    target: https://gitweb.torproject.org/torspec.git/tree/tor-spec.txt
+    target: https://spec.torproject.org/tor-spec
     description: Tor Protocol Specification
+    implicit: yes
   'torbrowser-design':
     target: https://2019.www.torproject.org/projects/torbrowser/design/
     description: The Design and Implementation of the Tor Browser
   'version-spec':
-    target: https://gitweb.torproject.org/torspec.git/tree/version-spec.txt
+    target: https://spec.torproject.org/version-spec
     description: How Tor Version Numbers Work
+    implicit: yes
   'tor-design':
     target: https://svn.torproject.org/svn/projects/design-paper/tor-design.pdf
     description: "Tor: The Second-Generation Onion Router"
   'walking-onions':
-    target: https://github.com/nmathewson/walking-onions-wip/tree/master/specs
-    description: Walking Onions specifications (work in progress)
+    target: https://spec.torproject.org/proposals/323-walking-onions-full.html
+    description: Walking Onions specifications