From b55a176b25afb2f838601b260aea28912fcd83a5 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Sat, 14 Sep 2002 08:31:23 +0000
Subject: [PATCH] Applied patch [ 608876 ] Improvements to installation docs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 demos/dbbrowse/help.de/problems.htm  |   4 +-
 demos/dbbrowse/help.std/problems.htm |   6 +-
 docs/gtk/install.txt                 |  93 +++++++++--------
 docs/gtk/readme.txt                  |   2 +-
 docs/latex/book/chap_install.tex     |  40 +++----
 docs/motif/aix.txt                   |   4 +-
 docs/motif/install.txt               | 106 +++++++++----------
 docs/x11/install.txt                 | 149 ++++++++++++---------------
 docs/x11/readme.txt                  |  12 +--
 9 files changed, 203 insertions(+), 213 deletions(-)

diff --git a/demos/dbbrowse/help.de/problems.htm b/demos/dbbrowse/help.de/problems.htm
index c502941ab9..980f689176 100644
--- a/demos/dbbrowse/help.de/problems.htm
+++ b/demos/dbbrowse/help.de/problems.htm
@@ -11,11 +11,11 @@
   <TH BGCOLOR=#CCFFFF><B>Allgemein</B></TH>
  </TR></TBODY></TABLE>
  <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :&nbsp;<IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;</B></TH><TH BGCOLOR=#FFFFE0><B>Nur gcc 2.95 Compiler :<BR>Assurt failed in file ../../src/msw/fontutil.cpp at line 238: unknown font slant</B></TH></TR>
+  <TR><TH BGCOLOR=#FFFFAA><B>Problem :&nbsp;<IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;</B></TH><TH BGCOLOR=#FFFFE0><B>Nur gcc 2.95 Compiler :<BR>Assert failed in file ../../src/msw/fontutil.cpp at line 238: unknown font slant</B></TH></TR>
   <TR><TH BGCOLOR=#CCFFCC><B>L&ouml;sung :</B></TH><TH><B>nicht bekannt</B></TH></TR>
  </TR></TBODY></TABLE><P>
  <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :&nbsp;<IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;</B></TH><TH BGCOLOR=#FFFFE0><B>Nur gcc 2.95 Compiler :<BR>Assurt failed in file ../../src/msw/fontutil.cpp at line 249: unknown font weight</B></TH></TR>
+  <TR><TH BGCOLOR=#FFFFAA><B>Problem :&nbsp;<IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;</B></TH><TH BGCOLOR=#FFFFE0><B>Nur gcc 2.95 Compiler :<BR>Assert failed in file ../../src/msw/fontutil.cpp at line 249: unknown font weight</B></TH></TR>
   <TR><TH BGCOLOR=#CCFFCC><B>L&ouml;sung :</B></TH><TH><B>nicht bekannt</B></TH></TR>
  </TR></TBODY></TABLE><P>
  <HR><TABLE BORDER=1><TBODY><TR>
diff --git a/demos/dbbrowse/help.std/problems.htm b/demos/dbbrowse/help.std/problems.htm
index a8014a0a8e..c15b8f2dd0 100644
--- a/demos/dbbrowse/help.std/problems.htm
+++ b/demos/dbbrowse/help.std/problems.htm
@@ -11,11 +11,11 @@
   <TH BGCOLOR=#CCFFFF><B>General</B></TH>
  </TR></TBODY></TABLE>
  <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :&nbsp;<IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;</B></TH><TH BGCOLOR=#FFFFE0><B>Only gcc 2.95 Compiler :<BR>Assurt failed in file ../../src/msw/fontutil.cpp at line 238: unknown font slant</B></TH></TR>
+  <TR><TH BGCOLOR=#FFFFAA><B>Problem :&nbsp;<IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;</B></TH><TH BGCOLOR=#FFFFE0><B>Only gcc 2.95 Compiler :<BR>Assert failed in file ../../src/msw/fontutil.cpp at line 238: unknown font slant</B></TH></TR>
   <TR><TH BGCOLOR=#CCFFCC><B>Solution :</B></TH><TH><B>unknown</B></TH></TR>
  </TR></TBODY></TABLE><P>
  <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :&nbsp;<IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;</B></TH><TH BGCOLOR=#FFFFE0><B>Only gcc 2.95 Compiler :<BR>Assurt failed in file ../../src/msw/fontutil.cpp at line 249: unknown font weight</B></TH></TR>
+  <TR><TH BGCOLOR=#FFFFAA><B>Problem :&nbsp;<IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;</B></TH><TH BGCOLOR=#FFFFE0><B>Only gcc 2.95 Compiler :<BR>Assert failed in file ../../src/msw/fontutil.cpp at line 249: unknown font weight</B></TH></TR>
   <TR><TH BGCOLOR=#CCFFCC><B>Solution :</B></TH><TH><B>unknown</B></TH></TR>
  </TR></TBODY></TABLE><P>
 <!----------------------------------------------------------------------------------------------------------->
@@ -44,7 +44,7 @@
 <!-------------------------------------->
  <TABLE BORDER=1><TBODY><TR>
   <TR><TH BGCOLOR=#FFFFAA><B>Problem :</B></TH><TH BGCOLOR=#FFFFE0><B>Why doesn't the Refresh-Button (F5) work?</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>solved :</B></TH><TH><B>unbekannt</B></TH></TR>
