diff options
| -rw-r--r-- | docs/git/index.html | 6 | ||||
| -rw-r--r-- | docs/gnulinux/configuring_parabola.html | 4 | ||||
| -rw-r--r-- | docs/gnulinux/encrypted_trisquel.html | 18 | ||||
| -rw-r--r-- | docs/gnulinux/grub_boot_installer.html | 6 | ||||
| -rw-r--r-- | docs/gnulinux/index.html | 2 | ||||
| -rw-r--r-- | docs/grub/index.html | 2 | ||||
| -rw-r--r-- | docs/hardware/t60_security.html | 2 | ||||
| -rw-r--r-- | docs/hardware/x60_security.html | 2 | ||||
| -rw-r--r-- | docs/hcl/ga-g41m-es2l.html | 2 | ||||
| -rw-r--r-- | docs/hcl/index.html | 2 | ||||
| -rw-r--r-- | docs/misc/index.html | 10 | ||||
| -rwxr-xr-x | resources/scripts/helpers/build/dependencies/debian (renamed from resources/scripts/helpers/build/dependencies/trisquel7) | 0 | ||||
| -rwxr-xr-x | resources/scripts/misc/powertop.debian (renamed from resources/scripts/misc/powertop.trisquel7) | 0 |
13 files changed, 31 insertions, 25 deletions
diff --git a/docs/git/index.html b/docs/git/index.html index 3edba6c0..9cea6f80 100644 --- a/docs/git/index.html +++ b/docs/git/index.html @@ -44,8 +44,8 @@ <div class="important"> <p> - For Trisquel 7, you can run the following command:<br/> - $ <b>sudo ./build dependencies trisquel7</b> + For Debian Stretch (may also work on Debian Jessie, or Trisquel), you can run the following command:<br/> + $ <b>sudo ./build dependencies debian</b> </p> <p> For Parabola, you can run the following command:<br/> @@ -323,7 +323,7 @@ <h2>Preparing release archives (optional)</h2> <p> - <b>This is only confirmed to work (tested) in Trisquel 7. Parabola *fails* at this stage + <b>This is only confirmed to work (tested) in Debian Stretch and Trisquel 7. Parabola *fails* at this stage (for now). For all other distros, YMMV.</b> </p> diff --git a/docs/gnulinux/configuring_parabola.html b/docs/gnulinux/configuring_parabola.html index 8dda4c51..c8efc841 100644 --- a/docs/gnulinux/configuring_parabola.html +++ b/docs/gnulinux/configuring_parabola.html @@ -102,7 +102,7 @@ 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 - all the same usability as Trisquel, without hiding any details from the user. + all the same usability as Debian, without hiding any details from the user. </p> <p> @@ -157,7 +157,7 @@ <h2 id="pacman_configure">Configure pacman</h2> <p> pacman (<b>pac</b>kage <b>man</b>ager) is the name of the package management system in Arch, which Parabola - (as a deblobbed parallel effort) also uses. Like with 'apt-get' on debian-based systems like Trisquel, + (as a deblobbed parallel effort) also uses. Like with 'apt-get' on Debian, this can be used to add/remove and update the software on your computer. </p> <p> diff --git a/docs/gnulinux/encrypted_trisquel.html b/docs/gnulinux/encrypted_trisquel.html index 0a44278a..e7e9c773 100644 --- a/docs/gnulinux/encrypted_trisquel.html +++ b/docs/gnulinux/encrypted_trisquel.html @@ -8,13 +8,19 @@ @import url('../css/main.css'); </style> - <title>Installing Trisquel or Debian GNU/Linux with full disk encryption (including /boot)</title> + <title>Installing Debian or Trisquel GNU/Linux with full disk encryption (including /boot)</title> </head> <body> <div class="section"> - <h1>Installing Trisquel or Debian GNU/Linux with full disk encryption (including /boot)</h1> - <p> + <h1>Installing Debian or Trisquel 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 + lead maintainer, also runs Debian. See: + <a href="../distros/">../distros/</a> + </p> + <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 (where your GRUB menu comes from) is stored directly alongside libreboot @@ -31,9 +37,9 @@ access to the system. </p> <p> - This works in Trisquel 7, and probably Trisquel 6. Boot the 'net installer' (Install Trisquel in Text Mode). + 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 also works for the Debian distribution, when you install using the netinstall option in Debian. </p> <p> <b>This guide is *only* for the GRUB payload. If you use the depthcharge payload, ignore this section entirely.</b> @@ -182,7 +188,7 @@ <div class="section"> - <h1>Tasksel</h1> + <h1>Tasksel (Debian or Trisquel)</h1> <p> Choose <i>"Trisquel Desktop Environment"</i> if you want GNOME, diff --git a/docs/gnulinux/grub_boot_installer.html b/docs/gnulinux/grub_boot_installer.html index bdb73c32..c97ebb0e 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="#trisquel_netinstall">Trisquel net install?</a></li> + <li><a href="#trisquel_netinstall">Debian or Trisquel 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_trisquel.html">Installing Trisquel GNU/Linux with full disk encryption (including /boot)</a></li> + <li><a href="encrypted_trisquel.html">Installing Debian or Trisquel 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="trisquel_netinstall" class="section"> - <h2>Trisquel net install?</h2> + <h2>Debian or Trisquel net install?</h2> <p> Tip: don't use the official net install image. Download the full GNOME ISO (the ~1.5GiB one). diff --git a/docs/gnulinux/index.html b/docs/gnulinux/index.html index 3db71e2c..4de2e4cf 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_trisquel.html">Installing Trisquel or Debian GNU/Linux-libre with full disk encryption (including /boot)</a></li> + <li><a href="encrypted_trisquel.html">Installing Debian or Trisquel 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 e82e9709..6e757abc 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 Trisquel or Parabola.</p> + <p>This is a free font that is also contained in GNU/Linux distributions like Debian, Trisquel 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 aaa18ef7..3c1fe31b 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_trisquel.html">Installing Trisquel GNU/Linux with full disk encryption (including /boot)</a></li> + <li><a href="../gnulinux/encrypted_trisquel.html">Installing Debian or Trisquel 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 5f972438..ddb127ac 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_trisquel.html">Installing Trisquel GNU/Linux with full disk encryption (including /boot)</a></li> + <li><a href="../gnulinux/encrypted_trisquel.html">Installing Debian or Trisquel 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 db773ba7..4ab12e0b 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 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 or Trisquel, 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 6df210cc..c5f07d13 100644 --- a/docs/hcl/index.html +++ b/docs/hcl/index.html @@ -623,7 +623,7 @@ EndSection 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. + work in Trisquel 7. It may also work in Debian, but this is unknown. </p> <p><a href="#pagetop">Back to top of page.</a></p> diff --git a/docs/misc/index.html b/docs/misc/index.html index 20c96e21..d75a78c8 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="#trisquel7_powertop">High Pitched Whining Noise on Idle (how to remove in Trisquel 7)</a></li> + <li><a href="#debian_powertop">High Pitched Whining Noise on Idle (how to remove in Debian or Trisquel 7)</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,15 +32,15 @@ <div class="section"> - <h1 id="trisquel7_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 Trisquel 7)</h1> <div class="subsection"> - <h2 id="trisquel7_powertop_autostart">Start powertop automatically at boot time</h2> + <h2 id="debian_powertop_autostart">Start powertop automatically at boot time</h2> - <p>Included with libreboot is a script called 'powertop.trisquel7'. Run this as root and it will setup powertop to run with --auto-tune + <p>Included with libreboot is a script called 'powertop.debian'. Run this as root and it will setup powertop to run with --auto-tune at boot time. Load the file in your text editor to see how it does that.</p> - <p>$ <b>sudo ./resources/scripts/misc/powertop.trisquel7</b></p> + <p>$ <b>sudo ./resources/scripts/misc/powertop.debian</b></p> <p> Might want to run with --calibrate first </p> diff --git a/resources/scripts/helpers/build/dependencies/trisquel7 b/resources/scripts/helpers/build/dependencies/debian index 56184b61..56184b61 100755 --- a/resources/scripts/helpers/build/dependencies/trisquel7 +++ b/resources/scripts/helpers/build/dependencies/debian diff --git a/resources/scripts/misc/powertop.trisquel7 b/resources/scripts/misc/powertop.debian index 1e29f38a..1e29f38a 100755 --- a/resources/scripts/misc/powertop.trisquel7 +++ b/resources/scripts/misc/powertop.debian |