Replace Trisquel with Fedora (#1156)
* Replace Trisquel with Fedora * Reorder recommendations
This commit was merged in pull request #1156.
	This commit is contained in:
		@@ -15,6 +15,16 @@ github="https://github.com/QubesOS"
 | 
			
		||||
tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/"
 | 
			
		||||
%}
 | 
			
		||||
 | 
			
		||||
{% include cardv2.html
 | 
			
		||||
title="Fedora Workstation"
 | 
			
		||||
image="/assets/img/tools/Fedora.png"
 | 
			
		||||
description='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.'
 | 
			
		||||
badges="info:GNU/Linux"
 | 
			
		||||
labels="warning:contrib:This software may depend on or recommend non-free software."
 | 
			
		||||
website="https://getfedora.org/"
 | 
			
		||||
git="https://src.fedoraproject.org/"
 | 
			
		||||
%}
 | 
			
		||||
 | 
			
		||||
{% include cardv2.html
 | 
			
		||||
title="Debian"
 | 
			
		||||
image="/assets/img/tools/Debian.png"
 | 
			
		||||
@@ -25,15 +35,6 @@ git="https://salsa.debian.org/qa/debsources"
 | 
			
		||||
tor="http://sejnfjrq6szgca7v.onion"
 | 
			
		||||
%}
 | 
			
		||||
 | 
			
		||||
{% include cardv2.html
 | 
			
		||||
title="Trisquel"
 | 
			
		||||
image="/assets/img/tools/Trisquel.png"
 | 
			
		||||
description='Trisquel is a Linux-based operating system derived from Ubuntu. The project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed.'
 | 
			
		||||
badges="info:GNU/Linux"
 | 
			
		||||
website="https://trisquel.info/"
 | 
			
		||||
git="https://devel.trisquel.info/groups/trisquel"
 | 
			
		||||
%}
 | 
			
		||||
 | 
			
		||||
<h3>Warning</h3>
 | 
			
		||||
 | 
			
		||||
<ul>
 | 
			
		||||
@@ -46,6 +47,7 @@ git="https://devel.trisquel.info/groups/trisquel"
 | 
			
		||||
  <li><a href="https://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
 | 
			
		||||
  <li><a href="https://www.archlinux.org/">Arch Linux</a> <span class="badge badge-info">GNU/Linux</span> - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. <a href="https://www.parabola.nu/">Parabola</a> is a
 | 
			
		||||
    completely open source version of Arch Linux.</li>
 | 
			
		||||
  <li><a href="https://trisquel.info/">Trisquel</a> <span class="badge badge-info">GNU/Linux</span> - Derived from Ubuntu, this project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed.</li>
 | 
			
		||||
  <li><a href="https://www.whonix.org/">Whonix</a> <span class="badge badge-info">GNU/Linux</span> - A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation"
 | 
			
		||||
    and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.</li>
 | 
			
		||||
</ul>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user