diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2021-03-04 18:07:52 -0500 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2021-03-04 18:07:52 -0500 |
| commit | b4f5326c8b29f16d44262dff54b36dca8e6814af (patch) | |
| tree | 9b6d9f31a44263742eb31ac33ce16718c8be9dcd | |
| parent | 0956dba241fbe6daafd0c049f60f1485b79e237e (diff) | |
move upstream contributions section to FAQ
| -rw-r--r-- | static/build.html | 2 | ||||
| -rw-r--r-- | static/faq.html | 22 | ||||
| -rw-r--r-- | static/index.html | 18 | ||||
| -rw-r--r-- | static/install/cli.html | 2 | ||||
| -rw-r--r-- | static/install/web.html | 2 | ||||
| -rw-r--r-- | static/js/redirect.js | 1 | ||||
| -rw-r--r-- | static/releases.html | 2 | ||||
| -rw-r--r-- | static/usage.html | 2 |
8 files changed, 31 insertions, 20 deletions
diff --git a/static/build.html b/static/build.html index a8902b9f..4ff43158 100644 --- a/static/build.html +++ b/static/build.html @@ -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> diff --git a/static/faq.html b/static/faq.html index 4460d064..4b0fcaa6 100644 --- a/static/faq.html +++ b/static/faq.html @@ -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> diff --git a/static/index.html b/static/index.html index 60b4ee27..60b6e40f 100644 --- a/static/index.html +++ b/static/index.html @@ -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"> diff --git a/static/install/cli.html b/static/install/cli.html index 030f2c0d..b5a7b5eb 100644 --- a/static/install/cli.html +++ b/static/install/cli.html @@ -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> diff --git a/static/install/web.html b/static/install/web.html index 2fa94fa0..412018c7 100644 --- a/static/install/web.html +++ b/static/install/web.html @@ -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> diff --git a/static/js/redirect.js b/static/js/redirect.js index f865fa98..e820b662 100644 --- a/static/js/redirect.js +++ b/static/js/redirect.js @@ -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"], diff --git a/static/releases.html b/static/releases.html index 6f5f34d4..95ee350f 100644 --- a/static/releases.html +++ b/static/releases.html @@ -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> diff --git a/static/usage.html b/static/usage.html index dc74aa41..da0971c1 100644 --- a/static/usage.html +++ b/static/usage.html @@ -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> |