From fc5c2af1a2ed58986dbbb6310bf1e2ca789f135e Mon Sep 17 00:00:00 2001
From: Leah Rowe <info@minifree.org>
Date: Sat, 12 Nov 2016 22:16:27 +0000
Subject: Say GNU+Linux instead of GNU/Linux. This is less confusing for normal
 people

---
 docs/archive_old.html                   | 10 +++++-----
 docs/bsd/freebsd.html                   |  4 ++--
 docs/bsd/netbsd.html                    |  4 ++--
 docs/bsd/openbsd.html                   |  4 ++--
 docs/distros/index.html                 | 14 +++++++-------
 docs/fsf-distros/index.html             |  4 ++--
 docs/future/dumps/grub.cfg              |  2 +-
 docs/git/index.html                     |  2 +-
 docs/gnulinux/configuring_parabola.html |  4 ++--
 docs/gnulinux/encrypted_debian.html     |  4 ++--
 docs/gnulinux/encrypted_parabola.html   | 10 +++++-----
 docs/gnulinux/grub_boot_installer.html  | 34 ++++++++++++++++-----------------
 docs/gnulinux/index.html                | 12 ++++++------
 docs/grub/index.html                    |  2 +-
 docs/hardware/t60_security.html         |  8 ++++----
 docs/hardware/x60_security.html         |  8 ++++----
 docs/hcl/c201.html                      |  6 +++---
 docs/hcl/d510mo.html                    |  2 +-
 docs/hcl/ga-g41m-es2l.html              |  2 +-
 docs/hcl/gm45_remove_me.html            |  4 ++--
 docs/hcl/index.html                     | 14 +++++++-------
 docs/hcl/kcma-d8.html                   |  2 +-
 docs/hcl/kgpe-d16.html                  |  2 +-
 docs/index.html                         | 12 ++++++------
 docs/install/c201.html                  |  4 ++--
 docs/install/ga-g41m-es2l.html          |  2 +-
 docs/install/index.html                 |  2 +-
 docs/install/kgpe-d16.html              |  2 +-
 docs/install/r400_external.html         |  2 +-
 docs/install/t400_external.html         |  4 ++--
 docs/install/t500_external.html         |  2 +-
 docs/install/x200_external.html         |  4 ++--
 docs/misc/bbb_ehci.html                 |  2 +-
 docs/release.html                       |  2 +-
 34 files changed, 98 insertions(+), 98 deletions(-)

(limited to 'docs')

diff --git a/docs/archive_old.html b/docs/archive_old.html
index a07e5ea4..061bd309 100644
--- a/docs/archive_old.html
+++ b/docs/archive_old.html
@@ -218,7 +218,7 @@
 					<li>coreboot-libreboot: don't rm raminit_tables (nahelem/sandybridge) (they are not blobs)</li>
 					<li>coreboot-libre: don't delete the .spd.hex files (they are not blobs)</li>
 					<li>build/release/archives: don't put rmodtool in libreboot_util</li>
-					<li>docs/install/x200_external.html: recommend installing GNU/Linux at the end</li>
+					<li>docs/install/x200_external.html: recommend installing GNU+Linux at the end</li>
 					<li>docs/install/x200_external.html: add more photos, improve instructions</li>
 					<li>build/clean/grub: use distclean instead of clean</li>
 					<li>grub-assemble: Add the <i>bsd</i> and <i>part_bsd</i> modules</li>
@@ -398,7 +398,7 @@
 					<li>docs/hcl/: update list of compatible T60 LCD panels</li>
 					<li>docs/: more clarification of libreboot's stated purpose.</li>
 					<li>build-release: include the commitid file in the release archives</li>
-					<li>docs/: Further emphasize the GNU/Linux requirement.</li>
+					<li>docs/: Further emphasize the GNU+Linux requirement.</li>
 					<li>lenovobios_firstflash: fix BASH errors</li>
 					<li>lenovobios_secondflash: fix BASH errors</li>
 					<li>docs/install/x200_external.html: Tell user to switch MAC address.</li>
@@ -624,13 +624,13 @@
 					<li>Documentation: x60_security.html and t60_security.html: added links to info about the ethernet controller (Intel 82573).</li>
 					<li>Documentation: x60_security.html and t60_security.html: added notes about DMA and the docking station.</li>
 					<li>
-						Documentation: configuring_parabola.html: basic post-install steps for Parabola GNU/Linux 
+						Documentation: configuring_parabola.html: basic post-install steps for Parabola GNU+Linux 
 						(helpful, since libreboot development is being moved to Parabola at the time of writing).
 					</li>
 					<li>builddeps-coreboot: use 'make crossgcc-i386' instead of 'make crossgcc'. Libreboot only targets x86 at the time of writing.</li>
 					<li>ROM images no longer include SeaBIOS. Instead, the user adds it afterwards. Documentation and scripts updated.</li>
 					<li>docs/images/encrypted_parabola.html: Notes about linux-libre-grsec</li>
-					<li>Documentation: encrypted_parabola.html: add tutorial for encrypted Parabola GNU/Linux installation.</li>
+					<li>Documentation: encrypted_parabola.html: add tutorial for encrypted Parabola GNU+Linux installation.</li>
 					<li>Documentation: added more info about wifi chipsets</li>
 				</ul>
 				
@@ -722,7 +722,7 @@
 				Revisions for r20140903 (6th beta) (3rd September 2014)
 			</h2>
 				<ul>
-					<li>Added modified builddeb* scripts for Parabola GNU/Linux-libre: buildpac, buildpac-flashrom, buildpac-bucts (courtesy of Noah Vesely)</li>
+					<li>Added modified builddeb* scripts for Parabola GNU+Linux-libre: buildpac, buildpac-flashrom, buildpac-bucts (courtesy of Noah Vesely)</li>
 					<li>Documentation: updated all relevant areas to mention use of buildpac* scripts for Parabola users.</li>
 					<li>Documentation: added information showing how to enable or disable bluetooth on the X60</li>
 					<li>MacBook1,1 tested! See <b>hcl/#macbook11</b></li>
