Fix version numbers. (Johan Dahlin.)

Fri Mar  8 11:12:32 2002  Owen Taylor  <otaylor@redhat.com>

        * NEWS: Fix version numbers. (Johan Dahlin.)

        * INSTALL.in: Update, just refer to gtk-building.html
        rather than duplicating information.

        * README.in: Add release specific notes.

        * Makefile.am (EXTRA_DIST): Remove TODO and TODO.xml
        from the distribution.

11 files changed, 211 insertions, 188 deletions

diff --git a/ChangeLog b/ChangeLog
index 6bbb3c6f5..c60f68b57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Fri Mar  8 11:12:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* NEWS: Fix version numbers. (Johan Dahlin.)
+
+	* INSTALL.in: Update, just refer to gtk-building.html
+	rather than duplicating information.
+
+	* README.in: Add release specific notes.
+
+	* Makefile.am (EXTRA_DIST): Remove TODO and TODO.xml
+	from the distribution.
+
 Thu Mar  7 23:29:35 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* NEWS: Final updates for 2.0.0
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 6bbb3c6f5..c60f68b57 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,15 @@
+Fri Mar  8 11:12:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* NEWS: Fix version numbers. (Johan Dahlin.)
+
+	* INSTALL.in: Update, just refer to gtk-building.html
+	rather than duplicating information.
+
+	* README.in: Add release specific notes.
+
+	* Makefile.am (EXTRA_DIST): Remove TODO and TODO.xml
+	from the distribution.
+
 Thu Mar  7 23:29:35 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* NEWS: Final updates for 2.0.0
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6bbb3c6f5..c60f68b57 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+Fri Mar  8 11:12:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* NEWS: Fix version numbers. (Johan Dahlin.)
+
+	* INSTALL.in: Update, just refer to gtk-building.html
+	rather than duplicating information.
+
+	* README.in: Add release specific notes.
+
+	* Makefile.am (EXTRA_DIST): Remove TODO and TODO.xml
+	from the distribution.
+
 Thu Mar  7 23:29:35 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* NEWS: Final updates for 2.0.0
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6bbb3c6f5..c60f68b57 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,15 @@
+Fri Mar  8 11:12:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* NEWS: Fix version numbers. (Johan Dahlin.)
+
+	* INSTALL.in: Update, just refer to gtk-building.html
+	rather than duplicating information.
+
+	* README.in: Add release specific notes.
+
+	* Makefile.am (EXTRA_DIST): Remove TODO and TODO.xml
+	from the distribution.
+
 Thu Mar  7 23:29:35 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* NEWS: Final updates for 2.0.0
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6bbb3c6f5..c60f68b57 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+Fri Mar  8 11:12:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* NEWS: Fix version numbers. (Johan Dahlin.)
+
+	* INSTALL.in: Update, just refer to gtk-building.html
+	rather than duplicating information.
+
+	* README.in: Add release specific notes.
+
+	* Makefile.am (EXTRA_DIST): Remove TODO and TODO.xml
+	from the distribution.
+
 Thu Mar  7 23:29:35 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* NEWS: Final updates for 2.0.0
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6bbb3c6f5..c60f68b57 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+Fri Mar  8 11:12:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* NEWS: Fix version numbers. (Johan Dahlin.)
+
+	* INSTALL.in: Update, just refer to gtk-building.html
+	rather than duplicating information.
+
+	* README.in: Add release specific notes.
+
+	* Makefile.am (EXTRA_DIST): Remove TODO and TODO.xml
+	from the distribution.
+
 Thu Mar  7 23:29:35 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* NEWS: Final updates for 2.0.0
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6bbb3c6f5..c60f68b57 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+Fri Mar  8 11:12:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* NEWS: Fix version numbers. (Johan Dahlin.)
+
+	* INSTALL.in: Update, just refer to gtk-building.html
+	rather than duplicating information.
+
+	* README.in: Add release specific notes.
+
+	* Makefile.am (EXTRA_DIST): Remove TODO and TODO.xml
+	from the distribution.
+
 Thu Mar  7 23:29:35 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* NEWS: Final updates for 2.0.0
diff --git a/INSTALL.in b/INSTALL.in
index 6992b0d70..321315afb 100644
--- a/INSTALL.in
+++ b/INSTALL.in
@@ -3,7 +3,7 @@ Prerequisites
 
 GTK+ requires the following packages:
 
- - The GLIB, Pango, and Atk libraries, available at the same location as GTK+
+ - The GLib, Pango, and Atk libraries, available at the same location as GTK+
 
  - The TIFF, PNG, and JPEG image loading libraries. You most
    likely have these installed on your system already. If not
