From 03bc3e619f311e11323be5bfce57ebd0842e6595 Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Sun, 8 May 2011 18:02:55 +0200
Subject: releng: clarify some text and options

Signed-off-by: Dieter Plaetinck <dieter@plaetinck.be>
Signed-off-by: Dan McGee <dan@archlinux.org>
---
 releng/fixtures/installtype.json |  2 +-
 releng/fixtures/source.json      |  4 ++--
 releng/views.py                  |  6 ++++--
 templates/releng/add.html        | 15 +++++++++++----
 templates/releng/results.html    |  4 ++++
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/releng/fixtures/installtype.json b/releng/fixtures/installtype.json
index 7fa21fc1..07d17f28 100644
--- a/releng/fixtures/installtype.json
+++ b/releng/fixtures/installtype.json
@@ -24,7 +24,7 @@
 	"pk": 4,
 	"model": "releng.installtype",
 	"fields": {
-	    "name": "automatic install custom config (specify in comments)"
+	    "name": "automatic install custom config (if special, specify in comments)"
 	}
     }
 ]
diff --git a/releng/fixtures/source.json b/releng/fixtures/source.json
index 2622f4c1..9d1950a5 100644
--- a/releng/fixtures/source.json
+++ b/releng/fixtures/source.json
@@ -3,14 +3,14 @@
 	"pk": 1,
 	"model": "releng.source",
 	"fields": {
-	    "name": "net install manual networking config (Check that it works + rc.conf, resolv.conf, mirrorlist)"
+	    "name": "net install manual networking config (verify network, rc.conf, resolv.conf, mirrorlist)"
 	}
     },
     {
 	"pk": 2,
 	"model": "releng.source",
 	"fields": {
-	    "name": "net install dhcp (Check that it works + rc.conf)"
+	    "name": "net install dhcp (verify network, rc.conf, mirrorlist)"
 	}
     },
     {
diff --git a/releng/views.py b/releng/views.py
index ae9c8682..70aaaf52 100644
--- a/releng/views.py
+++ b/releng/views.py
@@ -23,10 +23,12 @@ class TestForm(forms.ModelForm):
     source = standard_field(Source)
     clock_choice = standard_field(ClockChoice)
     filesystem = standard_field(Filesystem,
-            help_text="Check the installed system, including fstab.")
+            help_text="verify /etc/fstab, `df -hT` output and commands like " \
+            "lvdisplay for special modules")
     modules = forms.ModelMultipleChoiceField(queryset=Module.objects.all(),
             help_text="", widget=forms.CheckboxSelectMultiple(), required=False)
-    bootloader = standard_field(Bootloader)
+    bootloader = standard_field(Bootloader,
+            help_text="Verify that the entries in the bootloader config look ok")
     rollback_filesystem = standard_field(Filesystem,
             help_text="If you did a rollback followed by a new attempt to setup " \
             "your lockdevices/filesystems, select which option you took here.",
diff --git a/templates/releng/add.html b/templates/releng/add.html
index 3678532d..8488b40c 100644
--- a/templates/releng/add.html
+++ b/templates/releng/add.html
@@ -6,10 +6,17 @@
 <div class="box">
     <h2>Arch Releng Testbuild Feedback Entry</h2>
 
-    <p>This page allows you to submit feedback after testing and using a
-    release engineering install ISO. If you do not currently have feedback to
-    submit, you may want to take a look at the current
-    <a href="{% url releng-test-overview %}">results page</a>.</p>
+    <p>This page allows you to submit feedback after testing an Arch Linux installation
+    using a release engineering testbuild.  Mark all the options you used during the
+    installation; at the end you can specify whether everything went OK.  Be
+    sure to only denote a successful install after having checked the
+    installation properly.  Some options require you to check several things (such as
+    config files), this will be mentioned alongside the option.</p>
+    <p>There is also an overview of all feedback on the
+    <a href="{% url releng-test-overview %}">results page</a>.  Once we have
+    builds that are properly tested (enough successful feedback for all
+    important features of the ISO or a slightly earlier ISO), we can release new
+    official media.</p>
 
     <div id="releng-feedback"> <form action="" method="post">{% csrf_token %}
             {{ form.as_p }}
diff --git a/templates/releng/results.html b/templates/releng/results.html
index 4aca1f10..d7708cb7 100644
--- a/templates/releng/results.html
+++ b/templates/releng/results.html
@@ -13,6 +13,10 @@
     if you have tested and used any ISOs. Both successful and failed results
     are encouraged and welcome.</p>
 
+    <p>For more information, see the <a
+    href="https://wiki.archlinux.org/index.php/DeveloperWiki:releng_testimages_feedback">documentation
+    on the wiki</a></p>
+
     <p>All ISOs referenced on this page are available from
     <a href="{{ iso_url }}">{{ iso_url }}</a>.</p>
 
-- 
cgit v1.2.3-55-g3dc8