diff options
| -rw-r--r-- | devel/fixtures/staff_groups.json | 2 | ||||
| -rw-r--r-- | templates/public/about.html | 28 | ||||
| -rw-r--r-- | 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 @@ <p>In 2009 we started a project to offer the Free Software community the chance of using an Arch system completely - freed from nonfree software.</p> + freed from non-Free software.</p> <p>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.</p> - <p>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 + <p>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.</p> - <h3>Why you should use Parabola</h3> + <h3>Why you should use Parabola GNU/Linux-libre</h3> <p>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.</p> - <h3>Free Arch</h3> + <h3>Free the GNU/Linux distribution of Arch</h3> <p>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.</p> + achieve its freedom in a simple way. To Free your Arch installation, + just install our Free repositories list and update your system.</p> <p>No reinstallation needed.</p> @@ -38,10 +38,10 @@ <p>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.</p> - <p>We want Free Software with a social utility for a libre society.</p> + <p>We want Free Software with a social utility for a Free society.</p> <p>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.</p> @@ -49,8 +49,8 @@ <p>Remaining tasks:</p> <ul> - <li>Audit repositories. If you find a nonfree package, or a package - with nonfree parts, report it as a bug.</li> + <li>Audit repositories. If you find a non-Free package, or a package + with non-Free parts, report it as a bug.</li> <li>Host repositories. Mirrors are not abundant.</li> diff --git a/templates/public/index.html b/templates/public/index.html index 80527cd7..08ada571 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -15,7 +15,7 @@ <p>You've reached the website of the Parabola GNU/Linux-libre operating system. The Parabola project is a community driven effort to provide a - fully free (as in + fully Free (as in <a href="https://www.gnu.org/philosophy/free-sw">freedom</a>) operating system that is simple and lightweight.</p> @@ -118,10 +118,8 @@ title="Installation guide">Installation Guide</a></li> <li><a href="{% wiki_url 'ARM_Installation_Guide' %}" title="ARM Installation guide">ARM Installation Guide</a></li> - <li><a href="{% wiki_url 'Migration' %}" - title="Free your Arch distro installation">Migration from Arch (the GNU/Linux distribution)</a></li> - <li><a href="{% wiki_url 'Migration_from_Arch_ARM' %}" - title="Free your Arch ARM distro installation">Migration from Arch ARM (the GNU/Linux distribution)</a></li> + <li><a href="{% wiki_url 'Migration_from_other_distributions' %}" + title="Free your distro installation">Migration from other distros</a></li> </ul> <h4>Community</h4> |