@@ -27,160 +27,15 @@ Simple install procedure
   [ Become root if necessary ]
   % make install			   # install GTK
 
-The Nitty-Gritty
-================
+The Details
+===========
 
-The 'configure' script can be given a number of options to enable
-and disable various features. For a complete list, type:
+Complete information about installing GTK+ and related libraries can be found 
+in the file:
 
-  ./configure --help
+ docs/reference/gtk/docs/reference/gtk/html/gtk-building.html
 
-A few of the more important ones:
-
-*  --prefix=PREFIX         install architecture-independent files in PREFIX
-                           [ Defaults to /usr/local ]
-
-*  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                           [ Defaults to the value given to --prefix ]
-
-*  --with-xinput=[no/gxi/xfree] support XInput [default=no]
-
-The --with-xinput flag specifies whether to compile with support
-for the XInput extension (mainly used for graphics tablets), and
-which form of support to use:
-
-  no    : no support 
-  xfree : Use special features in the Wacom drivers in XFree86 3.3.1
-          and later.
-  gxi   : Use generic XInput support (not recommended)
-
-The XInput support is not known to work with any other XServer than
-XFree86. For more information about XInput, see:
-
- http://www.gtk.org/~otaylor/xinput/howto/index.html
- http://www.lepied.com/xfree86/
-
-*  --disable-nls           do not use Native Language Support
-
-If this flag is not specified, GTK+ will try to find
-and use the gettext() set of functions to provide translations
-of the strings in the standard dialogs into the
-user's native language.
-
-*  --enable-xim            support XIM [default=yes]
-
-Specifying --disable-xim will disable support for entering
-internationalized text using X Input Methods. This will give some
-slight savings in speed and memory use and might be necessary
-with older versions of X.
-
-*  --with-locale=LOCALE    locale name you want to use
-
-The --with-locale options is used to determine if your operating
-system has support for the locale you will be using. If not, X's
-built in locale support will be used.
-
-Because of bugs in autoconf, it is necessary to specify this
-option even if your LANG environment variable is correctly set.
-
-This option does not determine which locale GTK will use at
-runtime. That will be determined from the usual environment
-variables.  If you will be using multiple locales with GTK,
-specify the one for which your operating system has the worst
-support for the --with-locale option.
-
-
-Options can be given to the compiler and linker by setting
-environment variables before running configure. A few of the more
-important ones:
-
- CC       : The C compiler to use
- CPPFLAGS : Flags for the C preprocesser such as -I and -D
- CFLAGS   : C compiler flags
-
-The most important use of this is to set the
-optimization/debugging flags. For instance, to compile with no
-debugging information at all, run configure as:
-
- CFLAGS=-O2 ./configure           # Bourne compatible shells (sh/bash/zsh)
-
-or,
-
- setenv CFLAGS -O2 ; ./configure  # csh and variants
-
-Native-Language Support and gettext()
-=====================================
-
-To provide native-language support (NLS) GTK+ uses the
-gettext() set of functions. These functions are found
-in the C library on many systems, such as the Solaris
-C library and the GNU C Library, version 2.
-
-If your C library does not provide the necessary functionality,
-you may wish to install the GNU gettext package. You'll
-need version 0.10.35 or better. Version 0.10.35 is
-available from ftp://alpha.gnu.org/pub/gnu
-
-Generally, GTK+ will properly detect what is installed
-on your system and enable or disable NLS as appropriate.
-However, in rare cases, it may be necessary to disable
-NLS manually to get GTK+ to compile. You can do this
-by specifying the --disable-nls flag when configuring
-GTK+.
-
-Installation directories
-========================
-
-The location of the installed files is determined by the --prefix
-and --exec-prefix options given to configure. There are also more
-detailed flags to control individual directories. However, the
-use of these flags is not tested.
-
-One particular detail to note, is that the architecture-dependent
-include file glibconfig.h is installed in:
-
-  $exec_pref/lib/glib/include/
-
-if you have a version in $prefix/include, this is out of date
-and should be deleted.
-
-A shell script gtk-config is created during the configure
-process, and installed in the bin/ directory
-($exec_prefix/bin). This is used to determine the location of GTK
-when building applications.  If you move GTK after installation,
-it will be necessary to edit this file.
-
-For complete details, see the file docs/gtk-config.txt
-
-
-Notes for using XIM support for Japanese input
-==============================================
-
-* There is a bug in older versions of kinput2 that will cause GTK+
-to hang when destroying a text entry. The latest versions of
-kinput is available from:
-
-  ftp://ftp.sra.co.jp/pub/x11/kinput2
-
-* The locale information file for the ja_JP EUC locale
-distributed with some recent versions of X11 specifies to use the
-C library multibyte functions. Unless your C library has support
-for Japanese locales, this is incorrect, and will cause problems
-for GTK's internationalization.
-
-(In particular, this occurs with GNU libc 2.0 in which
-the multibyte functions always translate to and from UTF-8; but
-the problem may occur for other C libraries, and other operating
-systems as well.)
-
-To fix this, change the line:
-
-use_stdc_env		True
-
-to 
-
-use_stdc_env		False
-
-in the file /usr/X11R6/lib/X11/locale/ja_JP/XLC_LOCALE.
+Or online at:
 
