Revert name change

svn path=/trunk/; revision=20724

6 files changed, 37 insertions, 38 deletions

diff --git a/docs/faq/gtk-faq.sgml b/docs/faq/gtk-faq.sgml
index 54e74f6ca3..eb8563ac5c 100644
--- a/docs/faq/gtk-faq.sgml
+++ b/docs/faq/gtk-faq.sgml
@@ -150,9 +150,8 @@ better than Motif.  It contains common and complex widgets, such as
 file selection, and color selection widgets.</para>
 
 <para>GTK+ was initially developed as a widget set for the GIMP (GNU Image
-Manipulation Program), and in fact GTK originally stood for 'The GIMP Toolkit'.
-It has grown extensively since then, and is today used by a large number
-of applications, and is the toolkit used by the
+Manipulation Program). It has grown extensively since then, and is today
+used by a large number of applications, and is the toolkit used by the
 <ulink url="http://www.gnome.org/">GNOME</ulink> desktop project.</para>
 
 <para>GTK+ is free software and part of the GNU Project. However, the
@@ -199,7 +198,7 @@ interfaces.</para>
 <sect1>
 <title>Does the G in GTK+, GDK and GLib stand for? <emphasis>[GTK 2.x]</emphasis></title>
 
-<para>GTK+ == The GTK+ Toolkit</para>
+<para>GTK+ == The GIMP Toolkit</para>
 <para>GDK == GTK+ Drawing Kit</para>
 <para>GLib == G Library</para>
 
diff --git a/docs/tutorial/gtk-tut.sgml b/docs/tutorial/gtk-tut.sgml
index bb525fc3b8..335864789c 100755
--- a/docs/tutorial/gtk-tut.sgml
+++ b/docs/tutorial/gtk-tut.sgml
@@ -21,7 +21,7 @@
       </author>
     </authorgroup>
     <abstract>
-      <para>This is a tutorial on how to use GTK (the GTK+ Toolkit) through its C
+      <para>This is a tutorial on how to use GTK (the GIMP Toolkit) through its C
             interface.</para>
     </abstract>
   </bookinfo>
@@ -52,7 +52,7 @@ available for offline reference and for printing.</para>
 <chapter id="ch-Introduction">
 <title>Introduction</title>
 
-<para>GTK (GTK+ Toolkit) is a library for creating graphical user
+<para>GTK (GIMP Toolkit) is a library for creating graphical user
 interfaces. It is licensed using the LGPL license, so you can develop
 open software, free software, or even commercial non-free software
 using GTK without having to spend anything for licenses or royalties.</para>
@@ -61,7 +61,7 @@ using GTK without having to spend anything for licenses or royalties.</para>
 developing the GNU Image Manipulation Program (GIMP), but GTK has
 now been used in a large number of software projects, including the
 GNU Network Object Model Environment (GNOME) project. GTK is built on
-top of GDK (GTK+ Drawing Kit) which is basically a wrapper around the
+top of GDK (GIMP Drawing Kit) which is basically a wrapper around the
 low-level functions for accessing the underlying windowing functions
 (Xlib in the case of the X windows system), and gdk-pixbuf, a library for
 client-side image manipulation.</para>
