Remove installation instruction for unix binary and reorder chapters

Non-Windows binaries are not released any longer. Instructions are hence removed.

5 files changed, 37 insertions, 163 deletions

diff --git a/system/doc/installation_guide/Makefile b/system/doc/installation_guide/Makefile
index 6923f52d8a..83210bd21f 100644
--- a/system/doc/installation_guide/Makefile
+++ b/system/doc/installation_guide/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1996-2012. All Rights Reserved.
+# Copyright Ericsson AB 1996-2014. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -58,8 +58,7 @@ XML_FILES = \
 GENERATED_XML_FILES = \
 	INSTALL.xml \
 	INSTALL-CROSS.xml \
-	INSTALL-WIN32.xml \
-	MARKDOWN.xml
+	INSTALL-WIN32.xml
 
 # ----------------------------------------------------
 
@@ -74,8 +73,7 @@ REDIRECT_HTML_DIR = $(HTMLDIR)/source
 REDIRECT_HTML_FILES = \
 	$(REDIRECT_HTML_DIR)/INSTALL.html \
 	$(REDIRECT_HTML_DIR)/INSTALL-CROSS.html \
-	$(REDIRECT_HTML_DIR)/INSTALL-WIN32.html \
-	$(REDIRECT_HTML_DIR)/MARKDOWN.html
+	$(REDIRECT_HTML_DIR)/INSTALL-WIN32.html
 
 # ----------------------------------------------------
 # FLAGS 
diff --git a/system/doc/installation_guide/install-binary.xml b/system/doc/installation_guide/install-binary.xml
index 07027a39f6..af7dab6e44 100644
--- a/system/doc/installation_guide/install-binary.xml
+++ b/system/doc/installation_guide/install-binary.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2013</year>
+      <year>2000</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,117 +31,40 @@
     <rev>C</rev>
     <file>install-binary.xml</file>
   </header>
-
-  <section>
-    <title>UNIX</title>
-
-    <section>
-      <title>Introduction</title>
-      <p>The system is delivered as a single compressed tar file.</p>
-      <p>To browse the on-line HTML documentation, Netscape or an equivalent
-        browser supporting frames is needed.</p>
-    </section>
-
-    <section>
-      <title>Installation Procedure</title>
-      <p>When installed, the entire system, except for a small start-up
-        script, resides in a single directory tree. The location of this
-        directory tree can be chosen arbitrarily by the installer, and it
-        does not need to be in the user's <c>$PATH</c>. The only requirements
-        are that the file system where it is placed has enough free space,
-        and that the users who run Erlang/OTP have read access to it. In the
-        example below, the directory tree is assumed to be located at
-        <c>/usr/local/erlang</c>, which is here called the <em>top-level directory</em>.</p>
-      <p>It is assumed that you have the compressed tar file, the name of
-        which is <c><![CDATA[<PREFIX>.tar.gz]]></c>, where <c><![CDATA[<PREFIX>]]></c> is a string
-        denoting the particular Erlang/OTP release, e.g.
-        <c>otp_LXA_11930_sunos5_R9B</c>.</p>
-      <p>Wherever the string <c><![CDATA[<PREFIX>]]></c> is used below, it should
-        be replaced by the actual name prefix of the compressed tar file.</p>
-      <p>The tape archive file does not have one single directory in which
-        all other files are rooted. Therefore the tape archive file must be
-        extracted into an empty (newly created) directory.</p>
-      <list type="ordered">
-        <item>
-          <p>If the <em>top-level directory</em> does not already exist,
-            create it:</p>
-          <pre>
-mkdir /usr/local/erlang</pre>
-        </item>
-        <item>
-          <p>Change the current directory to the <em>top level directory</em>:</p>
-          <pre>
-cd /usr/local/erlang</pre>
-        </item>
-        <item>
-          <p>Create the <em>installation directory</em> with an appropriate
-            name. For example:</p>
-          <pre>
-mkdir otp_r7b</pre>
-        </item>
-        <item>
-          <p>Change to the <em>installation directory</em>, e.g.</p>
-          <pre>
-cd otp_r7b</pre>
-        </item>
-        <item>
-          <p>Assuming the compressed tar file resides in the directory
-            <c><![CDATA[<SOME-DIR>]]></c>,. extract the compressed tar file into the
-            current directory:</p>
-          <pre>
-gunzip -c &lt;SOME-DIR&gt;/&lt;PREFIX&gt;.tar.gz | tar xfp -</pre>
-        </item>
-        <item>
-          <p>Read the <c>README</c> file in the installation directory for
-            last minute updates, before proceeding.</p>
-        </item>
-        <item>
-          <p>Run the <c>Install</c> script in the installation directory,
-            with the absolute path of the installation directory as argument,</p>
-          <pre>
-./Install /usr/local/erlang/otp_r7b</pre>
-          <p>and supply answers to the prompts.</p>
-          <p>In most cases, there is a default answer in square brackets
-            (<c>[]</c>). If the default is satisfactory, just press
-            <c><![CDATA[<Return>]]></c>. In general you are only prompted for one thing:</p>
-          <list type="bulleted">
-            <item>
-              <p>"Do you want to use a minimal system startup instead of the
-                SASL startup?"                <br></br>
-
-                In a minimal system, only the Kernel and STDLIB applications
-                are loaded and started. If the SASL startup is used, the SASL
-                application is included as well. Normally, the minimal system
-                is enough.</p>
-            </item>
-          </list>
-        </item>
-        <item>
-          <p>Make Erlang/OTP available for users, either by putting the path
-            <c>/usr/local/erlang/otp_r7b/bin</c> in users <c>$PATH</c>
-            variable, or link the executable
-            <c>/usr/local/erlang/otp_r7b/bin/erl</c> accordingly, e.g.:</p>
-          <pre>
-ln -s /usr/local/erlang/otp_r7b/bin/erl /usr/local/bin/erl </pre>
-        </item>
-      </list>
-    </section>
-  </section>
-
   <section>
     <title>Windows</title>
 
     <section>
       <title>Introduction</title>
