Merge remote-tracking branch 'origin/master' into gtk3

[pspp] / INSTALL

diff --git a/INSTALL b/INSTALL
index 6223aa376dbe0034abd5d4c71838ddc69a3ed120..03739d5816f7c884a5078e5758f45465a53ee4ce 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -17,9 +17,16 @@ the following simple procedure should work, even on non-GNU systems:
  sudo make install
 
 Obviously, you should replace 'pspp-*' in the above, with the name of
-the tarball you are installing.  If any part of this process fails, then 
-it's likely that one or more of the necessary prerequisites is missing
-from your system.   Read on to find out how to correct this.
+the tarball you are installing.  
+
+In 99% of cases, that is all you have to do - FINISHED! 
+
+
+If any part of the above process fails, then it is
+likely that one or more of the necessary prerequisites is missing
+from your system.  The following paragraphs contain highly detailed
+information which will help you fix this.
+
 
 Before You Install
 ==================
@@ -35,7 +42,7 @@ not present on your system.
 
 The following packages are required to install PSPP:
 
-    * An ANSI C compiler and tool chain.  On Unix-like systems, we
+    * A C compiler and tool chain.  On Unix-like systems, we
       recommend GCC, but any modern compilation environment should
       work.  On Microsoft Windows, Cygwin (http://www.cygwin.com/) and
       MinGW (http://www.mingw.org/) are known to work.
@@ -56,7 +63,8 @@ The following packages are required to install PSPP:
 
 The following packages are required to enable PSPP's graphing
 features.  If you cannot arrange to install them, you must run
-`configure' with --without-cairo.
+`configure' with --without-cairo (in which case you will get no graphing
+capability).
 
     * Cairo (http://cairographics.org/), version 1.12 or later.
 
@@ -75,20 +83,21 @@ use the GUI, you must run `configure' with --without-gui.
     * GtkSourceView (http://projects.gnome.org/gtksourceview/) 
       version 3.4.0 or later.
 
+The following packages are optional:
 
-Installing the following packages will allow your PSPP binary to read
+Installing the following packages will allow your PSPP program to read
 Gnumeric files.
 
     * zlib (http://www.zlib.net/).
 
     * libxml2 (http://xmlsoft.org/).  
 
-Installing the following packages will allow your PSPP binary to write
+Installing the following packages will allow your PSPP program to write
 OpenDocument text (ODT) files:
 
     * libxml2 (http://xmlsoft.org/).  
 
-The following packages are optional.
+Other optional packages:
 
     * libncurses (http://www.gnu.org/software/ncurses/).  Without it,
       PSPP will assume it is running in an 80x25 terminal.
@@ -276,7 +285,7 @@ Optional Features
    This option is useful for building a package which can be installed
    into an arbitrary directory and freely copied to any other directory.
    If you use this option, you will probably want to install the pspp
-   with a command similar to "make install DESTDIR=<distination>".
+   with a command similar to "make install DESTDIR=<destination>".
 
 Defining Variables
 ==================