+ http://developer.gnome.org/doc/API/2.0/gtk/gtk-building.html
 
diff --git a/Makefile.am b/Makefile.am
index abf413f6c..421257277 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,8 +10,6 @@ EXTRA_DIST =			\
 	HACKING			\
 	gtk+.spec.in		\
 	makecopyright		\
-	TODO			\
-	TODO.xml		\
 	NEWS.pre-1-0		\
 	ChangeLog.pre-1-0	\
 	ChangeLog.pre-1-2	\
diff --git a/NEWS b/NEWS
index 2ce34ccad..36a02a361 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,11 @@
-Overview of Changes in GTK+ 1.0.0
+Overview of Changes in GTK+ 2.0.0
 =================================
 
 * GtkTreeView fixes [Jonathan Blandford, Kristian Rietveld, Darin Adler]
 * Build fixes [Anders Carlsson, Tor Lillqvist, Manish Singh]
 * Bug fixes. [Thomas Leonard, Owen Taylor]
 
-Overview of Changes in GTK+ 1.0.0 rc1
+Overview of Changes in GTK+ 2.0.0 rc1
 =====================================
 
 * GtkTreeView fixes [Kristian Rietveld, Jonathan Blandford, Richard Hult]
diff --git a/README.in b/README.in
index bbf7cc036..ef5bc45e3 100644
--- a/README.in
+++ b/README.in
@@ -1,15 +1,15 @@
 General Information
 ===================
 
-This is GTK+ version @GTK_VERSION@. GTK+ is a multi-platform toolkit
-for creating graphical user interfaces. Offering a complete set of
-widgets, GTK+ is suitable for projects ranging from small one-off
-projects to complete application suites.
+This is GTK+ version @GTK_VERSION@. GTK+ is a multi-platform toolkit for
+creating graphical user interfaces. Offering a complete set of widgets,
+GTK+ is suitable for projects ranging from small one-off projects to
+complete application suites.
 
 GTK+ is free software and part of the GNU Project. However, the
 licensing terms for GTK+, the GNU LGPL, allow it to be used by all
-developers, including those developing proprietary software, without
-any license fees or royalties.
+developers, including those developing proprietary software, without any
+license fees or royalties.
 
 The official ftp site is:
   ftp://ftp.gtk.org/pub/gtk
@@ -25,12 +25,100 @@ Installation
 
 See the file 'INSTALL'
 
