From ec6f90a90fed3e3bdf841d56a3f9ded7ae7b3f66 Mon Sep 17 00:00:00 2001
From: Leah Rowe <info@minifree.org>
Date: Wed, 12 Oct 2016 15:23:14 +0100
Subject: Delete all references to Trisquel in the documentation

---
 RELEASE                                            |  4 +--
 docs/archive_old.html                              | 19 ----------
 docs/future/dumps/grub.cfg                         |  2 +-
 docs/future/dumps/kernel312_irc                    |  1 -
 docs/future/index.html                             |  1 -
 docs/future/old.html                               |  6 ++--
 docs/git/index.html                                |  4 +--
 docs/gnulinux/encrypted_debian.html                | 41 ++++++++++++----------
 docs/gnulinux/grub_boot_installer.html             | 14 ++++----
 docs/gnulinux/index.html                           |  2 +-
 docs/grub/index.html                               |  2 +-
 docs/hardware/t60_security.html                    |  2 +-
 docs/hardware/x60_security.html                    |  2 +-
 docs/hcl/ga-g41m-es2l.html                         |  2 +-
 docs/hcl/index.html                                |  3 +-
 docs/install/x60_unbrick.html                      |  4 +--
 docs/misc/index.html                               | 10 +++---
 docs/release.html                                  |  2 +-
 .../scripts/helpers/build/dependencies/debian      |  2 +-
 .../scripts/helpers/build/dependencies/parabola    |  2 +-
 resources/scripts/helpers/build/release/tobuild    |  2 +-
 resources/scripts/helpers/build/release/util       |  2 +-
 resources/scripts/misc/powertop.debian             |  4 +--
 .../utilities/macbook21-three-finger-tap/README    |  2 --
 24 files changed, 59 insertions(+), 76 deletions(-)

diff --git a/RELEASE b/RELEASE
index 43555dd1..41e3efdf 100644
--- a/RELEASE
+++ b/RELEASE
@@ -73,8 +73,8 @@ easy to use for non-technical users, without having to modify the GRUB
 configuration used in libreboot.
 
 Utilities archives is now source only. You will need to compile the packages