-      <p>The system is delivered as a single <c>.exe</c> file.</p>
-      <p>To browse the on-line HTML documentation, Netscape or an equivalent
-        browser supporting frames is needed.</p>
+      <p>The system is delivered as a Windows Installer executable.
+        Get it from our <url href="http://www.erlang.org/download.html">download page</url>.</p>
     </section>
 
     <section>
-      <title>Installation Procedure</title>
+      <title>Installation</title>
       <p>The installation procedure is is automated. Double-click the
         <c>.exe</c> file icon and follow the instructions.</p>
     </section>
+    <section>
+    <title>Verification</title>
+    <list type="bulleted">
+      <item>
+        <p>Start Erlang/OTP by double-clicking on the Erlang shortcut icon on the
+          desktop.</p>
+        <p>Expect a command line window to pop up with an output looking something like this:</p>
+        <pre>
+  Erlang/OTP 17 [erts-6.0] [64-bit] [smp:2:2]
+
+  Eshell V6.0  (abort with ^G)
+  1></pre>
+      </item>
+      <item>
+        <p>Exit by entering the command <c>halt()</c>,</p>
+        <pre>
+  2> <input>halt().</input></pre>
+        <p>which will close the Erlang/OTP shell. </p>
+      </item>
+    </list>
+  </section>
   </section>
 </chapter>
diff --git a/system/doc/installation_guide/part.xml b/system/doc/installation_guide/part.xml
index 19808fd165..02bf98db7c 100644
--- a/system/doc/installation_guide/part.xml
+++ b/system/doc/installation_guide/part.xml
@@ -4,7 +4,7 @@
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2013</year>
+      <year>2000</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,9 +32,7 @@
     <p>How to install Erlang/OTP on UNIX or Windows.</p>
   </description>
   <xi:include href="install-binary.xml"/>
