Merge branch 'master-nomake'

3 files changed, 21 insertions, 58 deletions

diff --git a/main/fixtures/arches.json b/main/fixtures/arches.json
index 6ebd0c15..1ece16c9 100644
--- a/main/fixtures/arches.json
+++ b/main/fixtures/arches.json
@@ -25,21 +25,5 @@
         "name": "x86_64", 
         "required_signoffs": 2
     }
-},
-{
-    "pk": 4,
-    "model": "main.arch",
-    "fields": {
-        "agnostic": false,
-        "name": "mips64el"
-    }
-},
-{
-    "pk": 5, 
-    "model": "main.arch", 
-    "fields": {
-        "agnostic": false, 
-        "name": "i586"
-    }
 }
 ]
diff --git a/main/fixtures/repos.json b/main/fixtures/repos.json
index 655be64a..a6f564b7 100644
--- a/main/fixtures/repos.json
+++ b/main/fixtures/repos.json
@@ -142,25 +142,5 @@
             "svn_root": "packages", 
             "testing": true
         }
-    }, 
-    {
-        "pk": 10, 
-        "model": "main.repo", 
-        "fields": {
-            "svn_root": "", 
-            "testing": true, 
-            "name": "Libre-Testing", 
-            "bugs_project": 0
-        }
-    }, 
-    {
-        "pk": 11, 
-        "model": "main.repo", 
-        "fields": {
-            "svn_root": "", 
-            "testing": false, 
-            "name": "Libre", 
-            "bugs_project": 0
-        }
     }
 ]
diff --git a/templates/public/index.html b/templates/public/index.html
index f577dd9f..f5470d14 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -11,28 +11,27 @@
 {% block content_left %}
 {% cache 62 main-page-left secure %}
 <div id="intro" class="box">
-    <h2>A free, simple, lightweight distribution</h2>
-
-    <p>You've reached the website for <strong>{{BRANDING_DISTRONAME}}</strong>,
-    a project providing a fully free (as in <a title="Free Software Definition"
-        href="https://www.gnu.org/philosophy/free-sw">freedom</a>) derivative of
-    Arch Linux. Inheriting Arch's lightweight and flexibility,
-    {{BRANDING_SHORTNAME}} offers software freedom plus all power to the
-    users.</p>
-
-    <p>Currently we provide the packages from Arch that meet
-    the <a href="http://www.gnu.org/distros/free-system-distribution-guidelines.html">Free
-    System Distribution Guidelines</a> (FSDG), replacements for those that
-    don't, and our own additions, all of them optimized for the i686, x86-64,
-    and mips64el architectures.</p>
-
-    <p>Our strong community is diverse and helpful. Please
-    check out our <a href="irc://chat.freenode.net#parabola" title="IRC channel">IRC channel</a>
-    and <a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/"
-        title="{{ BRANDING_SHORTNAME }} Mailing Lists">mailing lists</a>
-    to get your feet wet.  Also glance through our <a href="{% wiki_url %}"
-        title="{{BRANDING_WIKINAME}}">wiki</a>
-    if you want to learn more about {{BRANDING_SHORTNAME}}.</p>
+    <h2>A fully free, simple, and lightweight operating system</h2>
+
+    <p>You've reached the website of the Parabola&nbsp;GNU/Linux-libre operating
+    system.  The Parabola project is a community driven effort to provide a
+    fully free (as in
+    <a href="https://www.gnu.org/philosophy/free-sw">freedom</a>) operating
+    system that is simple and lightweight.</p>
+
+    <p>Derived from Arch Linux, Parabola GNU/Linux-libre provides packages from
+    Arch that meet the
+    <a href="http://www.gnu.org/distros/free-system-distribution-guidelines.html">Free
+    System Distribution Guidelines (FSDG)</a> and replacements for the packages
+    that don't meet this requirement.  Packages are provided for the i686,
+    x86-64, and mips64el architectures.</p>
+
+    <p>Our community is friendly and helpful.  Please hop on
+    <a href="irc://chat.freenode.net#parabola">IRC channel</a> and check out our
+    <a href="https://lists.parabolagnulinux.org/mailman/listinfo/">mailing
+    lists</a> to get your feet wet. Also glance through our
+    <a href="https://wiki.parabolagnulinux.org/">wiki</a> if you want to learn
+    more about Parabola.</p>
 
     <p class="readmore"><a href="{% url 'page-about' %}"
         title="Learn more about {{ BRANDING_DISTRONAME }}">Learn more...</a></p>