aboutsummaryrefslogtreecommitdiff
path: root/docs/gnulinux
diff options
context:
space:
mode:
Diffstat (limited to 'docs/gnulinux')
-rw-r--r--docs/gnulinux/configuring_parabola.html4
-rw-r--r--docs/gnulinux/encrypted_trisquel.html18
-rw-r--r--docs/gnulinux/grub_boot_installer.html6
-rw-r--r--docs/gnulinux/index.html2
4 files changed, 18 insertions, 12 deletions
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>&quot;Trisquel Desktop Environment&quot;</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>