+  <TR><TH BGCOLOR=#CCFFCC><B>solved :</B></TH><TH><B>unknown</B></TH></TR>
  </TR></TBODY></TABLE><P>
 <!-------------------------------------->
  <TABLE BORDER=1><TBODY><TR>
diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt
index ce6b01c77a..168a270a2b 100644
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -1,10 +1,20 @@
+wxWindows 2.3 for GTK installation
+----------------------------------
 
-  !!! When sending bug reports tell us what version of wxWindows you are
-      using (including the beta) and what compiler on what system. One
-      example: wxGTK 2.3.0, egcs 1.1.1, Redhat 6.2 !!!
+IMPORTANT NOTE:
 
-* The most simple case
------------------------
+  If you experience problems installing, please re-read these
+  instructions and other related files (todo.txt, bugs.txt and
+  osname.txt for your platform if it exists) carefully before
+  mailing wxwin-users or the author. Preferably, try to fix the
+  problem first and then send a patch to the author.
+
+  When sending bug reports tell us what version of wxWindows you are
+  using (including the beta) and what compiler on what system. One
+  example: wxGTK 2.3.3, gcc 2.95.4, Redhat 6.2
+
+* The simplest case
+-------------------
 
 If you compile wxWindows on Linux for the first time and don't like to read
 install instructions just do (in the base dir):
@@ -64,8 +74,8 @@ cd buildgtkd
 make
 cd ..
 
-* The most simple errors
-------------------------
+* The simplest errors
+---------------------
 
 For any configure errors: please look at config.log file which was generated
 during configure run, it usually contains some useful information.
@@ -85,43 +95,44 @@ Solaris make. Other versions might work or not (any which don't have VPATH
 support definitely won't).
 
 You get errors during compilation: The reason is that you probably have a
-broken compiler, which includes a lot of old gcc versions. In particular, if
-you use gcc 2.8 you have to disable optimisation as the compiler will give up
-with an internal compiler error.
+broken compiler.  GCC 2.8 and earlier versions and egcs are likely to cause
+problems due to incomplete support for C++ and optimisation bugs.  Best to use
+GCC 2.95 or later.
 
 You get immediate segfault when starting any sample or application: This is
 either due to having compiled the library with different flags or options than
 your program - typically you might have the __WXDEBUG__ option set for the
-library but not for your program - or due to using a broken compiler (and its
-optimisation) such as gcc 2.8.
+library but not for your program - or due to using a compiler with optimisation
+bugs.
 
 Linker complains about missing PROIO_yy_flex_alloc and similar symbols: you
 probably have an old version of flex, 2.5.4 is recommended.
 
-* The most simple program
--------------------------
+* The simplest program
+----------------------
 
-Now create your super-application myfoo.app and compile anywhere with
+Now create your super-application myfoo.cpp and compile anywhere with
 
-gcc myfoo.cpp `wx-config --libs --cflags` -o myfoo
+g++ myfoo.cpp `wx-config --libs --cxxflags` -o myfoo
 
 * General
------------------------
+---------
 
-The Unix variants of wxWindows use GNU configure. If you have problems with your
-make use GNU make instead.
+The Unix variants of wxWindows use GNU configure. If you have problems with
+your make use GNU make instead.
 
 If you have general problems with installation, read my homepage at
 
-  http://wesley.informatik.uni-freiburg.de/~wxxt
+  http://wesley.informatik.uni-freiburg.de/~wxxt/
 
 for newest information. If you still don't have any success, please send a bug
 report to one of our mailing lists (see my homepage) INCLUDING A DESCRIPTION OF
-YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR VERSION OF GTK, WXGTK, WHAT DISTRIBUTION
-YOU USE AND WHAT ERROR WAS REPORTED. I know this has no effect, but I tried...
+YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR VERSION OF GTK, WXGTK, WHAT
+DISTRIBUTION YOU USE AND WHAT ERROR WAS REPORTED. I know this has no effect,
+but I tried...
 
 * GUI libraries
------------------------
+---------------
 
 wxWindows/GTK requires the GTK+ library to be installed on your system. It has
 to be a stable version, preferably version 1.2.10 (at least 1.2.3 is required,
@@ -135,15 +146,16 @@ We also mirror GTK+ at my ftp site. You'll find information about downloading
 at my homepage.
 
 * Additional libraries
------------------------
+----------------------
 
-wxWindows/Gtk requires a thread library and X libraries known to work with threads.
-This is the case on all commercial Unix-Variants and all Linux-Versions that are
-based on glibc 2 except RedHat 5.0 which is broken in many aspects. As of writing
-this, these Linux distributions have correct glibc 2 support:
+wxWindows/Gtk requires a thread library and X libraries known to work with
+threads.  This is the case on all commercial Unix-Variants and all
+Linux-Versions that are based on glibc 2 except RedHat 5.0 which is broken in
+many aspects. As of writing this, these Linux distributions have correct glibc
+2 support:
 
  - RedHat 5.1
- - Debian 2.0
+ - Debian 2.0 and 3.0
  - Stampede
  - DLD 6.0
  - SuSE 6.0
@@ -157,11 +169,8 @@ make install
 ldconfig
 exit
 
-NB: DO NOT COMPILE WXGTK WITH GCC 2.7 AND THREADS, SINCE ALL PROGRAMS WILL CRASH UPON
-START-UP! Just always use egcs and be happy.
-
 * Building wxGTK on OS/2
---------------------------
+------------------------
 
 Please send comments and question about the OS/2 installation
 to Andrea Venturoli <a.ventu@flashnet.it> and patches to
@@ -199,7 +208,7 @@ generate "lex.yy.c", you need to manually change the generated
 makefile.
 
 * Building wxGTK on SGI
---------------------------
+-----------------------
 
 Using the SGI native compilers, it is recommended that you
 also set CFLAGS and CXXFLAGS before running configure. These
@@ -217,7 +226,7 @@ untested).
 The SGI native compiler support has only been tested on Irix 6.5.
 
 * Create your configuration
------------------------------
+---------------------------
 
 Usage:
     ./configure options
@@ -226,8 +235,8 @@ If you want to use system's C and C++ compiler,
 set environment variables CC and CCC as
 
     % setenv CC cc
-    % setenv CCC CC
-    % ./configure options
+    % setenv CXX CC
+    % ./configure [options]
 
 to see all the options please use:
 
@@ -240,7 +249,7 @@ and Motif) simultaneously.
 
 
 * General options
