too many changes to list

1 files changed, 26 insertions, 45 deletions

diff --git a/install.txt b/install.txt
index 741181237..2b1422107 100644
--- a/install.txt
+++ b/install.txt
@@ -1,43 +1,22 @@
 Installation
 ============
 
-Installation on Windows - the easy way
---------------------------------------
-
-Install Nimrod by downloading the appropriate .zip file and extracting it to a
-directory of your choice. The Nimrod Compiler will stay in this directory; 
-do not use a temporary one! You should add the ``bin`` directory of Nimrod to 
-your ``$PATH`` environment variable.
-
 
-
-Installation on UNIX
---------------------
+Installation on Linux/UNIX
+--------------------------
 
 Note:
   A C compiler is required - knowledge of C is not!
 
-**Note: Installation under UNIX does not work yet** - you have to bootstrap. 
-Play with the ``koch.py`` script to compile the compiler. Under Windows the
-``nim.exe`` is provided, so you don't need to do anything. Under UNIX you need
-to install the `FreePascal <www.freepascal.org>`_ compiler. 
-Compile the compiler:: 
-
-  python koch.py nim
-
-To bootstrap (does not work yet)::
-
-  python koch.py boot
-
 The GNU C Compiler is fully supported, other compilers may work. The C compiler
 should be in your ``$PATH`` (most likely the case). Note that some Linux
-distributions do not ship with a C compiler preinstalled - then you have to
-install one.
+distributions do not ship with a GCC compiler preinstalled - then you have to
+install it.
 
 After you have made sure that a C compiler is available, install Nimrod
 by downloading the appropriate ``.zip`` file and extracting it to a
 directory of your choice. The Nimrod Compiler will stay in this
-directory; do not use a temporary one! Good choices are ``/opt/nimrod`` or - 
+directory; do not use a temporary one! Good choices are ``/opt/nimrod`` or -
 if you don't have root access - ``~/programs/nimrod``.
 Then run the following command::
 
@@ -46,7 +25,7 @@ Then run the following command::
 Unlike other software, Nimrod does not distribute its files over the whole file
 hierarchy. This has the advantage that you can deinstall it by just deleting
 its folder. The disadvantage is that you have to add it to your ``PATH``
-manually. The alternative is to create a symbolic link in ``/usr/bin``::
+manually. An alternative is to create a symbolic link in ``/usr/bin``::
 
   [sudo] ln -s $your_install_dir/bin/nimrod  /usr/bin/nimrod
 
@@ -55,35 +34,43 @@ Installation on the Macintosh
 -----------------------------
 
 Only MacOS X is supported.
-Since MacOS X is UNIX based too, it works like the installation on UNIX. You
+Since MacOS X is UNIX based too, it works like the installation on Linux. You
 need to install Apple's developer's tools for the GNU Compiler Collection
 though.
 
 
+Installation on Windows - the easy way
+--------------------------------------
+
+Install Nimrod by downloading and running
+the ``nimrod_windows_$version.exe`` file. The installation procedure detects
+which C compilers are installed and writes the ``config/nimrod.cfg`` file
+for you. If no installed C compiler is found, the ``LLVM-GCC`` compiler is
+used that is bundled with this installer. So it should just work.
+
+
 Installation on Windows - the hard way
 --------------------------------------
 
 Windows does not ship with a C compiler; you have to install one. The
 following C compilers are supported under Windows:
 
-- | Digital Mars C++
-  | http://www.digitalmars.com/download/freecompiler.html
-- | Watcom C++
-  | http://www.openwatcom.org/ftp/
-- | Borland C++ (5.5 or above; including Borland C++Builder)
-  | http://www.borland.com/downloads/download_cbuilder.html
-  | (Download the package under "compiler" - this requires registration though.)
 - | Microsoft's Visual C++
   | http://msdn.microsoft.com/visualc
   | (You may need the SDK too - but not the full one: Essential are only
     the win32api header files and import libraries.)
+- | Borland C++ (5.5 or above; including Borland C++Builder)
+  | http://www.borland.com/downloads/download_cbuilder.html
+  | (Download the package under "compiler" - this requires registration though.)
 - | Gnu C Compiler (the mingw version; the cygwin version has not been tested!)
   | http://www.mingw.org/download.shtml
 - | LLVM with GNU C/C++ frontend
   | http://llvm.org/releases/download.html#2.2
-- | Pelles C Compiler
+- | Digital Mars C++
+  | http://www.digitalmars.com/download/freecompiler.html
+- | Pelles C Compiler (bootstrapping does not work with PCC!)
   | http://www.smorgasbordet.com/pellesc
-- | Lcc-win32
+- | Lcc-win32 (bootstrapping does not work with LCC!)
   | http://www.cs.virginia.edu/~lcc-win32
 
 All of the above compilers are available for free!
@@ -95,11 +82,5 @@ LLVM.
 After you have made sure that a C compiler is available, install
 Nimrod by downloading the appropriate .zip file and extracting it to a
 directory of your choice. The Nimrod Compiler will stay in this
-directory; do not use a temporary one! Then adapt the ``config/nimrod.cfg`` 
-file appropriately. Choose your C compiler and press ``OK``. You should
-add Nimrod to your ``$PATH``.
-
-Alternatively, you can install Nimrod with the ``koch.py`` script just like
-in the UNIX installation instructions. 
-
-Nimrod does not use the Registry and can be removed by just deleting its folder.
+directory; do not use a temporary one! Then adapt the ``config/nimrod.cfg``
+file appropriately. You should add Nimrod to your ``$PATH``.