From baffdc4ec8fb6a8aed495ea93692dcb73955dcd4 Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Wed, 30 Dec 2020 23:53:55 -0500
Subject: move related topics together in the FAQ

---
 static/faq.html | 128 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 64 insertions(+), 64 deletions(-)

diff --git a/static/faq.html b/static/faq.html
index caf07794..9ec72ec1 100644
--- a/static/faq.html
+++ b/static/faq.html
@@ -113,12 +113,12 @@
                     <li><a href="#features">What features does GrapheneOS implement?</a></li>
                     <li><a href="#anti-theft">Does GrapheneOS provide Factory Reset Protection?</a></li>
                     <li><a href="#bundled-apps">Why aren't my favorite apps bundled with GrapheneOS?</a></li>
-                    <li><a href="#copyright-and-licensing">Who owns the GrapheneOS code and how is it licensed?</a></li>
-                    <li><a href="#trademark">What about the GrapheneOS name and logo?</a></li>
                     <li><a href="#roadmap">What is the roadmap for GrapheneOS?</a></li>
-                    <li><a href="#company">Will GrapheneOS create a company?</a></li>
                     <li><a href="#install">How do I install GrapheneOS?</a></li>
                     <li><a href="#build">How do I build GrapheneOS?</a></li>
+                    <li><a href="#company">Will GrapheneOS create a company?</a></li>
+                    <li><a href="#copyright-and-licensing">Who owns the GrapheneOS code and how is it licensed?</a></li>
+                    <li><a href="#trademark">What about the GrapheneOS name and logo?</a></li>
                 </ul>
             </nav>
 
@@ -1037,55 +1037,6 @@
                 down devices.</p>
             </article>
 
-            <article id="copyright-and-licensing">
-                <h2><a href="#copyright-and-licensing">Who owns the GrapheneOS code and how is it licensed?</a></h2>
-
-                <p>The copyright for GrapheneOS code is entirely owned by the GrapheneOS developers
-                and is made available under OSI-approved Open Source licenses. The upstream licensing
-                is inherited for the modifications to those projects and MIT licensing is used for our
-                own standalone projects. GrapheneOS has never had any copyright assignment and the
-                developers have always owned their own contributions.</p>
-
-                <p>The tiny portion of the code written by people under contract with the former
-                sponsor has not been included in the project since it was ported from Android Oreo to
-                Pie in 2018. This code became obsolete and was no longer useful. The vast majority of
-                the code from the previous era was owned by Daniel Micay, with very few exceptions. It
-                was never written under any contracts or employment agreements, was never assigned to
-                any company or organization and was the continuation of the original independent open
-                source project. The code was originally published under the same permissive open
-                source licenses that are used by GrapheneOS today. Only a small portion of this
-                historical code is actually still in use today. Most has become obsolete or has been
-                replaced by rewrites taking better approaches than in the past.</p>
-
-                <p>There was an era from September 2016 until the project split from the former
-                sponsor in 2018 where non-commercial usage licensing was used for revisions to the
-                existing permissively licensed code. This was an attempt to prop up the sponsor that
-                was supposed to be supporting the open source project. This did not impact ownership
-                of the code and Daniel Micay has relicensed the portions of the code that are used by
-                GrapheneOS. GrapheneOS does not contain any code based on code under non-commercial
-                usage licensing. Great care was taken to avoid pulling in anything that was not solely
-                owned by Daniel Micay, which was the case for nearly everything in the project.</p>
-            </article>
-
-            <article id="trademark">
-                <h2><a href="#trademark">What about the GrapheneOS name and logo?</a></h2>
-
-                <p>The GrapheneOS name and logo are trademarks of the GrapheneOS project. These
-                marks are the process of being formally registered in Canada and the US. In the
-                meantime, they're protected as unregistered trademarks.</p>
-
-                <p>Derivatives of GrapheneOS that are being published/redistributed should replace
-                the GrapheneOS branding with their own. It needs to be clear to users that it's a
-                distinct OS based on GrapheneOS. Forks of GrapheneOS are not GrapheneOS itself and
-                should not be presented that way.</p>
-
-                <p>Only unofficial builds of the official GrapheneOS sources should be referred to
-                as unofficial builds. An unofficial build is a build of the official GrapheneOS
-                sources with the update server URL changed to another server. A project making
-                modifications beyond that isn't simply an unofficial build and should be presented
-                as a distinct OS based on GrapheneOS.</p>
-            </article>
-
             <article id="roadmap">
                 <h2><a href="#roadmap">What is the roadmap for GrapheneOS?</a></h2>
 