-in there (build scripts included, and a script for installing build dependencies
-in Trisquel 7). (binary utility archives are planned again in the next
+in there (build scripts included, and a script for installing build
+dependencies. (binary utility archives are planned again in the next
 release, when the new build system is merged)
 
 SeaGRUB is now the default payload on all x86 boards. (SeaBIOS configured to
diff --git a/docs/archive_old.html b/docs/archive_old.html
index 63bf6187..70eff88a 100644
--- a/docs/archive_old.html
+++ b/docs/archive_old.html
@@ -192,7 +192,6 @@
 					<li>docs/hcl/gm45_remove_me.html: prioritize changing mac address</li>
 					<li>docs/hcl/gm45_remove_me.html: less confusing notes about ich9gen</li>
 					<li>build/dependencies/parabola: Add dependencies for x86_64</li>
-					<li>Move parabola/trisquel dependency scripts to scripts/helpers/build</li>
 					<li>scripts/dependencies/paraboladependencies: build dependencies (32-bit Parabola)</li>
 					<li><b>New board</b>: ThinkPad T500</li>
 					<li>Add diffs for descriptor/gbe differences between T500 and X200</li>
@@ -293,8 +292,6 @@
 					</li>
 					<li>Moved the get scripts to resources/scripts/helpers/download/</li>
 					<li>build-release: Remove the powertop entries</li>
-					<li>Moved powertop.trisquel7 to resources/scripts/misc/</li>
-					<li>Deleted the powertop.trisquel6 script (Trisquel 6 is obsolete)</li>
 					<li>Documentation: general improvements to the flashing instructions</li>
 					<li>Merged all flashing scripts into a single script</li>
 					<li>Updated GRUB</li>
@@ -481,7 +478,6 @@
 					<li>Documentation: general cleanup.</li>
 					<li>builddeps-flashrom: reduce build commands to a single for loop</li>
 					<li>scripts (all): replace unnecessary rm -Rf with rm -f</li>
-					<li>powertop.trisquel7: remove sudo (script already checks if the user is root)</li>
 					<li>docs/release.html: add lenovo g505s to the list of candidates</li>
 					<li>.gitignore: add libreboot_bin.tar.xz and libreboot_src.tar.xz</li>
 					<li>
@@ -491,11 +487,6 @@
 							or build from source anymore.</li>
 						</ul>
 					</li>
-					<li>deps-trisquel: Add binutils-source</li>
-					<li>powertop.trisquel7 (new): Setup powertop on trisquel 7</li>
-					<li>deps-trisquel,flash,lenovobios_firstflash,lenovobios_secondflash,macbook21_firstflash
-					x60flashfrom5,powertop.trisquel6: check if user is root</li>
-					<li>deps-trisquel: Make GRUB build on in Trisquel 7 x86_64. (cross compile dependencies. fixes build error in GRUB)</li>
 					<li>deps-parabola (removed) Remove Parabola dependencies script. Will re-add later (properly tested)</li>
 					<li>grub.cfg: Add more path checks to isolinux parser (more ISOs should work now)</li>
 					<li>Update SeaBIOS</li>
@@ -553,7 +544,6 @@
 						</ul>
 					</li>
 					<li>docs/gnulinux/grub_cbfs.html Major cleanup. Usability improvements.</li>
-					<li>hocs/gnulinux/encrypted_trisquel.html: Fixed mistakes/typos. General improvements</li>
 					<li>
 						flash (flashrom script): remove boardmismatch=force
 						<ul>
@@ -834,17 +824,14 @@
 							<li>Documentation: index.html#build updated to reflect the above.</li>
 						</ul>
 					</li>
-					<li>Removed 'sudo' from builddeb, builddeb-flashrom, powertop.trisquel6 and builddeb-bucts scripts (assuming that the user has it is a really bad idea).</li>
 					<li><s>Added all gcry_* modules to grub (luks/cryptomount): gcry_arcfour gcry_camellia gcry_crc gcry_dsa gcry_md4 gcry_rfc2268 gcry_rmd160 gcry_seed gcry_sha1 gcry_sha512 gcry_twofish gcry_blowfish gcry_cast5 gcry_des gcry_idea gcry_md5 gcry_rijndael gcry_rsa gcry_serpent gcry_sha256 gcry_tiger gcry_whirlpool</s></li>
 					<li>Added GNUtoo's list of GRUB modules (includes all of the gcry_* modules above), cryptomount should be working now.</li>
 					<li>Removed builddeb-bucts and builddeb-flashrom, merged them with builddeb (index.html updated accordingly)</li>
 					<li>Removed buildpac-bucts and buildpac-flashrom, merged them with buildpac (index.html updated accordingly)</li>
-					<li>Renamed builddeb to deps-trisquel (index.html updated accordingly)</li>
 					<li>Renamed buildpac to deps-parabola (index.html updated accordingly)</li>
 					<li>Documentation: removed all parts talking about build dependencies, replaced them with links to index.html#build_dependencies</li>
 					<li>Documentation: emphasized more strongly on the documentation, the need to re-build bucts and/or flashrom before flashing a ROM image.</li>
 					<li>build-release: flashrom, nvramtool, cbfstool and bucts are no longer provided pre-compiled in binary archives, and are now in source form only. (to maximize distro compatibility).</li>
-					<li>Documentation: added gnulinux/encrypted_trisquel.html showing how to setup a fully encrypted Trisquel installation (including /boot) and boot it from the GRUB payload.</li>
 					<li>'build' script: replaced grub.elf assembly instructons, it is now handled by a utility added under resources/utilities/grub-assemble</li>
 					<li>Moved resources/grub/keymap to resources/utilities/grub-assemble/keymap, and updated that utility to use it</li>
 					<li>Documentation: removed useless links to pictures of keyboard layouts and unmodified layouts.</li>
@@ -876,10 +863,6 @@
 							</li>
 						</ul>
 					</li>
-					<li>
-						Documentation: added note about 'fb=false' workaround for text-mode debian-installer (Trisquel net install) to 
-						gnulinux/grub_boot_installer.html
-					</li>
 					<li>
 						Documentation: updated gnulinux/grub_cbfs.html to make it safer (and easier) to follow.
 					</li>
@@ -1281,8 +1264,6 @@
 					</li>
 					<li>tidied up the menu entries in GRUB</li>
 					<li>tidied up the root directory of X60_source/, sorted more files into subdirectories</li>
-					<li>added 'pkg-config' to the list of dependencies for building powertop on Trisquel</li>
-					<li>wrote a script (powertop.trisquel6) to automatically setup Powertop to run at boot time (for Trisquel 6 users)</li>
 					<li>improved the commenting inside the 'build' script (should make modifying it easier)</li>
 					<li>Renamed X60_binary.tar.gz and X60_source.tar.gz to libreboot_bin.tar.gz and libreboot_src.tar.gz, respectively.</li>
 					<li>Replaced &quot;GNU GRUB version&quot; with &quot;FREE AS IN FREEDOM&quot; on GNU GRUB start screen.</li>
diff --git a/docs/future/dumps/grub.cfg b/docs/future/dumps/grub.cfg
index ddc56069..5bd1a50b 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 'Trisquel 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/future/dumps/kernel312_irc b/docs/future/dumps/kernel312_irc
index c5d7af32..81ff687c 100644
--- a/docs/future/dumps/kernel312_irc
+++ b/docs/future/dumps/kernel312_irc
@@ -269,7 +269,6 @@ PaulePanter:  vimuser: Yes. Please.
 vimuser: For you record:
 vimuser: $ uname -r
 vimuser: 3.2.0-56-generic-pae
-vimuser: distro: trisquel 6
 vimuser: PaulePanter: http://paste.debian.net/101404/
 
 PaulePanter linked to this:
diff --git a/docs/future/index.html b/docs/future/index.html
index d661044b..91952257 100644
--- a/docs/future/index.html
+++ b/docs/future/index.html
@@ -510,7 +510,6 @@ f0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff    ................
 			<ul>
 				<li>
 					Todo: test gnutoo's fallback patches: <a href="http://www.coreboot.org/Fallback_mechanism">http://www.coreboot.org/Fallback_mechanism</a>
-					(some parts use systemd. adapt for upstart, which is what trisquel uses)<br/>
 					see <a href="gnutoo_fallback_patch">this IRC log</a> (warning, not cleaned up)
 				</li>
 			</ul>
diff --git a/docs/future/old.html b/docs/future/old.html
index 4988fff5..2570a219 100644
--- a/docs/future/old.html
+++ b/docs/future/old.html
@@ -182,19 +182,19 @@
 			</p>
 
 			<p>
-				Here is some debugging output using intel_gpu_tools v1.2-1 (from trisquel repositories) using tool "intel_gtt":
+				Here is some debugging output using intel_gpu_tools v1.2-1 (from apt-get repositories) using tool "intel_gtt":
 			</p>
 
 			<ul>
 				<li>
-					Trisquel 6. kernel 3.14.4:
+					kernel 3.14.4:
 					<ul>
 						<li>with libreboot 5th release (using the 7c0000 gtt hack from 5927/3): <a href="http://paste.debian.net/104306">http://paste.debian.net/104306</a></li>
 						<li>with coreboot+vgarom: <a href="http://paste.debian.net/104309">http://paste.debian.net/104309</a></li>
 					</ul>
 				</li>
 				<li>
-					Trisquel 6. kernel 3.2.0-60 (from Trisquel repositories):
+					kernel 3.2.0-60 (from apt-get repositories):
 					<ul>
 						<li>with coreboot (no vbios or native init): <a href="http://paste.debian.net/104341">http://paste.debian.net/104341</a></li>
 					</ul>
diff --git a/docs/git/index.html b/docs/git/index.html
index 9cea6f80..b729cacb 100644
--- a/docs/git/index.html
+++ b/docs/git/index.html
@@ -44,7 +44,7 @@
 
 			<div class="important">
 				<p>
-					For Debian Stretch (may also work on Debian Jessie, or Trisquel), you can run the following command:<br/>
+					For Debian Stretch (may also work on Debian Jessie), you can run the following command:<br/>
 					$ <b>sudo ./build dependencies debian</b>
 				</p>
 				<p>
@@ -323,7 +323,7 @@
 				<h2>Preparing release archives (optional)</h2>
 
 					<p>
-						<b>This is only confirmed to work (tested) in Debian Stretch and Trisquel 7. Parabola *fails* at this stage
+						<b>This is only confirmed to work (tested) in Debian Stretch. Parabola *fails* at this stage
 						(for now). For all other distros, YMMV.</b>
 					</p>
 
diff --git a/docs/gnulinux/encrypted_debian.html b/docs/gnulinux/encrypted_debian.html
index 64f4668d..a9ce08b8 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 Trisquel GNU/Linux with full disk encryption (including /boot)</title>
+	<title>Installing Debian GNU/Linux with full disk encryption (including /boot)</title>
 </head>
 
 <body>
 	<div class="section">
-		<h1>Installing Debian or Trisquel GNU/Linux with full disk encryption (including /boot)</h1>
+		<h1>Installing Debian GNU/Linux with full disk encryption (including /boot)</h1>
             <p>
                 The libreboot project recommends Debian, because it is more stable and up to date,
                 while still being entirely free software by default. Leah Rowe, libreboot's
@@ -37,10 +37,25 @@
 				access to the system.
 			</p>
 			<p>
-                This guide is written for Debian.
-				This also works in Trisquel 7 (probably Trisquel 8), and probably Trisquel 6. Boot the 'net installer' (Install Trisquel in Text Mode).
-				<a href="grub_boot_installer.html">How to boot a GNU/Linux installer</a>.
+                This guide is written for Debian net installer. You can download the ISO from the homepage on
+                <a href="https://www.debian.org/">debian.org</a>.
+                Use this on the GRUB terminal to boot it from USB (for 64-bit Intel or AMD):<br/>
+                <strong>
+                set root='usb0'<br/>
+                linux /install.amd/vmlinuz<br/>
+                initrd /install.amd/initrd.gz<br/>
+                boot<br/>
+                If you are on a 32-bit system (e.g. X60):
+                set root='usb0'<br/>
+                linux /install.386/vmlinuz<br/>
+                initrd /install.386/initrd.gz<br/>
+                boot
+                </strong>
 			</p>
+            <p>
+                <a href="grub_boot_installer.html">This guide</a> shows how to
+                create a boot USB drive with the Debian ISO image.
+            </p>
 			<p>
 				<b>This guide is *only* for the GRUB payload. If you use the depthcharge payload, ignore this section entirely.</b>
 			</p>
@@ -188,22 +203,12 @@
 
 	<div class="section">
 		
-		<h1>Tasksel (Debian or Trisquel)</h1>
+		<h1>Tasksel</h1>
 
-			<p>
-				Choose <i>&quot;Trisquel Desktop Environment&quot;</i> if you want GNOME, 
-				<i>&quot;Trisquel-mini Desktop Environment&quot;</i> if you
-				want LXDE or <i>&quot;Triskel Desktop Environment&quot;</i> if you want KDE. 
-				If you want to have no desktop (just a basic shell)
-				when you boot or if you want to create your own custom setup, then choose nothing here (don't select anything). 
-				You might also want to choose some of the other package groups; it's up to you.
-			</p>
             <p>
                 For Debian, use the <em>MATE</em> option, or one of the others if you want.
-            </p>
-            <p>
-                On Debian or Trisquel, you may also want to select the option for a printer server,
-                so that you can print.
+                The libreboot project recommends MATE, unless you're saavy enough to choose something
+                else.
             </p>
             <p>
                 If you want debian-testing, then you should only select barebones options here
diff --git a/docs/gnulinux/grub_boot_installer.html b/docs/gnulinux/grub_boot_installer.html
index acede631..38aca2fa 100644
--- a/docs/gnulinux/grub_boot_installer.html
+++ b/docs/gnulinux/grub_boot_installer.html
@@ -23,7 +23,7 @@
 				<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="#guix">GNU Guix System Distribution?</a></li>
-				<li><a href="#debian_netinstall">Debian or Trisquel net install?</a></li>
+				<li><a href="#debian_netinstall">Debian 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>
 				<li><a href="#troubleshooting">Troubleshooting</a></li>
@@ -80,7 +80,7 @@
 		<h2>Installing GNU/Linux with full disk encryption</h2>
 
 			<ul>
-				<li><a href="encrypted_debian.html">Installing Debian or Trisquel GNU/Linux with full disk encryption (including /boot)</a></li>
+				<li><a href="encrypted_debian.html">Installing Debian 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>
 
@@ -92,7 +92,7 @@
 		
 	<div id="debian_netinstall" class="section">
 
-		<h2>Debian or Trisquel net install?</h2>
+		<h2>Debian net install?</h2>
 
 			<p>
 				Tip: don't use the official net install image. Download the full GNOME ISO (the ~1.5GiB one).
@@ -153,10 +153,12 @@
 			</p>
 
 			<p>
-				For Trisquel (and other debian-based distros), there are typically menuentries listed in
+				For Debian (and other debian-based distros), there are typically menuentries listed in
 				<i>/isolinux/txt.cfg</i> or <i>/isolinux/gtk.cfg</i>. For dual-architecture ISO images
 				(i686 and x86_64), there may be separate files/directories for each architecture.
 				Just keep searching through the image, until you find the correct ISOLINUX configuration file.
+                NOTE: Debian 8.6 ISO only lists 32-bit boot options in txt.cfg. This is important if you want
+                64-bit booting on your system.
 			</p>
 
 			<p>
@@ -207,13 +209,13 @@
 			<h2>debian-installer graphical corruption in text-mode</h2>
 				<p>
 					When using the ROM images that use coreboot's &quot;text mode&quot; instead of the coreboot framebuffer,
-					booting the Trisquel net installer results in graphical corruption because it is trying to switch to a framebuffer which doesn't
+					booting the Debian net installer results in graphical corruption because it is trying to switch to a framebuffer which doesn't
 					exist. Use that kernel parameter on the 'linux' line when booting it:<br/>
 					<b>vga=normal fb=false</b>
 				</p>
 
 				<p>
-					Tested in Trisquel 6 (and 7). This forces debian-installer to start in text-mode, instead of trying to switch to a framebuffer.
+					This forces debian-installer to start in text-mode, instead of trying to switch to a framebuffer.
 				</p>
 
 				<p>
diff --git a/docs/gnulinux/index.html b/docs/gnulinux/index.html
index eb1493d7..830b7816 100644
--- a/docs/gnulinux/index.html
+++ b/docs/gnulinux/index.html
@@ -35,7 +35,7 @@
 						<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 Trisquel GNU/Linux-libre with full disk encryption (including /boot)</a></li>
+				<li><a href="encrypted_debian.html">Installing Debian 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 6e757abc..a7256475 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, Trisquel or Parabola.</p>
+			<p>This is a free font that is also contained in GNU/Linux distributions like Debian 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 0974756d..1d8ad371 100644
--- a/docs/hardware/t60_security.html
+++ b/docs/hardware/t60_security.html
@@ -387,7 +387,7 @@
 			Further reading material (software security)
 		</h1>
 			<ul>
-				<li><a href="../gnulinux/encrypted_debian.html">Installing Debian or Trisquel GNU/Linux with full disk encryption (including /boot)</a></li>
+				<li><a href="../gnulinux/encrypted_debian.html">Installing Debian 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>
diff --git a/docs/hardware/x60_security.html b/docs/hardware/x60_security.html
index 49f07f7c..0ab1cd5e 100644
--- a/docs/hardware/x60_security.html
+++ b/docs/hardware/x60_security.html
@@ -247,7 +247,7 @@
 			Further reading material (software security)
 		</h1>
 			<ul>
-				<li><a href="../gnulinux/encrypted_debian.html">Installing Debian or Trisquel GNU/Linux with full disk encryption (including /boot)</a></li>
+				<li><a href="../gnulinux/encrypted_debian.html">Installing Debian 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>
diff --git a/docs/hcl/ga-g41m-es2l.html b/docs/hcl/ga-g41m-es2l.html
index 4ab12e0b..03ec459c 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 Trisquel,
+            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,
             this would be in the entry for your NIC:<br/>
             hwaddress ether macaddressgoeshere
         </p>
diff --git a/docs/hcl/index.html b/docs/hcl/index.html
index c5f07d13..d29b6260 100644
--- a/docs/hcl/index.html
+++ b/docs/hcl/index.html
@@ -622,8 +622,7 @@ EndSection
 			<p>
 				A user submitted a utility to enable 3-finger tap on this laptop. It's
 				available at <i>resources/utilities/macbook21-three-finger-tap</i> in
-				the libreboot git repository. The script is for GNOME, confirmed to
-				work in Trisquel 7. It may also work in Debian, but this is unknown.
+				the libreboot git repository.
 			</p>
 
 			<p><a href="#pagetop">Back to top of page.</a></p>
diff --git a/docs/install/x60_unbrick.html b/docs/install/x60_unbrick.html
index 2f789a2f..5a7c5f66 100644
--- a/docs/install/x60_unbrick.html
+++ b/docs/install/x60_unbrick.html
@@ -256,11 +256,11 @@ POMONA 5250:
 				<img src="../images/x60_unbrick/0047.jpg" alt="" />
 			</p>
 			<p>
-				Trisquel live USB menu (using the GRUB ISOLINUX parser):<br/>
+			    Live USB menu (using the GRUB ISOLINUX parser):<br/>
 				<img src="../images/x60_unbrick/0048.jpg" alt="" />
 			</p>
 			<p>
-				Trisquel live desktop:<br/>
+			    Operating system:<br/>
 				<img src="../images/x60_unbrick/0049.jpg" alt="" />
 			</p>
 			
diff --git a/docs/misc/index.html b/docs/misc/index.html
index d75a78c8..97b32576 100644
--- a/docs/misc/index.html
+++ b/docs/misc/index.html
@@ -19,7 +19,7 @@
 				Or <a href="../index.html">Back to main index</a>.
 			</p>
 			<ul>
-				<li><a href="#debian_powertop">High Pitched Whining Noise on Idle (how to remove in Debian or Trisquel 7)</a></li>
+				<li><a href="#debian_powertop">High Pitched Whining Noise on Idle (how to remove in Debian)</a></li>
 				<li><a href="#high_pitch_parabola">High Pitched Whining Noise on Idle (how to remove in Parabola)</a></li>
 				<li><a href="#serial">X60/T60: Serial port - how to use (for dock owners)</a></li>
 				<li><a href="#powerbeeps">Power Management Beeps on Thinkpads</a></li>
@@ -32,7 +32,7 @@
 
 	<div class="section">
 
-		<h1 id="debian_powertop">High Pitched Whining Noise on Idle (how to remove in Trisquel 7)</h1>
+		<h1 id="debian_powertop">High Pitched Whining Noise on Idle (how to remove in Debian)</h1>
 
 			<div class="subsection">
 				<h2 id="debian_powertop_autostart">Start powertop automatically at boot time</h2>
@@ -140,9 +140,9 @@ WantedBy=multi-user.target
 				You can also configure your distro so that a terminal (TTY) is accessible from the serial console.
 			</p>
 			<p>
-				The following guide is for Ubuntu, and can be followed for Trisquel 6.0 which is based on Ubuntu 12.04
-				(should also work in Trisquel 7, based on Ubuntu 14.04) to enable a serial console using GeTTY:<br/>
+				The following guide is for Ubuntu, but it should work in Debian, to enable a serial console using GeTTY:<br/>
 				<a href="https://help.ubuntu.com/community/SerialConsoleHowto">https://help.ubuntu.com/community/SerialConsoleHowto</a>
+                (we DO NOT recommend Ubuntu, because it contains non-free software in the default repos. Use Debian)
 			</p>
 			<p>
 				Note: part of the tutorial above requires changing your grub.cfg. Just change the <b>linux</b> line to add instructions for enabling getty.
@@ -250,7 +250,7 @@ WantedBy=multi-user.target
 				Or look in <b>/sys/class/drm/card0-LVDS-1/edid</b>
 			</p>
 			<p>
-				Alternatively you can use i2cdump. In Trisquel, this is in the package i2c-tools.<br/>
+				Alternatively you can use i2cdump. In Debian, this is in the package i2c-tools.<br/>
 				$ <b>sudo modprobe i2c-dev</b><br/>
 				$ <b>sudo i2cdump -y 5 0x50</b> (you might have to change the value for -y)<br/>
 				$ <b>sudo rmmod i2c-dev</b><br/>
diff --git a/docs/release.html b/docs/release.html
index a5444790..69af0d4c 100644
--- a/docs/release.html
+++ b/docs/release.html
@@ -246,7 +246,7 @@ Libreboot now uses the grub.cfg provided by the installed GNU/Linux distribution
 (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>
-Utilities archives is now source only. You will need to compile the packages in there (build scripts included, and a script for installing build dependencies in Trisquel 7). (binary utility archives are planned again in the next release, when the new build system is merged)
+Utilities archives is now source only. You will need to compile the packages in there (build scripts included, and a script for installing build dependencies). (binary utility archives are planned again in the next release, when the new build system is merged)
 </p>
 <p>
 SeaGRUB is now the default payload on all x86 boards. (SeaBIOS configured to load a compressed GRUB payload from CBFS immediately, without providing an interface in SeaBIOS. This way, GRUB is still used but now BIOS services are available, so you get the best of both worlds). Thanks go to Timothy Pearson of coreboot for this idea.
diff --git a/resources/scripts/helpers/build/dependencies/debian b/resources/scripts/helpers/build/dependencies/debian
index 2e47371c..e5af8bab 100755
--- a/resources/scripts/helpers/build/dependencies/debian
+++ b/resources/scripts/helpers/build/dependencies/debian
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# for_trisquel7 script: installs build dependencies for Trisquel 7
+# script: installs build dependencies for Debian
 #
 #	Copyright (C) 2014, 2015 Leah Rowe <info@minifree.org>
 #
diff --git a/resources/scripts/helpers/build/dependencies/parabola b/resources/scripts/helpers/build/dependencies/parabola
index 44052418..5180c8cc 100755
--- a/resources/scripts/helpers/build/dependencies/parabola
+++ b/resources/scripts/helpers/build/dependencies/parabola
@@ -2,7 +2,7 @@
 
 #  helper script: installs build dependencies for Parabola
 
-# this script is based on the script for Trisquel 7
+# this script is based on the script for Debian
 #
 #	Copyright (C) 2014, 2015 Leah Rowe <info@minifree.org>
 #	Copyright (C) 2015 Klemens Nanni <klemens@posteo.de>
diff --git a/resources/scripts/helpers/build/release/tobuild b/resources/scripts/helpers/build/release/tobuild
index b3a9fb0c..5b7890e2 100755
--- a/resources/scripts/helpers/build/release/tobuild
+++ b/resources/scripts/helpers/build/release/tobuild
@@ -69,7 +69,7 @@ cp "resources/scripts/helpers/build/clean/bucts" "${distdir}/resources/scripts/h
 cp "resources/scripts/helpers/build/clean/flashrom" "${distdir}/resources/scripts/helpers/build/clean/"
 cp "resources/scripts/helpers/build/module/bucts" "${distdir}/resources/scripts/helpers/build/module/"
 cp "resources/scripts/helpers/build/module/flashrom" "${distdir}/resources/scripts/helpers/build/module/"
-cp "resources/scripts/misc/powertop.trisquel7" "${distdir}/"
+cp "resources/scripts/misc/powertop.debian" "${distdir}/"
 
 # this has to be done before generating
 # the "version" file
diff --git a/resources/scripts/helpers/build/release/util b/resources/scripts/helpers/build/release/util
index df4bd6be..a6d3fa62 100755
--- a/resources/scripts/helpers/build/release/util
+++ b/resources/scripts/helpers/build/release/util
@@ -230,7 +230,7 @@ cd "../../"
 cp "flash" "${distdir}/"
 
 # powertop script
-cp "resources/scripts/misc/powertop.trisquel7" "${distdir}/"
+cp "resources/scripts/misc/powertop.debian" "${distdir}/"
 
 printf "\n\n"
 
diff --git a/resources/scripts/misc/powertop.debian b/resources/scripts/misc/powertop.debian
index 1e29f38a..1227041e 100755
--- a/resources/scripts/misc/powertop.debian
+++ b/resources/scripts/misc/powertop.debian
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#  powertop.trisquel7: automatically sets up powertop --auto-tune on startup in trisquel 7
+#  powertop.debian: automatically sets up powertop --auto-tune on startup in Debian
 #
 #	Copyright (C) 2014, 2015 Leah Rowe <info@minifree.org>
 #
@@ -26,7 +26,7 @@ if [ $EUID -ne 0 ]; then
    exit 1
 fi
 
-# For Trisquel 7 users.
+# For Debian users.
 
 apt-get -y install powertop
 
diff --git a/resources/utilities/macbook21-three-finger-tap/README b/resources/utilities/macbook21-three-finger-tap/README
index dbd1e11d..c91fb7f3 100644
--- a/resources/utilities/macbook21-three-finger-tap/README
+++ b/resources/utilities/macbook21-three-finger-tap/README
@@ -6,8 +6,6 @@ for "button 2" or "middle click" when you log in to GNOME.
 It was written for the macbook2,1 touchpad but may be useful
 for other hardware as well.
 
-It has been confirmed to work on Trisquel GNU/Linux 7.0.
-
 
 Conditions for redistribution
 =============================
-- 
cgit v1.2.3-70-g09d2