--------------------
+-----------------
 
 Given below are the commands to change the default behaviour,
 i.e. if it says "--disable-threads" it means that threads
@@ -309,7 +318,7 @@ The following options handle the kind of library you want to build.
                             options.
 
 * Feature Options
--------------------
+-----------------
 
 When producing an executable that is linked statically with wxGTK
 you'll be surprised at its immense size. This can sometimes be
@@ -365,7 +374,7 @@ the program of its debugging information resulting in a significant
 reduction in size.
 
 * Compiling
--------------
+-----------
 
 The following must be done in the base directory (e.g. ~/wxGTK
 or ~/wxWin or whatever)
@@ -406,7 +415,7 @@ in the various directories will do the work for you.
 1) The first way uses the installed libraries and header files
 automatically using wx-config
 
-gcc myfoo.cpp `wx-config --cflags --libs` -o myfoo
+g++ myfoo.cpp `wx-config --cxxflags --libs` -o myfoo
 
 Using this way, a make file for the minimal sample would look
 like this
@@ -417,7 +426,7 @@ minimal: minimal.o
 	$(CC) -o minimal minimal.o `wx-config --libs`
 
 minimal.o: minimal.cpp mondrian.xpm
-	$(CC) `wx-config --cflags` -c minimal.cpp -o minimal.o
+	$(CC) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
 
 clean:
 	rm -f *.o minimal
diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt
index b398d599ea..7b954792f3 100644
--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -33,7 +33,7 @@ support, you need to configure
 ./configure --with-gtk --enable-gtk2 --enable-unicode
 etc.
 
-Sofar, support for GTK 2.0 has only been tested on
+So far, support for GTK 2.0 has only been tested on
 Linux with glibc 2.2.
 
 When you run into problems, please read the INSTALL.txt and 
diff --git a/docs/latex/book/chap_install.tex b/docs/latex/book/chap_install.tex
index 9db602c197..4c1a0071e6 100644
--- a/docs/latex/book/chap_install.tex
+++ b/docs/latex/book/chap_install.tex
@@ -10,7 +10,7 @@ at each major platform in turn.
 
 \section{Unix: GTK+ and Motif}\label{installunix}
 
-\subsection{The most simple case}
+\subsection{The simplest case}
 
 If you are compile wxWindows on Linux for the first time and don't like to read 
 install instructions, just do this in the base directory:
@@ -76,7 +76,7 @@ For building three versions (one for GTK+, one for Motif and a debug GTK+ versio
   cd ..
 \end{verbatim}
 
-\subsection{The most simple errors}
+\subsection{The simplest errors}
 
 \begin{itemize}\itemsep=0pt
 \item Configure reports, that you don't have GTK 1.2 installed although you are 
@@ -86,21 +86,23 @@ versions of glib (and its headers). Also, look for the PATH variable and check
 if it includes the path to the correct gtk-config! The check your LDPATH if it 
 points to the correct library. There is no way to compile wxGTK if configure 
 doesn't pass this test as all this test does is compile and link a GTK program.
-\item You get errors during compilation: The reason is that you probably have a broken 
-compiler, which includes almost everything that is called gcc. If you use gcc 2.8 
-you have to disable optimisation as the compiler will give up with an internal 
-compiler error.You get immediate segfault when starting any sample or application: This is either 
-due to having compiled the library with different flags or options than your program - 
-typically you might have the __WXDEBUG__ option set for the library but not for your 
-program - or due to using a broken compiler (and its optimisation) such as GCC 2.8.
+\item You get errors during compilation: The reason is that you probably have a
+broken compiler.  GCC 2.8 and earlier versions and egcs are likely to cause
+problems due to incomplete support for C++ and optimisation bugs.  Best to use
+GCC 2.95 or later.
+\item You get immediate segfault when starting any sample or application: This is
+either due to having compiled the library with different flags or options than
+your program - typically you might have the \_\_WXDEBUG\_\_ option set for the
+library but not for your program - or due to using a compiler with optimisation
+bugs.
 \end{itemize}
 
-\subsection{The most simple program}
+\subsection{The simplest program}
 
 Now create your super-application myfoo.app and compile anywhere with:
 
 \begin{verbatim}
-  gcc myfoo.cpp `wx-config --libs --cflags` -o myfoo
+  g++ myfoo.cpp `wx-config --libs --cxxflags` -o myfoo
 \end{verbatim}
 
 \wxheading{General}
@@ -135,7 +137,7 @@ this, these Linux distributions have correct glibc 2 support:
 
 \begin{itemize}\itemsep=0pt
 \item RedHat 5.1
-\item Debian 2.0
+\item Debian 2.0 and 3.0
 \item Stampede
 \item DLD 6.0
 \item SuSE 6.0
@@ -144,7 +146,7 @@ this, these Linux distributions have correct glibc 2 support:
 You can disable thread support by running 
 
 \begin{verbatim}
-./configure "--disable-threads"
+./configure --disable-threads
 make
 su <type root password>
 make install
@@ -424,24 +426,24 @@ in the various directories will do the work for you.
 
 \subsubsection{Creating a new Project}
 
-1) The first way uses the installed libraries and header files
+1\ket The first way uses the installed libraries and header files
 automatically using wx-config
 
 \begin{verbatim}
