move upstream contributions section to FAQ

This commit is contained in:
Daniel Micay 2021-03-04 18:07:52 -05:00
parent 0956dba241
commit b4f5326c8b
8 changed files with 31 additions and 20 deletions

View File

@ -26,7 +26,7 @@
<link rel="stylesheet" href="/grapheneos.css?29"/>
<link rel="manifest" href="/manifest.webmanifest"/>
<link rel="license" href="/LICENSE.txt"/>
<script type="module" src="/js/redirect.js?9"></script>
<script type="module" src="/js/redirect.js?10"></script>
</head>
<body>
<header>

View File

@ -26,7 +26,7 @@
<link rel="stylesheet" href="/grapheneos.css?29"/>
<link rel="manifest" href="/manifest.webmanifest"/>
<link rel="license" href="/LICENSE.txt"/>
<script type="module" src="/js/redirect.js?9"></script>
<script type="module" src="/js/redirect.js?10"></script>
</head>
<body>
<header>
@ -117,6 +117,7 @@
<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="#donate">How can I donate to GrapheneOS?</a></li>
<li><a href="#upstream">Does GrapheneOS make upstream contributions?</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>
@ -1135,6 +1136,25 @@
support the GrapheneOS project. GrapheneOS is entirely funded by donations.</p>
</article>
<article id="upstream">
<h2><a href="#upstream">Does GrapheneOS make upstream contributions?</a></h2>
<p>GrapheneOS has made substantial contributions to the privacy and security of
the Android Open Source Project, along with contributions to the Linux kernel,
LLVM, OpenBSD and other projects. Much of our past work is no longer part of the
downstream GrapheneOS project because we've successfully landed many patches
upstream. We've had even more success with making suggestions and participating in
design discussions to steer things in the direction we want. Many upstream changes
in AOSP such as removing app access to low-level process, network, timing and
profiling information originated in the GrapheneOS project. The needs of the
upstream projects are often different from ours, so they'll often reimplement the
features in a more flexible way. We've almost always been able to move to using
the upstream features and even when we still need our own implementation it helps
to have the concepts/restrictions considered by the upstream project and apps
needing to be compatible with it. Getting features upstream often leads to an
improved user experience and app compatibility.</p>
</article>
<article id="company">
<h2><a href="#company">Will GrapheneOS create a company?</a></h2>

View File

@ -26,7 +26,7 @@
<link rel="stylesheet" href="/grapheneos.css?29"/>
<link rel="manifest" href="/manifest.webmanifest"/>
<link rel="license" href="/LICENSE.txt"/>
<script type="module" src="/js/redirect.js?9"></script>
<script type="module" src="/js/redirect.js?10"></script>
</head>
<body>
<header>
@ -183,19 +183,9 @@
<section id="upstream">
<h2><a href="#upstream">Upstream contributions</a></h2>
<p>GrapheneOS has made substantial contributions to the privacy and security of the
Android Open Source Project, along with contributions to the Linux kernel, LLVM,
OpenBSD and other projects. Much of our past work is no longer part of the downstream
GrapheneOS project because we've successfully landed many patches upstream. We've had
even more success with making suggestions and participating in design discussions to
steer things in the direction we want. Many upstream changes in AOSP such as removing
app access to low-level process, network, timing and profiling information originated
in the GrapheneOS project. The needs of the upstream projects are often different from
ours, so they'll often reimplement the features in a more flexible way. We've almost
always been able to move to using the upstream features and even when we still need
our own implementation it helps to have the concepts/restrictions considered by the
upstream project and apps needing to be compatible with it. Getting features upstream
often leads to an improved user experience and app compatibility.</p>
<p>See <a href="/faq#upstream">the FAQ section on our upstream work</a> improving
privacy and security for billions of users by getting a subset of our changes into
core infrastructure projects.</p>
</section>
<section id="copyright-and-licensing">

View File

@ -26,7 +26,7 @@
<link rel="stylesheet" href="/grapheneos.css?29"/>
<link rel="manifest" href="/manifest.webmanifest"/>
<link rel="license" href="/LICENSE.txt"/>
<script type="module" src="/js/redirect.js?9"></script>
<script type="module" src="/js/redirect.js?10"></script>
</head>
<body>
<header>

View File

@ -26,7 +26,7 @@
<link rel="stylesheet" href="/grapheneos.css?29"/>
<link rel="manifest" href="/manifest.webmanifest"/>
<link rel="license" href="/LICENSE.txt"/>
<script type="module" src="/js/redirect.js?9"></script>
<script type="module" src="/js/redirect.js?10"></script>
<script type="module" src="/js/fastboot/dist/fastboot.min.mjs?8"></script>
<script type="module" src="/js/web-install.js?13"></script>
</head>

View File

@ -11,6 +11,7 @@
const redirects = new Map([
["/#device-support", "/faq#device-support"],
["/#roadmap", "/faq#roadmap"],
["/#upstream", "/faq#upstream"],
["/#copyright-and-licensing", "/faq#copyright-and-licensing"],
["/usage#default-connections", "/faq#default-connections"],
["/releases#marlin-stable", "/faq#legacy-devices"],

View File

@ -28,7 +28,7 @@
<link rel="manifest" href="/manifest.webmanifest"/>
<link rel="license" href="/LICENSE.txt"/>
<script type="module" src="/js/releases.js?14"></script>
<script type="module" src="/js/redirect.js?9"></script>
<script type="module" src="/js/redirect.js?10"></script>
</head>
<body>
<header>

View File

@ -26,7 +26,7 @@
<link rel="stylesheet" href="/grapheneos.css?29"/>
<link rel="manifest" href="/manifest.webmanifest"/>
<link rel="license" href="/LICENSE.txt"/>
<script type="module" src="/js/redirect.js?9"></script>
<script type="module" src="/js/redirect.js?10"></script>
</head>
<body>
<header>