From c6824892af54c5a4b9d736fc4bf74eccddbafb67 Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Sat, 21 Mar 2020 22:29:04 -0400
Subject: [PATCH] remove old section on upgrading to Android 10

People can figure this out on their own if they have fallen incredibly
far behind the current releases.
---
 static/build.html    | 13 +------------
 static/faq.html      |  2 +-
 static/index.html    |  2 +-
 static/redirect.js   |  1 +
 static/releases.html |  2 +-
 static/usage.html    |  2 +-
 6 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/static/build.html b/static/build.html
index 90cd72f3..796bd725 100644
--- a/static/build.html
+++ b/static/build.html
@@ -65,7 +65,6 @@
                 <li>
                     <a href="#generating-release-signing-keys">Generating release signing keys</a>
                     <ul>
-                        <li><a href="#upgrading-to-android-10">Upgrading to Android 10</a></li>
                         <li><a href="#encrypting-keys">Encrypting keys</a></li>
                         <li><a href="#enabling-updatable-apex-components">Enabling updatable APEX components</a></li>
                     </ul>
@@ -470,17 +469,6 @@ cd ../..</pre>
             same scripts along with the expectation of it using the same passphrase as the other
             keys.</p>
 
-            <h3 id="upgrading-to-android-10">
-                <a href="#upgrading-to-android-10">Upgrading to Android 10</a>
-            </h3>
-
-            <p>For Android 10, there's a new <code>networkstack</code> key and you need to
-            generate one to avoid using the test key. For example, with crosshatch (needs to be
-            done for each set of device keys):</p>
-
-            <pre>cd keys/crosshatch
-../../development/tools/make_key networkstack '/CN=GrapheneOS/'</pre>
-
             <h3 id="encrypting-keys">
                 <a href="#encrypting-keys">Encrypting keys</a>
             </h3>
@@ -947,5 +935,6 @@ export PATH="$PATH:$HOME/sdk/tools:$HOME/sdk/tools/bin:$HOME/sdk/platform-tools:
                 <li><a href="https://reddit.com/r/GrapheneOS">Reddit</a></li>
             </ul>
         </footer>
+        <script src="/redirect.js?5"></script>
     </body>
 </html>
diff --git a/static/faq.html b/static/faq.html
index 771cf392..e790f797 100644
--- a/static/faq.html
+++ b/static/faq.html
@@ -653,6 +653,6 @@
                 <li><a href="https://reddit.com/r/GrapheneOS">Reddit</a></li>
             </ul>
         </footer>
-        <script src="/redirect.js?4"></script>
+        <script src="/redirect.js?5"></script>
     </body>
 </html>
diff --git a/static/index.html b/static/index.html
index 427854a8..dbe2b23e 100644
--- a/static/index.html
+++ b/static/index.html
@@ -114,6 +114,6 @@
                 <li><a href="https://reddit.com/r/GrapheneOS">Reddit</a></li>
             </ul>
         </footer>
-        <script src="/redirect.js?4"></script>
+        <script src="/redirect.js?5"></script>
     </body>
 </html>
diff --git a/static/redirect.js b/static/redirect.js
index 0ef16859..cbc198cc 100644
--- a/static/redirect.js
+++ b/static/redirect.js
@@ -18,6 +18,7 @@ const redirects = new Map([
     ["/releases#marlin-beta", "/faq#legacy-devices"],
     ["/releases#sailfish-beta", "/faq#legacy-devices"],
     ["/faq#dns", "/faq#custom-dns"],
+    ["/build#upgrading-to-android-10", "/build#generating-release-signing-keys"],
 ]);
 
 function handle_hash() {
diff --git a/static/releases.html b/static/releases.html
index dffa786f..53d15bbd 100644
--- a/static/releases.html
+++ b/static/releases.html
@@ -1079,6 +1079,6 @@
             </ul>
         </footer>
         <script src="/releases.js?11"></script>
-        <script src="/redirect.js?4"></script>
+        <script src="/redirect.js?5"></script>
     </body>
 </html>
diff --git a/static/usage.html b/static/usage.html
index 86da59cc..c568986d 100644
--- a/static/usage.html
+++ b/static/usage.html
@@ -335,6 +335,6 @@
                 <li><a href="https://reddit.com/r/GrapheneOS">Reddit</a></li>
             </ul>
         </footer>
-        <script src="/redirect.js?4"></script>
+        <script src="/redirect.js?5"></script>
     </body>
 </html>