-gcc myfoo.cpp `wx-config --cflags --libs` -o myfoo
+g++ myfoo.cpp `wx-config --cxxflags --libs` -o myfoo
 \end{verbatim}
 
 Using this way, a make file for the minimal sample would look
 like this
 
 \begin{verbatim}
-CC = gcc
+CXX = g++
 
 minimal: minimal.o
-    $(CC) -o minimal minimal.o `wx-config --libs` 
+    $(CXX) -o minimal minimal.o `wx-config --libs` 
 
 minimal.o: minimal.cpp mondrian.xpm
-    $(CC) `wx-config --cflags` -c minimal.cpp -o minimal.o
+    $(CXX) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
 
 clean: 
 	rm -f *.o minimal
@@ -450,7 +452,7 @@ clean:
 This is certain to become the standard way unless we decide
 to stick to tmake.
 
-2) The other way creates a project within the source code 
+2\ket The other way creates a project within the source code 
 directories of wxWindows. For this endeavour, you'll need
 GNU autoconf version 2.14 and add an entry to your Makefile.in
 to the bottom of the configure.in script and run autoconf
diff --git a/docs/motif/aix.txt b/docs/motif/aix.txt
index b4bf78d231..50acc4237e 100644
--- a/docs/motif/aix.txt
+++ b/docs/motif/aix.txt
@@ -8,8 +8,8 @@ configure for the first time:
 
 For Bourne shell (sh, ksh, zsh, bash) users:
 
-	export CC=xlc
-	export CXX=xlC
+	CC=xlc ; export CC
+	CXX=xlC ; export CXX
 
 For C shell (csh, tcsh) users:
 
diff --git a/docs/motif/install.txt b/docs/motif/install.txt
index 788fca63bf..c0c3157acb 100644
--- a/docs/motif/install.txt
+++ b/docs/motif/install.txt
@@ -11,7 +11,7 @@ IMPORTANT NOTE:
   
   When sending bug reports tell us what version of wxWindows you are 
   using (including the beta) and what compiler on what system. One 
-  example: wxMotif 2.3.0, egcs 1.1.1, Redhat 5.0
+  example: wxMotif 2.3.3, gcc 2.95.4, Redhat 6.1
 
 First steps
 -----------
@@ -42,8 +42,8 @@ First steps
 COMPILING USING CONFIGURE
 =========================
 
-* The most simple case
------------------------
+* The simplest case
+-------------------
 
 If you compile wxWindows on Linux for the first time and don't like to read 
 install instructions just do (in the base dir):
@@ -78,10 +78,10 @@ such as for GTK and Motif, you can now build two complete libraries and use
 them concurrently. For this end, you have to create a directory for each build 
 of wxWindows - you may also want to create different versions of wxWindows
 and test them concurrently. Most typically, this would be a version configured 
-with --enable-debug_flag and one without. Note, that only one build can currently 
-be installed, so you'd have to use local version of the library for that purpose.
-For building three versions (one GTK, one Motif and a debug version of the GTK 
-source) you'd do this:
+with --enable-debug_flag and one without. Note, that only one build can
+currently be installed, so you'd have to use local version of the library for
+that purpose.  For building three versions (one GTK, one Motif and a debug
+version of the GTK source) you'd do this:
 
 md buildmotif
 cd buildmotif
@@ -101,45 +101,45 @@ cd buildgtkd
 make
 cd ..
 
-* The most simple errors
-------------------------
-
-You get errors during compilation: The reason is that you probably have a broken 
-compiler, which includes almost everything that is called gcc. If you use gcc 2.8 
-you have to disable optimisation as the compiler will give up with an internal 
-compiler error.
+* The simplest errors
+---------------------
 
-If there is just any way for you to use egcs, use egcs. We cannot fix gcc.
+You get errors during compilation: The reason is that you probably have a
+broken compiler.  GCC 2.8 and earlier versions and egcs are likely to cause
+problems due to incomplete support for C++ and optimisation bugs.  Best to use
+GCC 2.95 or later.
 