@@ -11622,7 +11622,7 @@ would be a good idea to look them over before continuing.</para>
 Tictactoe widget. First, we have a header file:</para>
 
 <programlisting role="C">
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -14493,7 +14493,7 @@ which are not included in complete form elsewhere.</para>
 
 <programlisting role="C">
 <!-- example-start tictactoe tictactoe.h -->
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -14566,7 +14566,7 @@ G_END_DECLS
 <programlisting role="C">
 <!-- example-start tictactoe tictactoe.c -->
 
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -14796,7 +14796,7 @@ int main( int   argc,
 <programlisting role="C">
 <!-- example-start gtkdial gtkdial.h -->
 
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -14898,7 +14898,7 @@ void           gtk_dial_set_adjustment         (GtkDial      *dial,
 <programlisting role="C">
 <!-- example-start gtkdial gtkdial.c -->
 
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -15656,7 +15656,7 @@ int main( int   argc,
 <programlisting role="C">
 <!-- example-start scribble-simple scribble-simple.c -->
 
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -15848,7 +15848,7 @@ int main( int   argc,
 <programlisting role="C">
 <!-- example-start scribble-xinput scribble-xinput.c -->
 
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/docs/tutorial/gtk_tut.sgml b/docs/tutorial/gtk_tut.sgml
index 603bbbd986..8c3357a805 100644
--- a/docs/tutorial/gtk_tut.sgml
+++ b/docs/tutorial/gtk_tut.sgml
@@ -13,7 +13,7 @@ Ian Main <tt><htmlurl url="mailto:imain@gtk.org"
 			      name="&lt;imain@gtk.org&gt;"></tt>
 <date>February 23rd, 2000
 <abstract>
-This is a tutorial on how to use GTK (the GTK+ Toolkit) through its C
+This is a tutorial on how to use GTK (the GIMP Toolkit) through its C
 interface.
 </abstract>
 
@@ -27,7 +27,7 @@ interface.
 <sect>Introduction
 <!-- ***************************************************************** -->
 <p>
-GTK (GTK+ Toolkit) is a library for creating graphical user
+GTK (GIMP Toolkit) is a library for creating graphical user
 interfaces. It is licensed using the LGPL license, so you can develop
 open software, free software, or even commercial non-free software
 using GTK without having to spend anything for licenses or royalties.
@@ -36,7 +36,7 @@ It's called the GIMP toolkit because it was originally written for
 developing the GNU Image Manipulation Program (GIMP), but GTK has
 now been used in a large number of software projects, including the
 GNU Network Object Model Environment (GNOME) project. GTK is built on
-top of GDK (GTK+ Drawing Kit) which is basically a wrapper around the
+top of GDK (GIMP Drawing Kit) which is basically a wrapper around the
 low-level functions for accessing the underlying windowing functions
 (Xlib in the case of the X windows system). The primary authors of GTK
 are:
@@ -13385,7 +13385,7 @@ Quite a bit of our widget should look pretty familiar from the
 Tictactoe widget. First, we have a header file:
 
 <tscreen><verb>
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -16248,7 +16248,7 @@ which are not included in complete form elsewhere.
 <tscreen><verb>
 /* example-start tictactoe tictactoe.h */
 
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -16319,7 +16319,7 @@ void	       tictactoe_clear           (Tictactoe *ttt);
 <tscreen><verb>
 /* example-start tictactoe tictactoe.c */
 
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -16541,7 +16541,7 @@ int main( int   argc,
 <tscreen><verb>
 /* example-start gtkdial gtkdial.h */
 
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -16640,7 +16640,7 @@ void           gtk_dial_set_adjustment         (GtkDial      *dial,
 <tscreen><verb>
 /* example-start gtkdial gtkdial.c */
 
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -17377,7 +17377,7 @@ int main( int   argc,
 <tscreen><verb>
 /* example-start scribble-simple scribble-simple.c */
 
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -17563,7 +17563,7 @@ int main( int   argc,
 <tscreen><verb>
 /* example-start scribble-xinput scribble-xinput.c */
 
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/docs/tutorial/gtk_tut_12.es.sgml b/docs/tutorial/gtk_tut_12.es.sgml
index 7925765816..74b4827aa6 100755
--- a/docs/tutorial/gtk_tut_12.es.sgml
+++ b/docs/tutorial/gtk_tut_12.es.sgml
@@ -32,7 +32,7 @@ Toolkit) en C
 <sect>Introducción
 <!-- ***************************************************************** -->
 <p>
-GTK (GTK+ Toolkit) es una biblioteca para crear interfaces gráficas
+GTK (GIMP Toolkit) es una biblioteca para crear interfaces gráficas
 de usuario. Su licencia es la LGPL, así que mediante GTK podrá
 desarrollar programas con licencias abiertas, gratuitas, libres, y
 hasta licencias comerciales no libres sin mayores problemas.
@@ -41,7 +41,7 @@ Se llama el GIMP toolkit porque fue escrito para el desarrollo del
 General Image Manipulation Program (GIMP), pero ahora GTK se utiliza
 en un gran número de proyectos de programación, incluyendo el
 proyecto GNU Network Object Model Environment (GNOME). GTK está
-construido encima de GDK (GTK+ Drawing Kit) que básicamente es un
+construido encima de GDK (GIMP Drawing Kit) que básicamente es un
 recubrimiento de las funciones de bajo nivel que deben haber para
 acceder al sistema de ventanas sobre el que se programe (Xlib en el
 caso de X windows). Los principales autores de GTK son:
@@ -12829,7 +12829,7 @@ Nuestro <em/widget/ tiene un aspecto algo parecido al del <em/widget/
 Tictactoe. Primero, tenemos un fichero de cabecera:
 
 <tscreen><verb>
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -15836,7 +15836,7 @@ texto anterior y que no se ha incluido al completo en otro lugar.
 <tscreen><verb>
 /* principio del ejemplo tictactoe tictactoe.h */
 
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -15907,7 +15907,7 @@ void	       tictactoe_clear           (Tictactoe *ttt);
 <tscreen><verb>
 /* principio del ejemplo tictactoe tictactoe.c */
 
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -16127,7 +16127,7 @@ main (int argc, char *argv[])
 <tscreen><verb>
 /* principio del ejmplo gtkdial gtkdial.h */
 
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -16227,7 +16227,7 @@ void           gtk_dial_set_adjustment         (GtkDial      *dial,
 <tscreen><verb>
 /* principio del ejemplo gtkdial gtkdial.c */
 
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -16826,7 +16826,7 @@ gtk_dial_adjustment_value_changed (GtkAdjustment *adjustment,
 <tscreen><verb>
 /* principio del ejemplo scribble-simple scribble-simple.c */
 
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/docs/tutorial/gtk_tut_fr.sgml b/docs/tutorial/gtk_tut_fr.sgml
index d45e951e60..efb75e8c0e 100644
--- a/docs/tutorial/gtk_tut_fr.sgml
+++ b/docs/tutorial/gtk_tut_fr.sgml
@@ -8,9 +8,9 @@
    
 <sect>Introduction
 <p>
-GTK (GTK+ Toolkit) a été d'abord développé pour être une boîte à
+GTK (GIMP Toolkit) a été d'abord développé pour être une boîte à
 outils pour GIMP (General Image Manipulation Program).  GTK est
-construit sur GDK (GTK+ Drawing Kit) qui est, avant tout, une
+construit sur GDK (GIMP Drawing Kit) qui est, avant tout, une
 encapsulation des fonctions Xlib. On l'appelle « GIMP toolkit » car il
 fut créé pour développer GIMP, mais il est désormais utilisé dans
 plusieurs projets de logiciels libres. Les auteurs sont&nbsp;:
@@ -6860,7 +6860,7 @@ Un petite partie de notre widget devrait ressembler au widget Tictactoe. Nous
 avons d'abord le fichier en-tête&nbsp;:
 
 <tscreen><verb>
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/docs/tutorial/gtk_tut_it.sgml b/docs/tutorial/gtk_tut_it.sgml
index 789ca326f9..321a2b58de 100644
--- a/docs/tutorial/gtk_tut_it.sgml
+++ b/docs/tutorial/gtk_tut_it.sgml
@@ -13,9 +13,9 @@ Tony Gale <tt><htmlurl url="mailto:gale@gtk.org"
 <sect>Introduzione
 <!-- ***************************************************************** -->
 <p>
-GTK (GTK+ Toolkit) &egrave; stato orginariamente sviluppato come toolkit per
+GTK (GIMP Toolkit) &egrave; stato orginariamente sviluppato come toolkit per
 il programma GIMP (General Image Manipulation Program). GTK &egrave; costruito
-sulla base del kit di disegno di GIMP, il GDK (GTK+ Drawing Kit) il quale
+sulla base del kit di disegno di GIMP, il GDK (GIMP Drawing Kit) il quale
 &egrave; costruito a sua volta attorno alle funzioni della Xlib. E' chiamato
 ``toolkit di GIMP'' perch&eacute; era inizialmente scritto per sviluppare GIMP,
 ma ora viene utilizzato nello sviluppo di molti progetti software ``free''. 
@@ -8283,7 +8283,7 @@ Una parte del nostro widget potrebbe essere simile
 al widget Tictactoe. In primo luogo, abbiamo il file header:
 
 <tscreen><verb>
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or