From 412510f974ce168e9850ac6fed0ef9ee2426b4c7 Mon Sep 17 00:00:00 2001 From: Oskar Sharipov Date: Fri, 20 Dec 2019 11:45:59 +0300 Subject: [PATCH 1/4] Change a warning of Firefox about:config entering --- _includes/sections/browser-tweaks.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/sections/browser-tweaks.html b/_includes/sections/browser-tweaks.html index 04977e5d..d04cfa09 100644 --- a/_includes/sections/browser-tweaks.html +++ b/_includes/sections/browser-tweaks.html @@ -6,7 +6,7 @@
  1. Enter "about:config" in the firefox address bar and press enter.
    2. -
  2. Press the button "I'll be careful, I promise!"
    3. +
  3. Press the button "Accept the Risk and Continue"
  4. Follow the instructions below...
-- 2.47.2 From 76b6bc7e884e2297b594409021473eb03575f9cf Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Fri, 20 Dec 2019 13:51:00 +0000 Subject: [PATCH 2/4] Redo PC Live Operating Systems section (#1600) Remove the following operating systems, because of described issues KNOPPIX: - Site has optional HTTPS, so all links, will make you go back to HTTP - Source code distributed on ISOs, no online repositories/tarballs Puppy Linux: - Site is only over HTTP - Looks like garbage Tiny Core Linux: - Site is only over HTTP - Not really usable or useful - Looks like garbage Add Debian and Fedora to Worth Mentioning PC Live Operating Systems, since they are recommended as normal operating systems and support LiveUSB. --- _includes/nav.html | 2 +- .../sections/live-operating-systems.html | 35 ++++++------------- assets/img/svg/3rd-party/knoppix-dark.svg | 2 -- assets/img/svg/3rd-party/knoppix.svg | 2 -- assets/img/svg/3rd-party/puppy_linux.svg | 2 -- 5 files changed, 12 insertions(+), 31 deletions(-) delete mode 100644 assets/img/svg/3rd-party/knoppix-dark.svg delete mode 100644 assets/img/svg/3rd-party/knoppix.svg delete mode 100644 assets/img/svg/3rd-party/puppy_linux.svg diff --git a/_includes/nav.html b/_includes/nav.html index 21ccfe9a..6526b325 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -87,7 +87,7 @@ PC OS - Live CD OS + PC Live OS Mobile OS Android Privacy Add-ons Router Firmware diff --git a/_includes/sections/live-operating-systems.html b/_includes/sections/live-operating-systems.html index 23f5bc4a..f17db2f5 100644 --- a/_includes/sections/live-operating-systems.html +++ b/_includes/sections/live-operating-systems.html @@ -1,4 +1,4 @@ -

Live CD Operating Systems

+

PC Live Operating Systems

{% include cardv2.html title="Tails" @@ -10,30 +10,17 @@ website="https://tails.boum.org/" git="https://git-tails.immerda.ch/tails/" %} -{% include cardv2.html -title="KNOPPIX" -image="/assets/img/svg/3rd-party/knoppix.svg" -image="/assets/img/svg/3rd-party/knoppix-dark.svg" -description='Knoppix is an operating system based on Debian designed to be run directly from a CD / DVD (Live CD) or a USB flash drive (Live USB), one of the first of its kind for any operating system. When starting a program, it is loaded from the removable medium and decompressed into a RAM drive. The decompression is transparent and on-the-fly.' -badges="info:GNU/Linux" -labels="warning:contrib:This software may depend on or recommend non-free software." -website="https://www.knopper.net/knoppix/index-en.html" -source="https://www.knopper.net/knoppix-info/index-en.html#license" -%} - -{% include cardv2.html -title="Puppy Linux" -image="/assets/img/svg/3rd-party/puppy_linux.svg" -description='Puppy Linux operating system is a lightweight Linux distribution that focuses on ease of use and minimal memory footprint. The entire system can be run from RAM with current versions generally taking up about 210 MB, allowing the boot medium to be removed after the operating system has started.' -badges="info:GNU/Linux" -labels="warning:contrib:This software may depend on or recommend non-free software." -website="http://puppylinux.org/" -source="http://distro.ibiblio.org/puppylinux/" -%} -

Worth Mentioning

    -
  • Tiny Core Linux GNU/Linux contrib - A minimal Linux operating system focusing on providing a base system using BusyBox and FLTK. The distribution is notable for its size (15 MB) and minimalism, with additional functionality - provided by extensions.
    • +
  • + Fedora Workstation + GNU/Linux + - Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops, using GNOME as the default desktop environment. +
    • +
  • + Debian + GNU/Linux + - Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project. +
diff --git a/assets/img/svg/3rd-party/knoppix-dark.svg b/assets/img/svg/3rd-party/knoppix-dark.svg deleted file mode 100644 index 81c95fc9..00000000 --- a/assets/img/svg/3rd-party/knoppix-dark.svg +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/assets/img/svg/3rd-party/knoppix.svg b/assets/img/svg/3rd-party/knoppix.svg deleted file mode 100644 index ae115bc6..00000000 --- a/assets/img/svg/3rd-party/knoppix.svg +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/assets/img/svg/3rd-party/puppy_linux.svg b/assets/img/svg/3rd-party/puppy_linux.svg deleted file mode 100644 index cb8230a5..00000000 --- a/assets/img/svg/3rd-party/puppy_linux.svg +++ /dev/null @@ -1,2 +0,0 @@ - - -- 2.47.2 From ae0be9625a4e5a2c94b2b5988ac33ffeb33b23ce Mon Sep 17 00:00:00 2001 From: Oskar Sharipov Date: Sat, 21 Dec 2019 01:18:47 +0300 Subject: [PATCH 3/4] Return "I'll be careful, I promise!" --- _includes/sections/browser-tweaks.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/sections/browser-tweaks.html b/_includes/sections/browser-tweaks.html index d04cfa09..db6ebef6 100644 --- a/_includes/sections/browser-tweaks.html +++ b/_includes/sections/browser-tweaks.html @@ -6,7 +6,7 @@
  1. Enter "about:config" in the firefox address bar and press enter.
    2. -
  2. Press the button "Accept the Risk and Continue"
    3. +
  3. Press the button "I'll be careful, I promise!" or "Accept the Risk and Continue"
  4. Follow the instructions below...
-- 2.47.2 From 2b2a40a1591cd5d8f34254daf9892aefdf792110 Mon Sep 17 00:00:00 2001 From: Oskar Sharipov Date: Sun, 12 Jan 2020 02:26:34 +0300 Subject: [PATCH 4/4] Edit wording to modern (from ~FF60 to FF71 version) By @Thorin-Oakenpants researches: "I accept the risk" had been before FF60, "Accept the Risk and Continue" was written in FF71. --- _includes/sections/browser-tweaks.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/sections/browser-tweaks.html b/_includes/sections/browser-tweaks.html index db6ebef6..cae460c8 100644 --- a/_includes/sections/browser-tweaks.html +++ b/_includes/sections/browser-tweaks.html @@ -6,7 +6,7 @@
  1. Enter "about:config" in the firefox address bar and press enter.
    2. -
  2. Press the button "I'll be careful, I promise!" or "Accept the Risk and Continue"
    3. +
  3. Press the button "Accept the Risk and Continue" [FF71+] or "I accept the risk".
  4. Follow the instructions below...
-- 2.47.2