-You get immediate segfault when starting any sample or application: This is either 
-due to having compiled the library with different flags or options than your program - 
-typically you might have the __WXDEBUG__ option set for the library but not for your 
-program - or due to using a broken compiler (and its optimisation) such as GCC 2.8.
+You get immediate segfault when starting any sample or application: This is
+either due to having compiled the library with different flags or options than
+your program - typically you might have the __WXDEBUG__ option set for the
+library but not for your program - or due to using a compiler with optimisation
+bugs.
 
-* The most simple program
--------------------------
+* The simplest program
+----------------------
 
 Now create your super-application myfoo.app and compile anywhere with
 
-g++ myfoo.cpp `wx-config --libs --cflags` -o myfoo
+g++ myfoo.cpp `wx-config --libs --cxxflags` -o myfoo
 
 * General
------------------------
+---------
 
-The Unix variants of wxWindows use GNU configure. If you have problems with your 
-make use GNU make instead.
+The Unix variants of wxWindows use GNU configure. If you have problems with
+your make use GNU make instead.
 
-If you have general problems with installation, read my homepage at 
+If you have general problems with installation, see the wxWindows website at 
 
-  http://wesley.informatik.uni-freiburg.de/~wxxt
+  http://www.wxwindows.org/
   
 for newest information. If you still don't have any success, please send a bug 
 report to one of our mailing lists (see my homepage) INCLUDING A DESCRIPTION OF 
-YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR VERSION OF GTK, WXGTK, WHAT DISTRIBUTION 
-YOU USE AND WHAT ERROR WAS REPORTED. I know this has no effect, but I tried...
+YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR VERSION OF MOTIF, WXMOTIF, WHAT
+DISTRIBUTION YOU USE AND WHAT ERROR WAS REPORTED. I know this has no effect,
+but I tried...
 
 * GUI libraries
------------------------
+---------------
 
 wxWindows/Motif requires the Motif library to be installed on your system. As
 an alternative, you may also use the free library "lesstif" which implements
@@ -150,32 +150,30 @@ You can get the newest version of the Lesstif from the lesstif homepage at:
   http://www.lesstif.org
   
 * Additional libraries
------------------------
+----------------------
 
-wxWindows/Motif requires a thread library and X libraries known to work with threads. 
-This is the case on all commercial Unix-Variants and all Linux-Versions that are 
-based on glibc 2 except RedHat 5.0 which is broken in many aspects. As of writing 
-this, these Linux distributions have correct glibc 2 support:
+wxWindows/Motif requires a thread library and X libraries known to work with
+threads.  This is the case on all commercial Unix-Variants and all
+Linux-Versions that are based on glibc 2 except RedHat 5.0 which is broken in
+many aspects. As of writing this, these Linux distributions have correct glibc
+2 support:
 
  - RedHat 5.1
- - Debian 2.0
+ - Debian 2.0 and 3.0
  - Stampede
  - DLD 6.0
  - SuSE 6.0
  
 You can disable thread support by running 
 
-./configure "--disable-threads"
+./configure --disable-threads
 make
 su <type root password>
 make install
 ldconfig
 exit
   
-NB: DO NOT COMPILE WXGTK WITH GCC AND THREADS, SINCE ALL PROGRAMS WILL
-CRASH UPON START-UP! Just always use egcs and be happy.
-
-* Building wxGTK on OS/2
+* Building wxMotif on OS/2
 --------------------------
 
 Please send comments and question about the OS/2 installation
@@ -219,7 +217,7 @@ generate "lex.yy.c", you need to manually change the generated
 makefile.
 
 * Building wxMotif on SGI
---------------------------
+-------------------------
 
 Using the SGI native compilers, it is recommended that you
 also set CFLAGS and CXXFLAGS before running configure. These 
@@ -237,10 +235,10 @@ untested).
 The SGI native compiler support has only been tested on Irix 6.5.
 
 * Create your configuration
------------------------------
+---------------------------
 
 Usage:
-	./configure options
+	./configure [options]
 
 If you want to use system's C and C++ compiler,
 set environment variables CXX and CC as
@@ -280,8 +278,6 @@ in wxWindows snapshot 6, but not yet all (ODBC not).
 You have to add --with-motif on platforms, where Motif is
 not the default (on Linux, configure will default to GTK).
 
-        --without-gtk            Don't use the GIMP ToolKit (GTK)
-	
 	--with-motif             Use either Motif or Lesstif
 	                         Configure will look for both. 
 
@@ -339,7 +335,7 @@ The following options handle the kind of library you want to build.
 				options.
 
 * Feature Options
--------------------
+-----------------
 
 Many of the configure options have been thoroughly tested
 in wxWindows snapshot 6, but not yet all (ODBC not).
@@ -387,9 +383,9 @@ the program of its debugging information resulting in a significant
 reduction in size.
 
 * Compiling
--------------
+-----------
 
-The following must be done in the base directory (e.g. ~/wxGTK
+The following must be done in the base directory (e.g. ~/wxMotif
 or ~/wxWin or whatever)
 
 Now the makefiles are created (by configure) and you can compile 
@@ -423,12 +419,12 @@ object-files:
 in the various directories will do the work for you.
 
 * Creating a new Project
---------------------------
+------------------------
 
 1) The first way uses the installed libraries and header files
 automatically using wx-config
 
