diff options
61 files changed, 349 insertions, 353 deletions
@@ -4,4 +4,4 @@ ## Dynamic information -Once the dependencies have been emerged, run `bash ./bin/update.sh` from the base directory to update the site's dynamically generated information. Expect "LDAP user information" to be skipped when not running from a Gentoo box. +Once the dependencies have been emerged, run `bash ./bin/update.sh` from the base directory to update the site's dynamically generated information. Expect "LDAP user information" to be skipped when on systems that are not connected to Gentoo's LDAP infrastructure. diff --git a/_includes/downloads/alpha.html b/_includes/downloads/alpha.html index 15d2d27..66cc642 100644 --- a/_includes/downloads/alpha.html +++ b/_includes/downloads/alpha.html @@ -1,17 +1,17 @@ <div class="col-xs-12 col-md-6"> - <h4>Boot Media</h4> + <h4>Boot media</h4> <div class="list-group"> {% include partials/download-link.html type="iso" arch="alpha" id="minimal" title="Minimal Installation CD" %} </div> - <h4>Stage Archives</h4> + <h4>Stage archives</h4> <div class="list-group"> {% include partials/download-link.html type="stage3" arch="alpha" id="alpha" title="Stage 3" %} </div> </div> <div class="col-xs-12 col-md-6"> - <h4>Details (Contents, Hashes, and Signatures)</h4> + <h4>Details (contents, hashes, and signatures)</h4> <ul> <li><a href="http://distfiles.gentoo.org/releases/alpha/autobuilds/current-install-alpha-minimal/">Minimal Installation CD</a></li> <li><a href="http://distfiles.gentoo.org/releases/alpha/autobuilds/current-stage3-alpha/">Stage 3</a></li> </ul> -</div>
\ No newline at end of file +</div> diff --git a/_includes/downloads/amd64-advanced.html b/_includes/downloads/amd64-advanced.html index 9b3be60..01b2aae 100644 --- a/_includes/downloads/amd64-advanced.html +++ b/_includes/downloads/amd64-advanced.html @@ -1,30 +1,30 @@ <div class="col-xs-12 col-md-6"> - <h4>Boot Media</h4> + <h4>Boot media</h4> <div class="list-group"> {% include partials/download-link.html type="iso" arch="amd64" id="hardened/admincd-amd64" title="Admin CD" %} </div> - <h4>Stage Archives</h4> + <h4>Stage archives</h4> <div class="list-group"> {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-nomultilib" title="Stage 3" tag="no multilib" %} {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-uclibc-vanilla" title="Stage 3" tag="uclibc" %} - {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-hardened" title="Hardened Stage 3" %} - {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-hardened+nomultilib" title="Hardened Stage 3" tag="no multilib" %} - {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-uclibc-hardened" title="Hardened Stage 3" tag="uclibc" %} + {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-hardened" title="Hardened stage 3" %} + {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-hardened+nomultilib" title="Hardened stage 3" tag="no multilib" %} + {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-uclibc-hardened" title="Hardened stage 3" tag="uclibc" %} {% include partials/download-link.html type="stage3" arch="amd64" id="x32" title="Stage 3" tag="X32" %} {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-systemd" title="Stage 3" tag="systemd" %} </div> </div> <div class="col-xs-12 col-md-6"> - <h4>Details (Contents, Hashes, and Signatures)</h4> + <h4>Details (contents, hashes, and signatures)</h4> <ul> <li><a href="http://distfiles.gentoo.org/releases/amd64/autobuilds/current-install-amd64-minimal/">Minimal Installation CD</a></li> <li><a href="http://distfiles.gentoo.org/releases/amd64/autobuilds/current-stage3-amd64/">Stage 3</a></li> - <li><a href="http://distfiles.gentoo.org/releases/amd64/autobuilds/">All Stages</a></li> + <li><a href="http://distfiles.gentoo.org/releases/amd64/autobuilds/">All stages</a></li> </ul> <div class="alert alert-info"> - <strong><span class="fa fa-fw fa-info-circle"></span> Processor Compatibility</strong> + <strong><span class="fa fa-fw fa-info-circle"></span> Processor compatibility</strong> <p> The <em>amd64</em> architecture is intended for use on AMD 64-bit CPUs as well as 64-bit <strong>Intel Pentium/Core/Xeon</strong> processors. </p> diff --git a/_includes/downloads/amd64.html b/_includes/downloads/amd64.html index 0a787db..8d667a1 100644 --- a/_includes/downloads/amd64.html +++ b/_includes/downloads/amd64.html @@ -1,15 +1,15 @@ -<h4>Boot Media</h4> +<h4>Boot media</h4> <div class="list-group"> {% include partials/download-link.html type="iso" arch="amd64" id="minimal" title="Minimal Installation CD" %} {% include partials/download-link-raw.html url='http://bouncer.gentoo.org/fetch/gentoo-20160704-livedvd/amd64/' title='Hybrid ISO (LiveDVD)' size='2278404096' date='2016-07-04' %} </div> -<h4>Stage Archives</h4> +<h4>Stage archives</h4> <div class="list-group"> {% include partials/download-link.html type="stage3" arch="amd64" id="amd64" title="Stage 3" %} </div> -<h4>Details (Contents, Hashes, and Signatures)</h4> +<h4>Details (contents, hashes, and signatures)</h4> <p> <a href="http://distfiles.gentoo.org/releases/amd64/autobuilds/current-install-amd64-minimal/">Minimal Installation CD</a>, <a href="https://bouncer.gentoo.org/fetch/gentoo-20160704-livedvd/amd64/">Hybrid ISO</a>, diff --git a/_includes/downloads/arm.html b/_includes/downloads/arm.html index a2bf23e..0182469 100644 --- a/_includes/downloads/arm.html +++ b/_includes/downloads/arm.html @@ -1,5 +1,5 @@ <div class="col-xs-12 col-md-6"> - <h4>Stage Archives</h4> + <h4>Stage archives</h4> <div class="list-group"> {% include partials/download-link.html type="stage3" arch="arm" id="armv4tl" title="Stage 3" tag="ARMv4tl" %} {% include partials/download-link.html type="stage3" arch="arm" id="armv5tel" title="Stage 3" tag="ARMv5tel" %} @@ -10,8 +10,8 @@ </div> </div> <div class="col-xs-12 col-md-6"> - <h4>Details (Contents, Hashes, and Signatures)</h4> + <h4>Details (contents, hashes, and signatures)</h4> <ul> <li><a href="http://distfiles.gentoo.org/releases/arm/autobuilds/">Stage 3</a></li> </ul> -</div>
\ No newline at end of file +</div> diff --git a/_includes/downloads/experimental.html b/_includes/downloads/experimental.html index 8bc9d0d..f78f0fa 100644 --- a/_includes/downloads/experimental.html +++ b/_includes/downloads/experimental.html @@ -1,12 +1,12 @@ <div class="col-xs-12 col-md-6"> <h4 id="s390">s390</h4> <div class="list-group"> - {% include partials/download-link.html type="iso" arch="s390" id="netboot-s390-initramfs" title="Netboot Initramfs" tag="S390" %} - {% include partials/download-link.html type="iso" arch="s390" id="netboot-s390-kernel" title="Netboot Kernel" tag="S390" %} + {% include partials/download-link.html type="iso" arch="s390" id="netboot-s390-initramfs" title="Netboot initramfs" tag="S390" %} + {% include partials/download-link.html type="iso" arch="s390" id="netboot-s390-kernel" title="Netboot kernel" tag="S390" %} {% include partials/download-link.html type="stage3" arch="s390" id="s390" title="Stage 3" tag="S390" %} - {% include partials/download-link.html type="iso" arch="s390" id="netboot-s390x-initramfs" title="Netboot Initramfs" tag="S390X" %} - {% include partials/download-link.html type="iso" arch="s390" id="netboot-s390x-kernel" title="Netboot Kernel" tag="S390X" %} + {% include partials/download-link.html type="iso" arch="s390" id="netboot-s390x-initramfs" title="Netboot initramfs" tag="S390X" %} + {% include partials/download-link.html type="iso" arch="s390" id="netboot-s390x-kernel" title="Netboot kernel" tag="S390X" %} {% include partials/download-link.html type="stage3" arch="s390" id="s390x" title="Stage 3" tag="S390X" %} </div> @@ -17,7 +17,7 @@ </div> </div> <div class="col-xs-12 col-md-6"> - <h4 id="exp-other">Other Experimental Architectures</h4> + <h4 id="exp-other">Other experimental architectures</h4> <div class="alert alert-info"> <p> For all other experimental downloads (including for the diff --git a/_includes/downloads/hppa.html b/_includes/downloads/hppa.html index 8f2079e..0b2c0cd 100644 --- a/_includes/downloads/hppa.html +++ b/_includes/downloads/hppa.html @@ -1,18 +1,18 @@ <div class="col-xs-12 col-md-6"> - <h4>Boot Media</h4> + <h4>Boot media</h4> <div class="list-group"> {% include partials/download-link.html type="iso" arch="hppa" id="minimal" title="Minimal Installation CD" %} {% include partials/download-link.html type="iso" arch="hppa" id="netboot-hppa32" title="Netboot" tag="HPPA32" %} {% include partials/download-link.html type="iso" arch="hppa" id="netboot-hppa64" title="Netboot" tag="HPPA64" %} </div> - <h4>Stage Archives</h4> + <h4>Stage archives</h4> <div class="list-group"> {% include partials/download-link.html type="stage3" arch="hppa" id="hppa1.1" title="Stage 3" tag="HPPA 1.1" %} {% include partials/download-link.html type="stage3" arch="hppa" id="hppa2.0" title="Stage 3" tag="HPPA 2.0" %} </div> </div> <div class="col-xs-12 col-md-6"> - <h4>Details (Contents, Hashes, and Signatures)</h4> + <h4>Details (contents, hashes, and signatures)</h4> <ul> <li><a href="http://distfiles.gentoo.org/releases/hppa/autobuilds/current-install-hppa-minimal/">Minimal Installation CD</a></li> <li><a href="http://distfiles.gentoo.org/releases/hppa/autobuilds/current-netboot-hppa32/">Netboot HPPA32</a></li> diff --git a/_includes/downloads/ia64.html b/_includes/downloads/ia64.html index 46aee26..da22a25 100644 --- a/_includes/downloads/ia64.html +++ b/_includes/downloads/ia64.html @@ -1,25 +1,25 @@ <div class="col-xs-12 col-md-6"> - <h4>Boot Media</h4> + <h4>Boot media</h4> <div class="list-group"> {% include partials/download-link.html type="iso" arch="ia64" id="minimal" title="Minimal Installation CD" %} </div> - <h4>Stage Archives</h4> + <h4>Stage archives</h4> <div class="list-group"> {% include partials/download-link.html type="stage3" arch="ia64" id="ia64" title="Stage 3" %} </div> </div> <div class="col-xs-12 col-md-6"> - <h4>Details (Contents, Hashes, and Signatures)</h4> + <h4>Details (contents, hashes, and signatures)</h4> <ul> <li><a href="http://distfiles.gentoo.org/releases/ia64/autobuilds/current-iso/">Minimal Installation CD</a></li> <li><a href="http://distfiles.gentoo.org/releases/ia64/autobuilds/current-stage3/">Stage 3</a></li> </ul> <div class="alert alert-warning"> - <strong><i class="fa fa-fw fa-warning"></i> Confirm Processor Compatibility</strong> + <strong><i class="fa fa-fw fa-warning"></i> Confirm processor compatibility</strong> <p> The <em>ia64</em> architecture is intended for use on <strong>Intel Itanium</strong> processors only.<br /> If you have a 64-bit <strong>Intel Pentium/Core/Xeon</strong> processor, you need to use the <a href="#amd64" class="alert-link"><em>amd64</em></a> architecture. </p> </div> -</div>
\ No newline at end of file +</div> diff --git a/_includes/downloads/ppc.html b/_includes/downloads/ppc.html index 1880dde..13c5ad0 100644 --- a/_includes/downloads/ppc.html +++ b/_includes/downloads/ppc.html @@ -1,12 +1,12 @@ <div class="col-xs-12 col-md-6"> - <h4>Boot Media</h4> + <h4>Boot media</h4> <div class="list-group"> {% include partials/download-link.html type="iso" arch="ppc" id="minimal" title="Minimal Installation CD" %} </div> - <h4>Stage Archives</h4> + <h4>Stage archives</h4> <div class="list-group"> - {% include partials/download-link.html type="stage3" arch="ppc" id="ppc" title="PPC Stage 3" %} - {% include partials/download-link.html type="stage3" arch="ppc" id="ppc64-32ul" title="PPC64 Stage 3" tag="32ul" %} - {% include partials/download-link.html type="stage3" arch="ppc" id="ppc64-64ul" title="PPC64 Stage 3" tag="64ul" %} + {% include partials/download-link.html type="stage3" arch="ppc" id="ppc" title="PPC stage 3" %} + {% include partials/download-link.html type="stage3" arch="ppc" id="ppc64-32ul" title="PPC64 stage 3" tag="32ul" %} + {% include partials/download-link.html type="stage3" arch="ppc" id="ppc64-64ul" title="PPC64 stage 3" tag="64ul" %} </div> -</div>
\ No newline at end of file +</div> diff --git a/_includes/downloads/sparc.html b/_includes/downloads/sparc.html index 7e91ad3..0aa4281 100644 --- a/_includes/downloads/sparc.html +++ b/_includes/downloads/sparc.html @@ -1,11 +1,11 @@ <div class="col-xs-12 col-md-6"> - <h4>Boot Media</h4> + <h4>Boot media</h4> <div class="list-group"> {% include partials/download-link.html type="iso" arch="sparc" id="minimal" title="Minimal Installation CD" %} </div> - <h4>Stage Archives</h4> + <h4>Stage archives</h4> <div class="list-group"> {% include partials/download-link.html type="stage3" arch="sparc" id="sparc64" title="Stage 3" %} {% include partials/download-link.html type="stage3" arch="sparc" id="sparc64-multilib" title="Stage 3" tag="multilib" %} </div> -</div>
\ No newline at end of file +</div> diff --git a/_includes/downloads/x86-advanced.html b/_includes/downloads/x86-advanced.html index 7763e78..609025f 100644 --- a/_includes/downloads/x86-advanced.html +++ b/_includes/downloads/x86-advanced.html @@ -1,27 +1,27 @@ <div class="col-xs-12 col-md-6"> - <h4>Boot Media</h4> + <h4>Boot media</h4> <div class="list-group"> {% include partials/download-link.html type="iso" arch="x86" id="hardened/admincd-x86" title="Admin CD" %} </div> - <h4>Stage Archives</h4> + <h4>Stage archives</h4> <div class="list-group"> {% include partials/download-link.html type="stage3" arch="x86" id="i486" title="Stage 3" tag="i486" %} {% include partials/download-link.html type="stage3" arch="x86" id="i686-uclibc-vanilla" title="Stage 3" tag="i686 | uclibc" %} - {% include partials/download-link.html type="stage3" arch="x86" id="i686-hardened" title="Hardened Stage 3" tag="i686" %} - {% include partials/download-link.html type="stage3" arch="x86" id="i686-uclibc-hardened" title="Hardened Stage 3" tag="i686 | uclibc" %} + {% include partials/download-link.html type="stage3" arch="x86" id="i686-hardened" title="Hardened stage 3" tag="i686" %} + {% include partials/download-link.html type="stage3" arch="x86" id="i686-uclibc-hardened" title="Hardened stage 3" tag="i686 | uclibc" %} {% include partials/download-link.html type="stage3" arch="x86" id="i686-systemd" title="Stage 3" tag="systemd" %} </div> </div> <div class="col-xs-12 col-md-6"> - <h4>Details (Contents, Hashes, and Signatures)</h4> + <h4>Details (contents, hashes, and signatures)</h4> <ul> <li><a href="http://distfiles.gentoo.org/releases/x86/autobuilds/current-install-x86-minimal/">Minimal Installation CD</a></li> <li><a href="http://distfiles.gentoo.org/releases/x86/autobuilds/current-stage3-i686/">Stage 3</a></li> </ul> <div class="alert alert-warning"> - <strong><i class="fa fa-fw fa-warning"></i> Confirm Processor Compatibility</strong> + <strong><i class="fa fa-fw fa-warning"></i> Confirm processor compatibility</strong> <p> There are two builds of the <em>x86</em> architecture: <em>i486</em> and <em>i686</em>.<br /> Processors prior to the <strong>Intel Pentium Pro</strong> or <strong>Pentium II</strong> require the <em>i486</em> variant to be used. diff --git a/_includes/downloads/x86.html b/_includes/downloads/x86.html index f240871..260c8d6 100644 --- a/_includes/downloads/x86.html +++ b/_includes/downloads/x86.html @@ -1,15 +1,15 @@ -<h4>Boot Media</h4> +<h4>Boot media</h4> <div class="list-group"> {% include partials/download-link.html type="iso" arch="x86" id="minimal" title="Minimal Installation CD" %} {% include partials/download-link-raw.html url='http://bouncer.gentoo.org/fetch/gentoo-20160704-livedvd/x86/' title='Hybrid ISO (LiveDVD)' size='2442909696' date='2016-07-04' %} </div> -<h4>Stage Archives</h4> +<h4>Stage archives</h4> <div class="list-group"> {% include partials/download-link.html type="stage3" arch="x86" id="i686" title="Stage 3" tag="i686" %} </div> -<h4>Details (Contents, Hashes, and Signatures)</h4> +<h4>Details (contents, hashes, and signatures)</h4> <p> <a href="http://distfiles.gentoo.org/releases/x86/autobuilds/current-install-x86-minimal/">Minimal Installation CD</a>, <a href="https://bouncer.gentoo.org/fetch/gentoo-20160704-livedvd/x86/">Hybrid ISO</a>, diff --git a/_posts/2015-03-31-website-update.md b/_posts/2015-03-31-website-update.md index 03d6a77..25b8939 100644 --- a/_posts/2015-03-31-website-update.md +++ b/_posts/2015-03-31-website-update.md @@ -1,5 +1,5 @@ --- -title: Gentoo announces total website makeover (not an April Fool's) +title: Gentoo announces total website makeover (not an April Fool's joke!) --- **Thank you for participating in Gentoo's 2015 April Fools' joke!** @@ -68,9 +68,9 @@ every year," said Daniel Robbins (drobbins), former Gentoo founder. Several teams participated in the early development of the new website and would like to showcase their work: -- Games Team (JavaScript Pong) -- Multimedia Team (Ghostbusters Theme on 6 floppy drives) -- Net-News Team (A list of Gentoo newsgroups) +- Games team (JavaScript Pong). +- Multimedia team (Ghostbusters Theme on 6 floppy drives). +- Net-News team (A list of Gentoo newsgroups). ### Phase II The second phase of the project to get Gentoo Linux to a wider user base will @@ -84,4 +84,4 @@ Media release prepared by [A Jackson](mailto:ajackson@gentoo.org). Editorial inquiries: [PR team](mailto:pr@gentoo.org). -Interviews, photography and screen shots available on request.
\ No newline at end of file +Interviews, photography and screen shots available on request. diff --git a/donate/thanks.html b/donate/thanks.html index 87ae712..9f74ac6 100644 --- a/donate/thanks.html +++ b/donate/thanks.html @@ -9,7 +9,7 @@ layout: tyrian <br> <p class="lead text-center"> - On behalf of Larry the Cow, and the entire Gentoo community, thank you for your support! + On behalf of Larry the Cow, and the entire Gentoo community, we thank you for your support! </p> <hr> @@ -18,4 +18,4 @@ layout: tyrian <small> If you have any questions regarding your donation, please let our <a href="mailto:trustees@gentoo.org">Trustees</a> know. </small> -</p>
\ No newline at end of file +</p> diff --git a/downloads/index.html b/downloads/index.html index 9b8fe09..0aa8b15 100644 --- a/downloads/index.html +++ b/downloads/index.html @@ -9,7 +9,7 @@ inlinejs: "$(function() { $('#other-arches a:first').tab('show'); });" <p class="lead stick-bottom"> Gentoo Linux is available free over the Internet.<br> - You can download Gentoo Linux Live Environments and Stage Archives using the links below. + Live environments and stage archives can be downloaded using the links below. </p> <div class="row"> @@ -48,7 +48,7 @@ inlinejs: "$(function() { $('#other-arches a:first').tab('show'); });" <div class="row"> <div class="col-md-12"> - <h2>Advanced Choices and other Architectures</h2> + <h2>Advanced choices and other architectures</h2> @@ -66,13 +66,13 @@ inlinejs: "$(function() { $('#other-arches a:first').tab('show'); });" <div class="tab-content other-arches"> <div class="tab-pane active" id="amd64-advanced"> - <h3>amd64 – Advanced Choices</h3> + <h3>amd64 – Advanced choices</h3> <div class="row"> {% include downloads/amd64-advanced.html %} </div> </div> <div class="tab-pane active" id="x86-advanced"> - <h3>x86 – Advanced Choices</h3> + <h3>x86 – Advanced choices</h3> <div class="row"> {% include downloads/x86-advanced.html %} </div> @@ -114,7 +114,7 @@ inlinejs: "$(function() { $('#other-arches a:first').tab('show'); });" </div> </div> <div class="tab-pane active" id="experimental"> - <h3>Experimental Architectures</h3> + <h3>Experimental architectures</h3> <div class="row"> {% include downloads/experimental.html %} </div> diff --git a/downloads/mirrors/index.html b/downloads/mirrors/index.html index d042aed..c0de095 100644 --- a/downloads/mirrors/index.html +++ b/downloads/mirrors/index.html @@ -1,5 +1,5 @@ --- -title: 'Gentoo Source Mirrors' +title: 'Gentoo source mirrors' navtitle: 'Mirrors' nav1: downloads nav2: mirrors @@ -12,17 +12,17 @@ nav2-show: true </p> <div class="alert alert-info"> - <strong>Using Source Mirrors</strong> + <strong>Using source mirrors</strong> <br> - The mirrors listed <strong>on this page</strong> contain installation files such as <strong>LiveCDs, Portage tree snapshots</strong> + The mirrors listed <strong>on this page</strong> contain installation files such as <strong>LiveCDs, Gentoo ebuild repository snapshots</strong> as well as <strong>distfiles</strong> (the actual program code for our packages). <br> - To use a source mirror for Portage downloads, add a URL from the list below to your <code>GENTOO_MIRRORS</code> variable in <tt>make.conf</tt>. - <a href="https://wiki.gentoo.org/wiki/GENTOO_MIRRORS" class="alert-link">More information</a> is available in our Wiki. + To use a source mirror for Portage downloads, add a URL from the list below to the <var>GENTOO_MIRRORS</var> variable in <tt>make.conf</tt>. + <a href="https://wiki.gentoo.org/wiki/GENTOO_MIRRORS" class="alert-link">More information</a> is available in our wiki. </div> <div class="alert alert-success"> - <strong>rsync Mirrors</strong> + <strong>rsync mirrors</strong> <br> We also have a second type of mirrors that you use for updating your Portage tree (configured via <tt>repos.conf</tt>). They are available on a <a href="/support/rsync-mirrors/" class="alert-link">separate page</a>. @@ -34,7 +34,7 @@ nav2-show: true <hr> -<h2>Countries covered by Gentoo Source Mirrors</h2> +<h2>Countries covered by Gentoo source mirrors</h2> <table class="table table-condensed table-striped"> <tr> diff --git a/downloads/signatures/index.html b/downloads/signatures/index.html index b9011ca..62eda4f 100644 --- a/downloads/signatures/index.html +++ b/downloads/signatures/index.html @@ -1,5 +1,5 @@ --- -title: 'Release Media Signatures' +title: 'Release media signatures' navtitle: 'Signatures' nav1: downloads nav2: signatures @@ -45,7 +45,7 @@ nav2-show: true <div class="panel panel-default"> <div class="panel-heading"> - <h3 class="panel-title"><span class="fa fa-fw fa-check-circle-o"></span> Verifying Files</h3> + <h3 class="panel-title"><span class="fa fa-fw fa-check-circle-o"></span> Verifying files</h3> </div> <div class="panel-body"> <p>To verify downloaded files are not tampered with, you need the <tt>.DIGESTS</tt> file matching your release and the matching key from the table above.</p> diff --git a/get-involved/become-developer/index.md b/get-involved/become-developer/index.md index 33fa070..7399e44 100644 --- a/get-involved/become-developer/index.md +++ b/get-involved/become-developer/index.md @@ -61,8 +61,8 @@ learn a few basics on how Gentoo is structured and how it operates. To get commi access, you will also need to know a fair bit about ebuilds. To help you get yourself knowledgeable, we have prepared one or two quizzes for you to take. -The prospective developers aiming to obtain commit access should take the [ebuild -quiz](https://projects.gentoo.org/comrel/recruiters/quizzes/ebuild-quiz.txt), +The prospective developers aiming to obtain commit access to the Gentoo ebuild repository +should take the [ebuild quiz](https://projects.gentoo.org/comrel/recruiters/quizzes/ebuild-quiz.txt), followed by the [end quiz](https://projects.gentoo.org/comrel/recruiters/quizzes/end-quiz.txt). For candidates for developers without commit access, we have prepared a less technical [developer quiz](https://projects.gentoo.org/comrel/recruiters/quizzes/developer-quiz.txt) @@ -70,9 +70,9 @@ instead. ### Step 5. Get recruited! -Once you and your mentor agree that you're ready, you arrange a review session +Once you and your mentor agree that you're ready, arrange a review session with the [Recruiters](https://wiki.gentoo.org/wiki/Project:Recruiters) at a -convenient time. During this session(s), Recruiters interview you and ensure +convenient time. During the session(s), Recruiters interview you and ensure that you have obtained all the necessary knowledge. Once you pass the review, the Recruiters create your developer account and announce you as a new developer. @@ -80,7 +80,7 @@ developer. ## What do I get? -Besides the warm feeling of contributing to Free and Open Source Software you ask? +Besides the warm feeling of contributing to Free and Open Source Software? -Okay, there are indeed a few perks: You get an **@gentoo.org** email address, matching IRC cloak, -special access flags on our Wiki and Bugzilla, and a few other things to facilitate your development efforts. +There are indeed a few perks: You get an **@gentoo.org** email address, matching IRC cloak, +special access flags on our wiki and Bugzilla sites, and a few other things to facilitate development efforts. diff --git a/get-involved/contribute/index.html b/get-involved/contribute/index.html index 48c3653..6b0d48c 100644 --- a/get-involved/contribute/index.html +++ b/get-involved/contribute/index.html @@ -10,7 +10,7 @@ nav2-weight: 40 <p class="lead"> There are plenty of things you can do to make Gentoo even better. <br> - Here's your chance to leave a mark on our distribution. + Here's your chance to leave a mark on our distribution! </p> <br> @@ -20,22 +20,22 @@ nav2-weight: 40 <span class="fa fa-fw fa-users fa-5x"></span> </div> <div class="col-xs-12 col-md-10"> - <h2 class="stick-top">Provide Community Support</h2> + <h2 class="stick-top">Provide community support</h2> <p> Join the awesome crowd of helpful people in our <a href="../irc-channels/">IRC channels</a>, - on our <a href="https://forums.gentoo.org/">Forums</a> and on the <a href="../mailing-lists/">Mailing Lists</a>. + on our <a href="https://forums.gentoo.org/">forums</a> and on the <a href="../mailing-lists/">mailing lists</a>. <br> If a topic is being discussed that you're knowledgeable on, please feel free to contribute and help out a fellow user. </p> <p class="button-bar"> <a href="https://forums.gentoo.org/search.php?search_id=unanswered" class="btn btn-primary"> - <span class="fa fa-fw fa-question-circle"></span> Unanswered questions on the Forums + <span class="fa fa-fw fa-question-circle"></span> Unanswered questions on the forums </a> <a href="../irc-channels/" class="btn btn-primary"> <span class="fa fa-fw fa-comments-o"></span> Join <tt>#gentoo</tt> </a> <a href="../mailing-lists/" class="btn btn-primary"> - <span class="fa fa-fw fa-inbox"></span> Mailing Lists + <span class="fa fa-fw fa-inbox"></span> Mailing lists </a> </p> </div> @@ -48,9 +48,9 @@ nav2-weight: 40 <span class="fa fa-fw fa-book fa-5x"></span> </div> <div class="col-xs-12 col-md-10"> - <h2 class="stick-top">Improve our Documentation</h2> + <h2 class="stick-top">Improve our documentation</h2> <p> - The <a href="https://wiki.gentoo.org/">Gentoo Wiki</a> is the central documentation resource made by the community for the community. + The <a href="https://wiki.gentoo.org/">Gentoo wiki</a> is the central documentation resource made by the community for the community. <br> Found something that needs to be documented, improved, translated, or rewritten? Sign up and get it done! @@ -77,7 +77,7 @@ nav2-weight: 40 <span class="fa fa-fw fa-gears fa-5x"></span> </div> <div class="col-xs-12 col-md-10"> - <h2 class="stick-top">Maintain Packages</h2> + <h2 class="stick-top">Maintain ebuilds</h2> <p> Packages are the very essence of our distribution. Maintaining them is one of the most important tasks we have. @@ -88,7 +88,7 @@ nav2-weight: 40 </p> <ul> - <li><a href="https://wiki.gentoo.org/wiki/Basic_guide_to_write_Gentoo_Ebuilds">Basic Guide to writing Ebuilds</a></li> + <li><a href="https://wiki.gentoo.org/wiki/Basic_guide_to_write_Gentoo_Ebuilds">Basic guide to writing ebuilds</a></li> <li><a href="https://devmanual.gentoo.org/">The Gentoo Developer Manual</a></li> <li>The <a href="irc://irc.gentoo.org/gentoo-dev-help"><tt>#gentoo-dev-help</tt></a> IRC channel</li> <li>The <a href="/get-involved/mailing-lists/">gentoo-devhelp</a> mailing list</li> @@ -97,7 +97,7 @@ nav2-weight: 40 <p> Before <a href="/get-involved/become-developer/">becoming a developer</a>, you can test and improve your ebuild writing skills by contributing to the <a href="https://wiki.gentoo.org/wiki/Project:Sunrise">Sunrise user overlay</a>, testing packages as <em>Architecture tester</em> - or work together with a developer and act as <em>Proxy Maintainer</em> for a small set of packages. + or work together with a developer and act as <em>Proxy maintainer</em> for a small set of packages. </p> <p class="button-bar"> @@ -105,10 +105,10 @@ nav2-weight: 40 <span class="fa fa-fw fa-upload"></span> How to submit ebuilds </a> <a href="https://wiki.gentoo.org/wiki/Project:X86/Arch_Testers_FAQ" class="btn btn-primary"> - <span class="fa fa-fw fa-wrench"></span> Become Arch Tester + <span class="fa fa-fw fa-wrench"></span> Become arch tester </a> <a href="https://wiki.gentoo.org/wiki/Project:Proxy_Maintainers" class="btn btn-primary"> - <span class="fa fa-fw fa-user"></span> Become Proxy Maintainer + <span class="fa fa-fw fa-user"></span> Become proxy maintainer </a> </p> </div> @@ -121,7 +121,7 @@ nav2-weight: 40 <span class="fa fa-fw fa-bug fa-5x"></span> </div> <div class="col-xs-12 col-md-10"> - <h2 class="stick-top">Report and Resolve Bugs</h2> + <h2 class="stick-top">Report and resolve bugs</h2> <p> <br> If you've come across flaw in a package in our distribution, please take a moment to report it @@ -150,7 +150,7 @@ nav2-weight: 40 <span class="fa fa-fw fa-paint-brush fa-5x"></span> </div> <div class="col-xs-12 col-md-10"> - <h2 class="stick-top">Create Artwork and Designs</h2> + <h2 class="stick-top">Create artwork and designs</h2> <p> Got an idea for a cool wallpaper, case badge, graphic item, web feature, or anything else that will be a pleasure to look at? <br> @@ -182,7 +182,7 @@ nav2-weight: 40 </p> <p class="button-bar"> <a href="https://wiki.gentoo.org/wiki/Project:GMN" class="btn btn-primary"> - <span class="fa fa-fw fa-newspaper-o"></span> Contact the GMN team + <span class="fa fa-fw fa-newspaper-o"></span> Contact the news project </a> </p> </div> @@ -195,18 +195,18 @@ nav2-weight: 40 <span class="fa fa-fw fa-database fa-5x"></span> </div> <div class="col-xs-12 col-md-10"> - <h2 class="stick-top">Sponsor Infrastructure</h2> + <h2 class="stick-top">Sponsor infrastructure</h2> <p> Gentoo is largely run on sponsored infrastructure, as we can only sustain the very core machines of the distribution. </p> <p> If you have access to machines, bandwidth, or co-location and wish to support Gentoo, - please get in touch with our <a href="https://wiki.gentoo.org/wiki/Project:Infrastructure">Infrastructure team</a>. + please get in touch with our <a href="https://wiki.gentoo.org/wiki/Project:Infrastructure">Infrastructure project</a>. </p> <p class="button-bar"> - <a href="mailto:infra@gentoo.org" class="btn btn-primary"><span class="fa fa-fw fa-database"></span> Offer Infrastructure resources</a> + <a href="mailto:infra@gentoo.org" class="btn btn-primary"><span class="fa fa-fw fa-database"></span> Offer infrastructure resources</a> </p> </div> </section> @@ -218,7 +218,7 @@ nav2-weight: 40 <span class="fa fa-fw fa-cloud-download fa-5x"></span> </div> <div class="col-xs-12 col-md-10"> - <h2 class="stick-top">Provide a Mirror</h2> + <h2 class="stick-top">Provide a mirror</h2> <p> Mirrors provide users around the globe with speedy access to the latest ebuilds, program sources, stage archives, and boot media. <br> @@ -256,7 +256,6 @@ nav2-weight: 40 <div class="alert alert-info"> <strong>Looking for specific tasks?</strong> - The Gentoo Projects publish their <a href="https://wiki.gentoo.org/wiki/Project:Gentoo/Staffing_Needs" class="alert-link">Staffing Needs</a> - on our <a href="https://wiki.gentoo.org/wiki/Project:Gentoo/Staffing_Needs" class="alert-link">Wiki</a>. + The Gentoo projects publish their <a href="https://wiki.gentoo.org/wiki/Project:Gentoo/Staffing_Needs" class="alert-link">staffing needs on the wiki</a>. You are also always welcome to pick a <a href="https://bugs.gentoo.org" class="alert-link">bug</a> and work on it. </div> diff --git a/get-involved/discussion-forums/index.html b/get-involved/discussion-forums/index.html index 1b9b86a..d33b325 100644 --- a/get-involved/discussion-forums/index.html +++ b/get-involved/discussion-forums/index.html @@ -1,5 +1,5 @@ --- -title: 'Discussion Forums' +title: 'Discussion forums' navtitle: 'Forums' nav1: get-involved diff --git a/get-involved/get-code/index.html b/get-involved/get-code/index.html index e4e2a94..d93f9ad 100644 --- a/get-involved/get-code/index.html +++ b/get-involved/get-code/index.html @@ -1,6 +1,6 @@ --- -title: Gentoo Code Repositories -navtitle: Get the Code +title: Gentoo code repositories +navtitle: Get the code nav1: get-involved nav2: get-code @@ -8,41 +8,41 @@ nav2-show: true nav2-weight: 60 --- <p class="lead"> - Here is all the code that powers Gentoo, only one <kbd>git clone</kbd> away: + All the code that powers Gentoo is only one <kbd>git clone</kbd> away: </p> <div class="panel panel-default"> <div class="panel-heading"> - <h3 class="panel-title"><span class="fa fa-fw fa-git"></span> Git Repositories</h3> + <h3 class="panel-title"><span class="fa fa-fw fa-git"></span> Git repositories</h3> </div> <div class="panel-body"> <p> - Repositories containing our <a href="https://gitweb.gentoo.org/repo/gentoo.git/">main package repository</a>, - overlays, website code, and other project code are available in Git repositories. + Repositories including the <a href="https://gitweb.gentoo.org/repo/gentoo.git/">main ebuild repository</a>, + overlays (custom ebuild repositories), website code, and other project code are available in Git repositories. <br> We offer anonymous read-only access (<em>AnonGit</em>) via the HTTP and Git protocols as well as a web-based source code browser. </p> <br> <div class="alert alert-info"> - You can find the URLs needed to clone repositories on the project pages in the source code browser. - Unless you have an account on <tt>git.gentoo.org</tt>, please use the <tt>anongit.gentoo.org</tt> URL. + The URLs needed to clone repositories can be found on the project pages in the source code browser. + Unless you have an account on <tt>git.gentoo.org</tt>, please use the <tt>anongit.gentoo.org</tt> URL(s). </div> <hr> - Additionally, we mirror some repositories on GitHub to facilitate contributions. + Additionally, we mirror some repositories on GitHub to aid in facilitating community contributions. You can find them all under the <a href="https://github.com/gentoo/">Gentoo organization</a>. </div> <div class="panel-footer text-right"> <a href="https://anongit.gentoo.org/" class="btn btn-primary btn-sm"><span class="fa fa-fw fa-code-fork"></span> AnonGit</a> - <a href="https://gitweb.gentoo.org/" class="btn btn-primary btn-sm"><span class="fa fa-fw fa-search"></span> Source Code Browser</a> + <a href="https://gitweb.gentoo.org/" class="btn btn-primary btn-sm"><span class="fa fa-fw fa-search"></span> Source code browser</a> <a href="https://github.com/gentoo/" class="btn btn-primary btn-sm"><span class="fa fa-fw fa-github-alt"></span> Gentoo on GitHub</a> </div> </div> <div class="panel panel-default"> <div class="panel-heading"> - <h3 class="panel-title"><span class="fa fa-fw fa-code-fork"></span> CVS Repositories</h3> + <h3 class="panel-title"><span class="fa fa-fw fa-code-fork"></span> CVS repositories</h3> </div> <div class="panel-body"> Historical repositories are still available via CVS. @@ -51,12 +51,12 @@ nav2-weight: 60 </div> <div class="panel-footer text-right"> <a href="https://anoncvs.gentoo.org/" class="btn btn-primary btn-sm"><span class="fa fa-fw fa-code-fork"></span> AnonCVS</a> - <a href="https://sources.gentoo.org/" class="btn btn-primary btn-sm"><span class="fa fa-fw fa-search"></span> Source Code Browser</a> + <a href="https://sources.gentoo.org/" class="btn btn-primary btn-sm"><span class="fa fa-fw fa-search"></span> Source code browser</a> </div> </div> <h2>Want <code>+w</code>?</h2> <p> Please contact the listed repository owners to find out their contribution policy. - The main ebuild repository requires you to be a <a href="/get-involved/become-developer">Gentoo Developer</a> to commit. + The main ebuild repository requires you to be a <a href="/get-involved/become-developer">Gentoo developer</a> to commit. </p> diff --git a/get-involved/index.html b/get-involved/index.html index e1a86a8..399ee3a 100644 --- a/get-involved/index.html +++ b/get-involved/index.html @@ -1,5 +1,5 @@ --- -title: Get Involved +title: Get involved nav1: get-involved nav1-show: true @@ -13,15 +13,15 @@ nav1-weight: 30 <div class="col-xs-12 col-md-8 col-md-offset-2"> <div class="list-group"> <a href="irc-channels/" class="list-group-item"> - <h4 class="list-group-item-heading"><i class="fa fa-fw fa-comments-o"></i> IRC Channels</h4> - <p class="list-group-item-text">Gentoo offers a variety of IRC channels, from support to project-specific discussion.</p> + <h4 class="list-group-item-heading"><i class="fa fa-fw fa-comments-o"></i> IRC channels</h4> + <p class="list-group-item-text">Gentoo offers a variety of IRC channels - everything from support to project-specific discussion.</p> </a> <a href="https://forums.gentoo.org/" class="list-group-item"> - <h4 class="list-group-item-heading"><i class="fa fa-fw fa-group"></i> Discussion Forums</h4> + <h4 class="list-group-item-heading"><i class="fa fa-fw fa-group"></i> Discussion forums</h4> <p class="list-group-item-text">5,800,000 posts and counting.</p> </a> <a href="mailing-lists/" class="list-group-item"> - <h4 class="list-group-item-heading"><i class="fa fa-fw fa-send"></i> Mailing Lists</h4> + <h4 class="list-group-item-heading"><i class="fa fa-fw fa-send"></i> Mailing lists</h4> <p class="list-group-item-text">Subscribe to announcements, or get in on technical discussions.</p> </a> </div> @@ -37,16 +37,16 @@ nav1-weight: 30 <div class="list-group"> <a href="contribute/" class="list-group-item"> <h4 class="list-group-item-heading"><i class="fa fa-fw fa-gears"></i> Contribute</h4> - <p class="list-group-item-text">Lots of things we can use your help with.</p> + <p class="list-group-item-text">There are lots of things that could improved.</p> </a> <a href="become-developer/" class="list-group-item"> - <h4 class="list-group-item-heading"><i class="fa fa-fw fa-rocket"></i> Become a Developer</h4> + <h4 class="list-group-item-heading"><i class="fa fa-fw fa-rocket"></i> Become a developer</h4> <p class="list-group-item-text">Enjoy working on Gentoo? You're invited to officially join as a developer.</p> </a> <a href="get-code/" class="list-group-item"> - <h4 class="list-group-item-heading"><i class="fa fa-fw fa-code-fork"></i> Get the Code</h4> - <p class="list-group-item-text">Get the code that powers Gentoo to start hacking on it.</p> + <h4 class="list-group-item-heading"><i class="fa fa-fw fa-code-fork"></i> Get the code</h4> + <p class="list-group-item-text">Get the code that powers Gentoo and start hacking!</p> </a> </div> </div> -</div>
\ No newline at end of file +</div> diff --git a/get-involved/irc-channels/all-channels.html b/get-involved/irc-channels/all-channels.html index 7ebb982..b532b70 100644 --- a/get-involved/irc-channels/all-channels.html +++ b/get-involved/irc-channels/all-channels.html @@ -2,7 +2,7 @@ nav1: get-involved nav2: irc nav3: irc-all-channels -title: 'All IRC Channels' +title: 'All IRC channels' --- <p> @@ -16,7 +16,7 @@ title: 'All IRC Channels' Also, do read the channel's topic, it might just answer your question already. </div> -<h2>Primary Support Channels</h2> +<h2>Primary support channels</h2> <div class="table-responsive"> <table class="table table-striped"> @@ -30,7 +30,7 @@ title: 'All IRC Channels' </table> </div> -<h2>Architecture/Platform Support Channels</h2> +<h2>Architecture/Platform support channels</h2> <div class="table-responsive"> <table class="table table-striped"> @@ -44,7 +44,7 @@ title: 'All IRC Channels' </table> </div> -<h2>General and Development Channels</h2> +<h2>General and development channels</h2> <div class="table-responsive"> <table class="table table-striped"> @@ -58,7 +58,7 @@ title: 'All IRC Channels' </table> </div> -<h2>International Channels</h2> +<h2>International channels</h2> <div class="table-responsive"> <table class="table table-striped"> @@ -70,4 +70,4 @@ title: 'All IRC Channels' {% include partials/irc-channel.html %} {% endfor %} </table> -</div>
\ No newline at end of file +</div> diff --git a/get-involved/irc-channels/index.html b/get-involved/irc-channels/index.html index 6bbae6d..b5e4e80 100644 --- a/get-involved/irc-channels/index.html +++ b/get-involved/irc-channels/index.html @@ -1,5 +1,5 @@ --- -title: 'IRC Channels' +title: 'IRC channels' nav1: get-involved nav2: irc @@ -35,7 +35,7 @@ nav2-weight: 10 <div class="panel-body"> <div class="row"> <div class="col-xs-12"> - <h2 class="stick-top"><i class="fa fa-fw fa-comments-o"></i> <tt>#gentoo</tt> – Our Main IRC Support Channel</h2> + <h2 class="stick-top"><i class="fa fa-fw fa-comments-o"></i> <tt>#gentoo</tt> – Our main IRC support channel</h2> </div> </div> <div class="row"> @@ -61,16 +61,16 @@ nav2-weight: 10 </div> <div class="col-xs-12 col-md-3"> - <a href="irc://irc.gentoo.org/gentoo" role="button" class="btn btn-primary btn-block"><i class="fa fa-fw fa-comments-o"></i> Join <tt>#gentoo</tt> in your client</a> + <a href="irc://irc.gentoo.org/gentoo" role="button" class="btn btn-primary btn-block"><i class="fa fa-fw fa-comments-o"></i> Join <tt>#gentoo</tt> in a local client</a> <a href="http://webchat.freenode.net/?channels=gentoo" role="button" class="btn btn-primary btn-block"><i class="fa fa-fw fa-comments-o"></i> Join <tt>#gentoo</tt> via Webchat</a> </div> </div> </div> </div> -<h2>More Channels</h2> +<h2>More channels</h2> <p> Besides <tt>#gentoo,</tt> we also operate a number of other channels: - <a href="all-channels.html" class="btn btn-primary"><i class="fa fa-fw fa-comments-o"></i> Full Gentoo IRC Channel Listing</a> + <a href="all-channels.html" class="btn btn-primary"><i class="fa fa-fw fa-comments-o"></i> Full Gentoo IRC channel Listing</a> </p> diff --git a/get-involved/mailing-lists/all-lists.html b/get-involved/mailing-lists/all-lists.html index 836972e..e0e949d 100644 --- a/get-involved/mailing-lists/all-lists.html +++ b/get-involved/mailing-lists/all-lists.html @@ -6,7 +6,7 @@ nav3-show: true nav3-weight: 20 layout: page-nav3 -title: 'All Mailing Lists' +title: 'All mailing lists' --- <p class="lead"> @@ -29,7 +29,7 @@ title: 'All Mailing Lists' <hr> -<h2>Primary Mailing Lists</h2> +<h2>Primary mailing lists</h2> <div class="table-responsive"> <table class="table table-striped"> @@ -44,7 +44,7 @@ title: 'All Mailing Lists' </table> </div> -<h2>International Mailing Lists</h2> +<h2>International mailing lists</h2> <div class="table-responsive"> <table class="table table-striped"> @@ -59,7 +59,7 @@ title: 'All Mailing Lists' </table> </div> -<h2>Other Mailing Lists</h2> +<h2>Other mailing lists</h2> <div class="table-responsive"> <table class="table table-striped"> @@ -73,4 +73,4 @@ title: 'All Mailing Lists' {% endfor %} </table> </div> -{% include container/end %}
\ No newline at end of file +{% include container/end %} diff --git a/get-involved/mailing-lists/index.html b/get-involved/mailing-lists/index.html index 0008036..667ad66 100644 --- a/get-involved/mailing-lists/index.html +++ b/get-involved/mailing-lists/index.html @@ -8,7 +8,7 @@ nav3-show: true nav3-weight: 10 layout: page-nav3 -title: 'Mailing Lists' +title: 'Mailing lists' --- <p class="lead"> @@ -24,7 +24,7 @@ title: 'Mailing Lists' Like all of our Gentoo community venues, the mailing lists are governed by our <a href="https://wiki.gentoo.org/wiki/Project:Council/Code_of_conduct">Code of Conduct</a>. </p> -<h2>Main Lists</h2> +<h2>Main lists</h2> <h3>gentoo-user</h3> <p> @@ -33,7 +33,7 @@ title: 'Mailing Lists' <p> <a href="mailto:gentoo-user@lists.gentoo.org" title="Post to this list" class="btn btn-primary"><span class="fa fa-fw fa-send"></span> Post to gentoo-user</a> <a href="mailto:gentoo-user%2Bsubscribe@lists.gentoo.org" title="Subscribe to this list" class="btn btn-default"><span class="fa fa-fw fa-plus-square"></span> Subscribe to gentoo-user</a> - <a href="https://archives.gentoo.org/gentoo-user/" title="Archives of this list" class="btn btn-default"><span class="fa fa-fw fa-archive"></span> Browse Archives</a> + <a href="https://archives.gentoo.org/gentoo-user/" title="Archives of this list" class="btn btn-default"><span class="fa fa-fw fa-archive"></span> Browse archives</a> </p> <hr> @@ -44,7 +44,7 @@ title: 'Mailing Lists' <p> <a href="mailto:gentoo-dev@lists.gentoo.org" title="Post to this list" class="btn btn-primary"><span class="fa fa-fw fa-send"></span> Post to gentoo-dev</a> <a href="mailto:gentoo-dev%2Bsubscribe@lists.gentoo.org" title="Subscribe to this list" class="btn btn-default"><span class="fa fa-fw fa-plus-square"></span> Subscribe to gentoo-dev</a> - <a href="https://archives.gentoo.org/gentoo-dev/" title="Archives of this list" class="btn btn-default"><span class="fa fa-fw fa-archive"></span> Browse Archives</a> + <a href="https://archives.gentoo.org/gentoo-dev/" title="Archives of this list" class="btn btn-default"><span class="fa fa-fw fa-archive"></span> Browse archives</a> </p> <hr> @@ -54,7 +54,7 @@ title: 'Mailing Lists' </p> <p> <a href="mailto:gentoo-announce%2Bsubscribe@lists.gentoo.org" title="Subscribe to this list" class="btn btn-primary"><span class="fa fa-fw fa-plus-square"></span> Subscribe to gentoo-announce</a> - <a href="https://archives.gentoo.org/gentoo-announce/" title="Archives of this list" class="btn btn-default"><span class="fa fa-fw fa-archive"></span> Browse Archives</a> + <a href="https://archives.gentoo.org/gentoo-announce/" title="Archives of this list" class="btn btn-default"><span class="fa fa-fw fa-archive"></span> Browse archives</a> </p> <hr> @@ -62,9 +62,9 @@ title: 'Mailing Lists' <h2>Archives</h2> <p> - All of our public mailing lists are archived in the Gentoo Archives: + All of our public mailing lists are archived in the Gentoo archives: <br> - <a href="https://archives.gentoo.org" class="btn btn-primary btn-sm"><span class="fa fa-fw fa-archive"></span> Gentoo Archives</a> + <a href="https://archives.gentoo.org" class="btn btn-primary btn-sm"><span class="fa fa-fw fa-archive"></span> Gentoo archives</a> </p> <p> diff --git a/get-involved/mailing-lists/instructions.md b/get-involved/mailing-lists/instructions.md index 7d04826..ff3ad48 100644 --- a/get-involved/mailing-lists/instructions.md +++ b/get-involved/mailing-lists/instructions.md @@ -1,6 +1,6 @@ --- -title: 'Mailing List Instructions' -navtitle: 'Instructions & FAQ' +title: 'Mailing list instructions' +navtitle: 'Instructions and FAQs' nav1: get-involved nav2: ml @@ -48,7 +48,7 @@ To unsubscribe from a list, send an empty email to: You will then recieve a unsubscription confirmation request (double opt-in) from the list manager, that you must reply to if you wish to be unsubscribed. </div> -## Digest Lists +## Digest lists All of our lists also have a corresponding digest list. Digest lists will mail a single email to you every couple of days, rather than individual emails for each post. @@ -64,13 +64,13 @@ These users may subscribe to the "nomail" option of each list: `listname+subscribe-nomail@lists.gentoo.org`<br> `listname+unsubscribe-nomail@lists.gentoo.org` -## More Functions +## More functions You can learn more about the capabilities of mlmmj by sending an empty mail to the following address: `listname+help@lists.gentoo.org` -## Moderated Lists +## Moderated lists Very few of the Gentoo lists are moderated: only the `-announce` lists are fully moderatored. Additionally, some of our high-traffic lists have moderators in place for spam and unsubscribe requests (matching mail via regex). @@ -137,7 +137,7 @@ Choose just one list when sending a message. If you need additional help beyond the above, please [file a bug](https://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%20Infrastructure&version=unspecified&component=Mailing%20Lists&rep_platform=All&op_sys=Linux&priority=P2&bug_severity=normal&bug_status=NEW&alias=&bug_file_loc=https%3A%2F%2F&short_desc=&comment=&commentprivacy=0&keywords=&dependson=&blocked=&bit-25=1&maketemplate=Remember%20values%20as%20bookmarkable%20template&form_name=enter_bug&assigned_to=infra-bugs%40gentoo.org), or contact `listname+owner@lists.gentoo.org`. -## Privacy policy & disclaimer +## Privacy policy and disclaimer The mailing lists are public forums, except for lists explicitly otherwise. For lists explicitly marked private or restricted, all of the following except web archives are applicable. diff --git a/get-started/about/index.html b/get-started/about/index.html index 86d5fa8..483e591 100644 --- a/get-started/about/index.html +++ b/get-started/about/index.html @@ -9,7 +9,7 @@ title: 'About Gentoo' {% include hero-section/start class="abouthdr huge" %} <div class="row"> <div class="col-md-4"> - <img src="/assets/img/bg/larry.png" class="img-responsive" alt="Larry the cow, a bit unhappy"> + <img src="/assets/img/bg/larry.png" class="img-responsive" alt="Larry the cow, a bit unhappy."> </div> <div class="col-md-8"> Larry the Cow was a bit frustrated<br> at the current state of Linux distributions… @@ -74,4 +74,4 @@ title: 'About Gentoo' <p> Typing one command (<kbd>emerge -uD world</kbd>) will ensure that all the packages that <em>you</em> want on your system are updated automatically. -</p>
\ No newline at end of file +</p> diff --git a/get-started/index.html b/get-started/index.html index aa414ca..4dd4093 100644 --- a/get-started/index.html +++ b/get-started/index.html @@ -3,8 +3,8 @@ nav1: get-started nav1-show: true nav1-weight: 5 -title: 'Getting Started with Gentoo Linux' -navtitle: 'Get Started' +title: 'Getting started with Gentoo' +navtitle: 'Get started' --- <p class="lead"> @@ -17,10 +17,10 @@ navtitle: 'Get Started' <div class="row"> <div class="col-md-2 get-started-icon"><span class="fa fa-fw fa-power-off fa-5x"></span></div> <div class="col-md-10"> - <h2 class="stick-top">Step 1: Boot a Live Environment</h2> - <p>We offer a variety of Live Environments that allow you to perform the installation.</p> + <h2 class="stick-top">Step 1: Boot a live environment</h2> + <p>We offer a variety of live environments that allow you to perform the installation.</p> - <p>Choose between a lean console-only environment, a fully featured LiveDVD, or try the Gentoo-based SystemRescueCD which offers a mixture of both.</p> + <p>Choose between a lean console-only environment or a fully featured LiveDVD. Alternatively users are encouraged to try the Gentoo-based SystemRescueCD.</p> </div> </div> {% include hero-section/end %} @@ -29,8 +29,8 @@ navtitle: 'Get Started' <div class="row"> <div class="col-md-2 get-started-icon"><span class="fa fa-fw fa-book fa-5x"></span></div> <div class="col-md-10"> - <h2 class="stick-top">Step 2: Follow the Installation Instructions</h2> - <p>Gentoo provides you with detailed documentation that guides you through the installation process.</p> + <h2 class="stick-top">Step 2: Follow the installation instructions</h2> + <p>The Gentoo Handbook provides detailed documentation that guides you through the installation process.</p> <p>There is no installation program—you're the installer. That way, you can apply all the customizations you desire.</p> </div> @@ -68,18 +68,18 @@ navtitle: 'Get Started' <h3><i class="fa fa-fw fa-cogs"></i> Contribute</h3> <p> There's always things to engineer, build, fix, and document. - You're invited to help shape Gentoo. + Consider this your formal invitation to help shape Gentoo! </p> </div> <div class="col-xs-12 col-md-3"> <h3><i class="fa fa-fw fa-heart"></i> Donate</h3> <p> Your support is vital to keep us running. - Even little amounts help keep servers running. + Even little amounts help keep our servers online. </p> </div> <div class="col-xs-12 col-md-3"> - <h3><i class="fa fa-fw fa-bullhorn"></i> Spread the Word</h3> + <h3><i class="fa fa-fw fa-bullhorn"></i> Spread the word</h3> <p> Happy with the system you built? Tell the world about it. </p> @@ -87,7 +87,7 @@ navtitle: 'Get Started' </div> <div class="row"> <div class="col-xs-12 col-md-3"> - <a href="/get-involved/" class="btn btn-primary btn-block">Get Involved</a> + <a href="/get-involved/" class="btn btn-primary btn-block">Get involved</a> </div> <div class="col-xs-12 col-md-3"> <a href="/get-involved/contribute/" type="button" class="btn btn-primary btn-block">What can I do?</a> @@ -97,4 +97,4 @@ navtitle: 'Get Started' </div> <div class="col-xs-12 col-md-3"> </div> -</div>
\ No newline at end of file +</div> diff --git a/get-started/philosophy/index.md b/get-started/philosophy/index.md index ee3d0f1..6c8d5dc 100644 --- a/get-started/philosophy/index.md +++ b/get-started/philosophy/index.md @@ -7,7 +7,7 @@ nav3-show: true nav3-weight: 1 layout: page-nav3 -title: 'The Philosophy of Gentoo' +title: 'The philosophy of Gentoo' navtitle: 'Philosophy' --- Every user has work they need to do. The goal of Gentoo is to design tools and systems that allow a user to do that work as pleasantly and efficiently as possible, as they see fit. Our tools should be a joy to use, and should help the user to appreciate the richness of the Linux and free software community, and the flexibility of free software. This is only possible when the tool is designed to reflect and transmit the will of the user, and leave the possibilities open as to the final form of the raw materials (the source code.) If the tool forces the user to do things a particular way, then the tool is working against, rather than for, the user. We have all experienced situations where tools seem to be imposing their respective wills on us. This is backwards, and contrary to the Gentoo philosophy. @@ -17,4 +17,4 @@ Put another way, the Gentoo philosophy is to create better tools. When a tool is The goal of Gentoo is to strive to create near-ideal tools. Tools that can accommodate the needs of many different users all with divergent goals. Don't you love it when you find a tool that does exactly what you want to do? Doesn't it feel great? Our mission is to give that sensation to as many people as possible. Daniel Robbins \\ -Previous Chief Architect
\ No newline at end of file +Previous Chief Architect diff --git a/get-started/philosophy/social-contract.md b/get-started/philosophy/social-contract.md index 51796bd..c39ee7c 100644 --- a/get-started/philosophy/social-contract.md +++ b/get-started/philosophy/social-contract.md @@ -7,7 +7,7 @@ nav3-weight: 10 layout: page-nav3 title: 'Gentoo Social Contract' -navtitle: 'Social Contract' +navtitle: 'Social contract' --- This social contract is intended to clearly describe the overall development policies and standards of the Gentoo project development team. Parts of this document have been derived from the [Debian Social Contract](https://www.debian.org/social_contract). It is generally very similar to it except that certain parts have been clarified and augmented while other parts deemed redundant have been removed. Comments are welcome. Please send them to our [gentoo-dev@lists.gentoo.org](mailto:gentoo-dev@lists.gentoo.org) mailing list. @@ -25,7 +25,7 @@ If a product associated with an official Gentoo project does not satisfy these r An official list of Gentoo projects is listed under the Gentoo Metastructure. A Gentoo project does not need to produce a Gentoo operating system in order to be officially recognized. -## Gentoo is and will remain Free Software +## Gentoo is and will remain free software We will release our contributions to Gentoo as free software, metadata or documentation, under the GNU General Public License version 2 (or later, at our discretion) or the Creative Commons - Attribution / Share Alike version 2 (or later, at our discretion). @@ -39,7 +39,7 @@ Note: We are considering extending the above clause to require that all core Gen to a license approved by the OSI and Free Software Foundation (<a href="https://www.gnu.org/">FSF</a>). </div> -## We will give back to the Free Software Community +## We will give back to the free software community We will establish relationships with Free Software authors and collaborate with them when possible. We will submit bug-fixes, improvements, user requests, etc. to the "upstream" authors of software included in our system. We will also clearly document our contributions to Gentoo as well as any improvements or changes we make to external sources used by Gentoo (whether in the form of patches, "sed tweaks" or some other form). We acknowledge that our improvements and changes are much more meaningful to the larger Free Software community if they are clearly documented and explained, since not everyone has the time or ability to understand the literal changes contained in the patches or tweaks themselves. diff --git a/get-started/screenshots/index.html b/get-started/screenshots/index.html index 91e9dff..e294b00 100644 --- a/get-started/screenshots/index.html +++ b/get-started/screenshots/index.html @@ -1,5 +1,5 @@ --- -title: Gentoo Screenshots +title: Gentoo screenshots navtitle: Screenshots nav1: get-started @@ -7,10 +7,10 @@ nav2: screenshots nav2-show: true nav2-weight: 30 --- -<p class="lead"> - As Gentoo doesn't come with a default GUI, we can't show you a generic Gentoo screenshot. - <br> - What you can find here instead are examples of awesome setups ran by our users. +<p class="lead stick-bottom"> +Gentoo does not come with a default GUI so there is no such thing as a generic Gentoo screenshot. +<br /> +Rendered below are examples of great looking graphical configurations. Each one was created by our wonderful community. </p> <div class="row"> @@ -68,4 +68,4 @@ nav2-weight: 30 <p> Looking for more? The Gentoo community on Google+ has a dedicated <a href="https://plus.google.com/communities/100146718762350759856/stream/09938b7e-4913-4bc5-bdd6-9635c4a1bf60">Screenshots</a> section. -</p>
\ No newline at end of file +</p> @@ -42,11 +42,11 @@ meta: '<link rel="alternate" type="application/atom+xml" title="Gentoo Linux New <div class="row"> <div class="col-xs-12 col-md-6"> - <h2>New packages <small>more at the <a href="https://packages.gentoo.org">Gentoo Packages database</a></small></h2> + <h2>New packages <small>more at the <a href="https://packages.gentoo.org">Gentoo packages database</a></small></h2> {% include frontpage/packages %} </div> <div class="col-xs-12 col-md-6"> - <h2>Fresh documentation <small>on the <a href="https://wiki.gentoo.org/">Gentoo Wiki</a></small></h2> + <h2>Fresh documentation <small>on the <a href="https://wiki.gentoo.org/">Gentoo wiki</a></small></h2> {% include frontpage/wiki %} </div> </div> diff --git a/inside-gentoo/artwork/gentoo-logo.html b/inside-gentoo/artwork/gentoo-logo.html index bf0456d..af325fa 100644 --- a/inside-gentoo/artwork/gentoo-logo.html +++ b/inside-gentoo/artwork/gentoo-logo.html @@ -1,5 +1,5 @@ --- -title: Gentoo Logo +title: Gentoo logo nav1: inside-gentoo nav2: artwork @@ -12,7 +12,7 @@ layout: page-nav3 <p> This page contains the official Gentoo logo and word mark graphics. - For other unofficial graphical building blocks, see the <a href="https://wiki.gentoo.org/wiki/Project:Artwork/Artwork">Artwork project</a> on our Wiki. + For other unofficial graphical building blocks, see the <a href="https://wiki.gentoo.org/wiki/Project:Artwork/Artwork">Artwork project</a> on our wiki. </p> <h2 id="downloads">Downloads</h2> @@ -38,7 +38,7 @@ layout: page-nav3 <tr> <td><img src="/assets/img/logo/gentoo-logo.svg" alt="Gentoo logo"></td> <td> - <strong>Gentoo Logo</strong> + <strong>Gentoo logo</strong> </td> <td><a href="/assets/img/logo/gentoo-logo.svg" download>SVG</a></td> <td><a href="/assets/img/logo/gentoo-logo.eps" download>EPS</a></td> @@ -47,7 +47,7 @@ layout: page-nav3 <tr> <td><img src="/assets/img/logo/gentoo-signet.svg" alt="Gentoo logo"></td> <td> - <strong>Gentoo Signet</strong> + <strong>Gentoo signet</strong> </td> <td><a href="/assets/img/logo/gentoo-signet.svg" download>SVG</a></td> <td><a href="/assets/img/logo/gentoo-signet.eps" download>EPS</a></td> @@ -56,7 +56,7 @@ layout: page-nav3 <tr> <td><img src="/assets/img/logo/gentoo-typo.svg" alt="Gentoo logo"></td> <td> - <strong>Gentoo Word Mark</strong> + <strong>Gentoo word mark</strong> </td> <td><a href="/assets/img/logo/gentoo-typo.svg" download>SVG</a></td> <td><a href="/assets/img/logo/gentoo-typo.eps" download>EPS</a></td> @@ -65,9 +65,9 @@ layout: page-nav3 <tr> <td><img src="/assets/img/logo/gentoo-horizontal.svg" alt="Gentoo logo"></td> <td> - <strong>Gentoo Logo (horizontal)</strong> + <strong>Gentoo logo (horizontal)</strong> <br> - only use when vertical version is not suitable + Only use when vertical version is not suitable. </td> <td><a href="/assets/img/logo/gentoo-horizontal.svg" download>SVG</a></td> <td><a href="/assets/img/logo/gentoo-horizontal.eps" download>EPS</a></td> @@ -76,9 +76,9 @@ layout: page-nav3 <tr> <td class="img"><img src="/assets/img/logo/gentoo-3d-small.png" alt="Gentoo logo"></td> <td> - <strong>Classic Gentoo Logo</strong> + <strong>Classic Gentoo logo</strong> <br> - not available as vector graphic + Not available as vector graphic. </td> <td></td> <td></td> diff --git a/inside-gentoo/artwork/index.html b/inside-gentoo/artwork/index.html index 1abe723..6991b2d 100644 --- a/inside-gentoo/artwork/index.html +++ b/inside-gentoo/artwork/index.html @@ -1,5 +1,5 @@ --- -title: Gentoo Artwork +title: Gentoo artwork navtitle: Artwork nav1: inside-gentoo @@ -14,16 +14,16 @@ body_class: nav-align-h2 --- <p> - Here you can find <a href="#wallpapers">Wallpapers</a> and <a href="#badges">Badges</a> to brand your desktop or application. + Here you can find <a href="#wallpapers">wallpapers</a> and <a href="#badges">badges</a> to brand your desktop or application. </p> <div class="alert alert-info"> - <strong>Contribute Artwork</strong> + <strong>Contribute artwork</strong> <br> - Get creative and share your wallpapers and badges with the Gentoo Community! + Get creative and share your wallpapers and badges with the Gentoo community! <br> Please get in touch with our <a href="mailto:www@gentoo.org" class="alert-link">web team</a> to get your graphics added. - Get community feedback before handing in your artwork on the <a href="https://forums.gentoo.org/" class="alert-link">Gentoo Forums</a>. + Get community feedback before handing in your artwork on the <a href="https://forums.gentoo.org/" class="alert-link">Gentoo forums</a>. </div> <h2 id="wallpapers">Wallpapers</h2> @@ -422,7 +422,7 @@ body_class: nav-align-h2 <h2 id="badges">Badges</h2> <p> - <strong>Let the world know that you run on Gentoo Linux!</strong> + <strong>Let the world know that you run Gentoo Linux!</strong> </p> <div class="alert alert-warning"> @@ -447,7 +447,7 @@ body_class: nav-align-h2 </a> </div> <div class="media-body"> - <h4 class="media-heading">Web Badge 1</h4> + <h4 class="media-heading">Web badge 1</h4> <p>by Ryan Viljoen</p> </div> </div> @@ -458,7 +458,7 @@ body_class: nav-align-h2 </a> </div> <div class="media-body"> - <h4 class="media-heading">Web Badge 2</h4> + <h4 class="media-heading">Web badge 2</h4> <p>by m@o</p> </div> </div> @@ -469,7 +469,7 @@ body_class: nav-align-h2 </a> </div> <div class="media-body"> - <h4 class="media-heading">Web Badge 3</h4> + <h4 class="media-heading">Web badge 3</h4> <p>by wolven</p> </div> </div> diff --git a/inside-gentoo/contact/index.html b/inside-gentoo/contact/index.html index ed4242d..442259e 100644 --- a/inside-gentoo/contact/index.html +++ b/inside-gentoo/contact/index.html @@ -7,7 +7,7 @@ title: Contact --- <p class="lead"> - "Gentoo" is many things, and our project is rather large. This page will help you get in touch with the right people. + "Gentoo" is many things; our project is rather large. This page will help you get in touch with the right people. </p> <p> @@ -65,7 +65,7 @@ title: Contact <a href="/support/" class="btn btn-primary btn-sm">View support information</a> </div> </div> - + <div class="panel panel-default"> <div class="panel-heading"> <h3 class="panel-title" id="bug"><span class="fa fa-fw fa-bug"></span> I want to report an issue with a package that Gentoo provides</h3> @@ -81,7 +81,7 @@ title: Contact When you're ready to report the issue, head over to our Bugzilla, where you can file a bug after registering and logging in. <br><br> <strong>Security issues</strong><br> - If you would like to report a vulnerability in one of our packages, please get in touch with our <a href="/support/security/#contact">Security team</a>. + If you would like to report a vulnerability in one of our packages, please get in touch with our <a href="/support/security/#contact">Security</a>. </div> <div class="panel-footer text-right"> <a href="https://bugs.gentoo.org/" class="btn btn-primary btn-sm">Go to Bugzilla</a> @@ -95,8 +95,8 @@ title: Contact <div class="panel-body"> Depending on the type of content you have found to be wrong, there are different steps to take: <br><br> - <strong>The content is part of the <a href="https://wiki.gentoo.org/">Wiki</a> (<tt>wiki.gentoo.org</tt>)</strong><br> - In this case, please sign up to the Wiki and try to make the changes yourself + <strong>The content is part of the <a href="https://wiki.gentoo.org/">wiki</a> (<tt>wiki.gentoo.org</tt>)</strong><br> + In this case, please sign up to the wiki and try to make the changes yourself <br> If you can't because you are not authorized, or are unsure about your change, please add a comment to the discussion page of the respective article. <br><br> @@ -110,13 +110,13 @@ title: Contact <h3 class="panel-title" id="infra"><span class="fa fa-fw fa-bomb"></span> Something is wrong with a Gentoo server or service that operates <code>*.gentoo.org</code></h3> </div> <div class="panel-body"> - The Gentoo Infrastructure team maintains our services. + The Gentoo Infrastructure project maintains services. <br><br> Before contacting them, please check our <a href="https://infra-status.gentoo.org">Infrastructure Status</a> page. If the issue you would like to report is already listed there; or the service in question marked as being down or in maintenance, you don't need to send another message, they are already aware. </div> <div class="panel-footer text-right"> - <a href="mailto:infra@gentoo.org" class="btn btn-primary btn-sm">Contact Infrastructure Team</a> + <a href="mailto:infra@gentoo.org" class="btn btn-primary btn-sm">Contact Infrastructure</a> </div> </div> @@ -139,11 +139,11 @@ title: Contact </div> <div class="panel-body"> <div class="alert alert-danger"> - The PR team does <strong>not provide user support or troubleshooting advice.</strong><br> + The PR project does <strong>not provide user support or troubleshooting advice.</strong><br> Please do not contact them with such inquiries and refer to our <a href="/support/">support information</a> instead. </div> <p> - Please get in touch with our Public Relations team. + Please get in touch with our Public Relations project. </p> </div> <div class="panel-footer text-right"> @@ -156,7 +156,7 @@ title: Contact <h3 class="panel-title" id="mail"><span class="fa fa-fw fa-envelope-o"></span> Where do I send postal mail for the distribution?</h3> </div> <div class="panel-body"> - Please get in touch with our Public Relations team <strong class="text-danger">before posting anything.</strong> + Please get in touch with our Public Relations project <strong class="text-danger">before posting anything.</strong> They will provide you with the correct address depending on the matter. </div> <div class="panel-footer text-right"> diff --git a/inside-gentoo/developers/herds.html b/inside-gentoo/developers/herds.html index 31a118d..f19f8f5 100644 --- a/inside-gentoo/developers/herds.html +++ b/inside-gentoo/developers/herds.html @@ -1,5 +1,5 @@ --- -title: 'Gentoo Package Herds' +title: 'Gentoo herds' navtitle: 'Herds' nav1: inside-gentoo diff --git a/inside-gentoo/developers/index.html b/inside-gentoo/developers/index.html index 8321759..7e61ae0 100644 --- a/inside-gentoo/developers/index.html +++ b/inside-gentoo/developers/index.html @@ -1,5 +1,5 @@ --- -title: 'Current Gentoo Developers' +title: 'Current Gentoo developers' navtitle: 'Developers' nav1: inside-gentoo @@ -16,7 +16,7 @@ layout: page-nav3 --- <p class="lead"> - This Is Gentoo! Well, at least the "official" developers. <a href="/get-involved/become-developer/">Wanna join?</a> + This is Gentoo! Well, at least the "official" developers. <a href="/get-involved/become-developer/">Wanna join?</a> </p> <p> @@ -32,7 +32,7 @@ layout: page-nav3 <table class="table table-striped"> <tr> <th>Username</th> - <th>GPG Key(s)</th> + <th>GPG key(s)</th> <th>Location</th> <th>Roles</th> </tr> @@ -52,4 +52,4 @@ layout: page-nav3 <td>{{ entry[1].roles | xml_escape }}</td> </tr> {% endfor %} -</table>
\ No newline at end of file +</table> diff --git a/inside-gentoo/developers/map.html b/inside-gentoo/developers/map.html index 322bfb8..4d18ba0 100644 --- a/inside-gentoo/developers/map.html +++ b/inside-gentoo/developers/map.html @@ -1,6 +1,6 @@ --- -title: 'Gentoo Developers Map' -navtitle: 'Developer Map' +title: 'Gentoo Developer map' +navtitle: 'Developer map' nav1: inside-gentoo @@ -19,7 +19,7 @@ extrajs: [leaflet.js, devmap.js] <noscript> <div class="alert alert-danger"> <h2 class="stick-top"><i class="fa fa-fw fa-ban"></i> Map display requires JavaScript</h2> - Please enable JavaScript support in your browser to view the Developer Map. + Please enable JavaScript support in your browser to view the developer map. </div> <style type="text/css">#devlist { display: none; }</style> </noscript> @@ -52,4 +52,4 @@ extrajs: [leaflet.js, devmap.js] {% endif %}{% endfor %} </table> </div> -</div>
\ No newline at end of file +</div> diff --git a/inside-gentoo/developers/retired-developers.html b/inside-gentoo/developers/retired-developers.html index 86444cd..70c72c9 100644 --- a/inside-gentoo/developers/retired-developers.html +++ b/inside-gentoo/developers/retired-developers.html @@ -1,6 +1,6 @@ --- -title: 'Retired Gentoo Developers' -navtitle: 'Retired Developers' +title: 'Retired Gentoo developers' +navtitle: 'Retired developers' nav1: inside-gentoo @@ -28,4 +28,4 @@ layout: page-nav3 <td>{{ entry[1].roles }}</td> </tr> {% endfor %} -</table>
\ No newline at end of file +</table> diff --git a/inside-gentoo/developers/unavailable-developers.html b/inside-gentoo/developers/unavailable-developers.html index 12ead69..364c58a 100644 --- a/inside-gentoo/developers/unavailable-developers.html +++ b/inside-gentoo/developers/unavailable-developers.html @@ -1,6 +1,6 @@ --- -title: 'Unavailable Gentoo Developers (devaway)' -navtitle: 'Unavailable Developers' +title: 'Unavailable Gentoo developers (devaway)' +navtitle: 'Unavailable developers' nav1: inside-gentoo @@ -21,7 +21,7 @@ layout: page-nav3 <table class="table table-striped"> <tr> <th>Developer</th> - <th>Message and Timestamp</th> + <th>Message and timestamp</th> </tr> {% for entry in site.data.devaway %} <tr> @@ -29,4 +29,4 @@ layout: page-nav3 <td>{{ entry[1] | strip_html }}</td> </tr> {% endfor %} -</table>
\ No newline at end of file +</table> diff --git a/inside-gentoo/foundation/index.md b/inside-gentoo/foundation/index.md index b540c0e..ce5830e 100644 --- a/inside-gentoo/foundation/index.md +++ b/inside-gentoo/foundation/index.md @@ -28,17 +28,17 @@ as the developer can now focus his attention completely at the community and his The bureaucracy we mention includes: -* financial caretaking: accepting donations, managing financial assets and investing in required resources or entities that benefit the Gentoo development -* juridical protection: backing up the licenses Gentoo uses, maintaining the copyrights on Gentoo's software, documentation and other assets and protecting Gentoo's intellectual property -* Gentoo caretaking: protecting the community by requiring total adherence to the Gentoo Social Contract +* Financial caretaking: accepting donations, managing financial assets and investing in required resources or entities that benefit the Gentoo development. +* Juridical protection: backing up the licenses Gentoo uses, maintaining the copyrights on Gentoo's software, documentation and other assets and protecting Gentoo's intellectual property. +* Gentoo caretaking: protecting the community by requiring total adherence to the Gentoo Social Contract. In other words, the Gentoo Foundation will: -* protect the use of the Gentoo trademark and logo -* protect the developed code, documentation, artwork and other material through copyright and licenses -* sponsor Gentoo-related conferences and technical development resources -* oversee development so it adheres to the social contract +* Protect the use of the Gentoo trademark and logo. +* Protect the developed code, documentation, artwork and other material through copyright and licenses. +* Sponsor Gentoo-related conferences and technical development resources. +* Oversee development so it adheres to the social contract. ## Find out more -The Gentoo Foundation maintains a [presence on the Gentoo Wiki](https://wiki.gentoo.org/wiki/Foundation:Main_Page) where you can learn more.
\ No newline at end of file +The Gentoo Foundation maintains a [presence on the Gentoo Wiki](https://wiki.gentoo.org/wiki/Foundation:Main_Page) where you can learn more. diff --git a/inside-gentoo/foundation/name-logo-guidelines.md b/inside-gentoo/foundation/name-logo-guidelines.md index c18b6c1..c82865c 100644 --- a/inside-gentoo/foundation/name-logo-guidelines.md +++ b/inside-gentoo/foundation/name-logo-guidelines.md @@ -1,6 +1,6 @@ --- -title: 'Gentoo Name and Logo Usage Guidelines' -navtitle: 'Name and Logo Guidelines' +title: 'Gentoo name and logo usage guidelines' +navtitle: 'Name and logo guidelines' nav1: inside-gentoo nav2: foundation nav3-show: true @@ -71,20 +71,20 @@ section. You may incorporate the Gentoo name into the name of any group or event, provided that: -* the purpose of the group or event is to educate, provide networking +* The purpose of the group or event is to educate, provide networking opportunities, or provide a social outlet for Gentoo users; -* the name of the group or event is formed by combining the name "Gentoo" with +* The name of the group or event is formed by combining the name "Gentoo" with other words that qualify the geographical location, intended audience, or the activities of the group or event. -* if the group or event requires fees for membership of attendance, it must be +* If the group or event requires fees for membership of attendance, it must be made clear at the time the fee is paid what income organizers will be deriving from the event, and what proportion of event profits, if any, will be returned to the Gentoo Foundation, Inc. as a donation. -* the website for the group or event does not imply that it is official or +* The website for the group or event does not imply that it is official or otherwise endorsed by the Gentoo Foundation, Inc. -* the group or event agrees to adhere to the +* The group or event agrees to adhere to the [Gentoo Community Code of Conduct](https://wiki.gentoo.org/wiki/Project:Council/Code_of_conduct). -* the group or event also adopts a specific Code of Conduct governing the +* The group or event also adopts a specific Code of Conduct governing the behavior of participants. A group or event may use a logo that incorporates the Gentoo logo by adding a @@ -96,11 +96,11 @@ of the group of event. You may produce merchandise displaying the Gentoo name or logo, provided that: -* artwork to be printed on merchandise has been formally approved by the Gentoo +* Artwork to be printed on merchandise has been formally approved by the Gentoo Foundation, Inc. -* the products on which the artwork is to appear has been formally approved by +* The products on which the artwork is to appear has been formally approved by the Gentoo Foundation, Inc. -* if the product is to be sold, the individual or organization producing the +* If the product is to be sold, the individual or organization producing the product must make a clear statement declaring what proportion of the sale price will be retained by the organizers, and what proportion, if any, will be contributed back to the Gentoo Foundation, Inc. @@ -117,12 +117,12 @@ ratio or otherwise distort the shape. You may incorporate the Gentoo name into any website or product whose purpose is to organize, educate or inform the Gentoo community, provided that: -* the website or product does not use the Gentoo logo or mimic the official +* The website or product does not use the Gentoo logo or mimic the official sites in its design, except as provided for by earlier sections in this license; -* the website or product does not imply that it is official or otherwise +* The website or product does not imply that it is official or otherwise endorsed by the Gentoo Foundation, Inc. -* if a fee is to be charged for the product, or for access to any or all of the +* If a fee is to be charged for the product, or for access to any or all of the material on the website, a clear statement must exist declaring what proportion of those fees will be retained by the authors, and what proportion, if any, will be contributed back to the Gentoo Foundation, Inc. A link to this @@ -141,12 +141,12 @@ related. You may use the Gentoo name in any Internet domain or subdomain: -* for any group or event meeting the requirements of the section on [Groups and +* For any group or event meeting the requirements of the section on [Groups and events](#groups-and-events). -* any merchandise provider meeting the requirements of the section on +* Any merchandise provider meeting the requirements of the section on [Merchandise](#merchandise), provided the products sold under that domain are exclusively Gentoo merchandise -* any website or product meeting the requirements of the section on [Products and +* Any website or product meeting the requirements of the section on [Products and services serving the community](#products-and-services-serving-the-community). ### Uses outside of this license @@ -172,7 +172,7 @@ project, Gentoo Foundation, Inc., or Gentoo community. The Gentoo Foundation, Inc. reserves the right to determine if a usage of the Gentoo trademark meets the requirements and standards of this license. -## Frequently Asked Questions +## Frequently asked questions ### What about earlier name/logo usage guidelines? diff --git a/inside-gentoo/index.html b/inside-gentoo/index.html index 83687f9..94c2647 100644 --- a/inside-gentoo/index.html +++ b/inside-gentoo/index.html @@ -7,7 +7,7 @@ nav1-weight: 10 nav2: inside-gentoo-main --- <p class="lead"> - Gentoo offers lots of things for you to explore: + Gentoo has lots of areas to explore: </p> <div class="row"> @@ -15,19 +15,19 @@ nav2: inside-gentoo-main <div class="list-group"> <a href="developers/" class="list-group-item"> <h4 class="list-group-item-heading"><i class="fa fa-fw fa-user"></i> Developers</h4> - <p class="list-group-item-text">Who we are, what we do and where we are.</p> + <p class="list-group-item-text">Who we are, what we do, and where we are found.</p> </a> <a href="https://wiki.gentoo.org/wiki/Project:Gentoo" class="list-group-item"> <h4 class="list-group-item-heading"><i class="fa fa-fw fa-briefcase"></i> Projects</h4> - <p class="list-group-item-text">We collaborate in projects. Check the resources, maybe there's something for you to contribute to.</p> + <p class="list-group-item-text">We collaborate in projects. Check the resources, maybe there's something for you to contribute.</p> </a> <a href="artwork/" class="list-group-item"> <h4 class="list-group-item-heading"><i class="fa fa-fw fa-image"></i> Artwork</h4> - <p class="list-group-item-text">Check out artwork for your system. Features lots of Larry the Cow, promised.</p> + <p class="list-group-item-text">Check out artwork for your system. Features lots of Larry the Cow (we promise)!</p> </a> <a href="foundation/" class="list-group-item"> <h4 class="list-group-item-heading"><i class="fa fa-fw fa-institution"></i> Gentoo Foundation</h4> - <p class="list-group-item-text">The legal and financial base of our project.</p> + <p class="list-group-item-text">The legal and financial base of the Gentoo project.</p> </a> <a href="sponsors/" class="list-group-item"> <h4 class="list-group-item-heading"><i class="fa fa-fw fa-heart"></i> Sponsors</h4> @@ -35,7 +35,7 @@ nav2: inside-gentoo-main </a> <a href="stores/" class="list-group-item"> <h4 class="list-group-item-heading"><i class="fa fa-fw fa-shopping-cart"></i> Stores</h4> - <p class="list-group-item-text">Get your Gentoo swag and installation media here.</p> + <p class="list-group-item-text">Get Gentoo swag and installation media here.</p> </a> <a href="contact/" class="list-group-item"> <h4 class="list-group-item-heading"><i class="fa fa-fw fa-send"></i> Contact</h4> @@ -43,4 +43,4 @@ nav2: inside-gentoo-main </a> </div> </div> -</div>
\ No newline at end of file +</div> diff --git a/inside-gentoo/sponsors/former-sponsors.html b/inside-gentoo/sponsors/former-sponsors.html index e51157c..3f95817 100644 --- a/inside-gentoo/sponsors/former-sponsors.html +++ b/inside-gentoo/sponsors/former-sponsors.html @@ -1,7 +1,7 @@ --- nav1: inside-gentoo nav2: sponsors -title: Former Sponsors +title: Former sponsors --- <p> @@ -18,4 +18,4 @@ title: Former Sponsors {% for sponsor in site.data.sponsors.former %} {% include partials/sponsor.html %} -{% endfor %}
\ No newline at end of file +{% endfor %} diff --git a/inside-gentoo/sponsors/index.html b/inside-gentoo/sponsors/index.html index e94854c..d770c3b 100644 --- a/inside-gentoo/sponsors/index.html +++ b/inside-gentoo/sponsors/index.html @@ -29,7 +29,7 @@ title: Sponsors {% include partials/sponsor.html %} {% endfor %} -<h2>Former Sponsors</h2> +<h2>Former sponsors</h2> <p> Gentoo would like to extend a special thanks to all of our past sponsors. They are listed on a <a href="former-sponsors.html">separate page</a>. @@ -42,8 +42,8 @@ title: Sponsors Some mirrors are provided by individuals, others by companies. You can find a complete listing on our Gentoo mirrors page. </p> -<h2>Anonymous Sponsors</h2> +<h2>Anonymous sponsors</h2> <p> Several other companies and organizations provide services and assistance to the Gentoo project, but have expressed a desire to remain anonymous. We would like to thank those sponsors for their support of Gentoo. -</p>
\ No newline at end of file +</p> diff --git a/inside-gentoo/stores/index.md b/inside-gentoo/stores/index.md index fc9a192..687bc18 100644 --- a/inside-gentoo/stores/index.md +++ b/inside-gentoo/stores/index.md @@ -11,7 +11,7 @@ This page lists web stores where you can get Gentoo swag. Or, if you simply don't have the ability to download the large DVD or CD images, then you may wish to purchase a Gentoo DVD or CD. -## Approved Vendors +## Approved vendors Gentoo merchanise may be purchased from the following vendors who have been licensed to use the Gentoo Logo by either the [Gentoo Foundation Inc](https://foundation.gentoo.org) (in the USA) or @@ -21,7 +21,7 @@ Approved Vendors make a small contribution to Gentoo from sales of Gentoo relate ### Americas -* [Offical Gentoo Cafepress Store](http://www.cafepress.com/officialgentoo/) - Clothing and schwag. Located in the USA. +* [Offical Gentoo Cafepress store](http://www.cafepress.com/officialgentoo/) - Clothing and schwag. Located in the USA. * [Techiant, LLC](https://www.case-badges.com/gentoo-logo-3d-domed-computer-case-badges-p-212.html) - Case badges (stickers). Located in the USA * [Stickermule (by tecknicaltom)](https://www.stickermule.com/user/1070792095/stickers) - Case badges (stickers). Located in the USA. * [Stormfront Gentoo Section](https://www.jbox.ca/product-category/computers-tablets/software/linux-cds-dvds/gentoo-cds-dvds/) - DVDs. Located in Canada. @@ -32,7 +32,7 @@ Approved Vendors make a small contribution to Gentoo from sales of Gentoo relate ### Europe -* [Offical Friends of Gentoo e.V Store](https://22258.spreadshirt.net/de/DE/Shop) - Tee shirts, keychains, and mugs. Located in Germany. +* [Offical Friends of Gentoo e.V store](https://22258.spreadshirt.net/de/DE/Shop) - Tee shirts, keychains, and mugs. Located in Germany. * [LinuxPusher](http://www.linuxpusher.com/distributions/Gentoo-Linux) - Stickers, keychains, and mugs. Located in Denmark. If you buy something from a licenced vendor and you like it, tell all your friends. @@ -40,7 +40,7 @@ If you buy something from a licenced vendor and you like it, tell all your frien If you have problems with quality or the vendor, please tell [us](mailto:trustees@gentoo.org) and the vendor. We do not undertake to resolve individual issues but we take the quality of goods bearing our logo very seriously indeed. -## Unlicensed Vendors +## Unlicensed vendors If you would like a listing here, please email the [trustees](mailto:trustees@gentoo.org). A listing on this page is included in the [license](/inside-gentoo/foundation/name-logo-guidelines.html). diff --git a/news/index.html b/news/index.html index 094cfbb..7c5f343 100644 --- a/news/index.html +++ b/news/index.html @@ -4,7 +4,7 @@ navtitle: 'News' nav1: home nav2: news nav2-show: true -meta: '<link rel="alternate" type="application/atom+xml" title="Gentoo Linux News" href="/feeds/news.xml">' +meta: '<link rel="alternate" type="application/atom+xml" title="Gentoo Linux news" href="/feeds/news.xml">' --- {% for post in site.posts %} diff --git a/search/archives-gentoo-org.xml b/search/archives-gentoo-org.xml index 607d6c8..1f239ba 100644 --- a/search/archives-gentoo-org.xml +++ b/search/archives-gentoo-org.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/"> - <ShortName>Gentoo List Archives</ShortName> - <Description>Search archives.gentoo.org via Google</Description> + <ShortName>Gentoo list archives</ShortName> + <Description>Search archives.gentoo.org (via Google).</Description> <Image height="16" width="16" type="image/x-icon">http://www.gentoo.org/favicon.ico</Image> <Url type="text/html" template="http://www.google.com/search?q={searchTerms}+site%3Aarchives.gentoo.org"/> -</OpenSearchDescription>
\ No newline at end of file +</OpenSearchDescription> diff --git a/search/bugs-gentoo-org.xml b/search/bugs-gentoo-org.xml index ba2ab4e..7caa086 100644 --- a/search/bugs-gentoo-org.xml +++ b/search/bugs-gentoo-org.xml @@ -2,7 +2,7 @@ <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/"> <ShortName>Gentoo Bugzilla</ShortName> - <Description>Gentoo's Official Bugzilla</Description> + <Description>Gentoo's official Bugzilla</Description> <Image height="16" width="16" type="image/x-icon">http://www.gentoo.org/search/g-bugs.ico</Image> <Url type="text/html" template="http://bugs.gentoo.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailtype1=substring&emailassigned_to1=1&emailtype2=substring&emailreporter2=1&bugidtype=include&chfieldto=Now&short_desc={searchTerms}&short_desc_type=substring&long_desc_type=substring&bug_file_loc_type=substring&status_whiteboard_type=substring&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&cmdtype=doit&order=Reuse+same+sort+as+last+time&sourceid=Mozilla-search"/> -</OpenSearchDescription>
\ No newline at end of file +</OpenSearchDescription> diff --git a/search/forums-gentoo-org.xml b/search/forums-gentoo-org.xml index bb9dc4a..9e36209 100644 --- a/search/forums-gentoo-org.xml +++ b/search/forums-gentoo-org.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/"> - <ShortName>Gentoo Forums</ShortName> - <Description>Gentoo's Official Forums</Description> + <ShortName>Gentoo forums</ShortName> + <Description>Gentoo's official forums.</Description> <Image height="16" width="16" type="image/x-icon">http://www.gentoo.org/search/g-forums.ico</Image> <Url type="text/html" template="http://forums.gentoo.org/search.php?mode=results&show_results=topics&search_keywords={searchTerms}"/> -</OpenSearchDescription>
\ No newline at end of file +</OpenSearchDescription> diff --git a/search/packages-gentoo-org.xml b/search/packages-gentoo-org.xml index 5b3d0ba..466c5b3 100644 --- a/search/packages-gentoo-org.xml +++ b/search/packages-gentoo-org.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/"> - <ShortName>Gentoo Packages</ShortName> + <ShortName>Gentoo packages</ShortName> <Description>Search packages.gentoo.org</Description> <Image height="16" width="16" type="image/x-icon">http://www.gentoo.org/search/g-packages.ico</Image> <Url type="text/html" template="https://packages.gentoo.org/packages/search?q={searchTerms}"/> diff --git a/search/www-gentoo-org.xml b/search/www-gentoo-org.xml index ac55593..5ba7fdb 100644 --- a/search/www-gentoo-org.xml +++ b/search/www-gentoo-org.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/"> - <ShortName>Gentoo Website</ShortName> - <Description>Search www.gentoo.org via Google</Description> + <ShortName>Gentoo website</ShortName> + <Description>Search www.gentoo.org (via Google).</Description> <Image height="16" width="16" type="image/x-icon">http://www.gentoo.org/favicon.ico</Image> <Url type="text/html" template="http://www.google.com/search?q={searchTerms}+site%3Awww.gentoo.org"/> -</OpenSearchDescription>
\ No newline at end of file +</OpenSearchDescription> diff --git a/support/documentation/index.html b/support/documentation/index.html index 2eae34f..1f7fc31 100644 --- a/support/documentation/index.html +++ b/support/documentation/index.html @@ -19,14 +19,14 @@ title: 'Documentation' </div> <p> - Most of our documentation is available on the <a href="//wiki.gentoo.org">Gentoo Wiki</a>: + Most of our documentation is available on the <a href="//wiki.gentoo.org">Gentoo wiki</a>: </p> <div class="row"> <div class="col-xs-12 col-md-8 col-md-offset-2"> <div class="panel panel-default"> <div class="panel-heading"> - <h3 class="panel-title">Finding Documentation on the <a href="//wiki.gentoo.org">Gentoo Wiki</a></h3> + <h3 class="panel-title">Finding documentation on the <a href="//wiki.gentoo.org">Gentoo wiki</a></h3> </div> <div class="panel-body"> If you know what you are looking for, you can simply search for one or more keywords: @@ -41,32 +41,29 @@ title: 'Documentation' </form> <br> - Or, browse the Wiki contents using these categories: + Or, browse the wiki contents using these categories: <br><br> <div class="list-group" style="font-size: 125%;"> - <a href="//wiki.gentoo.org/wiki/Category:Core_system" title="Category:Core system" class="list-group-item"><i class="fa fa-fw fa-terminal"></i> Core System</a> + <a href="//wiki.gentoo.org/wiki/Category:Core_system" title="Category:Core system" class="list-group-item"><i class="fa fa-fw fa-terminal"></i> Core system</a> <a href="//wiki.gentoo.org/wiki/Category:Software" title="Category:Software" class="list-group-item"><i class="fa fa-fw fa-floppy-o"></i> Software</a> <a href="//wiki.gentoo.org/wiki/Category:Hardware" title="Category:Hardware" class="list-group-item"><i class="fa fa-fw fa-print"></i> Hardware</a> <a href="//wiki.gentoo.org/wiki/Category:Desktop" title="Category:Desktop" class="list-group-item"><i class="fa fa-fw fa-desktop"></i> Desktop</a> - <a href="//wiki.gentoo.org/wiki/Category:Server_and_Security" title="Category:Server and Security" class="list-group-item"><i class="fa fa-fw fa-database"></i> Server and Security</a> - <a href="//wiki.gentoo.org/wiki/Category:Project_and_Community" title="Category:Project and Community" class="list-group-item"><i class="fa fa-fw fa-institution"></i> Project and Community</a> + <a href="//wiki.gentoo.org/wiki/Category:Server_and_Security" title="Category:Server and Security" class="list-group-item"><i class="fa fa-fw fa-database"></i> Server and security</a> + <a href="//wiki.gentoo.org/wiki/Category:Project_and_Community" title="Category:Project and Community" class="list-group-item"><i class="fa fa-fw fa-institution"></i> Project and community</a> </div> - - <strong>Did you know?</strong> - Our documentation team maintains a list of <a href="//wiki.gentoo.org/wiki/Project:Documentation/Overview">featured Wiki articles</a> that are worth a read. </div> </div> </div> </div> -<h2>Developer Documentation</h2> +<h2>Developer documentation</h2> <p> - In addition to the documentation available on the Wiki, we also offer documentation resources geared towards Gentoo development: + In addition to the documentation available on the wiki, we also offer documentation resources geared towards Gentoo development: </p> <ul> - <li><a href="https://devmanual.gentoo.org/">Gentoo Development Guide</a></li> - <li><a href="https://devmanual.gentoo.org/eclass-reference/index.html">eclass Reference</a></li> -</ul>
\ No newline at end of file + <li><a href="https://devmanual.gentoo.org/">Gentoo Development Guide</a> (a.k.a Devmanual).</li> + <li><a href="https://devmanual.gentoo.org/eclass-reference/index.html">Online eclass reference</a>.</li> +</ul> diff --git a/support/index.html b/support/index.html index 4e78445..60859ce 100644 --- a/support/index.html +++ b/support/index.html @@ -8,7 +8,7 @@ title: 'Support' <br> <div class="panel panel-default"> <div class="panel-heading"> - <h3 class="panel-title"><span class="fa fa-fw fa-life-buoy"></span> Getting Help with your Gentoo System</h3> + <h3 class="panel-title"><span class="fa fa-fw fa-life-buoy"></span> Getting help with Gentoo</h3> </div> <div class="panel-body"> <p> @@ -19,11 +19,11 @@ title: 'Support' We advise you to seek answers to your support questions in the following documentation resources and support venues: </p> <div class="list-group large"> - <a href="https://wiki.gentoo.org/wiki/FAQ" class="list-group-item"><i class="fa fa-fw fa-question-circle"></i> Frequently Asked Questions</a> + <a href="https://wiki.gentoo.org/wiki/FAQ" class="list-group-item"><i class="fa fa-fw fa-question-circle"></i> Frequently asked questions</a> <a href="/support/documentation/" class="list-group-item"><i class="fa fa-fw fa-book"></i> Documentation</a> - <a href="/get-involved/irc-channels/" class="list-group-item"><i class="fa fa-fw fa-comments-o"></i> IRC Channels</a> + <a href="/get-involved/irc-channels/" class="list-group-item"><i class="fa fa-fw fa-comments-o"></i> IRC channels</a> <a href="https://forums.gentoo.org/" class="list-group-item"><i class="fa fa-fw fa-users"></i> Forums</a> - <a href="/get-involved/mailing-lists/" class="list-group-item"><i class="fa fa-fw fa-inbox"></i> Mailing Lists</a> + <a href="/get-involved/mailing-lists/" class="list-group-item"><i class="fa fa-fw fa-inbox"></i> Mailing lists</a> </div> Many Gentoo developers frequently visit those community channels and try their best to contribute to the ongoing discussions and questions. @@ -32,7 +32,7 @@ title: 'Support' <div class="panel panel-default"> <div class="panel-heading"> - <h3 class="panel-title"><span class="fa fa-fw fa-laptop"></span> Hardware Requirements</h3> + <h3 class="panel-title"><span class="fa fa-fw fa-laptop"></span> Hardware requirements</h3> </div> <div class="panel-body"> The hardware requirements for each architecture are placed in our <a href="https://wiki.gentoo.org/wiki/Handbook:Main_Page">Gentoo Handbook</a>, @@ -42,7 +42,7 @@ title: 'Support' <div class="panel panel-default"> <div class="panel-heading"> - <h3 class="panel-title"><span class="fa fa-fw fa-bug"></span> Reporting Bugs</h3> + <h3 class="panel-title"><span class="fa fa-fw fa-bug"></span> Reporting bugs</h3> </div> <div class="panel-body"> <p> diff --git a/support/news-items/index.html b/support/news-items/index.html index 5cf8701..06527c6 100644 --- a/support/news-items/index.html +++ b/support/news-items/index.html @@ -1,6 +1,6 @@ --- -title: 'Repository News Items' -navtitle: 'News Items' +title: 'Repository news items' +navtitle: 'News items' nav1: support @@ -8,16 +8,16 @@ nav2: news-items nav2-show: true --- <p class="lead"> - Important news regarding packages available in Gentoo are published via <em>news items</em>. You can find them below. + Important news regarding packages available in Gentoo are published via <em>news items</em>. They can be found below. </p> <div class="alert alert-info"> <strong>Which items affect me?</strong> <p> - This page lists <strong>all</strong> available news items for the official Gentoo package repository, but sometimes items don't affect you because you don't have the relevant package installed, + This page lists <strong>all</strong> available news items for the official Gentoo ebuild repository, but sometimes items don't affect you because you don't have the relevant package installed, or use a different architecture. <br> - The <kbd>emerge</kbd> command notifies you after each operation if there are news items affecting your configuration: + The <kbd>emerge</kbd> command provides notifications after each operation if there are news items affecting the system configuration: </p> <p> <pre> @@ -31,7 +31,7 @@ nav2-show: true For more information on the "Critical News" publication system, please see <a href="https://wiki.gentoo.org/wiki/GLEP:42">GLEP 42</a>. </p> -<h2>Published News Items</h2> +<h2>Published news items</h2> <table class="table table-condensed table-striped"> <tr> diff --git a/support/package-database.html b/support/package-database.html index 2668a00..5abf60d 100644 --- a/support/package-database.html +++ b/support/package-database.html @@ -1,5 +1,5 @@ --- -title: 'Package Database' +title: 'Package database' nav1: support nav2: package-database nav2-show: true diff --git a/support/rsync-mirrors/index.html b/support/rsync-mirrors/index.html index 38fd327..361a064 100644 --- a/support/rsync-mirrors/index.html +++ b/support/rsync-mirrors/index.html @@ -1,6 +1,6 @@ --- -title: 'Gentoo rsync Mirrors' -navtitle: 'rsync Mirrors' +title: 'Gentoo rsync mirrors' +navtitle: 'rsync mirrors' nav1: support nav2: mirrors nav2-show: true @@ -8,22 +8,22 @@ nav2-show: true <p> Gentoo is hosted by many mirrors around the globe. - Selecting a mirror that is geographically near you may help speed up Portage tree updates. + Selecting a mirror that is geographically near may help speed up repository syncs. </p> <div class="alert alert-info"> - <strong>Using rsync Mirrors</strong> + <strong>Using rsync mirrors</strong> <br /> - The mirrors listed <strong>on this page</strong> are used for updating your Portage tree. + The mirrors listed <strong>on this page</strong> are used for updating the Gentoo ebuild repository. <br /> To use an rsync mirror, set the <tt>sync-uri</tt> variable in the <tt>[gentoo]</tt> section of <tt>repos.conf</tt> to a URL from the list below. - <a href="https://wiki.gentoo.org/wiki//etc/portage/repos.conf/gentoo.conf" class="alert-link">More information</a> is available in our Wiki. + <a href="https://wiki.gentoo.org/wiki//etc/portage/repos.conf/gentoo.conf" class="alert-link">More information</a> is available on the wiki. </div> <div class="alert alert-success"> - <strong>Source Mirrors</strong> + <strong>Source (distfile) mirrors</strong> <br /> - We also have a second type of mirrors that you use for fetching installation files as well as package sources (configured via <code>GENTOO_MIRRORS</code>). + We also have a second type of mirrors that you use for fetching installation files as well as package sources (configured via <var>GENTOO_MIRRORS</var> variable in <tt>make.conf</tt>). They are available on a <a href="/downloads/mirrors/" class="alert-link">separate page</a>. </div> @@ -34,12 +34,12 @@ nav2-show: true </div> <p> - We would like to thank the many organizations and individuals that are providing mirroring services to the Gentoo project. If you would like to contribute a mirror, please consult the <a href="https://wiki.gentoo.org/wiki/Project:Infrastructure/Mirrors/Rsync">relevant documentation</a>. +We would like to thank the <i>many</i> organizations and individuals that are providing mirroring services to the Gentoo project. If you would like to contribute a mirror, please consult the <a href="https://wiki.gentoo.org/wiki/Project:Infrastructure/Mirrors/Rsync">relevant documentation</a>. </p> <hr> -<h2>Countries covered by Gentoo rsync Mirrors</h2> +<h2>Countries covered by Gentoo rsync mirrors</h2> <table class="table table-condensed table-striped"> <tr> diff --git a/support/security/index.html b/support/security/index.html index 994348f..c5ed46e 100644 --- a/support/security/index.html +++ b/support/security/index.html @@ -1,5 +1,5 @@ --- -title: 'Gentoo Security' +title: 'Gentoo security' navtitle: 'Security' nav1: support nav2: security @@ -16,7 +16,7 @@ layout: page-nav3 <p> Security is a primary focus of Gentoo Linux and ensuring the confidentiality and security of our users machines is of utmost importance to us. - The <a href="https://wiki.gentoo.org/wiki/Project:Security">Gentoo Linux Security Project</a> + The <a href="https://wiki.gentoo.org/wiki/Project:Security">Security Project</a> is tasked with providing timely information about security vulnerabilities in Gentoo Linux, along with patches to secure those vulnerabilities. We work directly with vendors, end users and other OSS projects to ensure all security incidents are responded to quickly and professionally. </p> @@ -32,7 +32,7 @@ layout: page-nav3 for building a secure system and hardening existing systems. </p> -<h3>Keeping your Gentoo system secure</h3> +<h3>Keeping Gentoo secure</h3> <p> To stay up-to-date with the security fixes you should subscribe to receive GLSAs and apply GLSA instructions whenever you have an affected package installed. Alternatively, syncing your portage tree and upgrading every package should also keep you up-to-date security-wise. @@ -52,7 +52,7 @@ layout: page-nav3 Gentoo Linux Security Announcements are notifications that we send out to the community to inform them of security vulnerabilities related to Gentoo Linux or the packages contained in our portage repository. </p> -<h3>Recent Advisories</h3> +<h3>Recent advisories</h3> {% include frontpage/glsa %} @@ -65,7 +65,7 @@ layout: page-nav3 GLSA announcements are sent to the <a href="/get-involved/mailing-lists/">gentoo-announce@gentoo.org mailing-list</a>, and are published via <a href="https://security.gentoo.org/subscribe">RSS and Atom feeds</a>. </p> -<h3 id="contact">Security Team contact information</h3> +<h3 id="contact">Security team contact information</h3> <p> Gentoo Linux takes security vulnerability reports very seriously. Please file new vulnerability reports on <a href="https://bugs.gentoo.org">Gentoo Bugzilla</a> @@ -78,13 +78,13 @@ layout: page-nav3 </p> <p> - <a href="https://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%20Security&component=Vulnerabilities" class="btn btn-primary btn-sm"><span class="fa fa-fw fa-bug"></span> Report Security Vulnerability</a> - <a href="https://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%20Security&component=GLSA%20Errors" class="btn btn-primary btn-sm"><span class="fa fa-fw fa-bug"></span> Report GLSA Error</a> + <a href="https://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%20Security&component=Vulnerabilities" class="btn btn-primary btn-sm"><span class="fa fa-fw fa-bug"></span> Report security vulnerability</a> + <a href="https://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%20Security&component=GLSA%20Errors" class="btn btn-primary btn-sm"><span class="fa fa-fw fa-bug"></span> Report GLSA error</a> </p> <h3>Confidential contacts</h3> <p> - You have two options to submit non-public vulnerabilities to the Gentoo Linux Security Team. + You have two options to submit non-public vulnerabilities to the security team. You may submit a bug in <a href="https://bugs.gentoo.org/">Gentoo Bugzilla</a> using the <em>New-Expert</em> action, or the <em>Enter a new bug report (advanced)</em> link, and check the <em>Gentoo Security</em> checkbox in the <em>Only users in all of the selected groups can view this bug</em> section. You may also contact directly using encrypted mail one of the following security contacts: @@ -94,11 +94,11 @@ layout: page-nav3 <td class="infohead"><b>Name</b></td> <td class="infohead"><b>Responsibility</b></td> <td class="infohead"><b>Email</b></td> - <td class="infohead"><b>GPG keyID (click to retrieve public key)</b></td> + <td class="infohead"><b>GPG key ID (click to retrieve public key)</b></td> </tr> <tr> <td class="tableinfo">Yury German</td> - <td class="tableinfo">Security team lead</td> + <td class="tableinfo">Security lead</td> <td class="tableinfo"><a href="mailto:blueknight@gentoo.org">blueknight@gentoo.org</a></td> <td class="tableinfo"><a href="https://pgp.mit.edu/pks/lookup?op=get&search=0xEEAFED89024C043D">0xEEAFED89024C043D</a></td> </tr> @@ -110,7 +110,7 @@ layout: page-nav3 </tr> <tr> <td class="tableinfo">Jason A. Donenfeld</td> - <td class="tableinfo">Security Auditing Lead</td> + <td class="tableinfo">Security auditing lead</td> <td class="tableinfo"><a href="mailto:zx2c4@gentoo.org">zx2c4@gentoo.org</a></td> <td class="tableinfo"><a href="http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x49FC7012A5DE03AE">0x49FC7012A5DE03AE</a></td> </tr> @@ -125,15 +125,15 @@ layout: page-nav3 <h3>Security pages</h3> <ul> - <li><a href="https://security.gentoo.org/glsa/">GLSA index page</a> — Full list of all published GLSAs</li> + <li><a href="https://security.gentoo.org/glsa/">GLSA index page</a> — Full list of all published GLSAs.</li> <li><a href="https://security.gentoo.org/glsa/feed.rss">GLSA RSS feed</a> — GLSA RSS live feed.</li> - <li><a href="vulnerability-treatment-policy.html">Vulnerability Treatment Policy</a> — The official policy the Security Team follows</li> - <li><a href="https://wiki.gentoo.org/wiki/Project:Security">Gentoo Linux Security Project</a> — The security project page</li> + <li><a href="vulnerability-treatment-policy.html">Vulnerability Treatment Policy</a> — The official policy of the security team.</li> + <li><a href="https://wiki.gentoo.org/wiki/Project:Security">Gentoo Linux Security Project</a> — The security project page.</li> </ul> <h3>Links</h3> <ul> - <li><a href="https://wiki.gentoo.org/wiki/Security_Handbook">Gentoo Security Handbook</a> — Step-by-step guide for hardening Gentoo Linux</li> - <li><a href="https://wiki.gentoo.org/wiki/Project:Hardened">Gentoo Hardened Project</a> — Bringing advanced security to Gentoo Linux</li> - <li><a href="/inside-gentoo/developers/">Active Developer List</a> — Active Developer List including GPG keys which can be used to verify GLSAs</li> + <li><a href="https://wiki.gentoo.org/wiki/Security_Handbook">Gentoo Security Handbook</a> — Step-by-step guide for hardening Gentoo Linux.</li> + <li><a href="https://wiki.gentoo.org/wiki/Project:Hardened">Gentoo Hardened Project</a> — Bringing advanced security to Gentoo Linux.</li> + <li><a href="/inside-gentoo/developers/">Active Developer List</a> — Active developer list including GPG keys which can be used to verify GLSAs.</li> </ul> diff --git a/support/security/vulnerability-treatment-policy.html b/support/security/vulnerability-treatment-policy.html index 9fec74d..bc4955e 100644 --- a/support/security/vulnerability-treatment-policy.html +++ b/support/security/vulnerability-treatment-policy.html @@ -21,7 +21,7 @@ body_class: nav-align-h2 </p> <p> - For this reason, the Security Team separates Gentoo architectures into two groups, <strong>supported</strong> and <strong>unsupported:</strong> + For this reason, the security team separates Gentoo architectures into two groups, <strong>supported</strong> and <strong>unsupported:</strong> </p> <dl> @@ -67,7 +67,7 @@ body_class: nav-align-h2 <strong>Note:</strong> This policy might be changed when our tools support more complex upgrade paths and if a sufficient number of GLSA coordinators join the Security Team. </div> -<h2>Vulnerability Feed</h2> +<h2>Vulnerability feed</h2> <h3>Published vulnerabilities</h3> <p> @@ -94,7 +94,7 @@ body_class: nav-align-h2 <h2>Dispatch</h2> -<h3>Severity Level</h3> +<h3>Severity level</h3> <p> In order to seed the appropriate reaction times and escalation procedures, we need to assign a severity level to each vulnerability. This severity level must be based on how widespread the affected software is amongst Gentoo users and depth of the vulnerability. @@ -275,20 +275,20 @@ You can use the following two tables to help you assign the severity level: <h2>Bug correction and GLSA draft</h2> -<h3>GLSA Coordinator role</h3> +<h3>GLSA coordinator role</h3> <p> The GLSA coordinator has responsibility for the following tasks: </p> <ul> - <li>determine what must be done in order to close the vulnerability (for example identify the upstream version containing the fix)</li> - <li>if no fix is available from upstream yet, ensure that the bug is correctly reported to the upstream developer and set status whiteboard to <code>upstream</code></li> - <li>if a fix is available, get the package maintainer involved to produce and commit an ebuild containing the fix and set status whiteboard to <code>ebuild</code></li> - <li>once an ebuild is committed, evaluate what keywords are needed for the fix ebuild - and get arch-specific Teams to test and mark the ebuild stable on their architectures (arch teams should be cc'd on the bug, as well as releng during release preparation) and set status whiteboard to <code>stable</code></li> - <li>arch-maintainers should mark the ebuild stable if there is no regression in the fix ebuild compared to the latest vulnerable version</li> - <li>in parallel, writing a draft GLSA using the GLSAMaker tool</li> - <li>when the corrective ebuild is ready for all supported archs, set the status whiteboard to <code>glsa</code></li> + <li>Determine what must be done in order to close the vulnerability (for example identify the upstream version containing the fix).</li> + <li>If no fix is available from upstream yet, ensure that the bug is correctly reported to the upstream developer and set status whiteboard to <code>upstream</code>.</li> + <li>If a fix is available, get the package maintainer involved to produce and commit an ebuild containing the fix and set status whiteboard to <code>ebuild</code>.</li> + <li>Once an ebuild is committed, evaluate what keywords are needed for the fix ebuild + and get arch-specific Teams to test and mark the ebuild stable on their architectures (arch teams should be cc'd on the bug, as well as releng during release preparation) and set status whiteboard to <code>stable</code>.</li> + <li>Arch-maintainers should mark the ebuild stable if there is no regression in the fix ebuild compared to the latest vulnerable version.</li> + <li>In parallel, writing a draft GLSA using the GLSAMaker tool.</li> + <li>When the corrective ebuild is ready for all supported archs, set the status whiteboard to <code>glsa</code>.</li> </ul> <div class="alert alert-info"> @@ -326,7 +326,7 @@ You can use the following two tables to help you assign the severity level: <li>Vulnerable versions should be left in the tree until the bug enters the <code>stable</code> status, in order to correctly evaluate what keywords are needed for the fix version</li> </ul> -<h2>GLSA Publication Process</h2> +<h2>GLSA publication process</h2> <h3>Peer review</h3> <p> @@ -370,7 +370,7 @@ You can use the following two tables to help you assign the severity level: <div class="alert alert-info"> <strong>Notes:</strong><br> - Developer key IDs can be found on the Gentoo Linux <a href="/inside-gentoo/developers/">Developer list</a>. All the Security Team GPG keys are published on public key servers, including (but not limited to) <a href="http://subkeys.pgp.net:11371">subkeys.pgp.net</a>.<br> + Developer key IDs can be found in the Gentoo Linux <a href="/inside-gentoo/developers/">Developer list</a>. All the security team GPG keys are published on public key servers, including (but not limited to) <a href="http://subkeys.pgp.net:11371">subkeys.pgp.net</a>.<br> To minimize errors in the publication process, the forum publication step is handled by an automatic poster when it receives the announcement.<br> @@ -384,7 +384,7 @@ You can use the following two tables to help you assign the severity level: GLSAMaker 2 offers this option after releasing the advisory. </p> -<h3>GLSA Errata</h3> +<h3>GLSA errata</h3> <p> Sometimes an error will slip through the peer-review process and an incorrect GLSA will be published to the world. Depending on the severity of the error(s), the following policy for erratum should be applied: </p> @@ -418,4 +418,4 @@ You can use the following two tables to help you assign the severity level: <td>Error in affected/unaffected versions number, people applying GLSA instructions are not at all protected</td> <td>An erratum GLSA should be published, replacing the erroneous one</td> </tr> -</table>
\ No newline at end of file +</table> diff --git a/support/use-flags/index.html b/support/use-flags/index.html index 140706f..86d8d8e 100644 --- a/support/use-flags/index.html +++ b/support/use-flags/index.html @@ -1,6 +1,6 @@ --- -title: 'USE Flag Index' -navtitle: 'USE Flags' +title: 'USE flag index' +navtitle: 'USE flags' nav1: support nav2: use nav2-show: true @@ -15,7 +15,7 @@ nav2-show: true <hr> -<h2 id="global">Global USE Flags</h2> +<h2 id="global">Global USE flags</h2> <table class="table table-condensed table-striped"> <tr> @@ -30,7 +30,7 @@ nav2-show: true {% endfor %} </table> -<h2 id="local">Local USE Flags</h2> +<h2 id="local">Local USE flags</h2> {% for category in site.data.use.local %} <h3 id="{{ category[0] }}">{{ category[0] }}</h3> @@ -47,4 +47,4 @@ nav2-show: true {% endfor %} </table> {% endfor %} -{% endfor %}
\ No newline at end of file +{% endfor %} |