From 07a0ba4bf0168d8f8278cd55256eb694620ae127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 22 Jun 2016 14:06:58 -0300 Subject: add some modifications based on the Social Contract's consensus --- devel/fixtures/staff_groups.json | 2 +- templates/public/about.html | 28 ++++++++++++++-------------- templates/public/index.html | 8 +++----- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/devel/fixtures/staff_groups.json b/devel/fixtures/staff_groups.json index 416e2a02..1f26b54e 100644 --- a/devel/fixtures/staff_groups.json +++ b/devel/fixtures/staff_groups.json @@ -4,7 +4,7 @@ "group": [ "Hackers" ], - "description": "This is a list of the current Parabola Hackers. They maintain the [libre] package repository and keep the [core], [extra], and [community] repositories clean of nonfree software, in addition to doing any other developer duties.", + "description": "This is a list of the current Parabola Hackers. They maintain the [libre] package repository and keep the [core], [extra], and [community] repositories clean of non-Free software, in addition to doing any other developer duties.", "sort_order": 1, "member_title": "Hacker", "slug": "hackers", diff --git a/templates/public/about.html b/templates/public/about.html index d380369d..35a4425d 100644 --- a/templates/public/about.html +++ b/templates/public/about.html @@ -7,30 +7,30 @@

In 2009 we started a project to offer the Free Software community the chance of using an Arch system completely - freed from nonfree software.

+ freed from non-Free software.

Today we have repositories and installable images of this wonderful - GNU/Linux distribution from which we have eliminated the nonfree software - contained in its official repositories and which we have replaced with libre + GNU/Linux distribution from which we have eliminated the non-Free software + contained in its official repositories and which we have replaced with Free alternatives whenever we could.

-

The first example is Linux-libre, the kernel without blobs nor nonfree - firmware. Followed by GNU IceCat, the libre fork of Mozilla Firefox that - doesn't recommend nonfree addons, and that in our case neither recommends +

The first example is Linux-libre, the kernel without blobs nor non-Free + firmware. Followed by GNU IceCat, the Free fork of Mozilla Firefox that + doesn't recommend non-Free addons, and that in our case neither recommends services that spy on you like the Google search engine.

-

Why you should use Parabola

+

Why you should use Parabola GNU/Linux-libre

Parabola equals software freedom plus all power to the users. GNU plus ArchWay. With a continuosly updated system, simple to manage, simple to package, you can build your own operating system in the way you want and learn a lot along the way.

-

Free Arch

+

Free the GNU/Linux distribution of Arch

Following the minimalist, KISS, spirit of Arch, we have managed to - achieve its freedom in a simple way. To free your Arch installation, - just install our libre repositories list and update your system.

+ achieve its freedom in a simple way. To Free your Arch installation, + just install our Free repositories list and update your system.

No reinstallation needed.

@@ -38,10 +38,10 @@

Boring tasks are always available. We want to start new projects. We want to help people have servers of their own, with services of their own, with - Parabola Social. We want people to remix their own Arch and share it + Parabola Social. We want people to remix their own Arch system and share it with the rest of the world.

-

We want Free Software with a social utility for a libre society.

+

We want Free Software with a social utility for a Free society.

But we need your help. If all of us share a little of the boring work, we'll have more time to do the really fun stuff.

@@ -49,8 +49,8 @@

Remaining tasks:

Community

-- cgit v1.2.3