+GTK+-2.0.0 Specific Notes
+=========================
+
+* The default configuration of GTK+ has been stream-lined to reduce
+  confusion on the part of new users or users coming from other
+  environments.  Users used to older versions of GTK+ may want to make
+  some adjustments to the default configuration.
+
+   - Emacs keybindings such as Control-A and Control-E to move to the
+     ends of lines are not enabled by default in the editing widgets. To
+     turn on Emacs keybindings, add the line:
+
+      gtk-key-theme-name = "Emacs"
+   
+     To your ~/.gtkrc-2.0
+
+   - Editing of menu accelerators by pressing an accelerator over the
+     menu item is disabled by default. To enable, it, add:
+
+      gtk-can-change-accels = 1
+
+     to your ~/.gtkrc-2.0
+
+   - To improve useability for keyboard operation, GTK+ now selects the
+     contents of an entry when tabbing into it or when it is focused on
+     initial window map. To disable this behavior, add:
+
+      gtk-entry-select-on-focus = 0
+ 
+     to your ~/.gtkrc-2.0
+
+* The GTK+ libraries use an '_' prefix to indicate private symbols that
+  must not be used by applications. The intention was not to export
+  symbols beginning with prefixes such as _gtk, _gdk, and _pango from
+  the libraries at all, but due to a bug in libtool, they are actually
+  exported at the moment on some platforms (including Linux). 
+  Applications that use these private symbols _will_ break when
+  this bug is fixed.
+
+* The Xft library that GTK+ uses to display anti-aliased fonts will
+  undergo a major version revision in the next few months. To deal with
+  this, by default, GTK+ and Pango are built so that applications will
+  not have explicit dependencies on version 1 on Xft. To make sure that
+  your application will be binary compatible with future versions of
+  GTK+:
+
+    - Do not configure Pango or GTK+ with the --enable-static or
+      --enable-explicit otions, since they will cause dependencies on
+      Xft version 1.
+
+    - Do not use Xft directly in your applicatons.
+
+* There is a bug in the Xft library in XFree86-4.1 and possibly previous
+  versions that causes random crashes when using the Pango Xft
+  backend. If you want to use Xft fonts, you should upgrade to
+  XFree86-4.2.
+
+* Xft support is not on by default. To turn it on set the environment
+  variable GDK_USE_XFT to '1'
+
+   GDK_USE_XFT=1
+   export GDK_USE_XFT
+
+* The gdk_pixbuf_xlib library included in the contrib/ directory of GTK+
+  is provided on a as-is basis and has not been tested at all. No
+  guarantees about the degree of workingness or about future
+  compatibility are provided.
+
+* There are known problems with some of the image loaders in the
+  gdk-pixbuf library included in GTK+ where corrupted images can cause
+  crashes and conceivably worse problems. Until these problems are fixed
+  (we hope to have this done for 2.0.1), gdk-pixbuf should not be used
+  to load untrusted data.
+
+* The assumption of GLib and GTK+ by default is that filenames on the
+  filesystem are encoded in UTF-8 rather than the encoding of the locale;
+  The GTK+ developers consider that having filenames whose interpretation
+  depends on the current locale is fundamentally a bad idea.
+
+  If you have filenames encoded in the encoding of your locale, then
+  you may want to set the G_BROKEN_FILENAMES environment variable:
+  
+   G_BROKEN_FILENAMES=1
+   export G_BROKEN_FILENAMES
+
+  Best integration of GTK+-2.0 with the environment is achieved by 
+  using a UTF-8 locale.
+
 How to report bugs
 ==================
 
-Bugs should be reported to the GNOME bug tracking system. 
-(http://bugzilla.gnome.org, product gtk+.) You will need
-to create an account for yourself.
+Bugs should be reported to the GNOME bug tracking system.
+(http://bugzilla.gnome.org, product gtk+.) You will need to create an
+account for yourself.
   
 In the bug report please include:
   
@@ -44,34 +132,32 @@ In the bug report please include:
 
 * How to reproduce the bug. 
 
-  If you can reproduce it with the testgtk program that is built 
-  in the gtk/ subdirectory, that will be most convenient.  Otherwise, 
-  please include a short test program that exhibits the behavior. 
-  As a last resort, you can also provide a pointer to a larger piece 
-  of software that can be downloaded.
+  If you can reproduce it with the testgtk program that is built in the
+  gtk/ subdirectory, that will be most convenient.  Otherwise, please
+  include a short test program that exhibits the behavior.  As a last
+  resort, you can also provide a pointer to a larger piece of software
+  that can be downloaded.
 
-* If the bug was a crash, the exact text that was printed out
-  when the crash occured.
+* If the bug was a crash, the exact text that was printed out when the
+  crash occured.
 
-* Further information such as stack traces may be useful, but
-  is not necessary. If you do send a stack trace, and the error
-  is an X error, it will be more useful if the stacktrace
-  is produced running the test program with the --sync command
-  line option.
+* Further information such as stack traces may be useful, but is not
+  necessary. If you do send a stack trace, and the error is an X error,
+  it will be more useful if the stacktrace is produced running the test
+  program with the --sync command line option.
 
 Patches
 =======
 
-Patches should also be submitted to bugzilla.gnome.org. If the
-patch fixes an existing bug, add the patch as an attachment
-to that bug report.
+Patches should also be submitted to bugzilla.gnome.org. If the patch
+fixes an existing bug, add the patch as an attachment to that bug
+report.
 
-Otherwise, enter a new bug report that describes the patch,
-and attach the patch to that bug report.
+Otherwise, enter a new bug report that describes the patch, and attach
+the patch to that bug report.
 
-Bug reports containing patches should include the PATCH keyword
-in their keyword fields. If the patch adds to or changes the GTK
-programming interface, the API keyword should also be included.
+Bug reports containing patches should include the PATCH keyword in their
+keyword fields. If the patch adds to or changes the GTK programming
+interface, the API keyword should also be included.
   
-Patches should be in unified diff form. (The -u option to GNU
-diff.)
+Patches should be in unified diff form. (The -u option to GNU diff.)