-  <xi:include href="verification.xml"/>
   <xi:include href="INSTALL.xml"/>
   <xi:include href="INSTALL-CROSS.xml"/>
   <xi:include href="INSTALL-WIN32.xml"/>
-  <xi:include href="MARKDOWN.xml"/>
 </part>
\ No newline at end of file
diff --git a/system/doc/installation_guide/verification.xml b/system/doc/installation_guide/verification.xml
index 391ddfb7b8..201ede6473 100644
--- a/system/doc/installation_guide/verification.xml
+++ b/system/doc/installation_guide/verification.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2013</year>
+      <year>2000</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,40 +32,7 @@
     <file>verification.xml</file>
   </header>
   <p>This chapter is about verifying your installation by performing
-    a few simple tests to see that your system is properly installed.</p>
-
-  <section>
-    <title>UNIX</title>
-    <list type="bulleted">
-      <item>
-        <p>Start Erlang/OTP from the command line,</p>
-        <pre>
-  unix> erl</pre>
-        <p>Expect the following output:</p>
-        <pre>
-  Erlang (BEAM) emulator version 5.0.1 [threads]
-
-  Eshell V5.0.1  (abort with ^G)
-  1></pre>
-      </item>
-      <item>
-        <p>Start the GS-based toolbar from the Erlang shell, </p>
-        <pre>
-  1> <input>toolbar:start().</input></pre>
-        <p>and check that the toolbar window pops up.
-          </p>
-        <p><em>Note:</em> The trailing full stop (<c>"."</c>) is an end marker
-          for all commands in the Erlang shell, and must be entered for a 
-          command to begin execution.</p>
-      </item>
-      <item>
-        <p>Exit by entering the command <c>halt()</c>,</p>
-        <pre>
-  2> <input>halt().</input></pre>
-        <p>which should end both the toolbar window and the command line window. </p>
-      </item>
-    </list>
-  </section>
+    a simple test to see that your system is properly installed.</p>
 
   <section>
     <title>Windows</title>
@@ -73,28 +40,18 @@
       <item>
         <p>Start Erlang/OTP by double-clicking on the Erlang shortcut icon on the
           desktop.</p>
-        <p>Expect a command line window to pop up with the following output,</p>
+        <p>Expect a command line window to pop up with an output looking something like this:</p>
         <pre>
-  Erlang (BEAM) emulator version 5.0.1 [threads]
+  Erlang/OTP 17 [erts-6.0] [64-bit] [smp:2:2]
 
-  Eshell V5.0.1  (abort with ^G)
+  Eshell V6.0  (abort with ^G)
   1></pre>
       </item>
       <item>
-        <p>Start the GS-based toolbar from the Erlang shell, </p>
-        <pre>
-  1> <input>toolbar:start().</input></pre>
-        <p>and check that the toolbar window pops up.
-          </p>
-        <p><em>Note:</em> The trailing full stop (<c>"."</c>) is an end marker
-          for all commands in the Erlang shell, and must be entered for a 
-          command to begin execution.</p>
-      </item>
-      <item>
         <p>Exit by entering the command <c>halt()</c>,</p>
         <pre>
   2> <input>halt().</input></pre>
-        <p>which should end both the toolbar window and the command line window. </p>
+        <p>which should close the command line window and stop Erlang/OTP. </p>
       </item>
     </list>
   </section>
diff --git a/system/doc/installation_guide/xmlfiles.mk b/system/doc/installation_guide/xmlfiles.mk
index 3995c607af..c443334cd7 100644
--- a/system/doc/installation_guide/xmlfiles.mk
+++ b/system/doc/installation_guide/xmlfiles.mk
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2009-2013. All Rights Reserved.
+# Copyright Ericsson AB 2009-2014. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -18,8 +18,6 @@
 #
 INST_GUIDE_CHAPTER_FILES = \
 	install-binary.xml \
-	verification.xml \
 	INSTALL.xml \
 	INSTALL-CROSS.xml \
-	INSTALL-WIN32.xml \
-	MARKDOWN.xml
+	INSTALL-WIN32.xml