-g++ myfoo.cpp `wx-config --libs` `wx-config --cflags` -o myfoo
+g++ myfoo.cpp `wx-config --libs` `wx-config --cxxflags` -o myfoo
 
 Using this way, a make file for the minimal sample would look
 like this
@@ -439,7 +435,7 @@ minimal: minimal.o
     $(CXX) -o minimal minimal.o `wx-config --libs` 
 
 minimal.o: minimal.cpp mondrian.xpm
-    $(CXX) `wx-config --cflags` -c minimal.cpp -o minimal.o
+    $(CXX) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
 
 clean: 
 	rm -f *.o minimal
@@ -482,9 +478,9 @@ and configure before you can type make.
 Troubleshooting
 ---------------
 
-- Solaris compilation with gcc: if the compiler has problems with the variable argument
-  functions, try putting the gcc fixinclude file paths early in the include
-  path.
+- Solaris compilation with gcc: if the compiler has problems with the variable
+  argument functions, try putting the gcc fixinclude file paths early in the
+  include path.
 
 - If you operator-related compile errors or strange memory problems
   (for example in deletion of string arrays), set wxUSE_GLOBAL_MEMORY_OPERATORS
diff --git a/docs/x11/install.txt b/docs/x11/install.txt
index a8f2f93aab..5239306806 100644
--- a/docs/x11/install.txt
+++ b/docs/x11/install.txt
@@ -1,5 +1,5 @@
 wxWindows 2.3 for X11 installation
-------------------------------------
+----------------------------------
 
 IMPORTANT NOTE:
 
@@ -8,10 +8,10 @@ IMPORTANT NOTE:
   osname.txt for your platform if it exists) carefully before
   mailing wxwin-users or the author. Preferably, try to fix the
   problem first and then send a patch to the author.
-  
+
   When sending bug reports tell us what version of wxWindows you are 
   using (including the beta) and what compiler on what system. One 
-  example: wxX11 2.3.0, egcs 1.1.1, Redhat 5.0
+  example: wxX11 2.3.3, gcc 2.95.4, Redhat 6.2
 
 First steps
 -----------
@@ -37,8 +37,8 @@ First steps
 COMPILING USING CONFIGURE
 =========================
 
-* The most simple case
------------------------
+* The simplest case
+-------------------
 
 If you compile wxWindows on Linux for the first time and don't like to read 
 install instructions just do (in the base dir):
@@ -73,14 +73,16 @@ such as for GTK and X11, you can now build two complete libraries and use
 them concurrently. For this end, you have to create a directory for each build 
 of wxWindows - you may also want to create different versions of wxWindows
 and test them concurrently. Most typically, this would be a version configured 
-with --enable-debug_flag and one without. Note, that only one build can currently 
-be installed, so you'd have to use local version of the library for that purpose.
+with --enable-debug_flag and one without. Note, that only one build can
+currently be installed, so you'd have to use local version of the library for
+that purpose.
+
 For building three versions (one GTK, one X11 and a debug version of the GTK 
 source) you'd do this:
 
 md buildx11
 cd buildx11
-../configure --with-x11 --with-universal
+../configure --with-x11
 make
 cd ..
 
@@ -96,91 +98,81 @@ cd buildgtkd
 make
 cd ..
 
-* The most simple errors
-------------------------
-
-You get errors during compilation: The reason is that you probably have a broken 
-compiler, which includes almost everything that is called gcc. If you use gcc 2.8 
-you have to disable optimisation as the compiler will give up with an internal 
-compiler error.
+* The simplest errors
+---------------------
 
-If there is just any way for you to use egcs, use egcs. We cannot fix gcc.
+You get errors during compilation: The reason is that you probably have a
+broken compiler.  GCC 2.8 and earlier versions and egcs are likely to cause
+problems due to incomplete support for C++ and optimisation bugs.  Best to use
+GCC 2.95 or later.
 
-You get immediate segfault when starting any sample or application: This is either 
-due to having compiled the library with different flags or options than your program - 
-typically you might have the __WXDEBUG__ option set for the library but not for your 
-program - or due to using a broken compiler (and its optimisation) such as GCC 2.8.
+You get immediate segfault when starting any sample or application: This is
+either due to having compiled the library with different flags or options than
+your program - typically you might have the __WXDEBUG__ option set for the
+library but not for your program - or due to using a compiler with optimisation
+bugs.
 
-* The most simple program
--------------------------
+* The simplest program
+----------------------
 
-Now create your super-application myfoo.app and compile anywhere with
+Now create your super-application myfoo.cpp and compile anywhere with
 
-g++ myfoo.cpp `wx-config --libs --cflags` -o myfoo
+g++ myfoo.cpp `wx-config --libs --cxxflags` -o myfoo
 
 * General
------------------------
+---------
 
-The Unix variants of wxWindows use GNU configure. If you have problems with your 
-make use GNU make instead.
+The Unix variants of wxWindows use GNU configure. If you have problems with
+your make use GNU make instead.
 
-If you have general problems with installation, read my homepage at 
+If you have general problems with installation, see the wxWindows website at 
 
-  http://wesley.informatik.uni-freiburg.de/~wxxt
+  http://www.wxwindows.org/
   
 for newest information. If you still don't have any success, please send a bug 
 report to one of our mailing lists (see my homepage) INCLUDING A DESCRIPTION OF 
-YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR VERSION OF GTK, WXGTK, WHAT DISTRIBUTION 
+YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR VERSION OF X, WHAT DISTRIBUTION 
 YOU USE AND WHAT ERROR WAS REPORTED. I know this has no effect, but I tried...
 
 * GUI libraries
------------------------
-
-wxWindows/X11 requires the X11 library to be installed on your system. As
-an alternative, you may also use the free library "lesstif" which implements
-most of the X11 API without the licence restrictions of X11.
-
-You can get the newest version of the Lesstif from the lesstif homepage at:
+---------------
 
-  http://www.lesstif.org
+wxWindows/X11 requires the X11 library to be installed on your system.
   
 * Additional libraries
------------------------
+----------------------
 
-wxWindows/X11 requires a thread library and X libraries known to work with threads. 
-This is the case on all commercial Unix-Variants and all Linux-Versions that are 
-based on glibc 2 except RedHat 5.0 which is broken in many aspects. As of writing 
-this, these Linux distributions have correct glibc 2 support:
+wxWindows/X11 requires a thread library and X libraries known to work with
+threads.  This is the case on all commercial Unix-Variants and all
+Linux-Versions that are based on glibc 2 except RedHat 5.0 which is broken in
+many aspects. As of writing this, these Linux distributions have correct glibc
+2 support:
 
  - RedHat 5.1
- - Debian 2.0
+ - Debian 2.0 and 3.0
  - Stampede
  - DLD 6.0
  - SuSE 6.0
  
 You can disable thread support by running 
 
-./configure "--disable-threads"
+./configure --disable-threads
 make
 su <type root password>
 make install
 ldconfig
 exit
   
-NB: DO NOT COMPILE WXGTK WITH GCC AND THREADS, SINCE ALL PROGRAMS WILL
-CRASH UPON START-UP! Just always use egcs and be happy.
-
-* Building wxGTK on OS/2
---------------------------
+* Building wxX11 on OS/2
+------------------------
 
 Please send comments and question about the OS/2 installation
 to Andrea Venturoli <a.ventu@flashnet.it> and patches to
 the wxWindows mailing list.
 
 You'll need OS/2 Warp (4.00FP#6), X-Free86/2 (3.3.3 or newer), 
-Lesstif (0.89.1 or newer), emx (0.9d fix 1), flex (2.5.4),
-yacc (1.8), unix like shell, e.g. korn shell (5.2.13),
-Autoconf (2.13),  GNU file utilities (3.6),
+emx (0.9d fix 1), flex (2.5.4), yacc (1.8), unix like shell,
+e.g. korn shell (5.2.13), Autoconf (2.13),  GNU file utilities (3.6),
 GNU text utilities (1.3), GNU shell utilites (1.12), m4 (1.4), 
 sed (2.05), grep (2.0), Awk (3.0.3), GNU Make (3.76.1).
 
@@ -200,7 +192,7 @@ versions of the configure scripts. Now run
     configure --with-x11
 as described above.
 
-To verify Lesstif installation, configure will try to compile a
+To verify X11 installation, configure will try to compile a
 sample program that requires X headers/libraries to be either
 available via C_INCLUDE_PATH and LIBRARY_PATH or you need to
 explicitly set CFLAGS prior to running configure.
@@ -214,7 +206,7 @@ generate "lex.yy.c", you need to manually change the generated
 makefile.
 
 * Building wxX11 on SGI
---------------------------
+-----------------------
 
 Using the SGI native compilers, it is recommended that you
 also set CFLAGS and CXXFLAGS before running configure. These 
@@ -232,17 +224,17 @@ untested).
 The SGI native compiler support has only been tested on Irix 6.5.
 
 * Create your configuration
------------------------------
+---------------------------
 
 Usage:
-	./configure options
+	./configure [options]
 
 If you want to use system's C and C++ compiler,
 set environment variables CXX and CC as
 
 	% setenv CC cc
 	% setenv CXX CC
-	% ./configure options
+	% ./configure [options]
 
 to see all the options please use:
 
@@ -263,23 +255,16 @@ not been defined. And Make in some circumstances as well...
 
 
 * General options
--------------------
+-----------------
 
 Given below are the commands to change the default behaviour,
 i.e. if it says "--disable-threads" it means that threads
 are enabled by default.
 
-Many of the configure options have been thoroughly tested
-in wxWindows snapshot 6, but not yet all (ODBC not).
-
 You have to add --with-x11 on platforms, where X11 is
 not the default (on Linux, configure will default to GTK).
 
-    --without-gtk            Don't use the GIMP ToolKit (GTK).
-	
-	--with-x11               Use X11.
-
-	--with-universal         Needs to be specified with X11.
+	--with-x11              Use X11.
 
 The following options handle the kind of library you want to build.
 
@@ -335,12 +320,12 @@ The following options handle the kind of library you want to build.
 				options.
 
 * Feature Options
--------------------
+-----------------
 
 Many of the configure options have been thoroughly tested
 in wxWindows snapshot 6, but not yet all (ODBC not).
 
-When producing an executable that is linked statically with wxGTK
+When producing an executable that is linked statically with wxX11
 you'll be surprised at its immense size. This can sometimes be
 drastically reduced by removing features from wxWindows that 
 are not used in your program. The most relevant such features