@@ -1121,18 +1072,6 @@
                 term, the project will need to move into the hardware space.</p>
             </article>
 
-            <article id="company">
-                <h2><a href="#company">Will GrapheneOS create a company?</a></h2>
-
-                <p>No, GrapheneOS will remain a non-profit open source project / organization. It
-                will remain an independent organization not strongly associated with any specific
-                company. We partner with a variety of companies and other organizations, and we're
-                interested in more partnerships in the future. Keeping it as an non-profit avoids
-                the conflicts of interest created by a profit-based model. It allows us to focus
-                on improving privacy/security without struggling to build a viable business model
-                that's not in conflict with the success of the open source project.</p>
-            </article>
-
             <article id="install">
                 <h2><a href="#install">How do I install GrapheneOS?</a></h2>
 
@@ -1150,6 +1089,67 @@
                 If you have trouble with the build process, ask for help from the
                 <a href="/contact#community">#grapheneos Matrix / IRC channel</a>.</p>
             </article>
+
+            <article id="company">
+                <h2><a href="#company">Will GrapheneOS create a company?</a></h2>
+
+                <p>No, GrapheneOS will remain a non-profit open source project / organization. It
+                will remain an independent organization not strongly associated with any specific
+                company. We partner with a variety of companies and other organizations, and we're
+                interested in more partnerships in the future. Keeping it as an non-profit avoids
+                the conflicts of interest created by a profit-based model. It allows us to focus
+                on improving privacy/security without struggling to build a viable business model
+                that's not in conflict with the success of the open source project.</p>
+            </article>
+
+            <article id="copyright-and-licensing">
+                <h2><a href="#copyright-and-licensing">Who owns the GrapheneOS code and how is it licensed?</a></h2>
+
+                <p>The copyright for GrapheneOS code is entirely owned by the GrapheneOS developers
+                and is made available under OSI-approved Open Source licenses. The upstream licensing
+                is inherited for the modifications to those projects and MIT licensing is used for our
+                own standalone projects. GrapheneOS has never had any copyright assignment and the
+                developers have always owned their own contributions.</p>
+
+                <p>The tiny portion of the code written by people under contract with the former
+                sponsor has not been included in the project since it was ported from Android Oreo to
+                Pie in 2018. This code became obsolete and was no longer useful. The vast majority of
+                the code from the previous era was owned by Daniel Micay, with very few exceptions. It
+                was never written under any contracts or employment agreements, was never assigned to
+                any company or organization and was the continuation of the original independent open
+                source project. The code was originally published under the same permissive open
+                source licenses that are used by GrapheneOS today. Only a small portion of this
+                historical code is actually still in use today. Most has become obsolete or has been
+                replaced by rewrites taking better approaches than in the past.</p>
+
+                <p>There was an era from September 2016 until the project split from the former
+                sponsor in 2018 where non-commercial usage licensing was used for revisions to the
+                existing permissively licensed code. This was an attempt to prop up the sponsor that
+                was supposed to be supporting the open source project. This did not impact ownership
+                of the code and Daniel Micay has relicensed the portions of the code that are used by
+                GrapheneOS. GrapheneOS does not contain any code based on code under non-commercial
+                usage licensing. Great care was taken to avoid pulling in anything that was not solely
+                owned by Daniel Micay, which was the case for nearly everything in the project.</p>
+            </article>
+
+            <article id="trademark">
+                <h2><a href="#trademark">What about the GrapheneOS name and logo?</a></h2>
+
+                <p>The GrapheneOS name and logo are trademarks of the GrapheneOS project. These
+                marks are the process of being formally registered in Canada and the US. In the
+                meantime, they're protected as unregistered trademarks.</p>
+
+                <p>Derivatives of GrapheneOS that are being published/redistributed should replace
+                the GrapheneOS branding with their own. It needs to be clear to users that it's a
+                distinct OS based on GrapheneOS. Forks of GrapheneOS are not GrapheneOS itself and
+                should not be presented that way.</p>
+
+                <p>Only unofficial builds of the official GrapheneOS sources should be referred to
+                as unofficial builds. An unofficial build is a build of the official GrapheneOS
+                sources with the update server URL changed to another server. A project making
+                modifications beyond that isn't simply an unofficial build and should be presented
+                as a distinct OS based on GrapheneOS.</p>
+            </article>
         </main>
         <footer>
             <a href="/"><img src="/logo.png" width="512" height="512" alt=""/>GrapheneOS</a>
-- 
cgit v1.3.1