install: Integrate suggestions from cb

3 files changed, 21 insertions, 4 deletions

diff --git a/src/install/1_begin.xml b/src/install/1_begin.xml
index d3d78a8..1c25c7b 100644
--- a/src/install/1_begin.xml
+++ b/src/install/1_begin.xml
@@ -12,12 +12,10 @@
             While every effort has been made to ensure that the Adélie Linux installation system is safe and error-free, we cannot guarantee that your data will be preserved once you start the installation.
             If you intend on dual-booting your computer with another operating system, such as Mac OS X or Windows, ensure there is adequate disk space available to install Adélie Linux.
             You will need up to 2 GB for a standard desktop installation, or at least 300 MB for a server installation.</para>
-        <para>To install Adélie Linux on a desktop or portable computer, you will need a graphical display capable of at least an 800x600 pixel resolution.
-            Most displays support this resolution.
-            HiDPI (or "Retina") displays are supported only on the Desktop installation media.
+        <para>HiDPI (or "Retina") displays are supported only on the Desktop installation media.
             Please note that the server installation media may render incorrectly, or even not at all, when using HiDPI displays.
             You may install server packages using the Desktop installation media if you need to use a HiDPI display during server installation.</para>
-        <para>To install Adélie Linux to a server, you will need either a display capable of at least 80x25 text console (720x480), or a supported serial line.
+        <para>To install Adélie Linux to a server, you will need either a connected display or a supported serial line.
             If you are installing via serial line, be sure to have your server's serial line settings available.
             Most servers default to either 9600 or 115200 baud; Adélie Linux does not reconfigure the serial line, so you will need to know your firmware's default settings.</para>
         <para>If you plan on connecting to the Internet directly from your Adélie Linux computer without using a router (not common),
diff --git a/src/install/2_req.xml b/src/install/2_req.xml
index e44b4a4..2f021a7 100644
--- a/src/install/2_req.xml
+++ b/src/install/2_req.xml
@@ -90,4 +90,9 @@
         </table>
         <warning><title>Warning</title><para>Using less than 96 MB RAM may cause lock ups or crashes during package installation.  For systems with less than 96 MB RAM, it is highly recommended that you use the HorizonScript Executor in Target Mode on a computer with more than 96 MB RAM.  For more information, see the section on Target Mode.</para></warning>
     </section>
+    <section id="gfx_req">
+        <title>Display and graphics hardware requirements</title>
+        <para>To install Adélie Linux on a desktop or portable computer, you will need a graphical display capable of at least an 800x600 pixel resolution.
+            Most displays support this resolution.</para>
+    </section>
 </chapter>
diff --git a/src/install/7_scripts.xml b/src/install/7_scripts.xml
index c21855a..06a1ba3 100644
--- a/src/install/7_scripts.xml
+++ b/src/install/7_scripts.xml
@@ -44,6 +44,7 @@
 network true
 netaddress eth0 static 10.1.9.8 255.255.0.0 10.1.0.1
 nameserver 9.9.9.9
+rootpw <userinput>...</userinput>
 hostname test-web
 pkginstall adelie-base-posix dash-binsh easy-kernel easy-kernel-modules lighttpd openrc ruby-full uwsgi-rack
 # Enable lighttpd on startup:
@@ -54,6 +55,19 @@ svcenable lighttpd
         <section id="using_js">
             <title>Using JSON</title>
             <para>If you have a properly-formatted JSON file, for example from a vendor-provided tool, you can use it to generate a HorizonScript file.</para>
+            <example>
+                <title>A simple JSON file</title>
+                <programlisting>
+{
+ "hostname": "horizon-json-testmachine.adelielinux.org",
+ "packages": ["adelie-base-posix", "easy-kernel", "easy-kernel-modules", "netifrc", "openrc", "s6-linux-init"],
+ "rootpw": "<userinput>...</userinput>",
+ "root": "/dev/sda1",
+ "netaddresses": [{"id":"eth0", "interface":"eth0", "addr-type":"dhcp"}],
+ "nameservers": ["9.9.9.9"]
+}
+                </programlisting>
+            </example>
             <procedure>
                 <title>Generating a HorizonScript from a JSON file</title>
                 <step><para>Locate the JSON file on your computer.</para></step>