diff --git a/docs/bsd/freebsd.html b/docs/bsd/freebsd.html
index dcebd6b5..99960882 100644
--- a/docs/bsd/freebsd.html
+++ b/docs/bsd/freebsd.html
@@ -110,10 +110,10 @@
 				<a href="#pagetop">Back to top of page</a>.
 			</p>	
 
-		<h2>Prepare the USB drive (in GNU/Linux)</h2>
+		<h2>Prepare the USB drive (in GNU+Linux)</h2>
 
             <p>
-                If you downloaded your ISO on a GNU/Linux system,
+                If you downloaded your ISO on a GNU+Linux system,
                 here is  how to create the bootable FreeBSD USB drive:
             </p>
 
diff --git a/docs/bsd/netbsd.html b/docs/bsd/netbsd.html
index dff93e18..2fab9f99 100644
--- a/docs/bsd/netbsd.html
+++ b/docs/bsd/netbsd.html
@@ -104,10 +104,10 @@
 				<a href="#pagetop">Back to top of page</a>.
 			</p>	
 
-		<h2>Prepare the USB drive (in GNU/Linux)</h2>
+		<h2>Prepare the USB drive (in GNU+Linux)</h2>
 
             <p>
-                If you downloaded your ISO on a GNU/Linux system,
+                If you downloaded your ISO on a GNU+Linux system,
                 here is  how to create the bootable NetBSD USB drive:
             </p>
 
diff --git a/docs/bsd/openbsd.html b/docs/bsd/openbsd.html
index d9136a14..751e884a 100644
--- a/docs/bsd/openbsd.html
+++ b/docs/bsd/openbsd.html
@@ -105,10 +105,10 @@
                 also use the same instructions with a OpenBSD ISO image.
             </p>
 
-		<h2>Prepare the USB drive (in GNU/Linux)</h2>
+		<h2>Prepare the USB drive (in GNU+Linux)</h2>
 
             <p>
-                If you downloaded your ISO on a GNU/Linux system,
+                If you downloaded your ISO on a GNU+Linux system,
                 here is  how to create the bootable OpenBSD USB drive:
             </p>
 
diff --git a/docs/distros/index.html b/docs/distros/index.html
index 795ed1b2..f8a7136c 100644
--- a/docs/distros/index.html
+++ b/docs/distros/index.html
@@ -8,13 +8,13 @@
 		@import url('../css/main.css');
 	</style>
 
-	<title>List of recommended GNU/Linux distributions for libreboot</title>
+	<title>List of recommended GNU+Linux distributions for libreboot</title>
 </head>
 
 <body>
 
 	<div class="section">
-		<h1 id="pagetop">List of recommended GNU/Linux distributions for libreboot</h1>
+		<h1 id="pagetop">List of recommended GNU+Linux distributions for libreboot</h1>
 			<p>
                 Any distribution should work, so long as it uses kernel mode setting for graphics.
                 We recommend using distributions that are entirely free software; most distros
@@ -27,18 +27,18 @@
                 distrubions wrongly call the whole system <em>Linux</em>. Despite libreboot's
                 <a href="../../gnu/">stance against the GNU project</a>, we still agree
                 with the free software philosophy and we still want you to call the
-                whole system <em>GNU/Linux</em>, since this is the technically correct
+                whole system <em>GNU+Linux</em>, since this is the technically correct
                 name for the system.
             </p>
             <h2>FSF-endorsed distros</h2>
             <p>
-                Many FSF-endorsed GNU/Linux distributions are considered unfit
+                Many FSF-endorsed GNU+Linux distributions are considered unfit
                 for general use by the libreboot project.
                 You can read about their problems here:<br/>
                 <a href="../fsf-distros/">Why we can't endorse many FSF-endorsed distributions</a>.
             </p>
             <p>
-                <a href="../gnulinux/grub_boot_installer.html">How to install GNU/Linux on a libreboot system</a>
+                <a href="../gnulinux/grub_boot_installer.html">How to install GNU+Linux on a libreboot system</a>
             </p>
             <p>
                 <a href="../">Back to main index</a>
@@ -167,14 +167,14 @@ manage it.</p>
             <p>
                 <a href="https://gentoo.org/">Visit the Gentoo website</a>
             </p>
-        <h2>Parabola GNU/Linux</h2>
+        <h2>Parabola GNU+Linux</h2>
             <p>
                 Fully free bleeding edge distribution, based on the <em>Arch</em> distribution.
                 Good for saavy users and developers in general (some libreboot developers
                 use this).
             </p>
             <p>
-                Arch users, refer to the <a href="https://wiki.parabola.nu/Migration_from_the_GNU/Linux_distribution_of_Arch">Parabola migration guide</a>.
+                Arch users, refer to the <a href="https://wiki.parabola.nu/Migration_from_the_GNU+Linux_distribution_of_Arch">Parabola migration guide</a>.
             </p>
             <p>
                <a href="https://www.parabola.nu/">Visit the Parabola website</a> 
diff --git a/docs/fsf-distros/index.html b/docs/fsf-distros/index.html
index c0a752df..0c2efcd2 100644
--- a/docs/fsf-distros/index.html
+++ b/docs/fsf-distros/index.html
@@ -20,9 +20,9 @@
                 usually well-known within the FSF community.
             </p>
             <p>
-                To learn more about the GNU/Linux systems that we do endorse,
+                To learn more about the GNU+Linux systems that we do endorse,
                 check out our list of
-                <a href="../distros/">free GNU/Linux distributions</a>. The <em>only</em>
+                <a href="../distros/">free GNU+Linux distributions</a>. The <em>only</em>
                 FSF-endorsed distribution that we endorse there is <em>Parabola</em>.
             </p>
             <p>
diff --git a/docs/future/dumps/grub.cfg b/docs/future/dumps/grub.cfg
index 5bd1a50b..c3a9d073 100644
--- a/docs/future/dumps/grub.cfg
+++ b/docs/future/dumps/grub.cfg
@@ -2,7 +2,7 @@ set default="0"
 set timeout=1
 set pager=1
 
