Merge branch 'gtk-plus' into 'main'

Rename GTK+ to GTK (mostly comments and documentation)

See merge request GNOME/glib!3429

29 files changed, 64 insertions, 66 deletions

diff --git a/README.win32.md b/README.win32.md
index 7f11e571e..81dee0465 100644
--- a/README.win32.md
+++ b/README.win32.md
@@ -9,7 +9,7 @@ warned.
 # General
 
 For prebuilt binaries (DLLs and EXEs) and developer packages (headers,
-import libraries) of GLib, Pango, GTK+ etc for Windows, go to
+import libraries) of GLib, Pango, GTK etc for Windows, go to
 https://www.gtk.org/docs/installations/windows/ . They are for "native"
 Windows meaning they use the Win32 API and Microsoft C runtime library
 only. No POSIX (Unix) emulation layer like Cygwin is involved.
@@ -59,9 +59,9 @@ MinGW](https://mingwpy.github.io/ucrt.html) too.
 GLib is not actively tested with the static versions of the UCRT, but if you
 need to use those, patches are welcome.
 
-# Building software that use GLib or GTK+
+# Building software that use GLib or GTK
 
-Building software that just *uses* GLib or GTK+ also require to have
+Building software that just *uses* GLib or GTK also require to have
 the right compiler set up the right way. If you intend to use MinGW-GCC,
 follow the relevant instructions below in that case, too.
 
diff --git a/docs/reference/gio/overview.xml b/docs/reference/gio/overview.xml
index 5f2afc65e..b93a17a09 100644
--- a/docs/reference/gio/overview.xml
+++ b/docs/reference/gio/overview.xml
@@ -154,7 +154,7 @@
   </para>
 
   <figure id="gvfs-overview">
-    <title>GIO in the GTK+ library stack</title>
+    <title>GIO in the GTK library stack</title>
     <graphic fileref="gvfs-overview.png" format="PNG"></graphic>
   </figure>
 
@@ -166,7 +166,7 @@
   </para>
   <para>
     One of the big advantages of putting the VFS in the GLib layer
-    is that GTK+ can directly use it, e.g. in the filechooser.
+    is that GTK can directly use it, e.g. in the filechooser.
   </para>
   </chapter>
 
diff --git a/docs/reference/glib/building.xml b/docs/reference/glib/building.xml
index e30cd66c4..2ae52e8dd 100644
--- a/docs/reference/glib/building.xml
+++ b/docs/reference/glib/building.xml
@@ -49,7 +49,7 @@
       aliasing and cannot be guaranteed to work.
     </para>
     <para>
-      The GTK+ documentation contains
+      The GTK documentation contains
       <ulink url="https://developer.gnome.org/gtk3/stable/gtk-building.html">further details</ulink>
       about the build process and ways to influence it.
     </para>
diff --git a/docs/reference/gobject/tut_gobject.xml b/docs/reference/gobject/tut_gobject.xml
index 7754fec1e..53f38abb2 100644
--- a/docs/reference/gobject/tut_gobject.xml
+++ b/docs/reference/gobject/tut_gobject.xml
@@ -19,7 +19,7 @@
       <listitem><para>Generic per-object properties with set/get function pairs</para></listitem>
       <listitem><para>Easy use of signals</para></listitem>
     </itemizedlist>
-    All the GNOME libraries which use the GLib type system (like GTK+ and GStreamer)
+    All the GNOME libraries which use the GLib type system (like GTK and GStreamer)
     inherit from <link linkend="GObject"><type>GObject</type></link> which is why it is important to understand
     the details of how it works.
   </para>
diff --git a/docs/reference/gobject/tut_gsignal.xml b/docs/reference/gobject/tut_gsignal.xml
index 5559673cb..d690d1690 100644
--- a/docs/reference/gobject/tut_gsignal.xml
+++ b/docs/reference/gobject/tut_gsignal.xml
@@ -10,7 +10,7 @@
 
     <para>
       Closures are central to the concept of asynchronous signal delivery
-      which is widely used throughout GTK+ and GNOME applications. A closure is an 
+      which is widely used throughout GTK and GNOME applications. A closure is an 
       abstraction, a generic representation of a callback. It is a small structure
       which contains three objects:
       <itemizedlist>
@@ -37,9 +37,9 @@ return_type function_callback (… , gpointer user_data);
       <footnote><para>
         In practice, closures sit at the boundary of language runtimes: if you are
         writing Python code and one of your Python callbacks receives a signal from
-        a GTK+ widget, the C code in GTK+ needs to execute your Python
-        code. The closure invoked by the GTK+ object invokes the Python callback:
-        it behaves as a normal C object for GTK+ and as a normal Python object for
+        a GTK widget, the C code in GTK needs to execute your Python
+        code. The closure invoked by the GTK object invokes the Python callback:
+        it behaves as a normal C object for GTK and as a normal Python object for
         Python code.
       </para></footnote>
       The GObject library provides a simple <link linkend="GCClosure"><type>GCClosure</type></link> type which
@@ -179,8 +179,8 @@ g_cclosure_marshal_VOID__INT (GClosure     *closure,
     <para>
       GObject's signals have nothing to do with standard UNIX signals: they connect 
       arbitrary application-specific events with any number of listeners.
-      For example, in GTK+, every user event (keystroke or mouse move) is received
-      from the windowing system and generates a GTK+ event in the form of a signal emission
+      For example, in GTK, every user event (keystroke or mouse move) is received
+      from the windowing system and generates a GTK event in the form of a signal emission
       on the widget object instance.
     </para>
 
diff --git a/docs/reference/gobject/tut_howto.xml b/docs/reference/gobject/tut_howto.xml
index 9bff49b56..82419239a 100644
--- a/docs/reference/gobject/tut_howto.xml
+++ b/docs/reference/gobject/tut_howto.xml
@@ -17,7 +17,7 @@
   
   <para>
     This chapter focuses on the implementation of a subtype of GObject, for
-    example to create a custom class hierarchy, or to subclass a GTK+ widget.
+    example to create a custom class hierarchy, or to subclass a GTK widget.
   </para>
 
   <para>
@@ -55,7 +55,7 @@
         <filename>viewer_file.c</filename>.</para></listitem>
         <listitem><para>Do not separate the prefix from the typename:
         <filename>viewerfile.h</filename> and <filename>viewerfile.c</filename>.
-        (this is the convention used by GTK+)</para></listitem>
+        (this is the convention used by GTK)</para></listitem>
       </itemizedlist>
       Some people like the first two solutions better: it makes reading file
       names easier for those with poor eyesight.
diff --git a/docs/reference/gobject/tut_intro.xml b/docs/reference/gobject/tut_intro.xml
index 7614bf013..87e8a4984 100644
--- a/docs/reference/gobject/tut_intro.xml
+++ b/docs/reference/gobject/tut_intro.xml
@@ -6,7 +6,7 @@
   <title>Background</title>
   
   <para>
-    GObject, and its lower-level type system, GType, are used by GTK+ and most GNOME libraries to
+    GObject, and its lower-level type system, GType, are used by GTK and most GNOME libraries to
     provide:
     <itemizedlist>
       <listitem><para>object-oriented C-based APIs and</para></listitem>
diff --git a/docs/reference/gobject/tut_tools.xml b/docs/reference/gobject/tut_tools.xml
index f1076e832..c56431eaa 100644
--- a/docs/reference/gobject/tut_tools.xml
+++ b/docs/reference/gobject/tut_tools.xml
@@ -62,7 +62,7 @@
         Yet another tool that you may find helpful when working with
         GObjects is <ulink
         url="http://sourceforge.net/projects/g-inspector">G-Inspector</ulink>. It
-        is able to display GLib/GTK+ objects and their properties.
+        is able to display GLib/GTK objects and their properties.
       </para>
   </chapter>
   
@@ -90,7 +90,7 @@ break g_object_unref if _object == 0xcafebabe
   <chapter id="tools-gtkdoc">
     <title>Writing API docs</title>
   
-    <para>The API documentation for most of the GLib, GObject, GTK+ and GNOME
+    <para>The API documentation for most of the GLib, GObject, GTK and GNOME
     libraries is built with a combination of complex tools. Typically, the part of 
     the documentation which describes the behavior of each function is extracted
     from the specially-formatted source code comments by a tool named gtk-doc which
diff --git a/docs/toolchain-requirements.md b/docs/toolchain-requirements.md
index 8028cd509..b432be510 100644
--- a/docs/toolchain-requirements.md
+++ b/docs/toolchain-requirements.md
@@ -139,7 +139,7 @@ Selected C99 features
 
 _Hard requirement._
 
-Starting with GLib 2.52 and GTK+ 3.90, we will be using the following C99
+Starting with GLib 2.52 and GTK 3.90, we will be using the following C99
 features where appropriate:
 
  * Compound literals
diff --git a/gio/gapplication.c b/gio/gapplication.c
index 3708e812c..c52f94cba 100644
--- a/gio/gapplication.c
+++ b/gio/gapplication.c
@@ -2230,7 +2230,7 @@ g_application_register (GApplication  *application,
  * Increases the use count of @application.
  *
  * Use this function to indicate that the application has a reason to
- * continue to run.  For example, g_application_hold() is called by GTK+
+ * continue to run.  For example, g_application_hold() is called by GTK
  * when a toplevel window is on the screen.
  *
  * To cancel the hold, call g_application_release().
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index 9e97ef1c9..6477ee3a4 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -3036,7 +3036,7 @@ g_unix_mount_point_guess_can_eject (GUnixMountPoint *mount_point)
 /* Utility functions {{{1 */
 
 #ifdef HAVE_MNTENT_H
-/* borrowed from gtk/gtkfilesystemunix.c in GTK+ on 02/23/2006 */
+/* borrowed from gtk/gtkfilesystemunix.c in GTK on 02/23/2006 */
 static void
 _canonicalize_filename (gchar *filename)
 {
diff --git a/gio/tests/desktop-files/usr/applications/glade.desktop b/gio/tests/desktop-files/usr/applications/glade.desktop
index dcede22a1..987f8dc0f 100644
--- a/gio/tests/desktop-files/usr/applications/glade.desktop
+++ b/gio/tests/desktop-files/usr/applications/glade.desktop
@@ -27,15 +27,15 @@ X-GNOME-FullName[en_GB]=Glade Interface Designer
 X-GNOME-FullName[eo]=Uzantointerfaca dizajnilo Glado
 X-GNOME-FullName[pt]=Designer de Interfaces Glade
 X-GNOME-FullName[pt_BR]=Construtor de interfaces Glade
-Comment=Create or open user interface designs for GTK+ applications
-Comment[ca]=Creeu o obriu dissenys d'interfície d'usuari per a aplicacions GTK+
-Comment[ca@valencia]=Creeu o obriu dissenys d'interfície d'usuari per a aplicacions GTK+
-Comment[en@shaw]=𐑒𐑮𐑦𐑱𐑑 𐑹 𐑴𐑐𐑩𐑯 𐑿𐑟𐑼 𐑦𐑯𐑑𐑼𐑓𐑱𐑕 𐑛𐑩𐑟𐑲𐑯𐑟 𐑓𐑹 GTK+ 𐑩𐑐𐑤𐑦𐑒𐑱𐑕𐑩𐑯𐑟
-Comment[en_CA]=Create or open user interface designs for GTK+ applications
-Comment[en_GB]=Create or open user interface designs for GTK+ applications
-Comment[eo]=Krei aŭ malfermi uzantointerfacan dizajnon por aplikaĵoj de GTK+
-Comment[pt]=Criar ou abrir um desenho de interface de utilizador para aplicações GTK+
-Comment[pt_BR]=Crie ou abra projetos de interface com o usuário para aplicativos GTK+
+Comment=Create or open user interface designs for GTK applications
+Comment[ca]=Creeu o obriu dissenys d'interfície d'usuari per a aplicacions GTK
+Comment[ca@valencia]=Creeu o obriu dissenys d'interfície d'usuari per a aplicacions GTK
+Comment[en@shaw]=𐑒𐑮𐑦𐑱𐑑 𐑹 𐑴𐑐𐑩𐑯 𐑿𐑟𐑼 𐑦𐑯𐑑𐑼𐑓𐑱𐑕 𐑛𐑩𐑟𐑲𐑯𐑟 𐑓𐑹 GTK 𐑩𐑐𐑤𐑦𐑒𐑱𐑕𐑩𐑯𐑟
+Comment[en_CA]=Create or open user interface designs for GTK applications
+Comment[en_GB]=Create or open user interface designs for GTK applications
+Comment[eo]=Krei aŭ malfermi uzantointerfacan dizajnon por aplikaĵoj de GTK
+Comment[pt]=Criar ou abrir um desenho de interface de utilizador para aplicações GTK
+Comment[pt_BR]=Crie ou abra projetos de interface com o usuário para aplicativos GTK
 Keywords=GUI designer;user interface;ui builder;
 Keywords[ca]=dissenyador d'interfícies d'usuari gràfiques;interfície d'usuari;constructor d'interfícies d'usuari;
 Keywords[ca@valencia]=dissenyador d'interfícies d'usuari gràfiques;interfície d'usuari;constructor d'interfícies d'usuari;
diff --git a/gio/tests/file.c b/gio/tests/file.c
index 7fbb3ef0c..5ca2e678d 100644
--- a/gio/tests/file.c
+++ b/gio/tests/file.c
@@ -2613,7 +2613,7 @@ test_measure (void)
   g_assert_true (ok);
   g_assert_no_error (error);
 
-  g_assert_cmpuint (num_bytes, ==, 74478);
+  g_assert_cmpuint (num_bytes, ==, 74469);
   g_assert_cmpuint (num_dirs, ==, 6);
   g_assert_cmpuint (num_files, ==, 32);
 
@@ -2696,7 +2696,7 @@ test_measure_async (void)
   file = g_file_new_for_path (path);
   g_free (path);
 
-  data->expected_bytes = 74478;
+  data->expected_bytes = 74469;
   data->expected_dirs = 6;
   data->expected_files = 32;
 
diff --git a/glib.doap b/glib.doap
index ae85ecbf2..32b217011 100644
--- a/glib.doap
+++ b/glib.doap
@@ -10,7 +10,7 @@
 
   <shortdesc xml:lang="en">Low level core library</shortdesc>
 
-  <description xml:lang="en">GLib is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure handling for C, portability wrappers, and interfaces for such runtime functionality as an event loop, threads, dynamic loading, and an object system.</description>
+  <description xml:lang="en">GLib is the low-level core library that forms the basis for projects such as GTK and GNOME. It provides data structure handling for C, portability wrappers, and interfaces for such runtime functionality as an event loop, threads, dynamic loading, and an object system.</description>
 
   <homepage rdf:resource="http://www.gtk.org" />
   <license rdf:resource="http://usefulinc.com/doap/licenses/lgpl" />
diff --git a/glib/docs.c b/glib/docs.c
index 69d81c09a..450616eb9 100644
--- a/glib/docs.c
+++ b/glib/docs.c
@@ -1068,7 +1068,7 @@
  * @title: Type Conversion Macros
  * @short_description: portably storing integers in pointer variables
  *
- * Many times GLib, GTK+, and other libraries allow you to pass "user
+ * Many times GLib, GTK, and other libraries allow you to pass "user
  * data" to a callback, in the form of a void pointer. From time to time
  * you want to pass an integer instead of a pointer. You could allocate
  * an integer, with something like:
diff --git a/glib/gconvert.c b/glib/gconvert.c
index 829fe38de..5e3d781df 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -56,7 +56,6 @@
 
 #include "glibintl.h"
 
-
 /**
  * SECTION:conversions
  * @title: Character Set Conversion
@@ -85,7 +84,7 @@
  * Character:  P  r  e  s  e  n  t  a  c  i  ó     n  .  s  x  i
  * Hex code:   50 72 65 73 65 6e 74 61 63 69 c3 b3 6e 2e 73 78 69
  * ]|
- * Glib uses UTF-8 for its strings, and GUI toolkits like GTK+ that use
+ * GLib uses UTF-8 for its strings, and GUI toolkits like GTK that use
  * GLib do the same thing. If you get a file name from the file system,
  * for example, from readdir() or from g_dir_read_name(), and you wish
  * to display the file name to the user, you  will need to convert it
diff --git a/glib/gerror.c b/glib/gerror.c
index 7ac85fc66..ea168e020 100644
--- a/glib/gerror.c
+++ b/glib/gerror.c
@@ -53,7 +53,7 @@
  * These two kinds of errors are fundamentally different: runtime errors
  * should be handled or reported to the user, programming errors should
  * be eliminated by fixing the bug in the program. This is why most
- * functions in GLib and GTK+ do not use the #GError facility.
+ * functions in GLib and GTK do not use the #GError facility.
  *
  * Functions that can fail take a return location for a #GError as their
  * last argument. On error, a new #GError instance will be allocated and
diff --git a/glib/ggettext.c b/glib/ggettext.c
index 42f3d0e72..71654fb84 100644
--- a/glib/ggettext.c
+++ b/glib/ggettext.c
@@ -362,12 +362,12 @@ _g_dgettext_should_translate (void)
  * translations for the current locale.
  *
  * The advantage of using this function over dgettext() proper is that
- * libraries using this function (like GTK+) will not use translations
+ * libraries using this function (like GTK) will not use translations
  * if the application using the library does not have translations for
  * the current locale.  This results in a consistent English-only
  * interface instead of one having partial translations.  For this
  * feature to work, the call to textdomain() and setlocale() should
- * precede any g_dgettext() invocations.  For GTK+, it means calling
+ * precede any g_dgettext() invocations.  For GTK, it means calling
  * textdomain() before gtk_init or its variants.
  *
  * This function disables translations if and only if upon its first
@@ -385,7 +385,7 @@ _g_dgettext_should_translate (void)
  *
  * Note that this behavior may not be desired for example if an application
  * has its untranslated messages in a language other than English. In those
- * cases the application should call textdomain() after initializing GTK+.
+ * cases the application should call textdomain() after initializing GTK.
  *
  * Applications should normally not use this function directly,
  * but use the _() macro for translations.
diff --git a/glib/glib-init.c b/glib/glib-init.c
index c513f5190..933f891da 100644
--- a/glib/glib-init.c
+++ b/glib/glib-init.c
@@ -220,7 +220,7 @@ G_STATIC_ASSERT (sizeof (int) == sizeof (gint32));
  *
  * Parses a string containing debugging options
  * into a %guint containing bit flags. This is used
- * within GDK and GTK+ to parse the debug options passed on the
+ * within GDK and GTK to parse the debug options passed on the
  * command line or through environment variables.
  *
  * If @string is equal to "all", all flags are set. Any flags
diff --git a/glib/gmain.c b/glib/gmain.c
index b994b59b1..b91e68d36 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -133,7 +133,7 @@
  * @short_description: manages all available sources of events
  *
  * The main event loop manages all the available sources of events for
- * GLib and GTK+ applications. These events can come from any number of
+ * GLib and GTK applications. These events can come from any number of
  * different types of sources such as file descriptors (plain files,
  * pipes or sockets) and timeouts. New types of event sources can also
  * be added using g_source_attach().
@@ -165,12 +165,12 @@
  * exit the main loop, and g_main_loop_run() returns.
  *
  * It is possible to create new instances of #GMainLoop recursively.
- * This is often used in GTK+ applications when showing modal dialog
+ * This is often used in GTK applications when showing modal dialog
  * boxes. Note that event sources are associated with a particular
  * #GMainContext, and will be checked and dispatched for all main
  * loops associated with that GMainContext.
  *
- * GTK+ contains wrappers of some of these functions, e.g. gtk_main(),
+ * GTK contains wrappers of some of these functions, e.g. gtk_main(),
  * gtk_main_quit() and gtk_events_pending().
  *
  * ## Creating new source types
@@ -2197,7 +2197,7 @@ g_source_set_name_full (GSource    *source,
  *
  * The source name should describe in a human-readable way
  * what the source does. For example, "X11 event queue"
- * or "GTK+ repaint idle handler" or whatever it is.
+ * or "GTK repaint idle handler" or whatever it is.
  *
  * It is permitted to call this function multiple times, but is not
  * recommended due to the potential performance impact.  For example,
diff --git a/glib/gmain.h b/glib/gmain.h
index 7109e63dc..14a1d2b06 100644
--- a/glib/gmain.h
+++ b/glib/gmain.h
@@ -73,7 +73,7 @@ typedef struct _GMainContext            GMainContext;
  * GMainLoop:
  *
  * The `GMainLoop` struct is an opaque data type
- * representing the main event loop of a GLib or GTK+ application.
+ * representing the main event loop of a GLib or GTK application.
  */
 typedef struct _GMainLoop               GMainLoop;
 
@@ -324,7 +324,7 @@ struct _GSourceFuncs
  *
  * Use this for high priority event sources.
  *
- * It is not used within GLib or GTK+.
+ * It is not used within GLib or GTK.
  */
 #define G_PRIORITY_HIGH            -100
 
@@ -344,7 +344,7 @@ struct _GSourceFuncs
  *
  * Use this for high priority idle functions.
  *
- * GTK+ uses %G_PRIORITY_HIGH_IDLE + 10 for resizing operations,
+ * GTK uses %G_PRIORITY_HIGH_IDLE + 10 for resizing operations,
  * and %G_PRIORITY_HIGH_IDLE + 20 for redrawing operations. (This is
  * done to ensure that any pending resizes are processed before any
  * pending redraws, so that widgets are not redrawn twice unnecessarily.)
@@ -366,7 +366,7 @@ struct _GSourceFuncs
  *
  * Use this for very low priority background tasks.
  *
- * It is not used within GLib or GTK+.
+ * It is not used within GLib or GTK.
  */
 #define G_PRIORITY_LOW              300
 
diff --git a/glib/gmessages.c b/glib/gmessages.c
index 541b08130..45906a754 100644
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -241,7 +241,7 @@
  * not advisable, as it cannot be filtered against using the `G_MESSAGES_DEBUG`
  * environment variable.
  *
- * For example, GTK+ uses this in its `Makefile.am`:
+ * For example, GTK uses this in its `Makefile.am`:
  * |[
  * AM_CPPFLAGS = -DG_LOG_DOMAIN=\"Gtk\"
  * ]|
@@ -831,7 +831,7 @@ g_log_set_fatal_mask (const gchar   *log_domain,
  *                    | G_LOG_FLAG_RECURSION, my_log_handler, NULL);
  * ]|
  *
- * This example adds a log handler for all critical messages from GTK+:
+ * This example adds a log handler for all critical messages from GTK:
  *
  * |[<!-- language="C" --> 
  * g_log_set_handler ("Gtk", G_LOG_LEVEL_CRITICAL | G_LOG_FLAG_FATAL
@@ -3295,7 +3295,7 @@ g_log_default_handler (const gchar   *log_domain,
  * Any messages passed to g_print() will be output via
  * the new handler. The default handler outputs
  * the encoded message to stdout. By providing your own handler
- * you can redirect the output, to a GTK+ widget or a
+ * you can redirect the output, to a GTK widget or a
  * log file for example.
  *
  * Since 2.76 this functions always returns a valid
@@ -3424,7 +3424,7 @@ g_print (const gchar *format,
  * Any messages passed to g_printerr() will be output via
  * the new handler. The default handler outputs the encoded
  * message to stderr. By providing your own handler you can
- * redirect the output, to a GTK+ widget or a log file for
+ * redirect the output, to a GTK widget or a log file for
  * example.
  *
  * Since 2.76 this functions always returns a valid
diff --git a/glib/goption.c b/glib/goption.c
index 64aed7a03..ee40e90bd 100644
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -65,7 +65,7 @@
  * Help Options:
  *   -h, --help               Show help options
  *   --help-all               Show all help options
- *   --help-gtk               Show GTK+ Options
+ *   --help-gtk               Show GTK Options
  *  
  * Application Options:
  *   -r, --repeats=N          Average over N repetitions
diff --git a/glib/gquark.c b/glib/gquark.c
index cdd9bdf9a..42cb39364 100644
--- a/glib/gquark.c
+++ b/glib/gquark.c
@@ -246,7 +246,7 @@ g_quark_from_string (const gchar *string)
  * with statically allocated strings in the main program, but not with
  * statically allocated memory in dynamically loaded modules, if you
  * expect to ever unload the module again (e.g. do not use this
- * function in GTK+ theme engines).
+ * function in GTK theme engines).
  *
  * This function must not be used before library constructors have finished
  * running. In particular, this means it cannot be used to initialize global
diff --git a/glib/gtypes.h b/glib/gtypes.h
index 9d68f93a7..9d912d523 100644
--- a/glib/gtypes.h
+++ b/glib/gtypes.h
@@ -165,7 +165,7 @@ typedef gpointer	(*GCopyFunc)            (gconstpointer  src,
  *
  * Declares a type of function which takes an arbitrary
  * data pointer argument and has no return value. It is
- * not currently used in GLib or GTK+.
+ * not currently used in GLib or GTK.
  */
 typedef void            (*GFreeFunc)            (gpointer       data);
 
diff --git a/glib/gutf8.c b/glib/gutf8.c
index a018f2a8d..3fa2def66 100644
--- a/glib/gutf8.c
+++ b/glib/gutf8.c
@@ -1678,7 +1678,7 @@ fast_validate_len (const char *str,
  * Note that g_utf8_validate() returns %FALSE if @max_len is 
  * positive and any of the @max_len bytes are nul.
  *
- * Returns %TRUE if all of @str was valid. Many GLib and GTK+
+ * Returns %TRUE if all of @str was valid. Many GLib and GTK
  * routines require valid UTF-8 as input; so data read from a file
  * or the network should be checked with g_utf8_validate() before
  * doing anything else with it.
diff --git a/glib/gutils.c b/glib/gutils.c
index dce7cbee5..362c55aff 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -1138,7 +1138,7 @@ static const gchar *g_prgname = NULL; /* always a quark */
  * in contrast to g_get_application_name().
  *
  * If you are using #GApplication the program name is set in
- * g_application_run(). In case of GDK or GTK+ it is set in
+ * g_application_run(). In case of GDK or GTK it is set in
  * gdk_init(), which is called by gtk_init() and the
  * #GtkApplication::startup handler. The program name is found by
  * taking the last component of @argv[0].
@@ -1167,7 +1167,7 @@ g_get_prgname (void)
  * in contrast to g_set_application_name().
  *
  * If you are using #GApplication the program name is set in
- * g_application_run(). In case of GDK or GTK+ it is set in
+ * g_application_run(). In case of GDK or GTK it is set in
  * gdk_init(), which is called by gtk_init() and the
  * #GtkApplication::startup handler. The program name is found by
  * taking the last component of @argv[0].
@@ -2575,16 +2575,16 @@ g_win32_get_system_data_dirs_for_module_real (void (*address_of_function)(void))
   p = get_special_folder (&FOLDERID_ProgramData);
   if (p)
     g_array_append_val (data_dirs, p);
-  
+
   /* Documents and Settings\All Users\Documents */
   p = get_special_folder (&FOLDERID_PublicDocuments);
   if (p)
     g_array_append_val (data_dirs, p);
-	
+
   /* Using the above subfolders of Documents and Settings perhaps
    * makes sense from a Windows perspective.
    *
-   * But looking at the actual use cases of this function in GTK+
+   * But looking at the actual use cases of this function in GTK
    * and GNOME software, what we really want is the "share"
    * subdirectory of the installation directory for the package
    * our caller is a part of.
diff --git a/glib/gwin32.c b/glib/gwin32.c
index 85053c079..ab9e4b571 100644
--- a/glib/gwin32.c
+++ b/glib/gwin32.c
@@ -123,8 +123,8 @@ g_win32_getlocale (void)
   const gchar *script = NULL;
 
   /* Let the user override the system settings through environment
-   * variables, as on POSIX systems. Note that in GTK+ applications
-   * since GTK+ 2.10.7 setting either LC_ALL or LANG also sets the
+   * variables, as on POSIX systems. Note that in GTK applications
+   * since GTK 2.10.7 setting either LC_ALL or LANG also sets the
    * Win32 locale and C library locale through code in gtkmain.c.
    */
   if (((ev = g_getenv ("LC_ALL")) != NULL && ev[0] != '\0')
diff --git a/gobject/gobject.c b/gobject/gobject.c
index a61754b9f..b4186c561 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -44,7 +44,7 @@
  * @see_also: #GParamSpecObject, g_param_spec_object()
  *
  * GObject is the fundamental type providing the common attributes and
- * methods for all object types in GTK+, Pango and other libraries
+ * methods for all object types in GTK, Pango and other libraries
  * based on GObject.  The GObject class provides methods for object
  * construction and destruction, property access methods, and signal
  * support.  Signals are described in detail [here][gobject-Signals].
@@ -136,7 +136,6 @@
  * ]|
  */
 
-
 /* --- macros --- */
 #define PARAM_SPEC_PARAM_ID(pspec)		((pspec)->param_id)
 #define	PARAM_SPEC_SET_PARAM_ID(pspec, id)	((pspec)->param_id = (id))