@@ -383,10 +368,10 @@ the program of its debugging information resulting in a significant
 reduction in size.
 
 * Compiling
--------------
+-----------
 
-The following must be done in the base directory (e.g. ~/wxGTK
-or ~/wxWin or whatever)
+The following must be done in the base directory (e.g. ~/wxX11
+or whatever)
 
 Now the makefiles are created (by configure) and you can compile 
 the library by typing:
@@ -414,17 +399,17 @@ You can remove any traces of wxWindows by typing
 If you want to save disk space by removing unnecessary
 object-files:
 
-	 make clean
+	make clean
 
 in the various directories will do the work for you.
 
 * Creating a new Project
---------------------------
+------------------------
 
 1) The first way uses the installed libraries and header files
 automatically using wx-config
 
-g++ myfoo.cpp `wx-config --libs` `wx-config --cflags` -o myfoo
+g++ myfoo.cpp `wx-config --libs` `wx-config --cxxflags` -o myfoo
 
 Using this way, a make file for the minimal sample would look
 like this
@@ -435,7 +420,7 @@ minimal: minimal.o
     $(CXX) -o minimal minimal.o `wx-config --libs` 
 
 minimal.o: minimal.cpp mondrian.xpm
-    $(CXX) `wx-config --cflags` -c minimal.cpp -o minimal.o
+    $(CXX) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
 
 clean: 
 	rm -f *.o minimal
@@ -450,7 +435,7 @@ to the bottom of the configure.in script and run autoconf
 and configure before you can type make.
 
 * Further notes by Julian Smart
----------------------------------
+-------------------------------
 
 - You may find the following script useful for compiling wxX11,
   especially if installing from zips (which don't preserve file
@@ -468,7 +453,7 @@ and configure before you can type make.
   # anyhow
   # -- Julian Smart
   chmod a+x configure config.sub config.guess
-  ./configure --with-shared --with-x11 --with-universal --without-gtk --with-debug_flag --with-debug_info --enable-debug --without-threads --without-sockets --without-odbc
+  ./configure --with-x11 --with-shared --with-debug_flag --with-debug_info --enable-debug --without-threads --without-sockets --without-odbc
   make
   -------:x-----Cut here-----:x-----
 
@@ -478,9 +463,9 @@ and configure before you can type make.
 Troubleshooting
 ---------------
 
-- Solaris compilation with gcc: if the compiler has problems with the variable argument
-  functions, try putting the gcc fixinclude file paths early in the include
-  path.
+- Solaris compilation with gcc: if the compiler has problems with the variable
+  argument functions, try putting the gcc fixinclude file paths early in the
+  include path.
 
 - If you operator-related compile errors or strange memory problems
   (for example in deletion of string arrays), set wxUSE_GLOBAL_MEMORY_OPERATORS
@@ -501,7 +486,7 @@ Other Notes
   recommended to use --with-debug_info and --with-debug_flag configure
   switches while developing your application. To compile in non-debug
   mode, remove the -D__WXDEBUG__ switch in make.env (or if using the
-  configure system, change --with-debug_flag to --without_debug_flag
+  configure system, change --with-debug_flag to --without-debug_flag
   and --with-debug_info to --without-debug_info in the makewxx11
   script).
 
diff --git a/docs/x11/readme.txt b/docs/x11/readme.txt
index 8f728dc987..4e8f155377 100644
--- a/docs/x11/readme.txt
+++ b/docs/x11/readme.txt
@@ -16,7 +16,7 @@ Information on how to install can be found in the file
 install.txt, but if you cannot wait, this should work on
 many systems:
 
-./configure --with-x11 --disable-shared --with-x11 --with-debug_flag --enable-log --with-debug_info --enable-debug --without-threads --without-sockets -without-odbc -with-libjpeg --enable-debug_cntxt --disable-no_rtti"
+./configure --with-x11 --disable-shared --enable-log --enable-debug -without-odbc --enable-debug_cntxt
 
 make
 su <type root password>
@@ -28,10 +28,9 @@ When you run into problems, please read the install.txt and
 follow those instructions. If you still don't have any success,
 please send a bug report to one of our mailing lists (see
 the wxWindows homepage) INCLUDING A DESCRIPTION OF YOUR SYSTEM AND
-YOUR PROBLEM, SUCH AS YOUR VERSION OF MOTIF, WXMOTIF, WHAT
-DISTRIBUTION YOU USE AND WHAT ERROR WAS REPORTED.
-Alternatively, you may also use the bug reporting system
-linked from the wxWindows web page.
+YOUR PROBLEM, SUCH AS YOUR VERSION OF X, WHAT DISTRIBUTION YOU USE
+AND WHAT ERROR WAS REPORTED. Alternatively, you may also use the bug
+reporting system linked from the wxWindows web page.
 
 The library produced by the install process will be called 
 libwx_x11univ[d].a (static) and libwx_x11univ[d]-2.3.so.0.0.0
@@ -63,8 +62,7 @@ Some remaining issues:
 - wxToggleButton implementation missing
 - wxSpinCtrl implementation missing
 - tooltips implementation missing
-- code common to the Motif and X11 ports needs to be
-  merged
+- code common to the Motif and X11 ports needs to be merged
 - need thread safety in event loop
 
   Regards,
-- 
2.50.0

