From 55ab419a18bb1ee163a459506c7491076d9416a6 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 27 Sep 2016 20:59:33 +0100 Subject: Prioritize Debian over Trisquel (Trisquel's leader is Ruben Rodriguez on libreboot.org/gnu) --- docs/gnulinux/configuring_parabola.html | 4 ++-- docs/gnulinux/encrypted_trisquel.html | 18 ++++++++++++------ docs/gnulinux/grub_boot_installer.html | 6 +++--- docs/gnulinux/index.html | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) (limited to 'docs/gnulinux') 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; parabola 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.

@@ -157,7 +157,7 @@

Configure pacman

pacman (package manager) 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.

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'); - Installing Trisquel or Debian GNU/Linux with full disk encryption (including /boot) + Installing Debian or Trisquel GNU/Linux with full disk encryption (including /boot)

-

Installing Trisquel or Debian GNU/Linux with full disk encryption (including /boot)

-

+

Installing Debian or Trisquel GNU/Linux with full disk encryption (including /boot)

+

+ 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: + ../distros/ +

+

Libreboot on x86 uses the GRUB payload 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.

- 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). How to boot a GNU/Linux installer. - This guide also works for the Debian distribution, when you install using the netinstall option in Debian.

This guide is *only* for the GRUB payload. If you use the depthcharge payload, ignore this section entirely. @@ -182,7 +188,7 @@

-

Tasksel

+

Tasksel (Debian or Trisquel)

Choose "Trisquel Desktop Environment" 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 @@

  • Prepare the USB drive (in GNU/Linux)
  • Installing GNU/Linux with full disk encryption
  • GNU Guix System Distribution?
    • -
  • Trisquel net install?
    • +
  • Debian or Trisquel net install?
  • Booting ISOLINUX images (automatic method)
  • Booting ISOLINUX images (manual method)
  • Troubleshooting
    • @@ -80,7 +80,7 @@

    Installing GNU/Linux with full disk encryption

    @@ -92,7 +92,7 @@
    -

    Trisquel net install?

    +

    Debian or Trisquel net install?

    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 @@

  • Follow-up tutorial: Configuring Parabola (post-install)
    • -
  • Installing Trisquel or Debian GNU/Linux-libre with full disk encryption (including /boot)
    • +
  • Installing Debian or Trisquel GNU/Linux-libre with full disk encryption (including /boot)
    • -- cgit v1.2.3-70-g09d2