Win32 package includes GTK; the runtime is no longer needed.

3 files changed, 23 insertions, 14 deletions

diff --git a/doc/manual/2_Installation.md b/doc/manual/2_Installation.md
index 8d6fc710..348e3a8e 100644
--- a/doc/manual/2_Installation.md
+++ b/doc/manual/2_Installation.md
@@ -3,8 +3,15 @@
 ## Requirements

 

 In its bid for minimalism, Textadept also needs very little to run. In fact, the

-only thing it needs is [GTK+ 2.0][GTK2] >= 2.16. Textadept has it's own version

-of Lua compiled in.

+only thing it needs is [GTK+ 2.0][GTK2] >= 2.16 on Linux systems. GTK is already

+included in Windows and Mac OSX packages. Textadept also has it's own version of

+Lua.

+

+Note: for Win32 and Mac OSX, more than 3/4 of the download and unpackaged

+application sizes are due to GTK, the cross-platform GUI toolkit Textadept uses.

+Textadept itself is much smaller.

+

+[GTK2]: http://gtk.org

 

 #### Linux

 

@@ -12,7 +19,6 @@ Most Linux systems already have GTK+ installed. If not, it is probably available
 through your package manager. Otherwise, compile and install it from the

 [GTK+ website][GTK-Linux].

 

-[GTK2]: http://gtk.org

 [GTK-Linux]: http://www.gtk.org/download-linux.html

 

 #### Mac OSX

@@ -26,7 +32,8 @@ Note that Textadept is designed for Intel Leopard+ Macs.
 

 #### Windows

 

-Windows systems need the [GTK+ 2.0 Runtime][GTK-Runtime] installed.

+Prior to 3.5, the [GTK+ 2.0 Runtime][GTK-Runtime] was needed. Newer versions are

+all-inclusive and do not require anything.

 

 [GTK-Runtime]: http://sourceforge.net/projects/gtk-win/

 

diff --git a/doc/manual/3_Compiling.md b/doc/manual/3_Compiling.md
index b3461042..ed007d61 100644
--- a/doc/manual/3_Compiling.md
+++ b/doc/manual/3_Compiling.md
@@ -21,13 +21,12 @@ distribution through its package manager.
 
 Compiling Textadept on Windows is no longer supported. If you wish to do so
 however, you will need a C compiler that supports the C99 standard (Microsoft's
-does not) and the [GTK+ for Windows bundle][GTK-Win32] and win_iconv libraries.
+does not) and the [GTK+ for Windows bundle][GTK-Win32] (2.16 is recommended).
 
 The preferred way to compile for Windows is cross-compiling from Linux. To do
-so, in addition to the GTK+ development libraries mentioned above, you will need
-[MinGW][MinGW] with the Windows header files and the Windows [bundle][GTK-Win32]
-along with win_iconv. The former should be available from your package manager.
-The latter you will have to download manually.
+so, in addition to the GTK bundle mentioned above, you will need [MinGW][MinGW]
+with the Windows header files. They should be available from your package
+manager.
 
 [GTK-Win32]: http://www.gtk.org/download-windows.html
 [MinGW]: http://mingw.org
@@ -59,11 +58,9 @@ BSD users please run `make BSD=1`.
 #### Windows (Cross-Compiling from Linux)
 
 When cross-compiling from within Linux, first unzip the GTK+ for Windows bundle
-into a new `src/win32gtk` directory. Then rename all the
-`src/win32gtk/lib/*.dll.a` files to `src/win32/gtk/lib/*.a`, removing the `.dll`
-part of the filename. Finally, modify the `CC`, `CPP`, and `WINDRES` variables
-in the `WIN32` block of `src/Makefile` to match your MinGW installation and run
-`make WIN32=1` to build `../textadept.exe`.
+into a new `src/win32gtk` directory. Then modify the `CC`, `CPP`, and `WINDRES`
+variables in the `WIN32` block of `src/Makefile` to match your MinGW
+installation and run `make WIN32=1` to build `../textadept.exe`.
 
 #### Mac OSX
 
diff --git a/doc/manual/5_FolderStructure.md b/doc/manual/5_FolderStructure.md
index 4fc2f8d3..10fc0d90 100644
--- a/doc/manual/5_FolderStructure.md
+++ b/doc/manual/5_FolderStructure.md
@@ -32,3 +32,8 @@ In Linux and Mac OSX, your home directory is the location specified by the
 `HOME` environment variable (typically `/home/username` and `/Users/username`
 respectively). In Windows, it is the `USERPROFILE` environment variable. This
 directory will be denoted as `~/.textadept` from now on in the manual.
+
+## GTK
+
+The `etc/`, `lib/`, and `share/` directories are used by GTK and only appear in
+the Win32 and Mac OSX packages.