Merge branch 'archweb-generic'lukeshu/netboot

# Conflicts:
#	AUTHORS
#	Makefile
#	public/views.py
#	settings.py
#	templates/public/donate.html
#	templates/public/download.html
#	templates/public/index.html

2 files changed, 21 insertions, 1 deletions

diff --git a/packages/migrations/0002_auto_20160731_0556.py b/packages/migrations/0002_auto_20160731_0556.py
new file mode 100644
index 00000000..feaa8b97
--- /dev/null
+++ b/packages/migrations/0002_auto_20160731_0556.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('packages', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='signoffspecification',
+            name='known_bad',
+            field=models.BooleanField(default=False, help_text=b'Is this package known to be broken in some way?'),
+            preserve_default=True,
+        ),
+    ]
diff --git a/packages/models.py b/packages/models.py
index 03f03422..83cc7cb7 100644
--- a/packages/models.py
+++ b/packages/models.py
@@ -86,7 +86,7 @@ class SignoffSpecification(models.Model):
     enabled = models.BooleanField(default=True,
         help_text="Is this package eligible for signoffs?")
     known_bad = models.BooleanField(default=False,
-        help_text="Is package is known to be broken in some way?")
+        help_text="Is this package known to be broken in some way?")
     comments = models.TextField(null=True, blank=True)
 
     objects = SignoffSpecificationManager()