-menuentry 'GNU/Linux with linux-libre 3.14.4' {
+menuentry 'GNU+Linux with linux-libre 3.14.4' {
         linux  (ahci0,1)/boot/vmlinuz-3.14.4-gnuowen root=/dev/sda1 processor.max_cstate=2 drm.debug=0x06 console=tty0 console=ttyS0,115200n8
         initrd  (ahci0,1)/boot/initrd.img-3.14.4-gnuowen
 }
diff --git a/docs/git/index.html b/docs/git/index.html
index 04981c93..e11e83c2 100644
--- a/docs/git/index.html
+++ b/docs/git/index.html
@@ -57,7 +57,7 @@
 			</div>
 
 			<p>
-				For other GNU/Linux distributions, you can adapt the existing scripts.
+				For other GNU+Linux distributions, you can adapt the existing scripts.
 			</p>
 
 			<p><a href="#pagetop">Back to top of page</a></p>
diff --git a/docs/gnulinux/configuring_parabola.html b/docs/gnulinux/configuring_parabola.html
index 97c826e7..c2e596a5 100644
--- a/docs/gnulinux/configuring_parabola.html
+++ b/docs/gnulinux/configuring_parabola.html
@@ -15,7 +15,7 @@
 	<div class="section">
 		<h1 id="pagetop">Configuring Parabola (post-install)</h1>
 			<p>
-				Post-installation configuration steps for Parabola GNU/Linux-libre. Parabola is extremely flexible; this is just an example.
+				Post-installation configuration steps for Parabola GNU+Linux-libre. Parabola is extremely flexible; this is just an example.
 			</p>
 			<p>
 				<a href="./">Back to previous index</a>
@@ -101,7 +101,7 @@
 		<p>
 			You do not necessarily have to follow this guide word-for-word; <i>parabola</i> is extremely flexible.
 			The aim here is to provide a common setup that most users will be happy with. While Parabola 
-			can seem daunting at first glance (especially for new GNU/Linux users), with a simple guide it can provide 
+			can seem daunting at first glance (especially for new GNU+Linux users), with a simple guide it can provide 
 			all the same usability as Debian or Devuan, without hiding any details from the user. 
 		</p>
 
diff --git a/docs/gnulinux/encrypted_debian.html b/docs/gnulinux/encrypted_debian.html
index 39149773..dc6ef028 100644
--- a/docs/gnulinux/encrypted_debian.html
+++ b/docs/gnulinux/encrypted_debian.html
@@ -8,12 +8,12 @@
 		@import url('../css/main.css');
 	</style>
 
-	<title>Installing Debian or Devuan GNU/Linux with full disk encryption (including /boot)</title>
+	<title>Installing Debian or Devuan GNU+Linux with full disk encryption (including /boot)</title>
 </head>
 
 <body>
 	<div class="section">
-		<h1>Installing Debian or Devuan GNU/Linux with full disk encryption (including /boot)</h1>
+		<h1>Installing Debian or Devuan GNU+Linux with full disk encryption (including /boot)</h1>
             <p>
                 This guide is written for the Debian distribution, but it should
                 also work for Devuan with the net installer.
diff --git a/docs/gnulinux/encrypted_parabola.html b/docs/gnulinux/encrypted_parabola.html
index 418f701c..0f4c8a7c 100644
--- a/docs/gnulinux/encrypted_parabola.html
+++ b/docs/gnulinux/encrypted_parabola.html
@@ -8,12 +8,12 @@
 		@import url('../css/main.css');
 	</style>
 
-	<title>Installing Parabola or Arch GNU/Linux with full disk encryption (including /boot)</title>
+	<title>Installing Parabola or Arch GNU+Linux with full disk encryption (including /boot)</title>
 </head>
 
 <body>
 	<div class="section">
-		<h1>Installing Parabola or Arch GNU/Linux with full disk encryption (including /boot)</h1>
+		<h1>Installing Parabola or Arch GNU+Linux with full disk encryption (including /boot)</h1>
 			<p>
 				Libreboot on x86 uses the GRUB <a href="http://www.coreboot.org/Payloads#GRUB_2">payload</a> 
 				by default, which means that the GRUB configuration file 
@@ -39,7 +39,7 @@
                 We recomend using Parabola, which is a version of Arch that removes all
                 proprietary software, both in the default installation and in the package repositories. It usually lags
                 behind Arch by only a day or two, so it is still usable for most people.
-                See <a href="https://wiki.parabola.nu/index.php?title=Migration_from_the_GNU/Linux_distribution_of_Arch&redirect=no">Arch to Parabola migration guide</a>.
+                See <a href="https://wiki.parabola.nu/index.php?title=Migration_from_the_GNU+Linux_distribution_of_Arch&redirect=no">Arch to Parabola migration guide</a>.
             </p>
 
             <p>
@@ -53,7 +53,7 @@
 	<div class="section">
 		
 		<p>
-			Boot Parabola's install environment. <a href="grub_boot_installer.html">How to boot a GNU/Linux installer</a>.
+			Boot Parabola's install environment. <a href="grub_boot_installer.html">How to boot a GNU+Linux installer</a>.
 		</p>
 
 		<p>
@@ -74,7 +74,7 @@
 	<div class="section">
 		
 		<p>	This section deals with wiping the storage device on which you plan to install Parabola
-			GNU/Linux. Follow these steps, but if you use an SSD, also:
+			GNU+Linux. Follow these steps, but if you use an SSD, also:
 
 		<p>
 			- beware there are issues with TRIM (not enabled through luks) and security issues if you do enable it.
diff --git a/docs/gnulinux/grub_boot_installer.html b/docs/gnulinux/grub_boot_installer.html
index 30d7e60e..03f5dc24 100644
--- a/docs/gnulinux/grub_boot_installer.html
+++ b/docs/gnulinux/grub_boot_installer.html
@@ -8,20 +8,20 @@
 		@import url('../css/main.css');
 	</style>
 
-	<title>How to install GNU/Linux on a libreboot system</title>
+	<title>How to install GNU+Linux on a libreboot system</title>
 </head>
 
 <body>
 	<div id="pagetop" class="section">
-		<h1>How to install GNU/Linux on a libreboot system</h1>
+		<h1>How to install GNU+Linux on a libreboot system</h1>
 			<p>
 				This section relates to preparing, booting and installing a
-				GNU/Linux distribution on your libreboot system, using nothing more than a USB flash drive (and <i>dd</i>).
+				GNU+Linux distribution on your libreboot system, using nothing more than a USB flash drive (and <i>dd</i>).
 			</p>
 			<ul>
-                <li><a href="../distros">List of recommended GNU/Linux distributions</a></li>
-				<li><a href="#prepare">Prepare the USB drive (in GNU/Linux)</a></li>
-				<li><a href="#encryption">Installing GNU/Linux with full disk encryption</a></li>
+                <li><a href="../distros">List of recommended GNU+Linux distributions</a></li>
+				<li><a href="#prepare">Prepare the USB drive (in GNU+Linux)</a></li>
+				<li><a href="#encryption">Installing GNU+Linux with full disk encryption</a></li>
 				<li><a href="#debian_netinstall">Debian or Devuan net install?</a></li>
 				<li><a href="#parse_isolinux">Booting ISOLINUX images (automatic method)</a></li>
 				<li><a href="#manual_isolinux">Booting ISOLINUX images (manual method)</a></li>
@@ -41,11 +41,11 @@
 
 	<div id="prepare" class="section">
 		
-		<h2>Prepare the USB drive (in GNU/Linux)</h2>
+		<h2>Prepare the USB drive (in GNU+Linux)</h2>
 
             <p>
-                If you downloaded your ISO on an existing GNU/Linux system,
-                here is  how to create the bootable GNU/Linux USB drive:
+                If you downloaded your ISO on an existing GNU+Linux system,
+                here is  how to create the bootable GNU+Linux USB drive:
             </p>
 
 			<p>
@@ -82,7 +82,7 @@
                <a href="https://wiki.netbsd.org/tutorials/how_to_install_netbsd_from_an_usb_memory_stick/">This page</a>
                on the NetBSD website shows how to create a NetBSD bootable USB drive
                from within NetBSD itself. You should use the <em>dd</em> method
-               documented there. This will also work with any GNU/Linux ISO image.
+               documented there. This will also work with any GNU+Linux ISO image.
             </p>
 
         <h2>Prepare the USB drive (in FreeBSD)</h2>
@@ -90,14 +90,14 @@
                 <a href="https://www.freebsd.org/doc/handbook/bsdinstall-pre.html">This page</a>
                 on the FreeBSD website shows how to create a bootable USB drive
                 for installing FreeBSD. Use the <em>dd</em> on that page. You can
-                also use the same instructions with any GNU/Linux ISO image..
+                also use the same instructions with any GNU+Linux ISO image..
             </p>
 
 		<h2>Prepare the USB drive (in LibertyBSD or OpenBSD)</h2>
 
             <p>
                 If you downloaded your ISO on a LibertyBSD or OpenBSD system,
-                here is how to create the bootable GNU/Linux USB drive:
+                here is how to create the bootable GNU+Linux USB drive:
             </p>
 
 			<p>
@@ -131,11 +131,11 @@
 
 	<div id="encryption" class="section">
 
-		<h2>Installing GNU/Linux with full disk encryption</h2>
+		<h2>Installing GNU+Linux with full disk encryption</h2>
 
 			<ul>
-				<li><a href="encrypted_debian.html">Installing Debian or Devuan GNU/Linux with full disk encryption (including /boot)</a></li>
-				<li><a href="encrypted_parabola.html">Installing Parabola GNU/Linux with full disk encryption (including /boot)</a></li>
+				<li><a href="encrypted_debian.html">Installing Debian or Devuan GNU+Linux with full disk encryption (including /boot)</a></li>
+				<li><a href="encrypted_parabola.html">Installing Parabola GNU+Linux with full disk encryption (including /boot)</a></li>
 			</ul>
 
 			<p>
@@ -196,7 +196,7 @@
 
 			<p>
 				<i>These are generic instructions. They may or may not be correct for your
-				distribution. You must adapt them appropriately, for whatever GNU/Linux distribution
+				distribution. You must adapt them appropriately, for whatever GNU+Linux distribution
 				it is that you are trying to install.</i>
 			</p>
 
@@ -258,7 +258,7 @@
 
 			<p>
 				Most of these issues occur when using libreboot with coreboot's 'text mode' instead of the coreboot framebuffer.
-				This mode is useful for booting payloads like memtest86+ which expect text-mode, but for GNU/Linux distributions
+				This mode is useful for booting payloads like memtest86+ which expect text-mode, but for GNU+Linux distributions
 				it can be problematic when they are trying to switch to a framebuffer because it doesn't exist.
 			</p>
 
diff --git a/docs/gnulinux/index.html b/docs/gnulinux/index.html
index 4f4bd25b..7fc8b6ba 100644
--- a/docs/gnulinux/index.html
+++ b/docs/gnulinux/index.html
@@ -8,16 +8,16 @@
 		@import url('../css/main.css');
 	</style>
 
-	<title>GNU/Linux distributions</title>
+	<title>GNU+Linux distributions</title>
 </head>
 
 <body>
 
 	<div class="section">
 		
-		<h1 id="pagetop">GNU/Linux distributions</h1>
+		<h1 id="pagetop">GNU+Linux distributions</h1>
 			<p>
-				This section relates to dealing with GNU/Linux distributions: preparing bootable USB drives,
+				This section relates to dealing with GNU+Linux distributions: preparing bootable USB drives,
 				changing the default GRUB menu and so on.
 			</p>
 			<p>
@@ -27,15 +27,15 @@
 				<a href="../">Back to previous index</a>.
 			</p>
 			<ul>
-				<li><a href="grub_boot_installer.html">How to install GNU/Linux on a libreboot system</a></li>
+				<li><a href="grub_boot_installer.html">How to install GNU+Linux on a libreboot system</a></li>
 				<li><a href="grub_cbfs.html">How to replace the default GRUB configuration file on a libreboot system</a></li>
 				<li>
-					<a href="encrypted_parabola.html">Installing Parabola or Arch GNU/Linux-libre with full disk encryption (including /boot)</a>
+					<a href="encrypted_parabola.html">Installing Parabola or Arch GNU+Linux-libre with full disk encryption (including /boot)</a>
 					<ul>
 						<li>Follow-up tutorial: <a href="configuring_parabola.html">Configuring Parabola (post-install)</a></li>
 					</ul>
 				</li>
-				<li><a href="encrypted_debian.html">Installing Debian or Devuan GNU/Linux-libre with full disk encryption (including /boot)</a></li>
+				<li><a href="encrypted_debian.html">Installing Debian or Devuan GNU+Linux-libre with full disk encryption (including /boot)</a></li>
 			</ul>
 			
 	</div>
diff --git a/docs/grub/index.html b/docs/grub/index.html
index 65de8e83..78beb3e6 100644
--- a/docs/grub/index.html
+++ b/docs/grub/index.html
@@ -65,7 +65,7 @@
 			<p>Specifically, the version that I chose was the latest at the time of writing (Saturday 21 June 2014):
 			<a href="http://sourceforge.net/projects/dejavu/files/dejavu/2.34/dejavu-fonts-ttf-2.34.tar.bz2">this one</a></p>
 
-			<p>This is a free font that is also contained in GNU/Linux distributions like Debian, Devuan or Parabola.</p>
+			<p>This is a free font that is also contained in GNU+Linux distributions like Debian, Devuan or Parabola.</p>
 
 			<p><b>$ cd libreboot_src/grub</b><br/>
 			compile grub (the build scripts info on how to do this)<br/>
diff --git a/docs/hardware/t60_security.html b/docs/hardware/t60_security.html
index cd2b0d9e..5e0c4bdd 100644
--- a/docs/hardware/t60_security.html
+++ b/docs/hardware/t60_security.html
@@ -36,7 +36,7 @@
 		<h1 id="software_requirements">Software requirements</h1>
 			<ul>
 				<li>none (at least in the scope of the article as-is)</li>
-				<li>You probably want to encrypt your GNU/Linux install using LUKS</li>
+				<li>You probably want to encrypt your GNU+Linux install using LUKS</li>
 			</ul>
 	</div>
 
@@ -387,8 +387,8 @@
 			Further reading material (software security)
 		</h1>
 			<ul>
-				<li><a href="../gnulinux/encrypted_debian.html">Installing Debian or Devuan GNU/Linux with full disk encryption (including /boot)</a></li>
-				<li><a href="../gnulinux/encrypted_parabola.html">Installing Parabola GNU/Linux with full disk encryption (including /boot)</a></li>
+				<li><a href="../gnulinux/encrypted_debian.html">Installing Debian or Devuan GNU+Linux with full disk encryption (including /boot)</a></li>
+				<li><a href="../gnulinux/encrypted_parabola.html">Installing Parabola GNU+Linux with full disk encryption (including /boot)</a></li>
 				<li><a href="dock.html">Notes about DMA access and the docking station</a></li>
 			</ul>
 	</div>
@@ -417,7 +417,7 @@
 						yourself, however they don't record loud at all. Also intel cards have
 						the capability to change a connector's function, for instance the
 						microphone jack can now become a headphone plug, that's called
-						retasking. There is some support for it in GNU/Linux but it's not very
+						retasking. There is some support for it in GNU+Linux but it's not very
 						well known.
 					</p>
 			</div>
diff --git a/docs/hardware/x60_security.html b/docs/hardware/x60_security.html
index ebda820b..f2bb70af 100644
--- a/docs/hardware/x60_security.html
+++ b/docs/hardware/x60_security.html
@@ -40,7 +40,7 @@
 		<h1 id="software_requirements">Software requirements</h1>
 			<ul>
 				<li>none (at least in the scope of the article as-is)</li>
-				<li>You probably want to encrypt your GNU/Linux install using LUKS</li>
+				<li>You probably want to encrypt your GNU+Linux install using LUKS</li>
 			</ul>
 			
 	</div>
@@ -247,8 +247,8 @@
 			Further reading material (software security)
 		</h1>
 			<ul>
-				<li><a href="../gnulinux/encrypted_debian.html">Installing Debian or Devuan GNU/Linux with full disk encryption (including /boot)</a></li>
-				<li><a href="../gnulinux/encrypted_parabola.html">Installing Parabola GNU/Linux with full disk encryption (including /boot)</a></li>
+				<li><a href="../gnulinux/encrypted_debian.html">Installing Debian or Devuan GNU+Linux with full disk encryption (including /boot)</a></li>
+				<li><a href="../gnulinux/encrypted_parabola.html">Installing Parabola GNU+Linux with full disk encryption (including /boot)</a></li>
 				<li><a href="dock.html">Notes about DMA access and the docking station</a></li>
 			</ul>
 	</div>
@@ -277,7 +277,7 @@
 						yourself, however they don't record loud at all. Also intel cards have
 						the capability to change a connector's function, for instance the
 						microphone jack can now become a headphone plug, that's called
-						retasking. There is some support for it in GNU/Linux but it's not very
+						retasking. There is some support for it in GNU+Linux but it's not very
 						well known.
 					</p>
 			</div>
diff --git a/docs/hcl/c201.html b/docs/hcl/c201.html
index 3cfa9c0f..595cd63e 100644
--- a/docs/hcl/c201.html
+++ b/docs/hcl/c201.html
@@ -85,14 +85,14 @@
 	<div class="section">
 		<h1 id="os">Considerations about ChromeOS and free operating systems</h1>
 			<p>
-				This laptop comes preinstalled (from the factory) with Google ChromeOS. This is a GNU/Linux distribution, but it's not general purpose
+				This laptop comes preinstalled (from the factory) with Google ChromeOS. This is a GNU+Linux distribution, but it's not general purpose
 				and it comes with proprietary software. It's designed for SaaSS. Libreboot recommends that users of this laptop replace it with another distribution.
 			</p>
 			<p>
                 Use one of the distributions recommend by the libreboot project.
                 See <a href="../distros/">../distros/</a>
             </p>
-            <h2>Debian GNU/Linux</h2>
+            <h2>Debian GNU+Linux</h2>
             <p>
                 <a href="https://wiki.debian.org/InstallingDebianOn/Asus/C201">https://wiki.debian.org/InstallingDebianOn/Asus/C201</a>
                 shows how to install Debian.
@@ -203,7 +203,7 @@
 			</p>
 			<p>
 				Write protection is useful, because it prevents the firmware from being re-flashed by any malicious software that
-				might become executed on your GNU/Linux system, as root. In other words, it can prevent a firmware-level <i>evil maid</i> attack. It's
+				might become executed on your GNU+Linux system, as root. In other words, it can prevent a firmware-level <i>evil maid</i> attack. It's
 				possible to write protect on all current libreboot systems, but CrOS devices make it easy. The screw is such a stupidly
 				simple idea, which all designs should implement.
 			</p>
diff --git a/docs/hcl/d510mo.html b/docs/hcl/d510mo.html
index bdf3edca..f11693cf 100644
--- a/docs/hcl/d510mo.html
+++ b/docs/hcl/d510mo.html
@@ -20,7 +20,7 @@
 			This is a desktop board using intel hardware (circa ~2009, ICH7 southbridge, similar performance-wise to the Libreboot X200. It can make for quite a nifty desktop. Powered by libreboot.
 		</p>
 		<p>
-		    NOTE: This board has a working framebuffer in Grub, but in GNU/Linux in native resolution the display is unusable due to some raminit issues.
+		    NOTE: This board has a working framebuffer in Grub, but in GNU+Linux in native resolution the display is unusable due to some raminit issues.
             This board can however be used for building a headless server.
         </p>
 		<p>
diff --git a/docs/hcl/ga-g41m-es2l.html b/docs/hcl/ga-g41m-es2l.html
index 663aa685..c485d6a2 100644
--- a/docs/hcl/ga-g41m-es2l.html
+++ b/docs/hcl/ga-g41m-es2l.html
@@ -29,7 +29,7 @@
 			<strong>NOTE: This board is unsupported in libreboot 20150518. To use it in libreboot, for now, you must build for it from source using the libreboot git repository.</strong>
 		</p>
         <p>
-            You need to set a custom MAC address in GNU/Linux for the NIC to work. In /etc/network/interfaces on debian-based systems like Debian or Devuan,
+            You need to set a custom MAC address in GNU+Linux for the NIC to work. In /etc/network/interfaces on debian-based systems like Debian or Devuan,
             this would be in the entry for your NIC:<br/>
             hwaddress ether macaddressgoeshere
         </p>
diff --git a/docs/hcl/gm45_remove_me.html b/docs/hcl/gm45_remove_me.html
index 5d03bf7f..449dbbe1 100644
--- a/docs/hcl/gm45_remove_me.html
+++ b/docs/hcl/gm45_remove_me.html
@@ -81,7 +81,7 @@
 			</p>
 			
 			<p>
-				You can find out your MAC address from <b>ip addr</b> or <b>ifconfig</b> in GNU/Linux. 
+				You can find out your MAC address from <b>ip addr</b> or <b>ifconfig</b> in GNU+Linux. 
 				Alternatively, if you are running libreboot already (with the correct MAC address in your
 				ROM), dump it (flashrom -r) and read the first 6 bytes from position 0x1000 (or 0x2000) in a hex editor
 				(or, rename it to factory.rom and run it in ich9deblob: in the newly created mkgbe.c
@@ -210,7 +210,7 @@
 			</p>
 			<p>
 				If you are working with libreboot_util release archive, you can find the utility included, statically compiled
-				(for i686 and x86_64 on GNU/Linux) under ./ich9deblob/.
+				(for i686 and x86_64 on GNU+Linux) under ./ich9deblob/.
 			</p>
 			
 			<p>
diff --git a/docs/hcl/index.html b/docs/hcl/index.html
index 9ac21c3d..893d5500 100644
--- a/docs/hcl/index.html
+++ b/docs/hcl/index.html
@@ -295,8 +295,8 @@ EndSection
 						<li>Samsung LTN150XG (15.1&quot; 1024x768)</li>
 						<li>LG-Philips LP150E06-A5K4 (15.1&quot; 1400x1050) (also, not an official T60 screen)</li>
 						<li>Samsung LTN154X3-L0A (15.4&quot; 1280x800)</li>
-						<li>IDtech IAQX10N (15.1&quot; 2048x1536) (no display in GRUB, display in GNU/Linux is temperamental) (P/N 42T0078 FRU 42T0079 or P/N 41W1338 recommended for the inverter board)</li>
-						<li>IDtech N150U3-L01 (15.1&quot; 1600x1200) (no display in GRUB, display in GNU/Linux works) (P/N 42T0078 FRU 42T0079 or P/N 41W1338 recommended for the inverter board)</li>
+						<li>IDtech IAQX10N (15.1&quot; 2048x1536) (no display in GRUB, display in GNU+Linux is temperamental) (P/N 42T0078 FRU 42T0079 or P/N 41W1338 recommended for the inverter board)</li>
+						<li>IDtech N150U3-L01 (15.1&quot; 1600x1200) (no display in GRUB, display in GNU+Linux works) (P/N 42T0078 FRU 42T0079 or P/N 41W1338 recommended for the inverter board)</li>
 					</ul>
 
 			</div>
@@ -439,7 +439,7 @@ EndSection
 			</p>
 
 			<p>
-				No method is yet known for flashing in GNU/Linux while the Apple firmware is running. You will need to disassemble the system and flash externally.
+				No method is yet known for flashing in GNU+Linux while the Apple firmware is running. You will need to disassemble the system and flash externally.
 				Reading from flash seems to work. For external flashing, refer to <a href="../install/bbb_setup.html">../install/bbb_setup.html</a>.
 			</p>
 
@@ -474,14 +474,14 @@ EndSection
 
 			<div class="subsection">
 				<h3>
-					Installing GNU/Linux distributions (on Apple EFI firmware)
+					Installing GNU+Linux distributions (on Apple EFI firmware)
 				</h3>
 					<ul>
-						<li><a href="#">Parabola GNU/Linux installation on a macbook2,1 with Apple EFI firmware</a> (this is a copy of Mono's page, see above)</li>
+						<li><a href="#">Parabola GNU+Linux installation on a macbook2,1 with Apple EFI firmware</a> (this is a copy of Mono's page, see above)</li>
 					</ul>
 					<p>
 						How to boot an ISO: burn it to a CD (like you would normally) and hold down the Alt/Control key while booting. 
-						The bootloader will detect the GNU/Linux CD as 'Windows' (because Apple doesn't think GNU/Linux exists). Install it like you normally would.
+						The bootloader will detect the GNU+Linux CD as 'Windows' (because Apple doesn't think GNU+Linux exists). Install it like you normally would.
 						When you boot up again, hold Alt/Control once more. The installation (on the HDD) will once again be seen as 'Windows'. (it's not actually Windows,
 						but Apple likes to think that Apple and Microsoft are all that exist.)
 						Now to install libreboot, follow <a href="../install/#flashrom_macbook21">../install/#flashrom_macbook21</a>.
@@ -543,7 +543,7 @@ EndSection
 			</p>
 
 			<p>
-				You need to replace OS X with GNU/Linux before flashing libreboot. (OSX won't run at all in libreboot).
+				You need to replace OS X with GNU+Linux before flashing libreboot. (OSX won't run at all in libreboot).
 			</p>
 
 			<p>
diff --git a/docs/hcl/kcma-d8.html b/docs/hcl/kcma-d8.html
index 5951bb0c..3e57945a 100644
--- a/docs/hcl/kcma-d8.html
+++ b/docs/hcl/kcma-d8.html
@@ -30,7 +30,7 @@
 			<p>
 				Flashing instructions can be found at <a href="../install/#flashrom">../install/#flashrom</a>
 				- note that external flashing is required (e.g. BBB), if the proprietary (ASUS) firmware is currently installed.
-				If you already have libreboot, by default it is possible to re-flash using software running in GNU/Linux
+				If you already have libreboot, by default it is possible to re-flash using software running in GNU+Linux
 				on the kcma-d8, without using external hardware.
 			</p>
 			
diff --git a/docs/hcl/kgpe-d16.html b/docs/hcl/kgpe-d16.html
index 1ede89ac..7fe60d2a 100644
--- a/docs/hcl/kgpe-d16.html
+++ b/docs/hcl/kgpe-d16.html
@@ -31,7 +31,7 @@
 			<p>
 				Flashing instructions can be found at <a href="../install/#flashrom">../install/#flashrom</a>
 				- note that external flashing is required (e.g. BBB), if the proprietary (ASUS) firmware is currently installed.
-				If you already have libreboot, by default it is possible to re-flash using software running in GNU/Linux
+				If you already have libreboot, by default it is possible to re-flash using software running in GNU+Linux
 				on the KGPE-D16, without using external hardware.
 			</p>
 			
diff --git a/docs/index.html b/docs/index.html
index af49669c..9d197f56 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -30,11 +30,11 @@
 	<div class="section">
 		
         <p>
-            Libreboot is compatible with GNU/Linux and several BSD systems.
+            Libreboot is compatible with GNU+Linux and several BSD systems.
         </p>
         <p>
-            For GNU/Linux,
-            have a look at our <a href="distros/">list of GNU/Linux distributions that we recommend</a>.
+            For GNU+Linux,
+            have a look at our <a href="distros/">list of GNU+Linux distributions that we recommend</a>.
         </p>
         <p>
             For BSD, refer to <a href="https://libreboot.org/faq/#bsd">the libreboot FAQ</a>. We wish
@@ -50,8 +50,8 @@
             </ul>
         <h1>Installing operating systems</h1>
             <ul>
-                <li><a href="distros/">List of recommended GNU/Linux distributions for libreboot</a></li>
-				<li><a href="gnulinux/">How to install GNU/Linux on a libreboot system</a></li>
+                <li><a href="distros/">List of recommended GNU+Linux distributions for libreboot</a></li>
+				<li><a href="gnulinux/">How to install GNU+Linux on a libreboot system</a></li>
                 <li><a href="bsd/">How to install BSD on a libreboot system</a></li>
             </ul>
         <h1>Information for developers</h1>
@@ -104,7 +104,7 @@
 			<p>
 				Libreboot has many practical advantages over proprietary boot firmware, 
 				such as faster boot speeds and better security. You can
-				<a href="gnulinux/">install GNU/Linux with encrypted /boot/</a>,
+				<a href="gnulinux/">install GNU+Linux with encrypted /boot/</a>,
 				<a href="http://www.coreboot.org/GRUB2#signed_kernels">verify GPG signatures on your kernel</a>,
 				put a kernel in the flash chip and more.
 			</p>
diff --git a/docs/install/c201.html b/docs/install/c201.html
index dc43982d..b009c6bd 100644
--- a/docs/install/c201.html
+++ b/docs/install/c201.html
@@ -67,7 +67,7 @@
 				</ul>
 			</li>
             <li>
-                <a href="#debian">Debian GNU/Linux is recommended for this device</a> (TODO: instructions for Devuan)
+                <a href="#debian">Debian GNU+Linux is recommended for this device</a> (TODO: instructions for Devuan)
             </i>
 		</ul>
 
@@ -269,7 +269,7 @@
 		</div>
 
         <h2 id="debian">
-            Debian GNU/Linux
+            Debian GNU+Linux
         </h2>
         <p>
             You might consider replacing ChromeOS with a free distro.
diff --git a/docs/install/ga-g41m-es2l.html b/docs/install/ga-g41m-es2l.html
index 2ed128ab..589b5420 100644
--- a/docs/install/ga-g41m-es2l.html
+++ b/docs/install/ga-g41m-es2l.html
@@ -54,7 +54,7 @@
             </p>
             <p>
                 Internal flashing is possible. Boot with the proprietary BIOS
-                and GNU/Linux. There are 2 flash chips (one is backup).
+                and GNU+Linux. There are 2 flash chips (one is backup).
             </p>
             <p>
                 Flash the first chip:
diff --git a/docs/install/index.html b/docs/install/index.html
index 5c098669..36121017 100644
--- a/docs/install/index.html
+++ b/docs/install/index.html
@@ -91,7 +91,7 @@
 			<p>
 				<i>keymap</i> can be one of several keymaps that keyboard supports (there are quite a few),
 				which affects the keyboard layout configuration that is used in GRUB. It doesn't matter
-				which ROM image you choose here, as far as the keymap in GNU/Linux is concerned.
+				which ROM image you choose here, as far as the keymap in GNU+Linux is concerned.
 			</p>
 			<p>
 				Keymaps are named appropriately according to each keyboard layout
diff --git a/docs/install/kgpe-d16.html b/docs/install/kgpe-d16.html
index 2d78f5bb..d2e10dd4 100644
--- a/docs/install/kgpe-d16.html
+++ b/docs/install/kgpe-d16.html
@@ -51,7 +51,7 @@
 
 			<p>
 				If you don't want to install libreboot yourself, companies exist that sell these boards
-				with libreboot pre-installed, along with a free GNU/Linux distribution.
+				with libreboot pre-installed, along with a free GNU+Linux distribution.
 			</p>
 			<p>
 				Check the <a href="../../suppliers">suppliers</a> page for more information.
diff --git a/docs/install/r400_external.html b/docs/install/r400_external.html
index 415a0171..d32ca8e9 100644
--- a/docs/install/r400_external.html
+++ b/docs/install/r400_external.html
@@ -530,7 +530,7 @@ Verifying flash... VERIFIED.
 			</p>
 			
 			<p>
-				Now <a href="../gnulinux/">install GNU/Linux</a>.
+				Now <a href="../gnulinux/">install GNU+Linux</a>.
 			</p>
 	
 	</div>
diff --git a/docs/install/t400_external.html b/docs/install/t400_external.html
index 2e91ecf2..21d0eab2 100644
--- a/docs/install/t400_external.html
+++ b/docs/install/t400_external.html
@@ -33,7 +33,7 @@
 
 			<p>
 				If you don't want to install libreboot yourself, companies exist that sell these laptops
-				with libreboot pre-installed, along with a free GNU/Linux distribution.
+				with libreboot pre-installed, along with a free GNU+Linux distribution.
 			</p>
 			<p>
 				Check the <a href="../../suppliers">suppliers</a> page for more information.
@@ -513,7 +513,7 @@ Verifying flash... VERIFIED.
 			</p>
 			
 			<p>
-				Now <a href="../gnulinux/">install GNU/Linux</a>.
+				Now <a href="../gnulinux/">install GNU+Linux</a>.
 			</p>
 	
 	</div>
diff --git a/docs/install/t500_external.html b/docs/install/t500_external.html
index bb5c5330..d30c53d2 100644
--- a/docs/install/t500_external.html
+++ b/docs/install/t500_external.html
@@ -523,7 +523,7 @@ Verifying flash... VERIFIED.
 			</p>
 			
 			<p>
-				Now <a href="../gnulinux/">install GNU/Linux</a>.
+				Now <a href="../gnulinux/">install GNU+Linux</a>.
 			</p>
 	
 	</div>
diff --git a/docs/install/x200_external.html b/docs/install/x200_external.html
index 790240ca..bb95eafa 100644
--- a/docs/install/x200_external.html
+++ b/docs/install/x200_external.html
@@ -44,7 +44,7 @@
 
 			<p>
 				If you don't want to install libreboot yourself, companies exist that sell these laptops
-				with libreboot pre-installed, along with a free GNU/Linux distribution.
+				with libreboot pre-installed, along with a free GNU+Linux distribution.
 			</p>
 			<p>
 				Check the <a href="../../suppliers">suppliers</a> page for more information.
@@ -369,7 +369,7 @@ Verifying flash... VERIFIED.
 			</p>
 			
 			<p>
-				Now <a href="../gnulinux/">install GNU/Linux</a>.
+				Now <a href="../gnulinux/">install GNU+Linux</a>.
 			</p>
 	
 	</div>
diff --git a/docs/misc/bbb_ehci.html b/docs/misc/bbb_ehci.html
index 25233b0f..e79cf0ac 100644
--- a/docs/misc/bbb_ehci.html
+++ b/docs/misc/bbb_ehci.html
@@ -78,7 +78,7 @@
 			not be exposed externally.
 		</p>
 		<ul>
-			<li>You need running OS (GNU/Linux) on your target for this step
+			<li>You need running OS (GNU+Linux) on your target for this step
 				(If you&#8217;ve flashed libreboot and it does not boot, you have to
 				flush back the stock bios)</li>
 			<li>You need USB memory stick (the data on it will not be
diff --git a/docs/release.html b/docs/release.html
index 79f143b1..1295a5bf 100644
--- a/docs/release.html
+++ b/docs/release.html
@@ -242,7 +242,7 @@ Partial fix in coreboot-libre for GRUB display on GM45, for dual channel LVDS hi
 </p>
 <p>
 Massively improved GRUB configuration, making it easier to boot more encrypted systems automatically, and generally a more useful menu for booting the system (thanks go to Klemens Nanni of the autoboot project).
-Libreboot now uses the grub.cfg provided by the installed GNU/Linux distribution automatically, if present, switching to that configuration. This is done across many partitions, where libreboot actively searches for a configuration file
+Libreboot now uses the grub.cfg provided by the installed GNU+Linux distribution automatically, if present, switching to that configuration. This is done across many partitions, where libreboot actively searches for a configuration file
 (also on LVM volumes and encrypted volumes). This should make libreboot more easy to use for non-technical users, without having to modify the GRUB configuration used in libreboot.
 </p>
 <p>
-- 
cgit v1.2.3-70-g09d2