testsuite: Add selection model tests

gtk: Add GtkSingleSelection
GtkSingleSelection is a GtkSelectionModel that allows selecting a single item.
2019-02-07 22:26:03 -05:00 · 2019-02-07 22:26:03 -05:00 · 2019-02-07 22:26:03 -05:00 · 2019-02-06 14:34:55 +01:00 · 2019-02-06 14:01:38 +01:00 · 2019-02-06 12:11:09 +01:00
501 changed files with 27621 additions and 27262 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,7 +21,7 @@ many things that we value:
 Please, do not use the issue tracker for support questions. If you have
 questions on how to use GTK effectively, you can use:

- - the `#gtk+` IRC channel on irc.gnome.org
+ - the `#gtk` IRC channel on irc.gnome.org
 - the [gtk](https://mail.gnome.org/mailman/listinfo/gtk-list) mailing list,
   for general questions on GTK
 - the [gtk-app-devel](https://mail.gnome.org/mailman/listinfo/gtk-app-devel-list)
@@ -245,7 +245,7 @@ people committing to GTK to follow a few rules:
   better way to do things. If you are making changes to GTK, you should
   be subscribed to the [gtk-devel](https://mail.gnome.org/mailman/listinfo/gtk-devel-list)
   mailing list; this is a good place to ask about intended changes.
-   The `#gtk+` IRC channel on irc.gnome.org is also a good place to find GTK
+   The `#gtk` IRC channel on irc.gnome.org is also a good place to find GTK
   developers to discuss changes, but if you live outside of the EU/US time
   zones, an email to the gtk-devel mailing list is the most certain and
   preferred method.
--- a/README.md
+++ b/README.md
@@ -1,17 +1,17 @@
-GTK+ — The GTK toolkit
-======================
+GTK — The GTK toolkit
+=====================

 [![Build Status](https://gitlab.gnome.org/GNOME/gtk/badges/master/build.svg)](https://gitlab.gnome.org/GNOME/gtk/pipelines)

 General information
 -------------------

-GTK+ is a multi-platform toolkit for creating graphical user interfaces.
-Offering a complete set of widgets, GTK+ is suitable for projects ranging
+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
+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.

@@ -39,7 +39,7 @@ Nightly documentation can be found at
 Building and installing
 -----------------------

-In order to build GTK+ you will need:
+In order to build GTK you will need:

  - [a C99 compatible compiler](https://wiki.gnome.org/Projects/GLib/CompilerRequirements)
  - [Python 3](https://www.python.org/)
@@ -79,7 +79,7 @@ If you are building the Wayland backend, you will also need:
  - Wayland-cursor
  - Wayland-EGL

-Once you have all the necessary dependencies, you can build GTK+ by using
+Once you have all the necessary dependencies, you can build GTK by using
 Meson:

 ```sh
@@ -94,7 +94,7 @@ You can run the test suite using:
 $ meson test
 ```

-And, finally, you can install GTK+ using:
+And, finally, you can install GTK using:

 ```
 $ sudo ninja install
@@ -118,10 +118,10 @@ In the bug report please include:

 * Information about your system. For instance:

-   - which version of GTK+ you are using
+   - which version of GTK you are using
   - what operating system and version
   - for Linux, which distribution
-   - if you built GTK+, the list of options used to configure the build
+   - if you built GTK, the list of options used to configure the build

  And anything else you think is relevant.

@@ -143,7 +143,7 @@ In the bug report please include:
 Release notes
 -------------

-The release notes for GTK+ are part of the migration guide in the API
+The release notes for GTK are part of the migration guide in the API
 reference. See:

 - [3.x release notes](https://developer.gnome.org/gtk3/unstable/gtk-migrating-2-to-3.html)
@@ -152,7 +152,7 @@ reference. See:
 Licensing terms
 ---------------

-GTK+ is released under the terms of the GNU Lesser General Public License,
+GTK is released under the terms of the GNU Lesser General Public License,
 version 2.1 or, at your option, any later version, as published by the Free
 Software Foundation.

--- a/demos/gtk-demo/application.c
+++ b/demos/gtk-demo/application.c
@@ -200,20 +200,20 @@ activate_about (GSimpleAction *action,
  };

  gtk_show_about_dialog (GTK_WINDOW (window),
-                         "program-name", "GTK+ Code Demos",
-                         "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
+                         "program-name", "GTK Code Demos",
+                         "version", g_strdup_printf ("%s,\nRunning against GTK %d.%d.%d",
                                                     PACKAGE_VERSION,
                                                     gtk_get_major_version (),
                                                     gtk_get_minor_version (),
                                                     gtk_get_micro_version ()),
-                         "copyright", "(C) 1997-2013 The GTK+ Team",
+                         "copyright", "(C) 1997-2013 The GTK Team",
                         "license-type", GTK_LICENSE_LGPL_2_1,
                         "website", "http://www.gtk.org",
-                         "comments", "Program to demonstrate GTK+ functions.",
+                         "comments", "Program to demonstrate GTK functions.",
                         "authors", authors,
                         "documenters", documentors,
                         "logo-icon-name", "gtk4-demo",
-                         "title", "About GTK+ Code Demos",
+                         "title", "About GTK Code Demos",
                         NULL);
 }

--- a/demos/gtk-demo/assistant.c
+++ b/demos/gtk-demo/assistant.c
@@ -96,12 +96,12 @@ create_page1 (GtkWidget *assistant)
  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);

  label = gtk_label_new ("You must fill out this entry to continue:");
-  gtk_box_pack_start (GTK_BOX (box), label);
+  gtk_container_add (GTK_CONTAINER (box), label);

  entry = gtk_entry_new ();
  gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
  gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (box), entry);
+  gtk_container_add (GTK_CONTAINER (box), entry);
  g_signal_connect (G_OBJECT (entry), "changed",
                    G_CALLBACK (on_entry_changed), assistant);

@@ -119,7 +119,7 @@ create_page2 (GtkWidget *assistant)

  checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
                                                 "even if you do not check this");
-  gtk_box_pack_start (GTK_BOX (box), checkbutton);
+  gtk_container_add (GTK_CONTAINER (box), checkbutton);

  gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE);
--- a/demos/gtk-demo/button_box.c
+++ b/demos/gtk-demo/button_box.c
@@ -1,127 +0,0 @@
-/* Button Boxes
- *
- * The Button Box widgets are used to arrange buttons with padding.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-static GtkWidget *
-create_bbox (gint  horizontal,
-             char *title,
-             gint  spacing,
-             gint  layout)
-{
-  GtkWidget *frame;
-  GtkWidget *bbox;
-  GtkWidget *button;
-
-  frame = gtk_frame_new (title);
-
-  if (horizontal)
-    bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
-  else
-    bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
-
-  g_object_set (bbox, "margin", 5, NULL);
-
-  gtk_container_add (GTK_CONTAINER (frame), bbox);
-
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
-  gtk_box_set_spacing (GTK_BOX (bbox), spacing);
-
-  button = gtk_button_new_with_label (_("OK"));
-  gtk_container_add (GTK_CONTAINER (bbox), button);
-
-  button = gtk_button_new_with_label (_("Cancel"));
-  gtk_container_add (GTK_CONTAINER (bbox), button);
-
-  button = gtk_button_new_with_label (_("Help"));
-  gtk_container_add (GTK_CONTAINER (bbox), button);
-
-  return frame;
-}
-
-GtkWidget *
-do_button_box (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GtkWidget *main_vbox;
-  GtkWidget *vbox;
-  GtkWidget *hbox;
-  GtkWidget *frame_horz;
-  GtkWidget *frame_vert;
-
-  if (!window)
-  {
-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_display (GTK_WINDOW (window),
-                            gtk_widget_get_display (do_widget));
-    gtk_window_set_title (GTK_WINDOW (window), "Button Boxes");
-
-    g_signal_connect (window, "destroy",
-                      G_CALLBACK (gtk_widget_destroyed),
-                      &window);
-
-    main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    g_object_set (main_vbox, "margin", 10, NULL);
-    gtk_container_add (GTK_CONTAINER (window), main_vbox);
-
-    frame_horz = gtk_frame_new ("Horizontal Button Boxes");
-    gtk_widget_set_margin_top (frame_horz, 10);
-    gtk_widget_set_margin_bottom (frame_horz, 10);
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz);
-
-    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-    g_object_set (vbox, "margin", 10, NULL);
-    gtk_container_add (GTK_CONTAINER (frame_horz), vbox);
-
-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Spread", 40, GTK_BUTTONBOX_SPREAD));
-
-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE));
-
-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START));
-
-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END));
-
-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Center", 40, GTK_BUTTONBOX_CENTER));
-
-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Expand", 0, GTK_BUTTONBOX_EXPAND));
-
-    frame_vert = gtk_frame_new ("Vertical Button Boxes");
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert);
-
-    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-    g_object_set (hbox, "margin", 10, NULL);
-    gtk_container_add (GTK_CONTAINER (frame_vert), hbox);
-
-    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Spread", 10, GTK_BUTTONBOX_SPREAD));
-
-    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Edge", 10, GTK_BUTTONBOX_EDGE));
-
-    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Start", 10, GTK_BUTTONBOX_START));
-
-    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "End", 10, GTK_BUTTONBOX_END));
-    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Center", 10, GTK_BUTTONBOX_CENTER));
-    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Expand", 0, GTK_BUTTONBOX_EXPAND));
-  }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -7,7 +7,7 @@
 * computers, as long as there is a network connection to the
 * computer where the application is running.
 *
- * Only some of the windowing systems where GTK+ runs have the
+ * Only some of the windowing systems where GTK runs have the
 * concept of multiple displays. (The X Window System is the
 * main example.) Other windowing systems can only handle one
 * keyboard and mouse, and combine all monitors into
@@ -315,7 +315,7 @@ create_frame (ChangeDisplayInfo *info,
                                  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollwin),
                                       GTK_SHADOW_IN);
-  gtk_box_pack_start (GTK_BOX (hbox), scrollwin);
+  gtk_container_add (GTK_CONTAINER (hbox), scrollwin);

  *tree_view = gtk_tree_view_new ();
  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (*tree_view), FALSE);
@@ -325,7 +325,7 @@ create_frame (ChangeDisplayInfo *info,
  gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);

  *button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-  gtk_box_pack_start (GTK_BOX (hbox), *button_vbox);
+  gtk_container_add (GTK_CONTAINER (hbox), *button_vbox);

  if (!info->size_group)
    info->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@@ -365,11 +365,11 @@ create_display_frame (ChangeDisplayInfo *info)

  button = left_align_button_new ("_Open...");
  g_signal_connect (button, "clicked",  G_CALLBACK (open_display_cb), info);
-  gtk_box_pack_start (GTK_BOX (button_vbox), button);
+  gtk_container_add (GTK_CONTAINER (button_vbox), button);

  button = left_align_button_new ("_Close");
  g_signal_connect (button, "clicked",  G_CALLBACK (close_display_cb), info);
-  gtk_box_pack_start (GTK_BOX (button_vbox), button);
+  gtk_container_add (GTK_CONTAINER (button_vbox), button);

  info->display_model = (GtkTreeModel *)gtk_list_store_new (DISPLAY_NUM_COLUMNS,
                                                            G_TYPE_STRING,
@@ -542,10 +542,10 @@ do_changedisplay (GtkWidget *do_widget)

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
      g_object_set (vbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox);
+      gtk_container_add (GTK_CONTAINER (content_area), vbox);

      frame = create_display_frame (info);
-      gtk_box_pack_start (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      initialize_displays (info);

--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -259,45 +259,45 @@ do_clipboard (GtkWidget *do_widget)

      label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard");

-      gtk_box_pack_start (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      g_object_set (hbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);

      /* Create the first entry */
      entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), entry);
+      gtk_container_add (GTK_CONTAINER (hbox), entry);

      /* Create the button */
      button = gtk_button_new_with_mnemonic (_("_Copy"));
-      gtk_box_pack_start (GTK_BOX (hbox), button);
+      gtk_container_add (GTK_CONTAINER (hbox), button);
      g_signal_connect (button, "clicked",
                        G_CALLBACK (copy_button_clicked), entry);

      label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      g_object_set (hbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);

      /* Create the second entry */
      entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), entry);
+      gtk_container_add (GTK_CONTAINER (hbox), entry);

      /* Create the button */
      button = gtk_button_new_with_mnemonic (_("_Paste"));
-      gtk_box_pack_start (GTK_BOX (hbox), button);
+      gtk_container_add (GTK_CONTAINER (hbox), button);
      g_signal_connect (button, "clicked",
                        G_CALLBACK (paste_button_clicked), entry);

      label = gtk_label_new ("Images can be transferred via the clipboard, too");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      g_object_set (hbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);

      /* Create the first image */
      image = gtk_image_new_from_icon_name ("dialog-warning");
--- a/demos/gtk-demo/colorsel.c
+++ b/demos/gtk-demo/colorsel.c
@@ -1,7 +1,7 @@
 /* Color Chooser
 *
 * A GtkColorChooser lets the user choose a color. There are several
- * implementations of the GtkColorChooser interface in GTK+. The
+ * implementations of the GtkColorChooser interface in GTK. The
 * GtkColorChooserDialog is a prebuilt dialog containing a
 * GtkColorChooserWidget.
 */
@@ -88,7 +88,7 @@ do_colorsel (GtkWidget *do_widget)

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_box_pack_start (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      da = gtk_drawing_area_new ();
      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 200);
@@ -101,7 +101,7 @@ do_colorsel (GtkWidget *do_widget)
      gtk_widget_set_halign (button, GTK_ALIGN_END);
      gtk_widget_set_valign (button, GTK_ALIGN_CENTER);

-      gtk_box_pack_start (GTK_BOX (vbox), button);
+      gtk_container_add (GTK_CONTAINER (vbox), button);

      g_signal_connect (button, "clicked",
                        G_CALLBACK (change_color_callback), NULL);
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -326,7 +326,7 @@ do_combobox (GtkWidget *do_widget)
     *  insensitive rows
     */
    frame = gtk_frame_new ("Items with icons");
-    gtk_box_pack_start (GTK_BOX (vbox), frame);
+    gtk_container_add (GTK_CONTAINER (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    g_object_set (box, "margin", 5, NULL);
@@ -367,7 +367,7 @@ do_combobox (GtkWidget *do_widget)
    /* A combobox demonstrating trees.
     */
    frame = gtk_frame_new ("Where are we ?");
-    gtk_box_pack_start (GTK_BOX (vbox), frame);
+    gtk_container_add (GTK_CONTAINER (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    g_object_set (box, "margin", 5, NULL);
@@ -395,7 +395,7 @@ do_combobox (GtkWidget *do_widget)

    /* A GtkComboBoxEntry with validation */
    frame = gtk_frame_new ("Editable");
-    gtk_box_pack_start (GTK_BOX (vbox), frame);
+    gtk_container_add (GTK_CONTAINER (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    g_object_set (box, "margin", 5, NULL);
@@ -413,7 +413,7 @@ do_combobox (GtkWidget *do_widget)

    /* A combobox with string IDs */
    frame = gtk_frame_new ("String IDs");
-    gtk_box_pack_start (GTK_BOX (vbox), frame);
+    gtk_container_add (GTK_CONTAINER (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    g_object_set (box, "margin", 5, NULL);
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -143,7 +143,6 @@
    <file>application_demo.c</file>
    <file>assistant.c</file>
    <file>builder.c</file>
-    <file>button_box.c</file>
    <file>changedisplay.c</file>
    <file>clipboard.c</file>
    <file>colorsel.c</file>
--- a/demos/gtk-demo/demo.ui
+++ b/demos/gtk-demo/demo.ui
@@ -199,9 +199,6 @@
              </object>
            </child>
          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
        </child>
        <child>
          <object class="GtkScrolledWindow" id="scrolledwindow1">
@@ -255,16 +252,10 @@
              </object>
            </child>
          </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
        </child>
        <child>
          <object class="GtkStatusbar" id="statusbar1">
          </object>
-          <packing>
-            <property name="position">3</property>
-          </packing>
        </child>
      </object>
    </child>
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -56,16 +56,16 @@ interactive_dialog_clicked (GtkButton *button,
  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));

  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-  gtk_box_pack_start (GTK_BOX (content_area), hbox);
+  gtk_container_add (GTK_CONTAINER (content_area), hbox);

  image = gtk_image_new_from_icon_name ("dialog-question");
  gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
-  gtk_box_pack_start (GTK_BOX (hbox), image);
+  gtk_container_add (GTK_CONTAINER (hbox), image);

  table = gtk_grid_new ();
  gtk_grid_set_row_spacing (GTK_GRID (table), 4);
  gtk_grid_set_column_spacing (GTK_GRID (table), 4);
-  gtk_box_pack_start (GTK_BOX (hbox), table);
+  gtk_container_add (GTK_CONTAINER (hbox), table);
  label = gtk_label_new_with_mnemonic ("_Entry 1");
  gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
  local_entry1 = gtk_entry_new ();
@@ -123,29 +123,29 @@ do_dialog (GtkWidget *do_widget)

      /* Standard message dialog */
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);
      button = gtk_button_new_with_mnemonic ("_Message Dialog");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (message_dialog_clicked), NULL);
-      gtk_box_pack_start (GTK_BOX (hbox), button);
+      gtk_container_add (GTK_CONTAINER (hbox), button);

-      gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
+      gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));

      /* Interactive dialog*/
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);
      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);

      button = gtk_button_new_with_mnemonic ("_Interactive Dialog");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (interactive_dialog_clicked), NULL);
-      gtk_box_pack_start (GTK_BOX (hbox), vbox2);
-      gtk_box_pack_start (GTK_BOX (vbox2), button);
+      gtk_container_add (GTK_CONTAINER (hbox), vbox2);
+      gtk_container_add (GTK_CONTAINER (vbox2), button);

      table = gtk_grid_new ();
      gtk_grid_set_row_spacing (GTK_GRID (table), 4);
      gtk_grid_set_column_spacing (GTK_GRID (table), 4);
-      gtk_box_pack_start (GTK_BOX (hbox), table);
+      gtk_container_add (GTK_CONTAINER (hbox), table);

      label = gtk_label_new_with_mnemonic ("_Entry 1");
      gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
--- a/demos/gtk-demo/dnd.c
+++ b/demos/gtk-demo/dnd.c
@@ -352,7 +352,7 @@ do_dnd (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (window), vbox);

      fixed = gtk_fixed_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), fixed);
+      gtk_container_add (GTK_CONTAINER (vbox), fixed);
      gtk_widget_set_hexpand (fixed, TRUE);
      gtk_widget_set_vexpand (fixed, TRUE);

--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -208,12 +208,12 @@ do_drawingarea (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Checkerboard pattern</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_vexpand (frame, TRUE);
-      gtk_box_pack_start (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      da = gtk_drawing_area_new ();
      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
@@ -228,12 +228,12 @@ do_drawingarea (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Scribble area</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_widget_set_vexpand (frame, TRUE);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_box_pack_start (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      da = gtk_drawing_area_new ();
      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -356,7 +356,7 @@ do_editable_cells (GtkWidget *do_widget)
      g_object_set (vbox, "margin", 5, NULL);
      gtk_container_add (GTK_CONTAINER (window), vbox);

-      gtk_box_pack_start (GTK_BOX (vbox),
+      gtk_container_add (GTK_CONTAINER (vbox),
                          gtk_label_new ("Shopping list (you can edit the cells!)"));

      sw = gtk_scrolled_window_new (NULL, NULL);
@@ -365,7 +365,7 @@ do_editable_cells (GtkWidget *do_widget)
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), sw);
+      gtk_container_add (GTK_CONTAINER (vbox), sw);

      /* create models */
      items_model = create_items_model ();
@@ -387,17 +387,17 @@ do_editable_cells (GtkWidget *do_widget)
      /* some buttons */
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);

      button = gtk_button_new_with_label ("Add item");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (add_item), treeview);
-      gtk_box_pack_start (GTK_BOX (hbox), button);
+      gtk_container_add (GTK_CONTAINER (hbox), button);

      button = gtk_button_new_with_label ("Remove item");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (remove_item), treeview);
-      gtk_box_pack_start (GTK_BOX (hbox), button);
+      gtk_container_add (GTK_CONTAINER (hbox), button);

      gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);
    }
--- a/demos/gtk-demo/entry_buffer.c
+++ b/demos/gtk-demo/entry_buffer.c
@@ -34,19 +34,19 @@ do_entry_buffer (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "Entries share a buffer. Typing in one is reflected in the other.");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      /* Create a buffer */
      buffer = gtk_entry_buffer_new (NULL, 0);

      /* Create our first entry */
      entry = gtk_entry_new_with_buffer (buffer);
-      gtk_box_pack_start (GTK_BOX (vbox), entry);
+      gtk_container_add (GTK_CONTAINER (vbox), entry);

      /* Create the second entry */
      entry = gtk_entry_new_with_buffer (buffer);
      gtk_entry_set_visibility (GTK_ENTRY (entry), FALSE);
-      gtk_box_pack_start (GTK_BOX (vbox), entry);
+      gtk_container_add (GTK_CONTAINER (vbox), entry);

      g_object_unref (buffer);
    }
--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -60,11 +60,11 @@ do_entry_completion (GtkWidget *do_widget)

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      /* Create our entry */
      entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), entry);
+      gtk_container_add (GTK_CONTAINER (vbox), entry);

      /* Create the completion object */
      completion = gtk_entry_completion_new ();
--- a/demos/gtk-demo/expander.c
+++ b/demos/gtk-demo/expander.c
@@ -73,7 +73,7 @@ do_expander (GtkWidget *do_widget)
                                "resize the window. Do it already !", -1);
      gtk_container_add (GTK_CONTAINER (sw), tv);
      gtk_container_add (GTK_CONTAINER (expander), sw);
-      gtk_box_pack_end (GTK_BOX (area), expander);
+      gtk_container_add (GTK_CONTAINER (area), expander);
      g_signal_connect (expander, "notify::expanded",
                        G_CALLBACK (expander_cb), window);

--- a/demos/gtk-demo/foreigndrawing.c
+++ b/demos/gtk-demo/foreigndrawing.c
@@ -1,8 +1,8 @@
 /* Foreign drawing
 *
- * Many applications can't use GTK+ widgets, for a variety of reasons,
+ * Many applications can't use GTK widgets, for a variety of reasons,
 * but still want their user interface to appear integrated with the
- * rest of the desktop, and follow GTK+ themes. This demo shows how to
+ * rest of the desktop, and follow GTK themes. This demo shows how to
 * use GtkStyleContext and the gtk_render_ APIs to achieve this.
 *
 * Note that this is a very simple, non-interactive example.
--- a/demos/gtk-demo/iconview.c
+++ b/demos/gtk-demo/iconview.c
@@ -266,7 +266,7 @@ do_iconview (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (window), vbox);

      tool_bar = gtk_toolbar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), tool_bar);
+      gtk_container_add (GTK_CONTAINER (vbox), tool_bar);

      up_button = gtk_tool_button_new (NULL, NULL);
      gtk_tool_button_set_label (GTK_TOOL_BUTTON (up_button), _("_Up"));
@@ -292,7 +292,7 @@ do_iconview (GtkWidget *do_widget)
                                      GTK_POLICY_AUTOMATIC);
      gtk_widget_set_vexpand (sw, TRUE);

-      gtk_box_pack_start (GTK_BOX (vbox), sw);
+      gtk_container_add (GTK_CONTAINER (vbox), sw);

      /* Create the store and fill it with the contents of '/' */
      parent = g_strdup ("/");
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -262,7 +262,7 @@ start_progressive_loading (GtkWidget *picture)
   * pauses in the reading process.
   */
  load_timeout = g_timeout_add (150, progressive_timeout, picture);
-  g_source_set_name_by_id (load_timeout, "[gtk+] progressive_timeout");
+  g_source_set_name_by_id (load_timeout, "[gtk] progressive_timeout");
 }

 static void
@@ -354,13 +354,13 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Image loaded from a file</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      image = gtk_image_new_from_icon_name ("gtk3-demo");
      gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
@@ -373,13 +373,13 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Animation loaded from a file</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      picture = gtk_picture_new_for_resource ("/images/floppybuddy.gif");

@@ -390,13 +390,13 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Symbolic themed icon</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
      image = gtk_image_new_from_gicon (gicon);
@@ -412,13 +412,13 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Progressive image loading</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      /* Create an empty image for now; the progressive loader
       * will create the pixbuf and fill it in.
@@ -435,13 +435,13 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Displaying video</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      video = gtk_video_new_for_resource ("/images/gtk-logo.webm");
      gtk_media_stream_set_loop (gtk_video_get_media_stream (GTK_VIDEO (video)), TRUE);
@@ -454,7 +454,7 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>GtkWidgetPaintable</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      paintable = gtk_widget_paintable_new (do_widget);
      picture = gtk_picture_new_for_paintable (paintable);
@@ -464,7 +464,7 @@ do_images (GtkWidget *do_widget)

      /* Sensitivity control */
      button = gtk_toggle_button_new_with_mnemonic ("_Insensitive");
-      gtk_box_pack_start (GTK_BOX (base_vbox), button);
+      gtk_container_add (GTK_CONTAINER (base_vbox), button);

      g_signal_connect (button, "toggled",
                        G_CALLBACK (toggle_sensitivity_callback),
--- a/demos/gtk-demo/infobar.c
+++ b/demos/gtk-demo/infobar.c
@@ -65,24 +65,24 @@ do_infobar (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (window), vbox);

      bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar);
+      gtk_container_add (GTK_CONTAINER (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_INFO);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_INFO");
      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
+      gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);

      button = gtk_toggle_button_new_with_label ("Message");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
      gtk_container_add (GTK_CONTAINER (actions), button);

      bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar);
+      gtk_container_add (GTK_CONTAINER (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_WARNING);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_WARNING");
      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
+      gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);

      button = gtk_toggle_button_new_with_label ("Warning");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
@@ -91,24 +91,24 @@ do_infobar (GtkWidget *do_widget)
      bar = gtk_info_bar_new_with_buttons (_("_OK"), GTK_RESPONSE_OK, NULL);
      gtk_info_bar_set_show_close_button (GTK_INFO_BAR (bar), TRUE);
      g_signal_connect (bar, "response", G_CALLBACK (on_bar_response), window);
-      gtk_box_pack_start (GTK_BOX (vbox), bar);
+      gtk_container_add (GTK_CONTAINER (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_QUESTION);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_QUESTION");
      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
+      gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);

      button = gtk_toggle_button_new_with_label ("Question");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
      gtk_container_add (GTK_CONTAINER (actions), button);

      bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar);
+      gtk_container_add (GTK_CONTAINER (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_ERROR);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_ERROR");
      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
+      gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);

      button = gtk_toggle_button_new_with_label ("Error");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
@@ -116,12 +116,12 @@ do_infobar (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (actions), button);

      bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar);
+      gtk_container_add (GTK_CONTAINER (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_OTHER);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_OTHER");
      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
+      gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);

      button = gtk_toggle_button_new_with_label ("Other");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
@@ -130,7 +130,7 @@ do_infobar (GtkWidget *do_widget)
      frame = gtk_frame_new ("Info bars");
      gtk_widget_set_margin_top (frame, 8);
      gtk_widget_set_margin_bottom (frame, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      g_object_set (vbox2, "margin", 8, NULL);
@@ -138,9 +138,9 @@ do_infobar (GtkWidget *do_widget)

      /* Standard message dialog */
      label = gtk_label_new ("An example of different info bars");
-      gtk_box_pack_start (GTK_BOX (vbox2), label);
+      gtk_container_add (GTK_CONTAINER (vbox2), label);

-      gtk_box_pack_start (GTK_BOX (vbox2), actions);
+      gtk_container_add (GTK_CONTAINER (vbox2), actions);
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -268,7 +268,7 @@ do_list_store (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (window), vbox);

      label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though).");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      sw = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
@@ -276,7 +276,7 @@ do_list_store (GtkWidget *do_widget)
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_NEVER,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), sw);
+      gtk_container_add (GTK_CONTAINER (vbox), sw);

      /* create tree model */
      model = create_model ();
--- a/demos/gtk-demo/listbox.c
+++ b/demos/gtk-demo/listbox.c
@@ -361,12 +361,12 @@ do_listbox (GtkWidget *do_widget)

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
      gtk_container_add (GTK_CONTAINER (window), vbox);
-      label = gtk_label_new ("Messages from Gtk+ and friends");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
+      label = gtk_label_new ("Messages from GTK and friends");
+      gtk_container_add (GTK_CONTAINER (vbox), label);
      scrolled = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
      gtk_widget_set_vexpand (scrolled, TRUE);
-      gtk_box_pack_start (GTK_BOX (vbox), scrolled);
+      gtk_container_add (GTK_CONTAINER (vbox), scrolled);
      listbox = gtk_list_box_new ();
      gtk_container_add (GTK_CONTAINER (scrolled), listbox);

--- a/demos/gtk-demo/listbox.ui
+++ b/demos/gtk-demo/listbox.ui
@@ -67,9 +67,6 @@
                  <class name="dim-label"/>
                </style>
              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
            </child>
            <child>
              <object class="GtkLabel" id="short_time_label">
@@ -79,10 +76,6 @@
                  <class name="dim-label"/>
                </style>
              </object>
-              <packing>
-                <property name="pack-type">end</property>
-                <property name="position">2</property>
-              </packing>
            </child>
          </object>
          <packing>
@@ -118,9 +111,6 @@
              <object class="GtkLabel" id="label4">
                <property name="label" translatable="yes">Resent by</property>
              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
            </child>
            <child>
              <object class="GtkLinkButton" id="resent_by_button">
@@ -130,9 +120,6 @@
                <property name="relief">none</property>
                <property name="uri">http://www.gtk.org</property>
              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
            </child>
          </object>
          <packing>
@@ -172,9 +159,6 @@
                    <property name="relief">none</property>
                    <signal name="clicked" handler="reshare_clicked" swapped="yes"/>
                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
                </child>
                <child>
                  <object class="GtkButton" id="favorite-buttton">
@@ -184,9 +168,6 @@
                    <property name="relief">none</property>
                    <signal name="clicked" handler="favorite_clicked" swapped="yes"/>
                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
                </child>
                <child>
                  <object class="GtkMenuButton" id="more-button">
@@ -200,14 +181,8 @@
                      </object>
                    </child>
                  </object>
-                  <packing>
-                    <property name="position">3</property>
-                  </packing>
                </child>
              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
            </child>
          </object>
          <packing>
@@ -250,14 +225,8 @@ FAVORITES</property>
                        </child>
                        <child type="label_item"/>
                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
                    </child>
                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
                </child>
                <child>
                  <object class="GtkBox" id="box6">
@@ -279,14 +248,8 @@ FAVORITES</property>
                          <class name="dim-label"/>
                        </style>
                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
                    </child>
                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
                </child>
              </object>
            </child>
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -42,24 +42,24 @@ activate_about (GSimpleAction *action,
 {
  GtkApplication *app = user_data;
  const gchar *authors[] = {
-    "The GTK+ Team",
+    "The GTK Team",
    NULL
  };

  gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
-                         "program-name", "GTK+ Demo",
-                         "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
+                         "program-name", "GTK Demo",
+                         "version", g_strdup_printf ("%s,\nRunning against GTK %d.%d.%d",
                                                     PACKAGE_VERSION,
                                                     gtk_get_major_version (),
                                                     gtk_get_minor_version (),
                                                     gtk_get_micro_version ()),
-                         "copyright", "(C) 1997-2013 The GTK+ Team",
+                         "copyright", "(C) 1997-2013 The GTK Team",
                         "license-type", GTK_LICENSE_LGPL_2_1,
                         "website", "http://www.gtk.org",
-                         "comments", "Program to demonstrate GTK+ widgets",
+                         "comments", "Program to demonstrate GTK widgets",
                         "authors", authors,
-                         "logo-icon-name", "gtk3-demo",
-                         "title", "About GTK+ Demo",
+                         "logo-icon-name", "gtk4-demo",
+                         "title", "About GTK Demo",
                         NULL);
 }

--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -19,7 +19,7 @@
    <style><class name="devel"/></style>
    <property name="default-width">800</property>
    <property name="default-height">600</property>
-    <property name="title">GTK+ Demo</property>
+    <property name="title">GTK Demo</property>
    <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="headerbar">
@@ -152,9 +152,6 @@
              </packing>
            </child>
          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
        </child>
      </object>
    </child>
--- a/demos/gtk-demo/menus.c
+++ b/demos/gtk-demo/menus.c
@@ -115,7 +115,7 @@ do_menus (GtkWidget *do_widget)

      menubar = gtk_menu_bar_new ();
      gtk_widget_set_hexpand (menubar, TRUE);
-      gtk_box_pack_start (GTK_BOX (box1), menubar);
+      gtk_container_add (GTK_CONTAINER (box1), menubar);
      gtk_widget_show (menubar);

      menu = create_menu (2);
@@ -136,19 +136,19 @@ do_menus (GtkWidget *do_widget)
      gtk_widget_show (menuitem);

      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2);
+      gtk_container_add (GTK_CONTAINER (box1), box2);
      gtk_widget_show (box2);

      button = gtk_button_new_with_label ("Flip");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (change_orientation), menubar);
-      gtk_box_pack_start (GTK_BOX (box2), button);
+      gtk_container_add (GTK_CONTAINER (box2), button);
      gtk_widget_show (button);

      button = gtk_button_new_with_label ("Close");
      g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK(gtk_widget_destroy), window);
-      gtk_box_pack_start (GTK_BOX (box2), button);
+      gtk_container_add (GTK_CONTAINER (box2), button);
      gtk_widget_set_can_default (button, TRUE);
      gtk_widget_grab_default (button);
      gtk_widget_show (button);
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -4,7 +4,6 @@ demos = files([
  'application_demo.c',
  'assistant.c',
  'builder.c',
-  'button_box.c',
  'changedisplay.c',
  'clipboard.c',
  'colorsel.c',
--- a/demos/gtk-demo/org.gtk.Demo.appdata.xml
+++ b/demos/gtk-demo/org.gtk.Demo.appdata.xml
@@ -3,12 +3,12 @@
  <id>org.gtk.Demo.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>LGPL-2.0+</project_license>
-  <name>GTK+ Demo</name>
-  <summary>Program to demonstrate GTK+ functions</summary>
+  <name>GTK Demo</name>
+  <summary>Program to demonstrate GTK functions</summary>
  <description>
    <p>
-      GTK+ Demo is a collection of examples that demonstrate the major
-      features of the GTK+ toolkit.
+      GTK Demo is a collection of examples that demonstrate the major
+      features of the GTK toolkit.
    </p>
  </description>
  <screenshots>
@@ -30,4 +30,4 @@
  <translation type="gettext">gtk-4.0</translation>
  <update_contact>matthias.clasen_at_gmail.com</update_contact>
  <developer_name>Matthias Clasen and others</developer_name>
-</component>
+</component>
--- a/demos/gtk-demo/org.gtk.Demo.desktop
+++ b/demos/gtk-demo/org.gtk.Demo.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=GTK+ Demo
-Comment=GTK+ code examples and demonstrations
+Name=GTK Demo
+Comment=GTK code examples and demonstrations
 Exec=gtk4-demo
 Icon=gtk4-demo
 Terminal=false
--- a/demos/gtk-demo/overlay.c
+++ b/demos/gtk-demo/overlay.c
@@ -65,7 +65,7 @@ do_overlay (GtkWidget *do_widget)
      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
      gtk_widget_set_margin_top (label, 8);
      gtk_widget_set_margin_bottom (label, 50);
-      gtk_box_pack_start (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), vbox);
@@ -74,7 +74,7 @@ do_overlay (GtkWidget *do_widget)
      gtk_entry_set_placeholder_text (GTK_ENTRY (entry), "Your Lucky Number");
      gtk_widget_set_margin_top (entry, 50);
      gtk_widget_set_margin_bottom (entry, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), entry);
+      gtk_container_add (GTK_CONTAINER (vbox), entry);

      gtk_container_add (GTK_CONTAINER (window), overlay);

--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -148,7 +148,7 @@ do_panes (GtkWidget *do_widget)

      vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
      g_object_set (vpaned, "margin", 5, NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), vpaned);
+      gtk_container_add (GTK_CONTAINER (vbox), vpaned);

      hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
      gtk_paned_add1 (GTK_PANED (vpaned), hpaned);
@@ -173,13 +173,13 @@ do_panes (GtkWidget *do_widget)

      /* Now create toggle buttons to control sizing */

-      gtk_box_pack_start (GTK_BOX (vbox),
+      gtk_container_add (GTK_CONTAINER (vbox),
                          create_pane_options (GTK_PANED (hpaned),
                                               "Horizontal",
                                               "Left",
                                               "Right"));

-      gtk_box_pack_start (GTK_BOX (vbox),
+      gtk_container_add (GTK_CONTAINER (vbox),
                          create_pane_options (GTK_PANED (vpaned),
                                               "Vertical",
                                               "Top",
--- a/demos/gtk-demo/popover.ui
+++ b/demos/gtk-demo/popover.ui
@@ -81,9 +81,6 @@
              </object>
            </child>
          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
        </child>
      </object>
    </child>
--- a/demos/gtk-demo/rotated_text.c
+++ b/demos/gtk-demo/rotated_text.c
@@ -12,7 +12,7 @@
 #include <string.h>

 #define HEART "♥"
-const char text[] = "I ♥ GTK+";
+const char text[] = "I ♥ GTK";

 static void
 fancy_shape_renderer (cairo_t        *cr,
--- a/demos/gtk-demo/search_entry.c
+++ b/demos/gtk-demo/search_entry.c
@@ -240,20 +240,20 @@ do_search_entry (GtkWidget *do_widget)

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label), "Search entry demo");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);

      /* Create our entry */
      entry = gtk_search_entry_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), entry);
+      gtk_container_add (GTK_CONTAINER (hbox), entry);

      /* Create the find and cancel buttons */
      notebook = gtk_notebook_new ();
      gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
      gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);
-      gtk_box_pack_start (GTK_BOX (hbox), notebook);
+      gtk_container_add (GTK_CONTAINER (hbox), notebook);

      find_button = gtk_button_new_with_label ("Find");
      g_signal_connect (find_button, "clicked",
--- a/demos/gtk-demo/search_entry2.c
+++ b/demos/gtk-demo/search_entry2.c
@@ -83,38 +83,38 @@ do_search_entry2 (GtkWidget *do_widget)
      entry = gtk_search_entry_new ();
      container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
      gtk_widget_set_halign (container, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (container), entry);
+      gtk_container_add (GTK_CONTAINER (container), entry);
      searchbar = gtk_search_bar_new ();
      gtk_search_bar_connect_entry (GTK_SEARCH_BAR (searchbar), GTK_ENTRY (entry));
      gtk_search_bar_set_show_close_button (GTK_SEARCH_BAR (searchbar), FALSE);
      gtk_container_add (GTK_CONTAINER (searchbar), container);
-      gtk_box_pack_start (GTK_BOX (vbox), searchbar);
+      gtk_container_add (GTK_CONTAINER (vbox), searchbar);

      /* Hook the search bar to key presses */
      gtk_search_bar_set_key_capture_widget (GTK_SEARCH_BAR (searchbar), window);

      /* Help */
      label = gtk_label_new ("Start Typing to search");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      /* Toggle button */
      button = gtk_toggle_button_new_with_label ("Search");
      g_object_bind_property (button, "active",
                              searchbar, "search-mode-enabled",
                              G_BINDING_BIDIRECTIONAL);
-      gtk_box_pack_start (GTK_BOX (vbox), button);
+      gtk_container_add (GTK_CONTAINER (vbox), button);

      /* Result */
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);

      label = gtk_label_new ("Result:");
      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
      gtk_widget_set_margin_start (label, 6);
-      gtk_box_pack_start (GTK_BOX (hbox), label);
+      gtk_container_add (GTK_CONTAINER (hbox), label);

      label = gtk_label_new ("");
-      gtk_box_pack_start (GTK_BOX (hbox), label);
+      gtk_container_add (GTK_CONTAINER (hbox), label);

      g_signal_connect (entry, "search-changed",
                        G_CALLBACK (search_changed_cb), label);
@@ -122,15 +122,15 @@ do_search_entry2 (GtkWidget *do_widget)
                        G_CALLBACK (changed_cb), label);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);

      label = gtk_label_new ("Signal:");
      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
      gtk_widget_set_margin_start (label, 6);
-      gtk_box_pack_start (GTK_BOX (hbox), label);
+      gtk_container_add (GTK_CONTAINER (hbox), label);

      label = gtk_label_new ("");
-      gtk_box_pack_start (GTK_BOX (hbox), label);
+      gtk_container_add (GTK_CONTAINER (hbox), label);

      g_signal_connect (entry, "search-changed",
                        G_CALLBACK (search_changed), label);
--- a/demos/gtk-demo/sidebar.c
+++ b/demos/gtk-demo/sidebar.c
@@ -19,7 +19,7 @@ do_sidebar (GtkWidget *do_widget)
  GtkWidget *widget;
  GtkWidget *header;
  const gchar* pages[] = {
-    "Welcome to GTK+",
+    "Welcome to GTK",
    "GtkStackSidebar Widget",
    "Automatic navigation",
    "Consistent appearance",
@@ -49,7 +49,7 @@ do_sidebar (GtkWidget *do_widget)

      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
      sidebar = gtk_stack_sidebar_new ();
-      gtk_box_pack_start (GTK_BOX (box), sidebar);
+      gtk_container_add (GTK_CONTAINER (box), sidebar);

      stack = gtk_stack_new ();
      gtk_stack_set_transition_type (GTK_STACK (stack), GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN);
@@ -57,9 +57,9 @@ do_sidebar (GtkWidget *do_widget)

      /* Separator between sidebar and stack */
      widget = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
-      gtk_box_pack_start (GTK_BOX(box), widget);
+      gtk_container_add (GTK_CONTAINER(box), widget);

-      gtk_box_pack_start (GTK_BOX (box), stack);
+      gtk_container_add (GTK_CONTAINER (box), stack);

      for (i=0; (c = *(pages+i)) != NULL; i++ )
        {
--- a/demos/gtk-demo/sizegroup.c
+++ b/demos/gtk-demo/sizegroup.c
@@ -116,7 +116,7 @@ do_sizegroup (GtkWidget *do_widget)

      /* Create one frame holding color options */
      frame = gtk_frame_new ("Color Options");
-      gtk_box_pack_start (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      table = gtk_grid_new ();
      g_object_set (table, "margin", 5, NULL);
@@ -129,7 +129,7 @@ do_sizegroup (GtkWidget *do_widget)

      /* And another frame holding line style options */
      frame = gtk_frame_new ("Line Options");
-      gtk_box_pack_start (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      table = gtk_grid_new ();
      g_object_set (table, "margin", 5, NULL);
@@ -142,7 +142,7 @@ do_sizegroup (GtkWidget *do_widget)

      /* And a check button to turn grouping on and off */
      check_button = gtk_check_button_new_with_mnemonic ("_Enable grouping");
-      gtk_box_pack_start (GTK_BOX (vbox), check_button);
+      gtk_container_add (GTK_CONTAINER (vbox), check_button);

      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
      g_signal_connect (check_button, "toggled",
--- a/demos/gtk-demo/spinner.c
+++ b/demos/gtk-demo/spinner.c
@@ -53,7 +53,7 @@ do_spinner (GtkWidget *do_widget)

    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
    g_object_set (vbox, "margin", 5, NULL);
-    gtk_box_pack_start (GTK_BOX (content_area), vbox);
+    gtk_container_add (GTK_CONTAINER (content_area), vbox);

    /* Sensitive */
    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
--- a/demos/gtk-demo/textscroll.c
+++ b/demos/gtk-demo/textscroll.c
@@ -157,7 +157,7 @@ create_text_view (GtkWidget *hbox,
  guint timeout;

  swindow = gtk_scrolled_window_new (NULL, NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), swindow);
+  gtk_container_add (GTK_CONTAINER (hbox), swindow);
  textview = gtk_text_view_new ();
  gtk_container_add (GTK_CONTAINER (swindow), textview);

--- a/demos/gtk-demo/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -280,7 +280,7 @@ insert_text (GtkTextBuffer *buffer)
  gtk_text_buffer_insert (buffer, &iter,
      "This line (and most of the others in this buffer) is word-wrapped, "
      "using the proper Unicode algorithm. Word wrap should work in all "
-      "scripts and languages that GTK+ supports. Let's make this a long "
+      "scripts and languages that GTK supports. Let's make this a long "
      "paragraph to demonstrate: blah blah blah blah blah blah blah blah "
      "blah blah blah blah blah blah blah blah blah blah blah\n\n", -1);

--- a/demos/gtk-demo/theming.ui
+++ b/demos/gtk-demo/theming.ui
@@ -131,9 +131,6 @@
            <property name="can-focus">1</property>
            <property name="receives-default">1</property>
          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
        </child>
        <child>
          <object class="GtkButton">
@@ -141,9 +138,6 @@
            <property name="can-focus">1</property>
            <property name="receives-default">1</property>
          </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
        </child>
      </object>
    </child>
--- a/demos/gtk-demo/theming_style_classes.c
+++ b/demos/gtk-demo/theming_style_classes.c
@@ -1,10 +1,10 @@
 /* Theming/Style Classes
 *
- * GTK+ uses CSS for theming. Style classes can be associated
+ * GTK uses CSS for theming. Style classes can be associated
 * with widgets to inform the theme about intended rendering.
 *
 * This demo shows some common examples where theming features
- * of GTK+ are used for certain effects: primary toolbars,
+ * of GTK are used for certain effects: primary toolbars,
 * inline toolbars and linked buttons.
 */

--- a/demos/gtk-demo/tree_store.c
+++ b/demos/gtk-demo/tree_store.c
@@ -401,7 +401,7 @@ do_tree_store (GtkWidget *do_widget)
      g_object_set (vbox, "margin", 8, NULL);
      gtk_container_add (GTK_CONTAINER (window), vbox);

-      gtk_box_pack_start (GTK_BOX (vbox),
+      gtk_container_add (GTK_CONTAINER (vbox),
                          gtk_label_new ("Jonathan's Holiday Card Planning Sheet"));

      sw = gtk_scrolled_window_new (NULL, NULL);
@@ -410,7 +410,7 @@ do_tree_store (GtkWidget *do_widget)
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), sw);
+      gtk_container_add (GTK_CONTAINER (vbox), sw);

      /* create model */
      model = create_model ();
--- a/demos/icon-browser/icon.list
+++ b/demos/icon-browser/icon.list
@@ -513,3 +513,5 @@ trophy-gold=
 night-light=
 daytime-sunrise=
 daytime-sunset=
+on=
+off=
--- a/demos/icon-browser/window.ui
+++ b/demos/icon-browser/window.ui
@@ -121,7 +121,7 @@
    <property name="use-header-bar">1</property>
    <property name="resizable">0</property>
    <property name="hide-on-close">1</property>
-    <child internal-child="vbox">
+    <child internal-child="content_area">
      <object class="GtkBox">
        <child>
          <object class="GtkGrid">
--- a/demos/widget-factory/org.gtk.WidgetFactory.appdata.xml
+++ b/demos/widget-factory/org.gtk.WidgetFactory.appdata.xml
@@ -3,11 +3,11 @@
  <id>org.gtk.WidgetFactory.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>LGPL-2.0+</project_license>
-  <name>GTK+ Widget Factory</name>
-  <summary>Program to demonstrate GTK+ functions</summary>
+  <name>GTK Widget Factory</name>
+  <summary>Program to demonstrate GTK functions</summary>
  <description>
    <p>
-      GTK+ Widget Factory is a showcase of GTK+ widgets. It was
+      GTK Widget Factory is a showcase of GTK widgets. It was
      originally created to help theme authors test their creations
      for completeness.
    </p>
--- a/demos/widget-factory/org.gtk.WidgetFactory.desktop
+++ b/demos/widget-factory/org.gtk.WidgetFactory.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Widget Factory
-Comment=A showcase for GTK+ widgets, designed for testing themes.
+Comment=A showcase for GTK widgets, designed for testing themes.
 Exec=gtk4-widget-factory
 Icon=gtk4-widget-factory
 Terminal=false
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -212,28 +212,28 @@ activate_about (GSimpleAction *action,
                          glib_major_version,
                          glib_minor_version,
                          glib_micro_version);
-  g_string_append_printf (s, "\tGTK+\t%d.%d.%d\n",
+  g_string_append_printf (s, "\tGTK\t%d.%d.%d\n",
                          gtk_get_major_version (),
                          gtk_get_minor_version (),
                          gtk_get_micro_version ());
  g_string_append_printf (s, "\nA link can apppear here: <http://www.gtk.org>");

-  version = g_strdup_printf ("%s\nRunning against GTK+ %d.%d.%d",
+  version = g_strdup_printf ("%s\nRunning against GTK %d.%d.%d",
                             PACKAGE_VERSION,
                             gtk_get_major_version (),
                             gtk_get_minor_version (),
                             gtk_get_micro_version ());

  gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
-                         "program-name", "GTK+ Widget Factory",
+                         "program-name", "GTK Widget Factory",
                         "version", version,
-                         "copyright", "(C) 1997-2013 The GTK+ Team",
+                         "copyright", "(C) 1997-2013 The GTK Team",
                         "license-type", GTK_LICENSE_LGPL_2_1,
                         "website", "http://www.gtk.org",
-                         "comments", "Program to demonstrate GTK+ themes and widgets",
+                         "comments", "Program to demonstrate GTK themes and widgets",
                         "authors", authors,
                         "logo-icon-name", "gtk4-widget-factory",
-                         "title", "About GTK+ Widget Factory",
+                         "title", "About GTK Widget Factory",
                         "system-information", s->str,
                         NULL);

@@ -803,7 +803,7 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget)
                "margin", 6,
                "xalign", 0.0,
                NULL);
-  gtk_box_pack_start (GTK_BOX (row), label);
+  gtk_container_add (GTK_CONTAINER (row), label);
  gdk_rgba_parse (&rgba, color);
  swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
                         "rgba", &rgba,
@@ -815,7 +815,7 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget)
                         NULL);
  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
  gtk_container_add (GTK_CONTAINER (box), swatch);
-  gtk_box_pack_start (GTK_BOX (row), box);
+  gtk_container_add (GTK_CONTAINER (row), box);
  gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1);
  row = gtk_widget_get_parent (row);
  gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
@@ -914,7 +914,7 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser)
                    "hexpand", TRUE,
                    "xalign", 0.0,
                    NULL);
-      gtk_box_pack_start (GTK_BOX (row), label);
+      gtk_container_add (GTK_CONTAINER (row), label);
      gdk_rgba_parse (&rgba, colors[i].color);
      swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
                             "rgba", &rgba,
@@ -926,7 +926,7 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser)
                             NULL);
      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
      gtk_container_add (GTK_CONTAINER (box), swatch);
-      gtk_box_pack_start (GTK_BOX (row), box);
+      gtk_container_add (GTK_CONTAINER (row), box);
      gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1);
      row = gtk_widget_get_parent (row);
      gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -407,7 +407,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
  </object>
  <object class="GtkApplicationWindow" id="window">
    <style><class name="devel"/></style>
-    <property name="title">GTK+ Widget Factory</property>
+    <property name="title">GTK Widget Factory</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="headerbar1">
        <property name="show-title-buttons">1</property>
@@ -472,9 +472,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                              </object>
                            </child>
                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
                        </child>
                        <child>
                          <object class="GtkEntry" id="entry1">
@@ -486,9 +483,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                            <property name="secondary-icon-tooltip-text">Change mode</property>
                            <signal name="icon-release" handler="on_entry_icon_release" swapped="no"/>
                          </object>
-                          <packing>
-                            <property name="position">2</property>
-                          </packing>
                        </child>
                        <child>
                          <object class="GtkEntry" id="entry2">
@@ -497,9 +491,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                            <property name="invisible-char">•</property>
                            <property name="text" translatable="yes">entry</property>
                          </object>
-                          <packing>
-                            <property name="position">3</property>
-                          </packing>
                        </child>
                        <child>
                          <object class="GtkBox" id="box223">
@@ -519,14 +510,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                <property name="can-focus">1</property>
                                <property name="icon-name">window-close-symbolic</property>
                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
                            </child>
                          </object>
-                          <packing>
-                            <property name="position">4</property>
-                          </packing>
                        </child>
                        <child>
                          <object class="GtkBox">
@@ -588,9 +573,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                <property name="sensitive">0</property>
                                <property name="label" translatable="yes">label</property>
                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
                            </child>
                            <child>
                              <object class="GtkSpinButton" id="spinbutton1">
@@ -599,9 +581,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                <property name="max-width-chars">2</property>
                                <property name="adjustment">adjustment2</property>
                              </object>
-                              <packing>
-                                <property name="position">2</property>
-                              </packing>
                            </child>
                            <child>
                              <object class="GtkSpinButton" id="spinbutton2">
@@ -610,9 +589,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                <property name="width-chars">2</property>
                                <property name="max-width-chars">2</property>
                              </object>
-                              <packing>
-                                <property name="position">3</property>
-                              </packing>
                            </child>
                          </object>
                        </child>
@@ -806,9 +782,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                      <object class="GtkSeparator" id="separator1">
                        <property name="orientation">vertical</property>
                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
                    </child>
                    <child>
                      <object class="GtkBox" id="box19">
@@ -828,9 +801,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                            <property name="can-focus">1</property>
                            <property name="receives-default">1</property>
                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
                        </child>
                        <child>
                          <object class="GtkToggleButton" id="togglebutton3">
@@ -839,9 +809,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                            <property name="receives-default">1</property>
                            <property name="active">1</property>
                          </object>
-                          <packing>
-                            <property name="position">2</property>
-                          </packing>
                        </child>
                        <child>
                          <object class="GtkToggleButton" id="togglebutton4">
@@ -851,9 +818,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                            <property name="receives-default">1</property>
                            <property name="active">1</property>
                          </object>
-                          <packing>
-                            <property name="position">3</property>
-                          </packing>
                        </child>
                        <child>
                          <object class="GtkComboBox" id="combobox1">
@@ -866,9 +830,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                              </attributes>
                            </child>
                          </object>
-                          <packing>
-                            <property name="position">5</property>
-                          </packing>
                        </child>
                        <child>
                          <object class="GtkComboBox" id="combobox2">
@@ -882,9 +843,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                              </attributes>
                            </child>
                          </object>
-                          <packing>
-                            <property name="position">6</property>
-                          </packing>
                        </child>
                        <child>
                          <object class="GtkFontButton" id="fontbutton1">
@@ -892,9 +850,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                            <property name="receives-default">1</property>
                            <property name="level">family|style|size|features|variations</property>
                          </object>
-                          <packing>
-                            <property name="position">6</property>
-                          </packing>
                        </child>
                        <child>
                          <object class="GtkColorButton" id="colorbutton1">
@@ -903,16 +858,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                            <property name="rgba">#31316867a09f</property>
                            <property name="use-alpha">1</property>
                          </object>
-                          <packing>
-                            <property name="position">8</property>
-                          </packing>
                        </child>
                        <child>
                          <object class="GtkFileChooserButton" id="filechooserbutton1">
                          </object>
-                          <packing>
-                            <property name="position">8</property>
-                          </packing>
                        </child>
                        <child>
                          <object class="GtkLinkButton" id="linkbutton1">
@@ -923,39 +872,24 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                            <property name="relief">none</property>
                            <property name="uri">http://www.gtk.org</property>
                          </object>
-                          <packing>
-                            <property name="position">9</property>
-                          </packing>
                        </child>
                        <child>
                          <object class="GtkSwitch" id="switch1">
                            <property name="halign">center</property>
                          </object>
-                          <packing>
-                            <property name="position">10</property>
-                          </packing>
                        </child>
                        <child>
                          <object class="GtkSwitch" id="switch2">
                            <property name="sensitive">0</property>
                            <property name="halign">center</property>
                          </object>
-                          <packing>
-                            <property name="position">11</property>
-                          </packing>
                        </child>
                      </object>
-                      <packing>
-                        <property name="position">2</property>
-                      </packing>
                    </child>
                    <child>
                      <object class="GtkSeparator" id="separator2">
                        <property name="orientation">vertical</property>
                      </object>
-                      <packing>
-                        <property name="position">3</property>
-                      </packing>
                    </child>
                    <child>
                      <object class="GtkBox" id="box20">
@@ -976,26 +910,17 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                <property name="fraction">0.5</property>
                                <property name="inverted">1</property>
                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
                            </child>
                            <child>
                              <object class="GtkProgressBar" id="progressbar3">
                                <property name="fraction">0.5</property>
                                <property name="show-text">1</property>
                              </object>
-                              <packing>
-                                <property name="position">2</property>
-                              </packing>
                            </child>
                            <child>
                              <object class="GtkLevelBar" id="levelbar1">
                                <property name="value">0.6</property>
                              </object>
-                              <packing>
-                                <property name="position">10</property>
-                              </packing>
                            </child>
                            <child>
                              <object class="GtkLevelBar" id="levelbar2">
@@ -1008,9 +933,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                  <offset name="full" value="5"/>
                                </offsets>
                              </object>
-                              <packing>
-                                <property name="position">11</property>
-                              </packing>
                            </child>
                          </object>
                        </child>
@@ -1039,16 +961,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="fill-level">75</property>
                                    <property name="draw-value">0</property>
                                  </object>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
                                </child>
                              </object>
                            </child>
                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
                        </child>
                        <child>
                          <object class="GtkScale" id="scale5">
@@ -1066,9 +982,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                              <mark value="4" position="bottom"></mark>
                            </marks>
                          </object>
-                          <packing>
-                            <property name="position">2</property>
-                          </packing>
                        </child>
                        <child>
                          <object class="GtkBox" id="box25">
@@ -1092,9 +1005,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="inverted">1</property>
                                    <property name="halign">start</property>
                                  </object>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
                                </child>
                              </object>
                            </child>
@@ -1129,32 +1039,17 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="halign">start</property>
                                    <signal name="format-value" handler="scale_format_value_blank"/>
                                  </object>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
                                </child>
                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
                            </child>
                          </object>
-                          <packing>
-                            <property name="position">3</property>
-                          </packing>
                        </child>
                      </object>
-                      <packing>
-                        <property name="position">4</property>
-                      </packing>
                    </child>
                    <child>
                      <object class="GtkSeparator" id="separator3">
                        <property name="orientation">vertical</property>
                      </object>
-                      <packing>
-                        <property name="position">5</property>
-                      </packing>
                    </child>
                    <child>
                      <object class="GtkBox" id="box26">
@@ -1187,9 +1082,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                              </object>
                            </child>
                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
                        </child>
                        <child>
                          <object class="GtkFrame" id="frame3">
@@ -1203,9 +1095,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                              </object>
                            </child>
                          </object>
-                          <packing>
-                            <property name="position">2</property>
-                          </packing>
                        </child>
                        <child>
                          <object class="GtkFrame" id="frame4">
@@ -1219,22 +1108,13 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                              </object>
                            </child>
                          </object>
-                          <packing>
-                            <property name="position">3</property>
-                          </packing>
                        </child>
                      </object>
-                      <packing>
-                        <property name="position">6</property>
-                      </packing>
                    </child>
                    <child>
                      <object class="GtkSeparator" id="separator4">
                        <property name="orientation">vertical</property>
                      </object>
-                      <packing>
-                        <property name="position">7</property>
-                      </packing>
                    </child>
                    <child>
                      <object class="GtkBox" id="box4">
@@ -1335,25 +1215,13 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                              </object>
                            </child>
                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
                        </child>
                      </object>
-                      <packing>
-                        <property name="position">8</property>
-                      </packing>
                    </child>
                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
                </child>
                <child>
                  <object class="GtkSeparator" id="separator5"/>
-                  <packing>
-                    <property name="position">3</property>
-                  </packing>
                </child>
                <child>
                  <object class="GtkBox" id="box5">
@@ -1379,9 +1247,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                          <object class="GtkBox" id="box7">
                            <property name="orientation">vertical</property>
                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
                        </child>
                        <child type="tab">
                          <object class="GtkLabel" id="label6">
@@ -1463,9 +1328,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                          </packing>
                        </child>
                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
                    </child>
                    <child>
                      <object class="GtkNotebook" id="notebook3">
@@ -1519,9 +1381,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                          </packing>
                        </child>
                      </object>
-                      <packing>
-                        <property name="position">2</property>
-                      </packing>
                    </child>
                    <child>
                      <object class="GtkNotebook" id="notebook4">
@@ -1575,14 +1434,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                          </packing>
                        </child>
                      </object>
-                      <packing>
-                        <property name="position">3</property>
-                      </packing>
                    </child>
                  </object>
-                  <packing>
-                    <property name="position">4</property>
-                  </packing>
                </child>
              </object>
              <packing>
@@ -3057,9 +2910,6 @@ microphone-sensitivity-medium-symbolic</property>
                                              <class name="small-button"/>
                                            </style>
                                          </object>
-                                          <packing>
-                                            <property name="pack-type">end</property>
-                                          </packing>
                                        </child>
                                      </object>
                                    </child>
@@ -3090,9 +2940,6 @@ microphone-sensitivity-medium-symbolic</property>
                                              <class name="small-button"/>
                                            </style>
                                          </object>
-                                          <packing>
-                                            <property name="pack-type">end</property>
-                                          </packing>
                                        </child>
                                      </object>
                                    </child>
@@ -3151,9 +2998,6 @@ microphone-sensitivity-medium-symbolic</property>
                            <property name="show-emoji-icon">1</property>
                            <property name="placeholder-text" translatable="yes">Age…</property>
                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
                        </child>
                        <style>
                          <class name="linked"/>
@@ -3289,7 +3133,7 @@ bad things might happen.</property>
    <property name="use-header-bar">1</property>
    <property name="title" translatable="yes">Zelda</property>
    <property name="hide-on-close">1</property>
-    <child internal-child="vbox">
+    <child internal-child="content_area">
      <object class="GtkBox">
        <child>
          <object class="GtkLabel">
@@ -3328,7 +3172,7 @@ bad things might happen.</property>
    <property name="use-header-bar">1</property>
    <property name="title" translatable="yes">Settings</property>
    <property name="hide-on-close">1</property>
-    <child internal-child="vbox">
+    <child internal-child="content_area">
      <object class="GtkBox">
        <child>
          <object class="GtkGrid">
@@ -3449,7 +3293,7 @@ bad things might happen.</property>
    <property name="use-header-bar">1</property>
    <property name="title" translatable="yes">Choose one</property>
    <property name="hide-on-close">1</property>
-    <child internal-child="vbox">
+    <child internal-child="content_area">
      <object class="GtkBox">
        <child>
          <object class="GtkFlowBox" id="selection_flowbox">
--- a/docs/CODING-STYLE
+++ b/docs/CODING-STYLE
@@ -1,8 +1,8 @@
-GTK+ Coding Style
+GTK Coding Style
 -------------------------------------------------------------------------------

 This document is intended to be a short description of the preferred
-coding style to be used for the GTK+ source code. It was strongly
+coding style to be used for the GTK source code. It was strongly
 inspired by Clutter's CODING_STYLE.

 Coding style is a matter of consistency, readability and maintainance;
@@ -12,7 +12,7 @@ and consistent answers to common questions regarding the coding style,
 and will also try to identify the allowed exceptions.

 The examples will show the preferred coding style; the negative examples
-will be clearly identified. Please, don't submit code to GTK+ that
+will be clearly identified. Please, don't submit code to GTK that
 looks like any of these.

 Part of the rationales for these coding style rules are available either
@@ -38,10 +38,10 @@ using tab characters alone, or using a combination of spaces and tabs.

 Do not change the editor's configuration to change the meaning of a
 tab character (see below); code using tabs to indent will not be accepted
-into GTK+.
+into GTK.

 Even if two spaces for each indentation level allows deeper nesting than
-8 spaces, GTK+ favours self-documenting function names that can take
+8 spaces, GTK favours self-documenting function names that can take
 quite some space. For this reason you should avoid deeply nested code.

 + Tab characters
@@ -399,7 +399,7 @@ patch or commit. Never use empty lines at the beginning or at the end of
 a file.

 Do enable the default git pre-commit hook that detect trailing
-whitespace for you and help you to avoid corrupting GTK+'s tree with
+whitespace for you and help you to avoid corrupting GTK's tree with
 it. Do that as follows:

  chmod a+x .git/hooks/pre-commit
@@ -410,7 +410,7 @@ duplicate blank lines.

 + Headers

-Headers are special, for GTK+, in that they don't have to obey the
+Headers are special, for GTK, in that they don't have to obey the
 80 characters limit. The only major rule for headers is that the function
 definitions should be vertically aligned in three columns:

@@ -479,7 +479,7 @@ Additionally, public headers should use C++ guards around their declarations:

 + Includes

-GTK+ source files must never include the global gtk.h header; instead, it
+GTK source files must never include the global gtk.h header; instead, it
 should include the individual headers that are needed.

 Every source file must include config.h first, followed by the header matching
@@ -658,7 +658,7 @@ after the license header:
   * @Short_Description: Height-for-width geometry management
   * @Title: GtkSizeRequest
   *
-   * The GtkSizeRequest interface is GTK+'s height-for-width (and
+   * The GtkSizeRequest interface is GTK's height-for-width (and
   * width-for-height) geometry management system.
   * ...
   */
@@ -672,8 +672,8 @@ get_type function needs to listed in gtk3.types.

 + Old code

-New code that is being added to GTK+ should adhere to the style
-explained above. Existing GTK+ code does largely follow these
+New code that is being added to GTK should adhere to the style
+explained above. Existing GTK code does largely follow these
 conventions, but there are some differences, e.g. occurrences
 of tabs, etc.

--- a/docs/RELEASE-HOWTO.md
+++ b/docs/RELEASE-HOWTO.md
@@ -1,5 +1,5 @@
-How to do a GTK+ release?
-=========================
+How to do a GTK release?
+========================

 ## Before we begin

@@ -91,7 +91,7 @@ $ ninja -C _build gtk40-properties-pot
  12. Tag the release. The git command for doing that looks like:

 ```sh
-$ git tag -m "GTK+ 4.2.0" 4.2.0
+$ git tag -m "GTK 4.2.0" 4.2.0
 ```

  13. Bump the version number in `meson.build` and commit the change.
@@ -110,8 +110,8 @@ $ git push origin 4.2.0
    this looks like:

 ```sh
-$ scp gtk+-4.2.0.tar.xz matthiasc@master.gnome.org:
-$ ssh matthiasc@master.gnome.org ftpadmin install gtk+-4.2.0.tar.xz
+$ scp gtk-4.2.0.tar.xz matthiasc@master.gnome.org:
+$ ssh matthiasc@master.gnome.org ftpadmin install gtk-4.2.0.tar.xz
 ```

  16. Go to the gnome-announce list archives, find the last announce message,
--- a/docs/developers.txt
+++ b/docs/developers.txt
@@ -1,5 +1,5 @@
-Things to care about when using/programing for GTK+
-===================================================
+Things to care about when using/programing for GTK
+==================================================

 This file is meant to collect some frequently triggered failures when
 programming for/with Gtk, having the spirit of a developers FAQ.
--- a/docs/dnd_internals.txt
+++ b/docs/dnd_internals.txt
@@ -57,7 +57,7 @@ The GDK API
 ===========

 It is expect that the GDK DND API will never be
-used by anything other than the DND code in GTK+.
+used by anything other than the DND code in GTK.

 /* Drag and Drop */

@@ -159,7 +159,7 @@ the taskbar.
 Internally, when the outer drag enters a proxy dest site, a
 new source drag is created, with SourceInfo and
 GdkDragContext. From the GDK side, it looks much like a
-normal source drag; on the GTK+ side, most of the code is
+normal source drag; on the GTK side, most of the code is
 disjoint. The need to pass in a specific target window
 is the reason why the GDK DND API splits
 gdk_drag_find_window() and gdk_drag_motion().
--- a/docs/iconcache.txt
+++ b/docs/iconcache.txt
@@ -1,4 +1,4 @@
-Information about the icon theme cache format used by GTK+
+Information about the icon theme cache format used by GTK
 for more information, see the mailing list threads at 

 http://mail.gnome.org/archives/gtk-devel-list/2004-April/msg00065.html
@@ -30,7 +30,7 @@ We would like to propose the cache file format as an appendix to the
 icon theme specification. One thing which still needs to be investigated
 is caching of the actual image data; the file format is has an
 IMAGE_DATA_OFFSET member to allow adding that compatibly. An
-implementation of the caching scheme for GTK+ can be found at [2]. The
+implementation of the caching scheme for GTK can be found at [2]. The
 cache generator which is included in the patch depends only on glib, and
 it may be a good idea to move it to freedesktop.org as well. 

--- a/docs/reference/gtk/broadway.xml
+++ b/docs/reference/gtk/broadway.xml
@@ -4,23 +4,23 @@
 ]>
 <refentry id="gtk-broadway">
 <refmeta>
-<refentrytitle>Using GTK+ with Broadway</refentrytitle>
+<refentrytitle>Using GTK with Broadway</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>

 <refnamediv>
-<refname>Using GTK+ with Broadway</refname>
+<refname>Using GTK with Broadway</refname>
 <refpurpose>
-HTML-specific aspects of using GTK+
+HTML-specific aspects of using GTK
 </refpurpose>
 </refnamediv>

 <refsect1>
-<title>Using GTK+ with Broadway</title>
+<title>Using GTK with Broadway</title>

 <para>
-The GDK Broadway backend provides support for displaying GTK+
+The GDK Broadway backend provides support for displaying GTK
 applications in a web browser, using HTML5 and web sockets. To run
 your application in this way, select the Broadway backend by setting
 <literal>GDK_BACKEND=broadway</literal>. Then you can make
@@ -36,9 +36,9 @@ port that you want to use.
 </para>

 <para>
-It is also possible to use multiple GTK+ applications in the same
+It is also possible to use multiple GTK applications in the same
 web browser window, by using the Broadway server,
-<command>broadwayd</command>, that ships with GTK+.
+<command>broadwayd</command>, that ships with GTK.
 To use broadwayd, start it like this:
 <programlisting>
 broadwayd :5
--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -4,31 +4,31 @@
 ]>
 <refentry id="gtk-building">
 <refmeta>
-<refentrytitle>Compiling the GTK+ libraries</refentrytitle>
+<refentrytitle>Compiling the GTK libraries</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>

 <refnamediv>
-<refname>Compiling the GTK+ Libraries</refname>
+<refname>Compiling the GTK Libraries</refname>
 <refpurpose>
-How to compile GTK+ itself
+How to compile GTK itself
 </refpurpose>
 </refnamediv>
  <refsect1 id="overview">
-    <title>Building GTK+</title>
+    <title>Building GTK</title>
    <para>
-      Before we get into the details of how to compile GTK+, we should
-      mention that in many cases, binary packages of GTK+ prebuilt for
+      Before we get into the details of how to compile GTK, we should
+      mention that in many cases, binary packages of GTK prebuilt for
      your operating system will be available, either from your
      operating system vendor or from independent sources. If such a
      set of packages is available, installing it will get you
-      programming with GTK+ much faster than building it yourself. In
-      fact, you may well already have GTK+ installed on your system
+      programming with GTK much faster than building it yourself. In
+      fact, you may well already have GTK installed on your system
      already.
    </para>
    <para>
-      In order to build GTK+, you will need <application>meson</application>
+      In order to build GTK, you will need <application>meson</application>
      installed on your system. On Linux, and other UNIX-like operating
      systems, you will also need <application>ninja</application>. This
      guide does not cover how to install these two requirements, but you
@@ -38,11 +38,11 @@ How to compile GTK+ itself
      refer to it in the examples.
    </para>
    <para>
-      If you are building GTK+ from a source distribution or from a Git
+      If you are building GTK from a source distribution or from a Git
      clone, you will need to use <application>meson</application> to
      configure the project. The most commonly useful argument is the
      <systemitem>--prefix</systemitem> one, which determines where the
-      files will go once installed. To install GTK+ under a prefix
+      files will go once installed. To install GTK under a prefix
      like <filename>/opt/gtk</filename> you would run Meson as:
    </para>
    <informalexample>
@@ -83,7 +83,7 @@ How to compile GTK+ itself
      <envar>PKG_CONFIG_PATH</envar> environment variable contains
      a search path that <command>pkg-config</command> (see below)
      uses when looking for files describing how to compile
-      programs using different libraries. If you were installing GTK+
+      programs using different libraries. If you were installing GTK
      and it's dependencies into <filename>/opt/gtk</filename>, you
      might want to set these variables as:
    </para>
@@ -109,26 +109,26 @@ How to compile GTK+ itself
  <refsect1 id="dependencies">
    <title>Dependencies</title>
    <para>
-      Before you can compile the GTK+ widget toolkit, you need to have
+      Before you can compile the GTK widget toolkit, you need to have
      various other tools and libraries installed on your
-      system. Dependencies of GTK+ have their own build systems, so
+      system. Dependencies of GTK have their own build systems, so
      you will need to refer to their own installation instructions.
    </para>
    <para>
-      A particular important tool used by GTK+ to find its dependencies
+      A particular important tool used by GTK to find its dependencies
      is <application>pkg-config</application>.
    </para>
    <para>
      <ulink url="https://www.freedesktop.org/wiki/Software/pkg-config/">pkg-config</ulink>
      is a tool for tracking the compilation flags needed for
-      libraries that are used by the GTK+ libraries. (For each
+      libraries that are used by the GTK libraries. (For each
      library, a small <literal>.pc</literal> text file is installed
      in a standard location that contains the compilation flags
      needed for that library along with version number information.)
    </para>
    <para>
-      Some of the libraries that GTK+ depends on are maintained by
-      by the GTK+ team: GLib, GdkPixbuf, Pango, ATK and GObject Introspection.
+      Some of the libraries that GTK depends on are maintained by
+      by the GTK team: GLib, GdkPixbuf, Pango, ATK and GObject Introspection.
      Other libraries are maintained separately.
    </para>
    <itemizedlist>
@@ -196,7 +196,7 @@ How to compile GTK+ itself
      <listitem>
        <para>
          The libraries from the X window system are needed to build
-          Pango and GTK+. You should already have these installed on
+          Pango and GTK. You should already have these installed on
          your system, but it's possible that you'll need to install
          the development environment for these libraries that your
          operating system vendor provides.
@@ -213,14 +213,14 @@ How to compile GTK+ itself
        <para>
          <ulink url="https://www.cairographics.org">Cairo</ulink>
          is a graphics library that supports vector graphics and image
-          compositing. Both Pango and GTK+ use Cairo for drawing.
+          compositing. Both Pango and GTK use Cairo for drawing.
        </para>
      </listitem>
      <listitem>
        <para>
          <ulink url="https://github.com/anholt/libepoxy">libepoxy</ulink>
          is a library that abstracts the differences between different
-          OpenGL libraries. GTK+ uses it for cross-platform GL support
+          OpenGL libraries. GTK uses it for cross-platform GL support
          and for its own drawing.
        </para>
      </listitem>
@@ -228,20 +228,20 @@ How to compile GTK+ itself
        <para>
          <ulink url="https://github.com/anholt/libepoxy">Graphene</ulink>
          is a library that provides vector and matrix types for 2D and
-          3D transformations. GTK+ uses it internally for drawing.
+          3D transformations. GTK uses it internally for drawing.
        </para>
      </listitem>
      <listitem>
        <para>
          The <ulink url="https://wayland.freedesktop.org">Wayland</ulink> libraries
-          are needed to build GTK+ with the Wayland backend.
+          are needed to build GTK with the Wayland backend.
        </para>
      </listitem>
      <listitem>
        <para>
          The <ulink url="https://www.freedesktop.org/wiki/Software/shared-mime-info">shared-mime-info</ulink>
-          package is not a hard dependency of GTK+, but it contains definitions
-          for mime types that are used by GIO and, indirectly, by GTK+.
+          package is not a hard dependency of GTK, but it contains definitions
+          for mime types that are used by GIO and, indirectly, by GTK.
          gdk-pixbuf will use GIO for mime type detection if possible. For this
          to work, shared-mime-info needs to be installed and
          <envar>XDG_DATA_DIRS</envar> set accordingly at configure time.
@@ -251,7 +251,7 @@ How to compile GTK+ itself
    </itemizedlist>
  </refsect1>
  <refsect1 id="building">
-    <title>Building and testing GTK+</title>
+    <title>Building and testing GTK</title>
    <para>
      First make sure that you have the necessary external
      dependencies installed: <command>pkg-config</command>, Meson, Ninja,
@@ -263,16 +263,16 @@ How to compile GTK+ itself
      accessible through your operating system package repositories.
    </para>
    <para>
-      Then build and install the GTK+ libraries in the order:
-      GLib, Cairo, Pango, ATK, then GTK+. For each library, follow the
+      Then build and install the GTK libraries in the order:
+      GLib, Cairo, Pango, ATK, then GTK. For each library, follow the
      instructions they provide, and make sure to share common settings
-      between them and the GTK+ build; if you are using a separate prefix
-      for GTK+, for instance, you will need to use the same prefix for all
+      between them and the GTK build; if you are using a separate prefix
+      for GTK, for instance, you will need to use the same prefix for all
      its dependencies you build. If you're lucky, this will all go smoothly,
      and you'll be ready to <link linkend="gtk-compiling">start compiling
-      your own GTK+ applications</link>. You can test your GTK+ installation
+      your own GTK applications</link>. You can test your GTK installation
      by running the <command>gtk4-demo</command> program that
-      GTK+ installs.
+      GTK installs.
    </para>
    <para>
      If one of the projects you're configuring or building fails, look
@@ -287,7 +287,7 @@ How to compile GTK+ itself
      <title>Extra Configuration Options</title>

      <para>
-        In addition to the normal options provided by Meson, GTK+ defines
+        In addition to the normal options provided by Meson, GTK defines
        various arguments that modify what should be built.

        <cmdsynopsis>
@@ -375,7 +375,7 @@ How to compile GTK+ itself
        <title><systemitem>xinerama</systemitem></title>

        <para>
-          By default GTK+ will try to link against the Xinerama libraries
+          By default GTK will try to link against the Xinerama libraries
          if they are found. This options can be used to explicitly control
          whether Xinerama should be used.
        </para>
@@ -388,16 +388,16 @@ How to compile GTK+ itself
        <para>
          The <application>gtk-doc</application> package is
          used to generate the reference documentation included
-          with GTK+. By default support for <application>gtk-doc</application>
+          with GTK. By default support for <application>gtk-doc</application>
          is disabled because it requires various extra dependencies
          to be installed. If you have
          <application>gtk-doc</application> installed and
-          are modifying GTK+, you may want to enable
+          are modifying GTK, you may want to enable
          <application>gtk-doc</application> support by passing
          in <systemitem>documentation</systemitem>.
        </para>
        <para>
-          Additionally, some tools provided by GTK+ have their own
+          Additionally, some tools provided by GTK have their own
          manual pages generated using a similar set of dependencies;
          if you have <application>xsltproc</application> then you
          can generate manual pages by passing <systemitem>man-pages</systemitem>
@@ -409,7 +409,7 @@ How to compile GTK+ itself
        <title><systemitem>print-backends</systemitem></title>

        <para>
-          By default, GTK+ will try to build various print backends if
+          By default, GTK will try to build various print backends if
          their dependencies are found. This option can be used to
          explicitly control which print backends should be built.
        </para>
@@ -439,7 +439,7 @@ How to compile GTK+ itself
        <para>
          Allows to disable building introspection support. This is option
          is mainly useful for shortening turnaround times on developer
-          systems. Installed builds of GTK+ should always have introspection
+          systems. Installed builds of GTK should always have introspection
          support.
        </para>
      </formalpara>
@@ -450,9 +450,9 @@ How to compile GTK+ itself
               <systemitem>demos</systemitem></title>

        <para>
-          By default, GTK+ will build quite a few tests and demos.
+          By default, GTK will build quite a few tests and demos.
          While these are useful on a developer system, they are not
-          needed when GTK+ is built e.g. for a flatpak runtime. These
+          needed when GTK is built e.g. for a flatpak runtime. These
          options allow to disable building tests and demos.
        </para>
      </formalpara>
--- a/docs/reference/gtk/compiling.sgml
+++ b/docs/reference/gtk/compiling.sgml
@@ -4,24 +4,24 @@
 ]>
 <refentry id="gtk-compiling">
 <refmeta>
-<refentrytitle>Compiling GTK+ Applications</refentrytitle>
+<refentrytitle>Compiling GTK Applications</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>

 <refnamediv>
-<refname>Compiling GTK+ Applications</refname>
+<refname>Compiling GTK Applications</refname>
 <refpurpose>
-How to compile your GTK+ application
+How to compile your GTK application
 </refpurpose>
 </refnamediv>

 <refsect1>
-<title>Compiling GTK+ Applications on UNIX</title>
+<title>Compiling GTK Applications on UNIX</title>

 <para>
-To compile a GTK+ application, you need to tell the compiler where to
-find the GTK+ header files and libraries. This is done with the
+To compile a GTK application, you need to tell the compiler where to
+find the GTK header files and libraries. This is done with the
 <literal>pkg-config</literal> utility.
 </para>
 <para>
@@ -29,9 +29,9 @@ The following interactive shell session demonstrates how
 <literal>pkg-config</literal> is used (the actual output on
 your system may be different):
 <programlisting>
-$ pkg-config --cflags gtk+-4.0
+$ pkg-config --cflags gtk4
 -pthread -I/usr/include/gtk-4.0 -I/usr/lib64/gtk-4.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12
-$ pkg-config --libs gtk+-4.0
+$ pkg-config --libs gtk4
 -pthread -lgtk-4 -lgdk-4 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
 </programlisting>
 </para>
@@ -40,14 +40,14 @@ The simplest way to compile a program is to use the "backticks"
 feature of the shell. If you enclose a command in backticks
 (<emphasis>not single quotes</emphasis>), then its output will be
 substituted into the command line before execution. So to compile
-a GTK+ Hello, World, you would type the following:
+a GTK Hello, World, you would type the following:
 <programlisting>
-$ cc `pkg-config --cflags gtk+-4.0` hello.c -o hello `pkg-config --libs gtk+-4.0`
+$ cc `pkg-config --cflags gtk4` hello.c -o hello `pkg-config --libs gtk4`
 </programlisting>
 </para>

 <para>
-Deprecated GTK+ functions are annotated to make the compiler
+Deprecated GTK functions are annotated to make the compiler
 emit warnings when they are used (e.g. with gcc, you need to use
 the -Wdeprecated-declarations option). If these warnings are
 problematic, they can be turned off by defining the preprocessor
@@ -56,26 +56,26 @@ option <literal>-DGDK_DISABLE_DEPRECATION_WARNINGS</literal>
 </para>

 <para>
-GTK+ deprecation annotations are versioned; by defining the
+GTK deprecation annotations are versioned; by defining the
 macros %GDK_VERSION_MIN_REQUIRED and %GDK_VERSION_MAX_ALLOWED,
-you can specify the range of GTK+ versions whose API you want
+you can specify the range of GTK versions whose API you want
 to use. APIs that were deprecated before or introduced after
 this range will trigger compiler warnings.
 </para>

 <para>
 Here is how you would compile hello.c if you want to allow it
-to use symbols that were not deprecated in 3.2:
+to use symbols that were not deprecated in 4.2:
 <programlisting>
-$ cc `pkg-config --cflags gtk+-4.0` -DGDK_VERSION_MIN_REQIRED=GDK_VERSION_3_2 hello.c -o hello `pkg-config --libs gtk+-4.0`
+$ cc `pkg-config --cflags gtk4` -DGDK_VERSION_MIN_REQIRED=GDK_VERSION_4_2 hello.c -o hello `pkg-config --libs gtk4`
 </programlisting>
 </para>

 <para>
 And here is how you would compile hello.c if you don't want
-it to use any symbols that were introduced after 3.4:
+it to use any symbols that were introduced after 4.2:
 <programlisting>
-$ cc `pkg-config --cflags gtk+-4.0` -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4 hello.c -o hello `pkg-config --libs gtk+-4.0`
+$ cc `pkg-config --cflags gtk4` -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_2 hello.c -o hello `pkg-config --libs gtk4`
 </programlisting>
 </para>

--- a/docs/reference/gtk/css-overview.xml
+++ b/docs/reference/gtk/css-overview.xml
@@ -4,15 +4,15 @@
 ]>
 <refentry id="chap-css-overview">
 <refmeta>
-<refentrytitle>GTK+ CSS Overview</refentrytitle>
+<refentrytitle>GTK CSS Overview</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>

 <refnamediv>
-<refname>GTK+ CSS Overview</refname>
+<refname>GTK CSS Overview</refname>
 <refpurpose>
-Overview of CSS in GTK+
+Overview of CSS in GTK
 </refpurpose>
 </refnamediv>

@@ -31,10 +31,10 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
 -->

 <refsect1 id="css-overview">
-  <title>Overview of CSS in GTK+</title>
+  <title>Overview of CSS in GTK</title>

  <para>
-    This chapter describes in detail how GTK+ uses CSS for styling
+    This chapter describes in detail how GTK uses CSS for styling
    and layout.
  </para>

@@ -61,7 +61,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
    <title>CSS nodes</title>

    <para>
-      GTK+ applies the style information found in style sheets by matching
+      GTK applies the style information found in style sheets by matching
      the selectors against a tree of nodes. Each node in the tree has a
      name, a state and possibly style classes. The children of each node
      are linearly ordered.
@@ -99,7 +99,7 @@ scale[.fine-tune]
    <title>Style sheets</title>

    <para>
-      The basic structure of the style sheets understood by GTK+ is
+      The basic structure of the style sheets understood by GTK is
      a series of statements, which are either rule sets or “@-rules”,
      separated by whitespace.
    </para>
@@ -128,7 +128,7 @@ button, entry {
    <title>Importing style sheets</title>

    <para>
-      GTK+ supports the CSS @import rule, in order to load another
+      GTK supports the CSS @import rule, in order to load another
      style sheet in addition to the currently parsed one.
    </para>

@@ -339,8 +339,8 @@ checkbutton:indeterminate {
    </para>

    <para>
-      The full syntax for selectors understood by GTK+ can be found in the
-      table below. The main difference to CSS is that GTK+ does not currently
+      The full syntax for selectors understood by GTK can be found in the
+      table below. The main difference to CSS is that GTK does not currently
      support attribute selectors.
    </para>

@@ -373,7 +373,7 @@ checkbutton:indeterminate {
            <entry><phrase role="nowrap">E#id</phrase></entry>
            <entry>any E node with the given ID</entry>
            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#id-selectors">CSS</ulink></entry>
-            <entry>GTK+ uses the widget name as ID</entry>
+            <entry>GTK uses the widget name as ID</entry>
          </row>
          <row>
            <entry><phrase role="nowrap">E:nth-child(〈nth-child〉)</phrase></entry>
@@ -543,7 +543,7 @@ checkbutton:indeterminate {
    </example>

    <para>
-      GTK+ adds several additional ways to specify colors.
+      GTK adds several additional ways to specify colors.
    </para>

 <literallayout><code>〈gtk color〉 = 〈symbolic color〉 | 〈color expression〉 | 〈win32 color〉</code>
@@ -576,7 +576,7 @@ checkbutton:indeterminate {
    </example>

    <para>
-      GTK+ also supports color expressions, which allow colors to be transformed
+      GTK also supports color expressions, which allow colors to be transformed
      to new ones and can be nested, providing a rich language to define colors.
      Color expressions resemble functions, taking 1 or more colors and in some
      cases a number as arguments.
@@ -595,7 +595,7 @@ checkbutton:indeterminate {
 </literallayout>

    <para>
-      On Windows, GTK+ allows to refer to system colors, as follows:
+      On Windows, GTK allows to refer to system colors, as follows:
    </para>

 <literallayout><code>〈win32 color〉 = -gtk-win32-color( 〈name〉, 〈integer〉 )</code>
@@ -632,7 +632,7 @@ checkbutton:indeterminate {
    <para>
      The simplest way to specify an image in CSS is to load an image
      file from a URL. CSS does not specify anything about supported file
-      formats; within GTK+, you can expect at least PNG, JPEG and SVG to
+      formats; within GTK, you can expect at least PNG, JPEG and SVG to
      work. The full list of supported image formats is determined by the
      available gdk-pixbuf image loaders and may vary between systems.
    </para>
@@ -734,14 +734,14 @@ label {
    </para>

    <para>
-      GTK+ extends the CSS syntax for images and also uses it for specifying icons.
+      GTK extends the CSS syntax for images and also uses it for specifying icons.
    </para>

 <literallayout><code>〈gtk image〉 = 〈themed icon〉 | 〈scaled image〉 | 〈recolored image〉 | 〈win32 theme part〉</code>
 </literallayout>

    <para>
-      GTK+ has extensive support for loading icons from icon themes. It is
+      GTK has extensive support for loading icons from icon themes. It is
      accessible from CSS with the -gtk-icontheme syntax.
    </para>

@@ -770,7 +770,7 @@ arrow.fancy {
    </example>

    <para>
-      GTK+ supports scaled rendering on hi-resolution displays. This works
+      GTK supports scaled rendering on hi-resolution displays. This works
      best if images can specify normal and hi-resolution variants. From
      CSS, this can be done with the -gtk-scaled syntax.
    </para>
@@ -816,7 +816,7 @@ arrow {
 ]]></programlisting>
    </example>
    <para>
-      On Windows, GTK+ allows to refer to system theme parts as images, as follows:
+      On Windows, GTK allows to refer to system theme parts as images, as follows:
    </para>

 <literallayout><code>〈win32 theme part〉 = -gtk-win32-theme-part( 〈name〉, 〈integer〉 〈integer〉</code>
@@ -830,7 +830,7 @@ arrow {

    <para>
      CSS defines a mechanism by which changes in CSS property values can
-      be made to take effect gradually, instead of all at once. GTK+ supports
+      be made to take effect gradually, instead of all at once. GTK supports
      these transitions as well.
    </para>

@@ -911,7 +911,7 @@ spinner {

    <para>
      In order to extend key bindings affecting different widgets,
-      GTK+ supports the @binding-set rule to parse a set of bind/unbind
+      GTK supports the @binding-set rule to parse a set of bind/unbind
      directives. Note that in order to take effect, the binding sets
      defined in this way must be associated with rule sets by setting
      the -gtk-key-bindings property.
--- a/docs/reference/gtk/css-properties.xml
+++ b/docs/reference/gtk/css-properties.xml
@@ -4,15 +4,15 @@
 ]>
 <refentry id="chap-css-properties">
 <refmeta>
-<refentrytitle>GTK+ CSS Properties</refentrytitle>
+<refentrytitle>GTK CSS Properties</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>

 <refnamediv>
-<refname>GTK+ CSS Properties</refname>
+<refname>GTK CSS Properties</refname>
 <refpurpose>
-CSS Properties in GTK+
+CSS Properties in GTK
 </refpurpose>
 </refnamediv>

@@ -34,9 +34,9 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
  <title>Supported CSS Properties</title>

    <para>
-      GTK+ supports CSS properties and shorthands as far as they can be applied
+      GTK supports CSS properties and shorthands as far as they can be applied
      in the context of widgets, and adds its own properties only when needed.
-      All GTK+-specific properties have a -gtk prefix.
+      All GTK-specific properties have a -gtk prefix.
    </para>

    <para>
@@ -66,7 +66,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
    </para>

    <para>
-      Whereever a number is allowed, GTK+ also accepts a Windows-specific
+      Whereever a number is allowed, GTK also accepts a Windows-specific
      theme size:
    </para>

@@ -1159,7 +1159,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
      </table>

      <para>
-        GTK+ uses the CSS outline properties to render the 'focus rectangle'.
+        GTK uses the CSS outline properties to render the 'focus rectangle'.
      </para>

      <table pgwide="1">
--- a/docs/reference/gtk/drawing-model.xml
+++ b/docs/reference/gtk/drawing-model.xml
@@ -4,15 +4,15 @@
 ]>
 <refentry id="chap-drawing-model">
 <refmeta>
-<refentrytitle>The GTK+ Drawing Model</refentrytitle>
+<refentrytitle>The GTK Drawing Model</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>

 <refnamediv>
-<refname>The GTK+ Drawing Model</refname>
+<refname>The GTK Drawing Model</refname>
 <refpurpose>
-    The GTK+ drawing model in detail
+    The GTK drawing model in detail
 </refpurpose>
 </refnamediv>

@@ -21,12 +21,12 @@
    <title>Overview of the drawing model</title>

    <para>
-      This chapter describes the GTK+ drawing model in detail.  If you
-      are interested in the procedure which GTK+ follows to draw its
+      This chapter describes the GTK drawing model in detail.  If you
+      are interested in the procedure which GTK follows to draw its
      widgets and windows, you should read this chapter; this will be
      useful to know if you decide to implement your own widgets.  This
      chapter will also clarify the reasons behind the ways certain
-      things are done in GTK+; for example, why you cannot change the
+      things are done in GTK; for example, why you cannot change the
      background color of all widgets with the same method.
    </para>

@@ -52,7 +52,7 @@
        clipping", instead of "toplevel application windows".  Most
        windowing systems support nested windows, where the contents of
        child windows get clipped by the boundaries of their parents.
-        Although GTK+ and GDK in particular may run on a windowing
+        Although GTK and GDK in particular may run on a windowing
        system with no such notion of nested windows, GDK presents the
        illusion of being under such a system.  A toplevel window may
        contain many subwindows and sub-subwindows, for example, one for
@@ -63,16 +63,16 @@
      </para>

      <para>
-        In practice, most windows in modern GTK+ application are client-side
+        In practice, most windows in modern GTK application are client-side
        constructs. Only few windows (in particular toplevel windows) are
        <emphasis>native</emphasis>, which means that they represent a
-        window from the underlying windowing system on which GTK+ is running.
+        window from the underlying windowing system on which GTK is running.
        For example, on X11 it corresponds to a <type>Window</type>; on Win32,
        it corresponds to a <type>HANDLE</type>.
      </para>

      <para>
-        Generally, the drawing cycle begins when GTK+ receives an
+        Generally, the drawing cycle begins when GTK receives an
        exposure event from the underlying windowing system:  if the
        user drags a window over another one, the windowing system will
        tell the underlying window that it needs to repaint itself.  The
@@ -80,7 +80,7 @@
        that it needs to update its display.  For example, when the user
        types a character in a <link
        linkend="GtkEntry"><classname>GtkEntry</classname></link>
-        widget, the entry asks GTK+ to queue a redraw operation for
+        widget, the entry asks GTK to queue a redraw operation for
        itself.
      </para>

@@ -95,7 +95,7 @@
      </para>

      <para>
-        The following sections describe how GTK+ decides which widgets
+        The following sections describe how GTK decides which widgets
        need to be repainted in response to such events, and how widgets
        work internally in terms of the resources they use from the
        windowing system.
@@ -106,10 +106,10 @@
      <title>The frame clock</title>

      <para>
-        All GTK+ applications are mainloop-driven, which means that most
+        All GTK applications are mainloop-driven, which means that most
        of the time the app is idle inside a loop that just waits for
        something to happen and then calls out to the right place when
-        it does. On top of this GTK+ has a frame clock that gives a
+        it does. On top of this GTK has a frame clock that gives a
        “pulse” to the application. This clock beats at a steady rate,
        which is tied to the framerate of the output (this is synced to
        the monitor via the window manager/compositor). The clock has
@@ -215,7 +215,7 @@
      <para>
        Most widgets, including those that create their own GdkSurfaces have
        a transparent background, so they draw on top of whatever widgets
-        are below them. This was not the case in GTK+ 2 where the theme set
+        are below them. This was not the case in GTK 2 where the theme set
        the background of most widgets to the default background color. (In
        fact, transparent GdkSurfaces used to be impossible.)
      </para>
@@ -233,7 +233,7 @@
      <title>Scrolling</title>

      <para>
-        Traditionally, GTK+ has used self-copy operations to implement
+        Traditionally, GTK has used self-copy operations to implement
        scrolling with native windows. With transparent backgrounds, this
        no longer works. Instead, we just mark the entire affected area for
        repainting when these operations are used. This allows (partially)
@@ -253,7 +253,7 @@
      <literal>draw</literal> handler were sent directly to the
      windowing system, flicker could result.  This is because areas may get
      redrawn repeatedly:  the background, then decorative frames, then text
-      labels, etc.  To avoid flicker, GTK+ employs a <firstterm>double
+      labels, etc.  To avoid flicker, GTK employs a <firstterm>double
 	buffering</firstterm> system at the GDK level.  Widgets normally don't
      know that they are drawing to an off-screen buffer; they just issue their
      normal drawing commands, and the buffer gets sent to the windowing system
@@ -284,7 +284,7 @@
      </para>

      <para>
-	To make this easier, GTK+ normally calls
+	To make this easier, GTK normally calls
        <function>gdk_surface_begin_paint_region()</function>
        before emitting the #GtkWidget::draw signal, and
 	then it calls <function>gdk_surface_end_paint()</function>
--- a/docs/reference/gtk/getting_started.xml.in
+++ b/docs/reference/gtk/getting_started.xml.in
@@ -3,11 +3,11 @@
               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 <chapter id="gtk-getting-started" xmlns:xi="http://www.w3.org/2003/XInclude">
-  <title>Getting Started with GTK+</title>
+  <title>Getting Started with GTK</title>

-  <para>GTK+ is a <ulink url="http://en.wikipedia.org/wiki/Widget_toolkit">
+  <para>GTK is a <ulink url="http://en.wikipedia.org/wiki/Widget_toolkit">
  widget toolkit</ulink>. Each user interface created by 
-  GTK+ consists of widgets. This is implemented in C using 
+  GTK consists of widgets. This is implemented in C using 
  <link linkend="gobject">GObject</link>, an object-oriented framework for C.
  Widgets are organized in a hierachy. The window widget is the main container.
  The user interface is then built by adding buttons, drop-down menus, input 
@@ -17,14 +17,14 @@
  assembling the interface manually. You can also use a visual user interface
  editor, like <ulink url="https://glade.gnome.org/">Glade</ulink>.</para>
  
-  <para>GTK+ is event-driven. The toolkit listens for events such as
+  <para>GTK is event-driven. The toolkit listens for events such as
  a click on a button, and passes the event to your application.</para>

  <para>This chapter contains some tutorial information to get you
-  started with GTK+ programming. It assumes that you have GTK+, its
+  started with GTK programming. It assumes that you have GTK, its
  dependencies and a C compiler installed and ready to use. If you
-  need to build GTK+ itself first, refer to the
-  <link linkend="gtk-compiling">Compiling the GTK+ libraries</link>
+  need to build GTK itself first, refer to the
+  <link linkend="gtk-compiling">Compiling the GTK libraries</link>
  section in this reference.</para>

  <section>
@@ -50,24 +50,24 @@
    <para>
      You can compile the program above with GCC using:
      <literallayout>
-        <literal>gcc `pkg-config --cflags gtk+-4.0` -o example-0 example-0.c `pkg-config --libs gtk+-4.0`</literal>
+        <literal>gcc `pkg-config --cflags gtk4` -o example-0 example-0.c `pkg-config --libs gtk4`</literal>
      </literallayout>
    </para>

-    <note><para>For more information on how to compile a GTK+ application, please
-    refer to the <link linkend="gtk-compiling">Compiling GTK+ Applications</link>
+    <note><para>For more information on how to compile a GTK application, please
+    refer to the <link linkend="gtk-compiling">Compiling GTK Applications</link>
    section in this reference.</para></note>

-    <para>All GTK+ applications will, of course, include
+    <para>All GTK applications will, of course, include
    <filename>gtk/gtk.h</filename>, which declares functions, types and
-    macros required by GTK+ applications.</para>
+    macros required by GTK applications.</para>

-    <warning><para>Even if GTK+ installs multiple header files, only the
+    <warning><para>Even if GTK installs multiple header files, only the
    top-level <filename>gtk/gtk.h</filename> header can be directly included
    by third party code. The compiler will abort with an error if any other
    header is directly included.</para></warning>

-    <para>In a GTK+ application, the purpose of the main() function is to
+    <para>In a GTK application, the purpose of the main() function is to
    create a #GtkApplication object and run it. In this example a
    #GtkApplication pointer named <varname>app</varname> is called and then
    initialized using gtk_application_new().</para>
@@ -89,8 +89,8 @@
    when your application is launched with
    g_application_run() on the line below.
    The gtk_application_run() also takes as arguments the pointers to the command line arguments
-    counter and string array; this allows GTK+ to parse specific command line
-    arguments that control the behavior of GTK+ itself. The parsed arguments
+    counter and string array; this allows GTK to parse specific command line
+    arguments that control the behavior of GTK itself. The parsed arguments
    will be removed from the array, leaving the unrecognized ones for your
    application to parse.
    </para>
@@ -128,16 +128,16 @@
    #GtkApplication object is freed from memory with g_object_unref().
    Finally the status integer is returned and the GTK application exits.</para>

-    <para>While the program is running, GTK+ is receiving
+    <para>While the program is running, GTK is receiving
    <firstterm>events</firstterm>. These are typically input events caused by
    the user interacting with your program, but also things like messages from
-    the window manager or other applications. GTK+ processes these and as a
+    the window manager or other applications. GTK processes these and as a
    result, <firstterm>signals</firstterm> may be emitted on your widgets.
    Connecting handlers for these signals is how you normally make your
    program do something in response to user input.</para>

    <para>The following example is slightly more complex, and tries to
-    showcase some of the capabilities of GTK+.</para>
+    showcase some of the capabilities of GTK.</para>

    <para>In the long tradition of programming languages and libraries,
    it is called <emphasis>Hello, World</emphasis>.</para>
@@ -151,7 +151,7 @@
    </informalfigure>

    <example id="gtk-getting-started-hello-world">
-      <title>Hello World in GTK+</title>
+      <title>Hello World in GTK</title>
      <para>Create a new file with the following content named example-1.c.</para>
      <programlisting><xi:include href="@SRC_DIR@/examples/hello-world.c" parse="text">
          <xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
@@ -160,7 +160,7 @@
    <para>
      You can compile the program above with GCC using:
      <literallayout>
-        <literal>gcc `pkg-config --cflags gtk+-4.0` -o example-1 example-1.c `pkg-config --libs gtk+-4.0`</literal>
+        <literal>gcc `pkg-config --cflags gtk4` -o example-1 example-1.c `pkg-config --libs gtk4`</literal>
      </literallayout>
    </para>
  </section>
@@ -169,8 +169,8 @@
  button to our window, with the label "Hello World". Two new GtkWidget pointers
  are declared to accomplish this, <varname>button</varname> and
  <varname>button_box</varname>. The button_box variable is created to store a
-  #GtkButtonBox which is GTK+'s way of controlling the size and layout of buttons.
-  The #GtkButtonBox is created and assigned to gtk_button_box_new() which takes a
+  #GtkBox which is GTK's way of controlling the size and layout of buttons.
+  The #GtkBox is created and assigned to gtk_box_new() which takes a
  #GtkOrientation enum as parameter. The buttons which this box will contain can
  either be stored horizontally or vertically but this does not matter in this
  particular case as we are dealing with only one button. After initializing
@@ -215,7 +215,7 @@
    it becomes important to control how each widget is positioned and sized.
    This is where packing comes in.</para>

-    <para>GTK+ comes with a large variety of <firstterm>layout containers</firstterm>
+    <para>GTK comes with a large variety of <firstterm>layout containers</firstterm>
    whose purpose it is to control the layout of the child widgets that are
    added to them. See <xref linkend="LayoutContainers"/> for an overview.</para>

@@ -238,7 +238,7 @@
    <para>
      You can compile the program above with GCC using:
      <literallayout>
-        <literal>gcc `pkg-config --cflags gtk+-4.0` -o example-2 example-2.c `pkg-config --libs gtk+-4.0`</literal>
+        <literal>gcc `pkg-config --cflags gtk4` -o example-2 example-2.c `pkg-config --libs gtk4`</literal>
      </literallayout>
    </para>
  </section>
@@ -250,7 +250,7 @@
    or hundreds of widgets, doing all the setup work in C code is
    cumbersome, and making changes becomes next to impossible.</para>

-    <para>Thankfully, GTK+ supports the separation of user interface
+    <para>Thankfully, GTK supports the separation of user interface
    layout from your business logic, by using UI descriptions in an
    XML format that can be parsed by the #GtkBuilder class.</para>

@@ -264,7 +264,7 @@
    <para>
      You can compile the program above with GCC using:
      <literallayout>
-        <literal>gcc `pkg-config --cflags gtk+-4.0` -o example-3 example-3.c `pkg-config --libs gtk+-4.0`</literal>
+        <literal>gcc `pkg-config --cflags gtk4` -o example-3 example-3.c `pkg-config --libs gtk4`</literal>
      </literallayout>
    </para>

@@ -324,7 +324,7 @@
    </variablelist>
    </para>

-    <para>GTK+ includes application support that is built on top of
+    <para>GTK includes application support that is built on top of
    #GApplication. In this tutorial we'll build a simple application by
    starting from scratch, adding more and more pieces over time. Along
    the way, we'll learn about #GtkApplication, templates, resources,
@@ -332,8 +332,8 @@
    #GtkListBox, and more.</para>

    <para>The full, buildable sources for these examples can be found
-    in the examples/ directory of the GTK+ source distribution, or
-    <ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/master/examples">online</ulink> in the GTK+ git repository.
+    in the examples/ directory of the GTK source distribution, or
+    <ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/master/examples">online</ulink> in the GTK git repository.
    You can build each example separately by using make with the <filename>Makefile.example</filename>
    file. For more information, see the <filename>README</filename> included in the
    examples directory.</para>
@@ -368,7 +368,7 @@
      </informalexample>

      <para>Another important class that is part of the application support
-      in GTK+ is #GtkApplicationWindow. It is typically subclassed as well.
+      in GTK is #GtkApplicationWindow. It is typically subclassed as well.
      Our subclass does not do anything yet, so we will just get an empty
      window.</para>

@@ -797,7 +797,7 @@ preferences_activated (GSimpleAction *action,
      <title>Adding a search bar</title>

      <para>We continue to flesh out the functionality of our application.
-      For now, we add search. GTK+ supports this with #GtkSearchEntry and
+      For now, we add search. GTK supports this with #GtkSearchEntry and
      #GtkSearchBar. The search bar is a widget that can slide in from the
      top to present a search entry.</para>

@@ -1007,7 +1007,7 @@ example_app_window_init (ExampleAppWindow *win)

      <para>Our application already uses a GtkHeaderBar, but so far it
      still gets a 'normal' window titlebar on top of that. This is a
-      bit redundant, and we will now tell GTK+ to use the header bar
+      bit redundant, and we will now tell GTK to use the header bar
      as replacement for the titlebar. To do so, we move it around to
      be a direct child of the window, and set its type to be titlebar.</para>

@@ -1048,7 +1048,7 @@ example_app_window_init (ExampleAppWindow *win)
    e.g. when another window is moved and uncovers part of the widget, or
    when the window containing it is resized. It is also possible to explicitly
    cause part or all of the widget to be redrawn, by calling
-    gtk_widget_queue_draw() or its variants. GTK+ takes care of most of the
+    gtk_widget_queue_draw() or its variants. GTK takes care of most of the
    details by providing a ready-to-use cairo context to the ::draw signal
    handler.</para>

@@ -1073,7 +1073,7 @@ example_app_window_init (ExampleAppWindow *win)
    <para>
      You can compile the program above with GCC using:
      <literallayout>
-        <literal>gcc `pkg-config --cflags gtk+-4.0` -o example-4 example-4.c `pkg-config --libs gtk+-4.0`</literal>
+        <literal>gcc `pkg-config --cflags gtk4` -o example-4 example-4.c `pkg-config --libs gtk4`</literal>
      </literallayout>
    </para>
  </section>
--- a/docs/reference/gtk/glossary.xml
+++ b/docs/reference/gtk/glossary.xml
@@ -51,11 +51,11 @@
    <glossterm>column</glossterm>
    <glossdef>
      <para>
-	GTK+ contains several widgets which display data in columns,
+	GTK contains several widgets which display data in columns,
        e.g. the #GtkTreeView. 
        These <glossterm linkend="view-column">view columns</glossterm> in 
        the tree view are represented by #GtkTreeViewColumn
-        objects inside GTK+. They should not be confused with 
+        objects inside GTK. They should not be confused with 
        <glossterm linkend="model-column">model columns</glossterm> which
        are used to organize the data in tree models.
      </para>
@@ -114,7 +114,7 @@
    <glossterm>event</glossterm>
    <glossdef>
      <para>
-        Events are the way in which GDK informs GTK+ about external events
+        Events are the way in which GDK informs GTK about external events
        like pointer motion, button clicks, key presses, etc. 
      </para>
    </glossdef>
@@ -177,7 +177,7 @@
      <para>
        These widgets follow the well-known model-view pattern, which separates
        the data (the model) to be displayed from the component which does the 
-        actual visualization (the view). Examples of this pattern in GTK+ are 
+        actual visualization (the view). Examples of this pattern in GTK are 
        the #GtkTreeView/#GtkTreeModel and #GtkTextView/#GtkTextBuffer
      </para>
      <para>
@@ -281,7 +281,7 @@
    <glossterm>style</glossterm>
    <glossdef>
      <para>
-        A style encapsulates what GTK+ needs to know in order to draw
+        A style encapsulates what GTK needs to know in order to draw
        a widget. Styles can be modified with 
        <link linkend="gtk3-Resource-Files">resource files</link>.
      </para>
@@ -294,7 +294,7 @@
      <para>
 	A <glossterm linkend="widget">widget</glossterm> that does not
 	require a <glossterm linkend="parent">parent</glossterm> container.  
-        The only toplevel widgets in GTK+ are #GtkWindow and widgets derived from it.
+        The only toplevel widgets in GTK are #GtkWindow and widgets derived from it.
      </para>
      <glossseealso>
 	<glossterm linkend="container">container</glossterm>
--- a/docs/reference/gtk/gtk4-broadwayd.xml
+++ b/docs/reference/gtk/gtk4-broadwayd.xml
@@ -6,7 +6,7 @@

 <refentryinfo>
  <title>gtk4-broadwayd</title>
-  <productname>GTK+</productname>
+  <productname>GTK</productname>
  <authorgroup>
    <author>
      <contrib>Developer</contrib>
@@ -40,7 +40,7 @@
 <refsect1><title>Description</title>
 <para>
 <command>gtk4-broadwayd</command> is a display server for the Broadway
-GDK backend. It allows multiple GTK+ applications to display their
+GDK backend. It allows multiple GTK applications to display their
 windows in the same web browser, by connecting to gtk4-broadwayd.
 </para>
 <para>
--- a/docs/reference/gtk/gtk4-builder-tool.xml
+++ b/docs/reference/gtk/gtk4-builder-tool.xml
@@ -6,7 +6,7 @@

 <refentryinfo>
  <title>gtk4-builder-tool</title>
-  <productname>GTK+</productname>
+  <productname>GTK</productname>
  <authorgroup>
    <author>
      <contrib>Developer</contrib>
--- a/docs/reference/gtk/gtk4-demo-application.xml
+++ b/docs/reference/gtk/gtk4-demo-application.xml
@@ -6,7 +6,7 @@

 <refentryinfo>
  <title>gtk4-demo-application</title>
-  <productname>GTK+</productname>
+  <productname>GTK</productname>
  <authorgroup>
    <author>
      <contrib>Developer</contrib>
--- a/docs/reference/gtk/gtk4-demo.xml
+++ b/docs/reference/gtk/gtk4-demo.xml
@@ -6,7 +6,7 @@

 <refentryinfo>
  <title>gtk4-demo</title>
-  <productname>GTK+</productname>
+  <productname>GTK</productname>
  <authorgroup>
    <author>
      <contrib>Developer</contrib>
@@ -24,7 +24,7 @@

 <refnamediv>
  <refname>gtk4-demo</refname>
-  <refpurpose>Demonstrate GTK+ widgets</refpurpose>
+  <refpurpose>Demonstrate GTK widgets</refpurpose>
 </refnamediv>

 <refsynopsisdiv>
@@ -40,7 +40,7 @@
 <refsect1><title>Description</title>
 <para>
 <command>gtk4-demo</command> is a collection of examples.
-Its purpose is to demonstrate many GTK+ widgets in a form
+Its purpose is to demonstrate many GTK widgets in a form
 that is useful to application developers.
 </para>
 <para>
--- a/docs/reference/gtk/gtk4-docs.xml
+++ b/docs/reference/gtk/gtk4-docs.xml
@@ -8,18 +8,18 @@
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
  <bookinfo>
-    <title>GTK+ 4 Reference Manual</title>
+    <title>GTK 4 Reference Manual</title>
    <releaseinfo>
-      This document is for the GTK+ 4 library, version &version;.
+      This document is for the GTK 4 library, version &version;.
      The latest versions can be found online at
      <ulink role="online-location" url="https://developer.gnome.org/gtk4/">https://developer.gnome.org/gtk4/</ulink>.
-      If you are looking for the older GTK+ 3 series of libraries,
+      If you are looking for the older GTK 3 series of libraries,
      see <ulink role="online-location" url="https://developer.gnome.org/gtk3/">https://developer.gnome.org/gtk3/</ulink>.
    </releaseinfo>
  </bookinfo>

  <part id="gtk">
-    <title>GTK+ Overview</title>
+    <title>GTK Overview</title>
    <xi:include href="overview.xml"/>
    <xi:include href="xml/getting_started.xml"/>
    <xi:include href="resources.sgml" />
@@ -29,7 +29,7 @@
  </part>

  <part id="gtkobjects">
-    <title>GTK+ Widgets and Objects</title>
+    <title>GTK Widgets and Objects</title>

    <chapter>
      <title>Object Hierarchy</title>
@@ -71,7 +71,6 @@
      <xi:include href="xml/gtkmessagedialog.xml" />
      <xi:include href="xml/gtkaboutdialog.xml" />
      <xi:include href="xml/gtkassistant.xml" />
-      <xi:include href="xml/gtkinvisible.xml" />
      <xi:include href="xml/gtkwindowgroup.xml" />
    </chapter>

@@ -89,7 +88,6 @@
      <xi:include href="xml/gtkactionbar.xml" />
      <xi:include href="xml/gtkheaderbar.xml" />
      <xi:include href="xml/gtkoverlay.xml" />
-      <xi:include href="xml/gtkbbox.xml" />
      <xi:include href="xml/gtkpaned.xml" />
      <xi:include href="xml/gtklayout.xml" />
      <xi:include href="xml/gtknotebook.xml" />
@@ -162,7 +160,6 @@
    <chapter id="TreeWidgetObjects">
      <title>Tree, List and Icon Grid Widgets</title>
      <xi:include href="xml/tree_widget.sgml" />
-      <xi:include href="xml/treeview_tutorial.xml" />
      <xi:include href="xml/gtktreemodel.xml" />
      <xi:include href="xml/gtktreeselection.xml" />
      <xi:include href="xml/gtktreeviewcolumn.xml" />
@@ -331,7 +328,7 @@
  </part>

  <part  id="gtkbase">
-    <title>GTK+ Core Reference</title>
+    <title>GTK Core Reference</title>
    <xi:include href="xml/gtkmain.xml" />
    <xi:include href="xml/gtkfeatures.xml" />
    <xi:include href="xml/gtkaccelgroup.xml" />
@@ -346,7 +343,7 @@
  </part>

  <part id="theming">
-    <title>Theming in GTK+</title>
+    <title>Theming in GTK</title>
    <xi:include href="css-overview.xml" />
    <xi:include href="css-properties.xml" />
    <xi:include href="xml/gtkstylecontext.xml" />
@@ -357,15 +354,15 @@
  </part>

  <part id="migrating">
-    <title>Migrating from Previous Versions of GTK+</title>
+    <title>Migrating from Previous Versions of GTK</title>

    <partintro>
      <para>
        This part describes what you need to change in programs use
-        older versions of GTK+ so that they can use the new features.
+        older versions of GTK so that they can use the new features.
        It also mentions how to convert applications using widgets
        found in the libgnomeui library to use their counterparts
-        in GTK+.
+        in GTK.
      </para>
    </partintro>

@@ -374,7 +371,7 @@
  </part>

  <part>
-    <title>GTK+ Tools</title>
+    <title>GTK Tools</title>
    <xi:include href="gtk4-demo.xml" />
    <xi:include href="gtk4-demo-application.xml" />
    <xi:include href="gtk4-widget-factory.xml" />
@@ -388,7 +385,7 @@
  </part>

  <part id="platform-support">
-    <title>GTK+ Platform Support</title>
+    <title>GTK Platform Support</title>
    <xi:include href="building.sgml" />
    <xi:include href="xml/compiling.sgml" />
    <xi:include href="running.sgml" />
--- a/docs/reference/gtk/gtk4-encode-symbolic-svg.xml
+++ b/docs/reference/gtk/gtk4-encode-symbolic-svg.xml
@@ -6,7 +6,7 @@

 <refentryinfo>
  <title>gtk4-encode-symbolic-svg</title>
-  <productname>GTK+</productname>
+  <productname>GTK</productname>
  <authorgroup>
    <author>
      <contrib>Developer</contrib>
@@ -39,7 +39,7 @@
 <refsect1><title>Description</title>
 <para>
  <command>gtk4-encode-symbolic-svg</command> converts symbolic svg icons into
-  specially prepared png files. GTK+ can load and recolor these pngs, just like
+  specially prepared png files. GTK can load and recolor these pngs, just like
  original svgs, but loading them is much faster.
 </para>
 <para>
--- a/docs/reference/gtk/gtk4-icon-browser.xml
+++ b/docs/reference/gtk/gtk4-icon-browser.xml
@@ -6,7 +6,7 @@

 <refentryinfo>
  <title>gtk4-icon-browser</title>
-  <productname>GTK+</productname>
+  <productname>GTK</productname>
  <authorgroup>
    <author>
      <contrib>Developer</contrib>
--- a/docs/reference/gtk/gtk4-launch.xml
+++ b/docs/reference/gtk/gtk4-launch.xml
@@ -6,7 +6,7 @@

 <refentryinfo>
  <title>gtk4-launch</title>
-  <productname>GTK+</productname>
+  <productname>GTK</productname>
  <authorgroup>
    <author>
      <contrib>Developer</contrib>
--- a/docs/reference/gtk/gtk4-query-settings.xml
+++ b/docs/reference/gtk/gtk4-query-settings.xml
@@ -6,7 +6,7 @@

 <refentryinfo>
  <title>gtk4-query-settings</title>
-  <productname>GTK+</productname>
+  <productname>GTK</productname>
  <authorgroup>
    <author>
      <contrib>Developer</contrib>
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -1,6 +1,3 @@
-
-<INCLUDE>gtk/gtk.h</INCLUDE>
-
 <SECTION>
 <FILE>gtkaboutdialog</FILE>
 <TITLE>GtkAboutDialog</TITLE>
@@ -273,31 +270,6 @@ GtkAspectFramePrivate
 gtk_aspect_frame_get_type
 </SECTION>

-<SECTION>
-<FILE>gtkbbox</FILE>
-<TITLE>GtkButtonBox</TITLE>
-GtkButtonBox
-GtkButtonBoxClass
-gtk_button_box_new
-gtk_button_box_get_layout
-gtk_button_box_get_child_secondary
-gtk_button_box_get_child_non_homogeneous
-GtkButtonBoxStyle
-gtk_button_box_set_layout
-gtk_button_box_set_child_secondary
-gtk_button_box_set_child_non_homogeneous
-<SUBSECTION Standard>
-GTK_BUTTON_BOX
-GTK_IS_BUTTON_BOX
-GTK_TYPE_BUTTON_BOX
-GTK_BUTTON_BOX_CLASS
-GTK_IS_BUTTON_BOX_CLASS
-GTK_BUTTON_BOX_GET_CLASS
-<SUBSECTION Private>
-GtkButtonBoxPrivate
-gtk_button_box_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkbin</FILE>
 <TITLE>GtkBin</TITLE>
@@ -322,17 +294,14 @@ gtk_bin_get_type
 GtkBox
 GtkBoxClass
 gtk_box_new
-gtk_box_pack_start
-gtk_box_pack_end
 gtk_box_get_homogeneous
 gtk_box_set_homogeneous
 gtk_box_get_spacing
 gtk_box_set_spacing
-gtk_box_reorder_child
-gtk_box_query_child_packing
-gtk_box_set_child_packing
 gtk_box_get_baseline_position
 gtk_box_set_baseline_position
+gtk_box_insert_child_after
+gtk_box_reorder_child_after
 <SUBSECTION Standard>
 GTK_BOX
 GTK_IS_BOX
@@ -442,6 +411,30 @@ gtk_list_box_get_type
 gtk_list_box_row_get_type
 </SECTION>

+<SECTION>
+<FILE>gtkselectionmodel</FILE>
+<TITLE>GtkSelectionModel</TITLE>
+GtkSelectionModel
+gtk_selection_model_is_selected
+gtk_selection_model_select_item
+gtk_selection_model_unselect_item
+gtk_selection_model_select_range
+gtk_selection_model_unselect_range
+gtk_selection_model_select_all
+gtk_selection_model_unselect_all
+<SUBSECTION>
+gtk_selection_model_selection_changed
+<SUBSECTION Standard>
+GTK_SELECTION_MODEL
+GTK_SELECTION_MODEL_CLASS
+GTK_SELECTION_MODEL_GET_CLASS
+GTK_IS_SELECTION_MODEL
+GTK_IS_SELECTION_MODEL_CLASS
+GTK_TYPE_SELECTION_MODEL
+<SUBSECTION Private>
+gtk_selection_model_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkbuildable</FILE>
 GtkBuildable
@@ -1617,23 +1610,6 @@ gtk_im_multicontext_get_type
 GtkIMMulticontextPrivate
 </SECTION>

-<SECTION>
-<FILE>gtkinvisible</FILE>
-<TITLE>GtkInvisible</TITLE>
-GtkInvisible
-gtk_invisible_new
-<SUBSECTION Standard>
-GTK_INVISIBLE
-GTK_IS_INVISIBLE
-GTK_TYPE_INVISIBLE
-GTK_INVISIBLE_CLASS
-GTK_IS_INVISIBLE_CLASS
-GTK_INVISIBLE_GET_CLASS
-<SUBSECTION Private>
-gtk_invisible_get_type
-GtkInvisiblePrivate
-</SECTION>
-
 <SECTION>
 <FILE>gtklabel</FILE>
 <TITLE>GtkLabel</TITLE>
@@ -3362,7 +3338,6 @@ gtk_tooltip_set_icon
 gtk_tooltip_set_icon_from_icon_name
 gtk_tooltip_set_icon_from_gicon
 gtk_tooltip_set_custom
-gtk_tooltip_trigger_tooltip_query
 gtk_tooltip_set_tip_area
 <SUBSECTION Standard>
 GTK_TYPE_TOOLTIP
@@ -5376,7 +5351,6 @@ GtkPrintOperationPrivate


 <SECTION>
-<INCLUDE>gtk/gtkunixprint.h</INCLUDE>
 <FILE>gtkprintunixdialog</FILE>
 <TITLE>GtkPrintUnixDialog</TITLE>
 GtkPrintUnixDialog
@@ -5724,7 +5698,6 @@ gtk_print_context_get_type


 <SECTION>
-<INCLUDE>gtk/gtkunixprint.h</INCLUDE>
 <FILE>gtkprintjob</FILE>
 <TITLE>GtkPrintJob</TITLE>
 GtkPrintJob
@@ -5776,7 +5749,6 @@ gtk_print_job_get_type


 <SECTION>
-<INCLUDE>gtk/gtkunixprint.h</INCLUDE>
 <FILE>gtkpagesetupunixdialog</FILE>
 <TITLE>GtkPageSetupUnixDialog</TITLE>
 GtkPageSetupUnixDialog
--- a/docs/reference/gtk/gtk4-update-icon-cache.xml
+++ b/docs/reference/gtk/gtk4-update-icon-cache.xml
@@ -6,7 +6,7 @@

 <refentryinfo>
  <title>gtk4-update-icon-cache</title>
-  <productname>GTK+</productname>
+  <productname>GTK</productname>
  <authorgroup>
    <author>
      <contrib>Developer</contrib>
@@ -56,7 +56,7 @@
  the icons in the directory tree below the given directory.
 </para>
 <para>
-  GTK+ can use the cache files created by <command>gtk4-update-icon-cache</command>
+  GTK can use the cache files created by <command>gtk4-update-icon-cache</command>
  to avoid a lot of system call and disk seek overhead when the application
  starts. Since the format of the cache files allows them to be mmaped
  shared between multiple applications, the overall memory consumption is
--- a/docs/reference/gtk/gtk4-widget-factory.xml
+++ b/docs/reference/gtk/gtk4-widget-factory.xml
@@ -6,7 +6,7 @@

 <refentryinfo>
  <title>gtk4-widget-factory</title>
-  <productname>GTK+</productname>
+  <productname>GTK</productname>
  <authorgroup>
    <author>
      <contrib>Developer</contrib>
@@ -24,7 +24,7 @@

 <refnamediv>
  <refname>gtk4-widget-factory</refname>
-  <refpurpose>Demonstrate GTK+ widgets</refpurpose>
+  <refpurpose>Demonstrate GTK widgets</refpurpose>
 </refnamediv>

 <refsynopsisdiv>
@@ -37,8 +37,8 @@
 <refsect1><title>Description</title>
 <para>
 <command>gtk4-widget-factory</command> is a collection of examples.
-Its purpose is to demonstrate many GTK+ widgets in a form
-that is useful to GTK+ theme developers.
+Its purpose is to demonstrate many GTK widgets in a form
+that is useful to GTK theme developers.
 </para>
 <para>
 The application shows widgets in different, typical combinations
--- a/docs/reference/gtk/gtk4.types.in
+++ b/docs/reference/gtk/gtk4.types.in
@@ -18,7 +18,6 @@ gtk_bin_get_type
 gtk_box_get_type
 gtk_builder_get_type
 gtk_buildable_get_type
-gtk_button_box_get_type
 gtk_button_get_type
 gtk_calendar_get_type
 gtk_cell_area_get_type
@@ -91,7 +90,6 @@ gtk_im_context_get_type
 gtk_im_context_simple_get_type
 gtk_im_multicontext_get_type
 gtk_info_bar_get_type
-gtk_invisible_get_type
 gtk_label_get_type
 gtk_layout_get_type
 gtk_link_button_get_type
--- a/docs/reference/gtk/images/README
+++ b/docs/reference/gtk/images/README
@@ -1,5 +1,5 @@
 This directory contains a collection of images of various widgets.
-They are created via the shooter command in gtk+/docs/tools/, and are
+They are created via the shooter command in gtk/docs/tools/, and are
 updated semi-regularly. The images are used in both the headers of
 individual widgets as well as the visual index of widgets.

--- a/docs/reference/gtk/input-handling.xml
+++ b/docs/reference/gtk/input-handling.xml
@@ -4,26 +4,26 @@
 ]>
 <refentry id="chap-input-handling">
 <refmeta>
-<refentrytitle>The GTK+ Input and Event Handling Model</refentrytitle>
+<refentrytitle>The GTK Input and Event Handling Model</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>

 <refnamediv>
-<refname>The GTK+ Input and Event Handling Model</refname>
+<refname>The GTK Input and Event Handling Model</refname>
 <refpurpose>
-    GTK+ input and event handling in detail
+    GTK input and event handling in detail
 </refpurpose>
 </refnamediv>


  <refsect1 id="input-overview">
-    <title>Overview of GTK+ input and event handling</title>
+    <title>Overview of GTK input and event handling</title>

  <para>
-   This chapter describes in detail how GTK+ handles input. If you are interested
+   This chapter describes in detail how GTK handles input. If you are interested
   in what happens to translate a key press or mouse motion of the users into a
-   change of a GTK+ widget, you should read this chapter. This knowledge will also
+   change of a GTK widget, you should read this chapter. This knowledge will also
   be useful if you decide to implement your own widgets.
  </para>

@@ -33,13 +33,13 @@
    <!-- input devices: master/slave, keyboard/pointer/touch -->
    <para>
     The most basic input devices that every computer user has interacted with are
-     keyboards and mice; beyond these, GTK+ supports touchpads, touchscreens and
-     more exotic input devices such as graphics tablets. Inside GTK+, every such
+     keyboards and mice; beyond these, GTK supports touchpads, touchscreens and
+     more exotic input devices such as graphics tablets. Inside GTK, every such
     input device is represented by a #GdkDevice object.
    </para>

    <para>
-     To simplify dealing with the variability between these input devices, GTK+
+     To simplify dealing with the variability between these input devices, GTK
     has a concept of master and slave devices. The concrete physical devices that
     have many different characteristics (mice may have 2 or 3 or 8 buttons,
     keyboards have different layouts and may or may not have a separate number
@@ -48,14 +48,14 @@
     pointer/keyboard pairs - you can think of such a pair as a 'seat'.
    </para>
    <para>
-     GTK+ widgets generally deal with the master devices, and thus can be used
+     GTK widgets generally deal with the master devices, and thus can be used
     with any pointing device or keyboard.
    </para>

    <!-- input events: button, touch, key, motion, etc -->
    <para>
     When a user interacts with an input device (e.g. moves a mouse or presses
-     a key on the keyboard), GTK+ receives events from the windowing system.
+     a key on the keyboard), GTK receives events from the windowing system.
     These are typically directed at a specific window - for pointer events,
     the window under the pointer (grabs complicate this), for keyboard events,
     the window with the keyboard focus.
@@ -81,7 +81,7 @@
      </simplelist>
    </para>
    <para>
-      When GTK+ is initialized, it sets up an event handler function with
+      When GTK is initialized, it sets up an event handler function with
      gdk_event_handler_set(), which receives all of these input events
      (as well as others, for instance window management related events).
    </para>
@@ -152,7 +152,7 @@

    <para>
      Next, the #GtkWidget::event signal is emitted.
-      Handling these signals was the primary way to handle input in GTK+ widgets
+      Handling these signals was the primary way to handle input in GTK widgets
      before gestures were introduced. The signal is emitted from
      the target widget up to the top-level, as part of the “bubble” phase.
    </para>
@@ -193,7 +193,7 @@
      by granting a “pointer emulating” hint to one of the currently interacting touch
      sequences, which will be reported on every #GdkEventTouch event from that sequence. By
      default, if a widget didn't request touch events by setting %GDK_TOUCH_MASK on its
-      event mask and didn't override #GtkWidget::touch-event, GTK+ will transform these
+      event mask and didn't override #GtkWidget::touch-event, GTK will transform these
      “pointer emulating” events into semantically similar #GdkEventButton and #GdkEventMotion
      events. Depending on %GDK_TOUCH_MASK being in the event mask or not, non-pointer-emulating
      sequences could still trigger gestures or just get filtered out, regardless of the widget
--- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build
@@ -11,7 +11,6 @@ private_headers = [
  'gtkapplicationprivate.h',
  'gtkbindingsprivate.h',
  'gtkbitmaskprivate.h',
-  'gtkboxprivate.h',
  'gtkbuilderprivate.h',
  'gtkbuttonprivate.h',
  'gtkcellareaboxcontextprivate.h',
@@ -362,7 +361,6 @@ content_files = [
  'running.sgml',
  'text_widget.sgml',
  'tree_widget.sgml',
-  'treeview_tutorial.xml',
  'visual_index.xml',
  'wayland.xml',
  'windows.sgml',
@@ -379,7 +377,6 @@ expand_content_files = [
  'question_index.sgml',
  'text_widget.sgml',
  'tree_widget.sgml',
-  'treeview_tutorial.xml',
 ]

 configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
@@ -414,6 +411,9 @@ gnome.gtkdoc('gtk4',
               '--ignore-decorators=_GDK_EXTERN|G_GNUC_WARN_UNUSED_RESULT',
               '--ignore-headers=' + ' '.join(private_headers),
             ],
+             mkdb_args: [
+               '--default-includes=gtk/gtk.h',
+             ],
             fixxref_args: [
               '--html-dir=@0@'.format(docpath),
               '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
--- a/docs/reference/gtk/migrating-2to4.xml
+++ b/docs/reference/gtk/migrating-2to4.xml
@@ -4,11 +4,11 @@
 <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
 ]>
 <chapter id="gtk-migrating-2-to-4">
-  <title>Migrating from GTK+ 2.x to GTK+ 4</title>
+  <title>Migrating from GTK 2.x to GTK 4</title>

  <para>
-    If your application is still using GTK+ 2, you should first convert it to
-    GTK+ 3, by following the <ulink url="https://developer.gnome.org/gtk3/stable/gtk-migrating-2-to-3.html">migration guide</ulink> in the GTK+ 3
+    If your application is still using GTK 2, you should first convert it to
+    GTK 3, by following the <ulink url="https://developer.gnome.org/gtk3/stable/gtk-migrating-2-to-3.html">migration guide</ulink> in the GTK 3
    documentation, and then follow <xref linkend="gtk-migrating-3-to-4"/>.
  </para>

--- a/docs/reference/gtk/migrating-3to4.xml
+++ b/docs/reference/gtk/migrating-3to4.xml
@@ -4,26 +4,26 @@
 <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
 ]>
 <chapter id="gtk-migrating-3-to-4">
-  <title>Migrating from GTK+ 3.x to GTK+ 4</title>
+  <title>Migrating from GTK 3.x to GTK 4</title>

  <para>
-    GTK+ 4 is a major new version of GTK+ that breaks both API and ABI
-    compared to GTK+ 3.x. Thankfully, most of the changes are not hard
+    GTK 4 is a major new version of GTK that breaks both API and ABI
+    compared to GTK 3.x. Thankfully, most of the changes are not hard
    to adapt to and there are a number of steps that you can take to
-    prepare your GTK+ 3.x application for the switch to GTK+ 4. After
+    prepare your GTK 3.x application for the switch to GTK 4. After
    that, there's a small number of adjustments that you may have to do
-    when you actually switch your application to build against GTK+ 4.
+    when you actually switch your application to build against GTK 4.
  </para>

  <section>
-    <title>Preparation in GTK+ 3.x</title>
+    <title>Preparation in GTK 3.x</title>

    <para>
      The steps outlined in the following sections assume that your
-      application is working with GTK+ 3.24, which is the final stable
-      release of GTK+ 3.x. It includes all the necessary APIs and tools
-      to help you port your application to GTK+ 4. If you are still using
-      an older version of GTK+ 3.x, you should first get your application
+      application is working with GTK 3.24, which is the final stable
+      release of GTK 3.x. It includes all the necessary APIs and tools
+      to help you port your application to GTK 4. If you are still using
+      an older version of GTK 3.x, you should first get your application
      to build and work with the latest minor release in the 3.24 series.
    </para>

@@ -33,7 +33,7 @@
        Over the years, a number of functions, and in some cases, entire
        widgets have been deprecated. These deprecations are clearly spelled
        out in the API reference, with hints about the recommended replacements.
-        The API reference for GTK+ 3 also includes an
+        The API reference for GTK 3 also includes an
        <ulink url="https://developer.gnome.org/gtk3/3.24/api-index-deprecated.html">index</ulink> of all deprecated symbols.
      </para>
      <para>
@@ -70,7 +70,7 @@
    <section>
      <title>Do not use widget style properties</title>
      <para>
-        Style properties do not exist in GTK+ 4. You should stop using them in
+        Style properties do not exist in GTK 4. You should stop using them in
        your custom CSS and in your code.
      </para>
    </section>
@@ -78,18 +78,18 @@
    <section>
      <title>Review your window creation flags</title>
      <para>
-        GTK+ 4 removes the GDK_WA_CURSOR flag. Instead, just use
+        GTK 4 removes the GDK_WA_CURSOR flag. Instead, just use
        gdk_window_set_cursor() to set a cursor on the window after
        creating it.
      </para>
      <para>
-        GTK+ 4 also removes the GDK_WA_VISUAL flag, and always uses
+        GTK 4 also removes the GDK_WA_VISUAL flag, and always uses
        an RGBA visual for windows. To prepare your code for this,
        use gdk_window_set_visual (gdk_screen_get_rgba_visual ()) after
        creating your window.
      </para>
      <para>
-        GTK+ 4 also removes the GDK_WA_WMCLASS flag. If you need this
+        GTK 4 also removes the GDK_WA_WMCLASS flag. If you need this
        X11-specific functionality, use XSetClassHint() directly.
      </para>
    </section>
@@ -97,12 +97,12 @@
    <section>
      <title>Stop using non-RGBA visuals</title>
      <para>
-        GTK+ 4 always uses RGBA visuals for its windows; you should make
+        GTK 4 always uses RGBA visuals for its windows; you should make
        sure that your code works with that.
      </para>
      <para>
        At the same time, you should stop using GdkVisual APIs, this object
-        not longer exist in GTK+ 4. Most of its APIs are deprecated already
+        not longer exist in GTK 4. Most of its APIs are deprecated already
        and not useful when dealing with RGBA visuals.
      </para>
    </section>
@@ -110,7 +110,7 @@
    <section>
      <title>Stop using GtkBox:padding, GtkBox:fill and GtkBox:expand</title>
      <para>
-        GTK+4 removes these #GtkBox child properties, so you should not use them.
+        GTK4 removes these #GtkBox child properties, so you should not use them.
        You can replace GtkBox:padding using the #GtkWidget:margin properties
        on your #GtkBox child widgets.
      </para>
@@ -152,7 +152,7 @@
    <section>
      <title>Stop using gdk_pixbuf_get_from_window() and gdk_cairo_set_source_surface()</title>
      <para>
-        These functions are not supported in GTK+ 4. Instead, either use backend-specific
+        These functions are not supported in GTK 4. Instead, either use backend-specific
        APIs, or render your widgets using gtk_widget_render().
      </para>
    </section>
@@ -162,7 +162,7 @@
      <para>
        The functions and properties related to automatically add a GtkImage
        to a GtkButton, and using a GtkSetting to control its visibility, are
-        not supported in GTK+ 4. Instead, you can just pack a GtkImage inside
+        not supported in GTK 4. Instead, you can just pack a GtkImage inside
        a GtkButton, and control its visibility like you would for any other
        widget. If you only want to add a named icon to a GtkButton, you can
        use gtk_button_set_icon_name().
@@ -172,24 +172,35 @@
    <section>
      <title>Stop using GtkWidget event signals</title>
      <para>
-        Event controllers and #GtkGestures replace event signals in GTK+ 4. They
-        have been backported to GTK+ 3.x so you can prepare for this change.
+        Event controllers and #GtkGestures replace event signals in GTK 4. They
+        have been backported to GTK 3.x so you can prepare for this change.
      </para>
    </section>

    <section>
      <title>Set a proper app_id</title>
      <para>
-        In GTK+4 we want the application's #GApplication
+        In GTK4 we want the application's #GApplication
        'application-id' (and therefore the D-Bus name), the desktop
        file basename and Wayland's xdg-shell app_id to match. In
-        order to achieve this with GTK+3 call g_set_prgname() with the same
+        order to achieve this with GTK3 call g_set_prgname() with the same
        application id you passed to #GtkApplication. Rename your
        desktop files to match the application id if needed.
      </para>
      <para>
        The call to g_set_prgname() can be removed once you fully migrated
-        to GTK+4.
+        to GTK4.
+      </para>
+    </section>
+
+    <section>
+      <title>Stop using GtkBox's pack-type child property</title>
+      <para>
+        In order to improve performance and simplify the widget, GtkBox lost its
+        'pack-type' child property. In GTK4, every GtkBox instance has a simple
+        list of child widgets that it allocates from start to end.
+        The old behavior of pack-type=END can be emulated by simply making the
+        box child in the center hexpand and right-align the ones at the end.
      </para>
    </section>

@@ -201,15 +212,15 @@
    <para>
      This section outlines porting tasks that you need to tackle when
      you get to the point that you actually build your application against
-      GTK+ 4. Making it possible to prepare for these in GTK+ 3 would
+      GTK 4. Making it possible to prepare for these in GTK 3 would
      have been either impossible or impractical.
    </para>

    <section>
      <title>Stop using GdkScreen</title>
      <para>
-        The GdkScreen object has been removed in GTK+ 4. Most of its APIs already
-        had replacements in GTK+ 3 and were deprecated, a few remaining replacements
+        The GdkScreen object has been removed in GTK 4. Most of its APIs already
+        had replacements in GTK 3 and were deprecated, a few remaining replacements
        have been added to GdkDisplay.
      </para>
    </section>
@@ -227,7 +238,7 @@
    <section>
      <title>Stop using GdkVisual</title>
      <para>
-        This object is not useful with current GTK+ drawing APIs and has been removed
+        This object is not useful with current GTK drawing APIs and has been removed
        without replacement.
      </para>
    </section>
@@ -235,8 +246,8 @@
    <section>
      <title>Stop using GdkDeviceManager</title>
      <para>
-        The GdkDeviceManager object has been removed in GTK+ 4. Most of its APIs already
-        had replacements in GTK+ 3 and were deprecated in favor of GdkSeat.
+        The GdkDeviceManager object has been removed in GTK 4. Most of its APIs already
+        had replacements in GTK 3 and were deprecated in favor of GdkSeat.
      </para>
    </section>

@@ -264,9 +275,9 @@
    <section>
      <title>Stop accessing GdkEvent fields</title>
      <para>
-        Direct access to GdkEvent structs is no longer possible in GTK+ 4. Some
-        frequently-used fields already had accessors in GTK+ 3, and the remaining
-        fields have gained accessors in GTK+ 4.
+        Direct access to GdkEvent structs is no longer possible in GTK 4. Some
+        frequently-used fields already had accessors in GTK 3, and the remaining
+        fields have gained accessors in GTK 4.
      </para>
    </section>

@@ -317,7 +328,7 @@
    <section>
      <title>Adapt to GtkCssProvider API changes</title>
      <para>
-        In GTK+ 4, the various #GtkCssProvider load functions have lost
+        In GTK 4, the various #GtkCssProvider load functions have lost
        their #GError argument. If you want to handle CSS loading errors,
        use the #GtkCssProvider::parsing-error signal instead.
      </para>
@@ -326,7 +337,7 @@
    <section>
      <title>Stop using GtkContainer::border-width</title>
      <para>
-        GTK+ 4 has removed the #GtkContainer::border-width property.
+        GTK 4 has removed the #GtkContainer::border-width property.
        Use other means to influence the spacing of your containers,
        such as the CSS margin and padding properties on child widgets.
      </para>
@@ -335,9 +346,9 @@
    <section>
      <title>Adapt to GtkWidget's size request changes</title>
      <para>
-        GTK+ 3 used five different virtual functions in GtkWidget to
+        GTK 3 used five different virtual functions in GtkWidget to
        implement size requisition, namely the gtk_widget_get_preferred_width()
-        family of functions. To simplify widget implementations, GTK+4 uses
+        family of functions. To simplify widget implementations, GTK4 uses
        only one virtual function, GtkWidgetClass::measure() that widgets
        have to implement.
      </para>
@@ -355,7 +366,7 @@
    <section>
      <title>Switch to GtkWidget's children APIs</title>
      <para>
-        Instead of the GtkContainer subclass, in GTK+ 4, any widget can
+        Instead of the GtkContainer subclass, in GTK 4, any widget can
        have children, and there is new API to navigate the widget tree:
        gtk_widget_get_first_child(), gtk_widget_get_last_child(),
        gtk_widget_get_next_sibling(), gtk_widget_get_prev_sibling().
@@ -367,7 +378,7 @@
    <section>
      <title>Don't use -gtk-gradient in your CSS</title>
      <para>
-        GTK+ now supports standard CSS syntax for both linear and radial
+        GTK now supports standard CSS syntax for both linear and radial
        gradients, just use those.
      </para>
    </section>
@@ -375,7 +386,7 @@
    <section>
      <title>Don't use -gtk-icon-effect in your CSS</title>
      <para>
-        GTK+ now supports a more versatile -gtk-icon-filter instead. Replace
+        GTK now supports a more versatile -gtk-icon-filter instead. Replace
        -gtk-icon-effect: dim; with -gtk-icon-filter: opacity(0.5); and
        -gtk-icon-effect: hilight; with -gtk-icon-filter: brightness(1.2);.
      </para>
@@ -392,8 +403,8 @@
    <section>
      <title>Adapt to drawing model changes</title>
      <para>
-        This area has seen the most radical changes in the transition from GTK+ 3
-        to GTK+ 4. Widgets no longer use a draw() function to render their contents
+        This area has seen the most radical changes in the transition from GTK 3
+        to GTK 4. Widgets no longer use a draw() function to render their contents
        to a cairo surface. Instead, they have a snapshot() function that creates
        one or more GskRenderNodes to represent their content. Third-party widgets
        that use a draw() function or a #GtkWidget::draw signal handler for custom
@@ -423,7 +434,7 @@
    <section>
      <title>Widgets are now visible by default</title>
      <para>
-        The default value of #GtkWidget::visible in GTK+ 4 is %TRUE, so you no
+        The default value of #GtkWidget::visible in GTK 4 is %TRUE, so you no
        longer need to explicitly show all your widgets. On the flip side, you
        need to hide widgets that are not meant to be visible from the start.
      </para>
@@ -434,7 +445,7 @@
      </para>
      <para>
        The function gtk_widget_show_all(), the #GtkWidget::no-show-all property
-        and its getter and setter have been removed in  GTK+ 4, so you should stop using them.
+        and its getter and setter have been removed in  GTK 4, so you should stop using them.
      </para>
    </section>

@@ -476,8 +487,8 @@
    <section>
      <title>GtkWidget event signals are removed</title>
      <para>
-        Event controllers and #GtkGestures have already been introduced in GTK+ 3 to handle
-        input for many cases. In GTK+ 4, the traditional widget signals for handling input,
+        Event controllers and #GtkGestures have already been introduced in GTK 3 to handle
+        input for many cases. In GTK 4, the traditional widget signals for handling input,
        such as #GtkWidget::motion-event or #GtkWidget::event have been removed.
      </para>
    </section>
@@ -533,7 +544,7 @@
    <section>
      <title>Adapt to icon size API changes</title>
      <para>
-        Instead of the existing extensible set of symbolic icon sizes, GTK+ now only
+        Instead of the existing extensible set of symbolic icon sizes, GTK now only
        supports normal and large icons with the #GtkIconSize enumeration. The actual sizes
        can be defined by themes via the CSS property -gtk-icon-size.
      </para>
--- a/docs/reference/gtk/osx.sgml
+++ b/docs/reference/gtk/osx.sgml
@@ -4,34 +4,34 @@
 ]>
 <refentry id="gtk-osx">
 <refmeta>
-<refentrytitle>Using GTK+ on Mac OS X</refentrytitle>
+<refentrytitle>Using GTK on Apple macOS</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>

 <refnamediv>
-<refname>Using GTK+ on Mac OS X</refname>
+<refname>Using GTK on Apple macOS</refname>
 <refpurpose>
-OS X-specific aspects of using GTK+
+MacOS-specific aspects of using GTK
 </refpurpose>
 </refnamediv>

 <refsect1>
-<title>Using GTK+ on Mac OS X</title>
+<title>Using GTK on Apple macOS</title>

 <para>
-The Mac OS X port of GTK+ is an implementation of GDK (and therefore GTK+)
-on top of the Quarz API.
+The Apple macOS port of GTK is an implementation of GDK (and therefore GTK)
+on top of the Quartz API.
 </para>

 <para>
-Currently, the Mac OS X port does not use any additional commandline options
+Currently, the macOS port does not use any additional commandline options
 or environment variables.
 </para>

 <para>
 For up-to-date information about the current status of this port, see the
-<ulink url="https://wiki.gnome.org/Projects/GTK+/OSX">project page</ulink>.
+<ulink url="https://wiki.gnome.org/Projects/GTK/OSX">project page</ulink>.
 </para>

 </refsect1>
--- a/docs/reference/gtk/other_software.sgml
+++ b/docs/reference/gtk/other_software.sgml
@@ -4,15 +4,15 @@
 ]>
 <refentry id="gtk-other-software">
 <refmeta>
-<refentrytitle>Mixing GTK+ with other software</refentrytitle>
+<refentrytitle>Mixing GTK with other software</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>Mixing GTK+ with other software</refmiscinfo>
+<refmiscinfo>Mixing GTK with other software</refmiscinfo>
 </refmeta>

 <refnamediv>
-<refname>Mixing GTK+ with other software</refname>
+<refname>Mixing GTK with other software</refname>
 <refpurpose>
-How to combine GTK+ with other code and event loops
+How to combine GTK with other code and event loops
 </refpurpose>
 </refnamediv>

@@ -20,9 +20,9 @@ How to combine GTK+ with other code and event loops
 <title>Overview</title>

 <para>
-Often people want to use GTK+ in combination with another library or existing 
-body of code that is not GTK+-aware. The general problem people encounter 
-is that the control flow of the other code does not return to GTK+, so 
+Often people want to use GTK in combination with another library or existing 
+body of code that is not GTK-aware. The general problem people encounter 
+is that the control flow of the other code does not return to GTK, so 
 widgets do not repaint, mouse and keyboard events are ignored, and so forth.
 </para>

@@ -35,10 +35,10 @@ targetting, and your own familiarity with each approach.
 </refsect1>

 <refsect1>
-<title>Periodically yield to GTK+ main loop</title>
+<title>Periodically yield to GTK main loop</title>

 <para>
-This is the simplest method, but requires you to modify the non-GTK+ code.
+This is the simplest method, but requires you to modify the non-GTK code.
 Say you have a function that does some kind of lengthy task:
 <informalexample>
 <programlisting>
@@ -99,7 +99,7 @@ lengthy task.
 </refsect1>

 <refsect1>
-<title>Run the other code as a slave of the GTK+ main loop</title>
+<title>Run the other code as a slave of the GTK main loop</title>

 <para>
 As a slightly cleaner solution, you can ask the main loop to run a small part of your 
@@ -190,7 +190,7 @@ your needs.
 </refsect1>

 <refsect1>
-<title>Integrate the GTK+ main loop with another main loop</title>
+<title>Integrate the GTK main loop with another main loop</title>

 <para>
 </para>
--- a/docs/reference/gtk/overview.xml
+++ b/docs/reference/gtk/overview.xml
@@ -4,17 +4,17 @@
               ]>
 <partintro>
 <para>
-GTK+ is a library for creating graphical user interfaces. It
+GTK is a library for creating graphical user interfaces. It
 works on many UNIX-like platforms, Windows, and OS X.
-GTK+ is released under the GNU Library General Public License
+GTK is released under the GNU Library General Public License
 (GNU LGPL), which allows for flexible licensing of client
-applications. GTK+ has a C-based object-oriented architecture that
+applications. GTK has a C-based object-oriented architecture that
 allows for maximum flexibility.  Bindings for many other languages have
 been written, including C++, Objective-C, Guile/Scheme, Perl, Python,
 TOM, Ada95, Free Pascal, and Eiffel.
 </para>
 <para>
-GTK+ depends on the following libraries:
+GTK depends on the following libraries:
 <variablelist>

 <varlistentry>
@@ -64,7 +64,7 @@ other widgets that display text.
 ATK is the Accessibility Toolkit. It provides a set of generic
 interfaces allowing accessibility technologies to interact with a
 graphical user interface. For example, a screen reader uses ATK to
-discover the text in an interface and read it to blind users.  GTK+
+discover the text in an interface and read it to blind users.  GTK
 widgets have built-in support for accessibility using the ATK
 framework.
 </para></listitem>
@@ -82,16 +82,16 @@ Use a GdkPixbuf in combination with GtkImage to display images.
 <varlistentry>
 <term>GDK</term>
 <listitem><para>
-GDK is the abstraction layer that allows GTK+ to support multiple
+GDK is the abstraction layer that allows GTK to support multiple
 windowing systems. GDK provides window system facilities on X11, Windows,
 and OS X.
 </para></listitem>
 </varlistentry>

 <varlistentry>
-<term>GTK+</term>
+<term>GTK</term>
 <listitem><para>
-The GTK+ library itself contains <firstterm>widgets</firstterm>,
+The GTK library itself contains <firstterm>widgets</firstterm>,
 that is, GUI components such as GtkButton or GtkTextView.
 </para></listitem>
 </varlistentry>
--- a/docs/reference/gtk/question_index.sgml
+++ b/docs/reference/gtk/question_index.sgml
@@ -12,7 +12,7 @@
 <refnamediv>
 <refname>Common Questions</refname>
 <refpurpose>
-Find answers to common questions in the GTK+ manual
+Find answers to common questions in the GTK manual
 </refpurpose>
 </refnamediv>

@@ -31,13 +31,13 @@ the question you have, this list is a good place to start.

 <qandaentry>
 <question><para>
-How do I get started with GTK+?
+How do I get started with GTK?
 </para></question>

 <answer><para>
-The GTK+ <ulink url="https://www.gtk.org">website</ulink> offers some
+The GTK <ulink url="https://www.gtk.org">website</ulink> offers some
 <ulink url="https://www.gtk.org/documentation.php">tutorials</ulink> and other
-documentation (most of it about GTK+ 2.x, but mostly still applicable).
+documentation (most of it about GTK 2.x, but mostly still applicable).
 More documentation ranging from whitepapers to online books can be found at
 the <ulink url="https://developer.gnome.org">GNOME developer's site</ulink>.
 After studying these materials you should be well prepared to come back to
@@ -47,7 +47,7 @@ this reference manual for details.

 <qandaentry>
 <question><para>
-Where can I get help with GTK+, submit a bug report, or make a feature
+Where can I get help with GTK, submit a bug report, or make a feature
 request?
 </para></question>

@@ -63,7 +63,7 @@ See the <link linkend="gtk-resources">documentation on this topic</link>.


 <qandaentry>
-<question><para>How do I port from one GTK+
+<question><para>How do I port from one GTK
 version to another?</para></question>

 <answer>
@@ -77,8 +77,8 @@ specific widgets and functions.
 <para>
 If you have a question not covered in the manual, feel free to
 ask on the mailing lists and please <ulink
-url="https://bugzilla.gnome.org">file a bug report</ulink> against the
-documentation.
+url="https://gitlab.gnome.org/GNOME/gtk/issues/new">file a bug report</ulink>
+against the documentation.
 </para>

 </answer>
@@ -88,7 +88,7 @@ documentation.

 <qandaentry>
 <question><para>
-How does memory management work in GTK+? Should I free data returned
+How does memory management work in GTK? Should I free data returned
 from functions?
 </para></question>

@@ -105,8 +105,8 @@ state (explained in its documentation).
 For strings returned from functions, they will be declared "const"
 if they should not be freed. Non-const strings should be
 freed with g_free(). Arrays follow the same rule. If you find an
-undocumented exception to the rules, please report a bug to <ulink
-url="https://bugzilla.gnome.org">https://bugzilla.gnome.org</ulink>.
+undocumented exception to the rules, please
+<ulink url="https://gitlab.gnome.org/GNOME/gtk/issues/new">file a bug report</ulink>.
 </para>

 </answer>
@@ -135,7 +135,7 @@ reference counting, not floating reference counting.

 <para>
 To get this, you must acquire a reference to the widget and drop the
-floating reference (<quote>ref and sink</quote> in GTK+ parlance) after
+floating reference (<quote>ref and sink</quote> in GTK parlance) after
 creating it:
 <informalexample><programlisting>
 foo = gtk_foo_new (<!-- -->);
@@ -158,7 +158,7 @@ to get rid of the widget.

 <qandaentry>
 <question><para>
-How do I use GTK+ with threads?
+How do I use GTK with threads?
 </para></question>

 <answer>
@@ -175,7 +175,7 @@ documentation for portable threading primitives.

 <qandaentry>
 <question><para>
-How do I internationalize a GTK+ program?
+How do I internationalize a GTK program?
 </para></question>

 <answer>
@@ -257,13 +257,13 @@ the following convenience:
 <qandaentry>
 <question>
 <para>
-How do I use non-ASCII characters in GTK+ programs ?
+How do I use non-ASCII characters in GTK programs ?
 </para>
 </question>

 <answer>
 <para>
-GTK+ uses <ulink url="http://www.unicode.org">Unicode</ulink> (more exactly
+GTK uses <ulink url="http://www.unicode.org">Unicode</ulink> (more exactly
 UTF-8) for all text. UTF-8 encodes each Unicode codepoint as a sequence of
 one to six bytes and has a number of nice properties which make it a good
 choice for working with Unicode text in C programs:
@@ -288,7 +288,7 @@ encodings, see g_locale_to_utf8() and g_convert().
 </para>
 <para>
 Text coming from external sources (e.g. files or user input), has to be
-converted to UTF-8 before being handed over to GTK+. The following example
+converted to UTF-8 before being handed over to GTK. The following example
 writes the content of a IS0-8859-1 encoded text file to
 <literal>stdout</literal>:
 <informalexample><programlisting>
@@ -368,24 +368,24 @@ returned in UTF-8 encoding.

 <qandaentry>
 <question><para>
-How do I use GTK+ with C++?
+How do I use GTK with C++?
 </para></question>

 <answer>
 <para>
-There are two ways to approach this. The GTK+ header files use the subset
-of C that's also valid C++, so you can simply use the normal GTK+ API
+There are two ways to approach this. The GTK header files use the subset
+of C that's also valid C++, so you can simply use the normal GTK API
 in a C++ program. Alternatively, you can use a "C++ binding"
 such as <ulink url="https://www.gtkmm.org/">gtkmm</ulink>
 which provides a native C++ API.
 </para>
 <para>
-When using GTK+ directly, keep in mind that only functions can be
+When using GTK directly, keep in mind that only functions can be
 connected to signals, not methods. So you will need to use global
 functions or "static" class functions for signal connections.
 </para>
 <para>
-Another common issue when using GTK+ directly is that
+Another common issue when using GTK directly is that
 C++ will not implicitly convert an integer to an enumeration.
 This comes up when using bitfields; in C you can write the following
 code:
@@ -410,7 +410,7 @@ There are very few functions that require this cast, however.

 <qandaentry>
 <question><para>
-How do I use GTK+ with other non-C languages?
+How do I use GTK with other non-C languages?
 </para></question>

 <answer>
@@ -620,7 +620,7 @@ single-line text entry, see #GtkEntry.

 <answer>
 <para>
-#GtkImage can display images in just about any format GTK+ understands.
+#GtkImage can display images in just about any format GTK understands.
 You can also use #GtkDrawingArea if you need to do something more complex,
 such as draw text or graphics over the top of the image.
 </para>
@@ -635,7 +635,7 @@ would use a combo box?

 <answer>
 <para>
-With GTK+, a #GtkComboBox is the recommended widget to use for this use case.
+With GTK, a #GtkComboBox is the recommended widget to use for this use case.
 This widget looks like either a combo box or the current option menu, depending
 on the current theme. If you need an editable text entry, use the
 #GtkComboBox:has-entry property.
@@ -707,7 +707,7 @@ How do I disable/ghost/desensitize a widget?
 </para></question>

 <answer><para>
-In GTK+ a disabled widget is termed "insensitive."
+In GTK a disabled widget is termed "insensitive."
 See gtk_widget_set_sensitive().
 </para></answer>
 </qandaentry>
@@ -931,11 +931,11 @@ See gtk_tree_view_set_expander_column() and gtk_tree_view_column_set_visible().

 </qandadiv>

-<qandadiv><title>Using cairo with GTK+</title>
+<qandadiv><title>Using cairo with GTK</title>

 <qandaentry>
 <question><para>
-How do I use cairo to draw in GTK+ applications ?
+How do I use cairo to draw in GTK applications ?
 </para></question>

 <answer><para>
@@ -943,7 +943,7 @@ The #GtkWidget::draw signal gets a ready-to-use cairo context
 as parameter that you should use.
 </para>
 <para>
-All drawing in GTK+ is normally done in a draw handler, and GTK+
+All drawing in GTK is normally done in a draw handler, and GTK
 creates a temporary pixmap for double-buffering the drawing.
 It is possible to turn off double-buffering, with
 gtk_widget_set_double_buffered(), but this is not ideal,
@@ -961,7 +961,7 @@ Glitz or GL backend of cairo ?
 <answer><para>
 No. The GDK X11 backend uses the cairo X backend (and the other
 GDK backends use their respective native cairo backends). The
-GTK+ developers believe that the best way to improving the GDK
+GTK developers believe that the best way to improving the GDK
 drawing performance is to optimize the cairo X backend and the
 relevant code paths in the X server that is uses (mostly the
 Render extension).
--- a/docs/reference/gtk/resources.sgml
+++ b/docs/reference/gtk/resources.sgml
@@ -12,20 +12,19 @@
 <refnamediv>
 <refname>Mailing lists and bug reports</refname>
 <refpurpose>
-Getting help with GTK+
+Getting help with GTK
 </refpurpose>
 </refnamediv>

 <refsect1>
-<title>Filing a bug report or feature request</title>
+<title>Opening a bug or feature request</title>

 <para>
-If you encounter a bug, misfeature, or missing feature in GTK+, please
-file a bug report on 
-<ulink url="https://bugzilla.gnome.org">https://bugzilla.gnome.org</ulink>.
-We'd also appreciate reports of incomplete or misleading information in 
-the GTK+ documentation; file those against the "docs" component of the "gtk+"
-product in Bugzilla.
+If you encounter a bug, misfeature, or missing feature in GTK, please
+file a bug report on our
+<ulink url="https://gitlab.gnome.org/GNOME/gtk/issues/new">GitLab project</ulink>.
+You should also file issues if the documentation is out of date with the
+existing API, or unclear.
 </para>

 <para>
@@ -37,29 +36,34 @@ discussed, we'll add a note to that effect in the report.

 <para>
 The bug tracker should definitely be used for feature requests, it's
-not only for bugs. We track all GTK+ development in Bugzilla, so it's
-the way to be sure the GTK+ developers won't forget about an issue.
+not only for bugs. We track all GTK development in GitLab, to ensure
+that nothing gets lost.
 </para>

 </refsect1>

 <refsect1>
-<title>Submitting Patches</title>
+<title>Working on GTK</title>

 <para>
-If you develop a bugfix or enhancement for GTK+, please file that in
-Bugzilla as well. Bugzilla allows you to attach files; please attach a
-patch generated by the <command>diff</command> utility, using the 
-<option>-u</option> option to make the patch more readable. All patches 
-must be offered under the terms of the GNU LGPL license, so be sure you 
-are authorized to give us the patch under those terms.
+If you develop a bugfix or enhancement for GTK, please open a merge
+request in GitLab as well. You should not attach patches to an issue,
+or describe the fix as a comment. Merge requests allow us to build
+GTK with your code applied, and run the test suite, on multiple platforms
+and architectures, and verify that nothing breaks. They also allow us to
+do proper code reviews, so we can iterate over the changes.
 </para>

 <para>
-If you want to discuss your patch before or after developing it, mail 
-<ulink url="mailto:gtk-devel-list@gnome.org">gtk-devel-list@gnome.org</ulink>. 
-But be sure to file the Bugzilla report as well; if the patch is only on the 
-list and not in Bugzilla, it's likely to slip through the cracks.
+You should follow the <ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/master/CONTRIBUTING.md">contribution guide</ulink>
+for GTK, available on GitLab.
+</para>
+
+<para>
+If you want to discuss your approach before or after working on it,
+send and email to <ulink url="mailto:gtk-devel-list@gnome.org">gtk-devel-list@gnome.org</ulink>.
+You should not send a patch to the mailing list, as it will inevitably
+get lost, or forgotten. Always open a merge request.
 </para>

 </refsect1>
@@ -68,8 +72,8 @@ list and not in Bugzilla, it's likely to slip through the cracks.
 <title>Mailing lists</title>

 <para>
-There are several mailing lists dedicated to GTK+ and related
-libraries. Discussion of GLib, Pango, and ATK in addition to GTK+
+There are several mailing lists dedicated to GTK and related
+libraries. Discussion of GLib, Pango, and ATK in addition to GTK
 proper is welcome on these lists. You can subscribe or view the
 archives of these lists on 
 <ulink url="https://mail.gnome.org">http://mail.gnome.org</ulink>.
@@ -84,28 +88,28 @@ some days to happen.
 <varlistentry>
 <term><ulink url="mailto:gtk-list@gnome.org">gtk-list@gnome.org</ulink></term>
 <listitem><para>
-gtk-list covers general GTK+ topics; questions about using GTK+ in programs,
-GTK+ from a user standpoint, announcements of GTK+-related projects
-such as themes or GTK+ modules would all be on-topic. The bulk of the
-traffic consists of GTK+ programming questions.
+gtk-list covers general GTK topics; questions about using GTK in programs,
+GTK from a user standpoint, announcements of GTK-related projects
+such as themes or GTK modules would all be on-topic. The bulk of the
+traffic consists of GTK programming questions.
 </para></listitem>
 </varlistentry>

 <varlistentry>
 <term><ulink url="mailto:gtk-app-devel-list@gnome.org">gtk-app-devel-list@gnome.org</ulink></term> 
 <listitem><para>
-gtk-app-devel-list covers writing applications in GTK+. It's narrower
+gtk-app-devel-list covers writing applications in GTK. It's narrower
 in scope than gtk-list, but the two lists overlap quite a
-bit. gtk-app-devel-list is a good place to ask questions about GTK+
+bit. gtk-app-devel-list is a good place to ask questions about GTK
 programming.  </para></listitem>
 </varlistentry>

 <varlistentry>
 <term><ulink url="mailto:gtk-devel-list@gnome.org">gtk-devel-list@gnome.org</ulink></term>
 <listitem><para>
-gtk-devel-list is for discussion of work on GTK+ itself, it is 
+gtk-devel-list is for discussion of work on GTK itself, it is 
 <emphasis>not</emphasis> for
-asking questions about how to use GTK+ in applications. gtk-devel-list 
+asking questions about how to use GTK in applications. gtk-devel-list 
 is appropriate for discussion of patches, bugs, proposed features, 
 and so on.
 </para></listitem>
@@ -114,7 +118,7 @@ and so on.
 <varlistentry>
 <term><ulink url="mailto:gtk-i18n-list@gnome.org">gtk-i18n-list@gnome.org</ulink></term>
 <listitem><para>
-gtk-i18n-list is for discussion of internationalization in GTK+; 
+gtk-i18n-list is for discussion of internationalization in GTK; 
 Pango is the main focus of the list. Questions about the details of 
 using Pango, and discussion of proposed Pango patches or features, are
 all on topic.
@@ -125,7 +129,7 @@ all on topic.
 <term><ulink url="mailto:gtk-doc-list@gnome.org">gtk-doc-list@gnome.org</ulink></term>
 <listitem><para>
 gtk-doc-list is for discussion of the <application>gtk-doc</application> 
-documentation system (used to document GTK+), and for work on the GTK+ 
+documentation system (used to document GTK), and for work on the GTK 
 documentation.
 </para></listitem>
 </varlistentry>
--- a/docs/reference/gtk/running.sgml
+++ b/docs/reference/gtk/running.sgml
@@ -4,26 +4,26 @@
 ]>
 <refentry id="gtk-running">
 <refmeta>
-<refentrytitle>Running GTK+ Applications</refentrytitle>
+<refentrytitle>Running GTK Applications</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>

 <refnamediv>
-<refname>Running GTK+ Applications</refname>
+<refname>Running GTK Applications</refname>
 <refpurpose>
-How to run and debug your GTK+ application
+How to run and debug your GTK application
 </refpurpose>
 </refnamediv>

 <refsect1>
-<title>Running and debugging GTK+ Applications</title>
+<title>Running and debugging GTK Applications</title>

 <refsect2>
 <title>Environment variables</title>

 <para>
-GTK+ inspects a number of environment variables in addition to standard
+GTK inspects a number of environment variables in addition to standard
 variables like <envar>LANG</envar>, <envar>PATH</envar>, <envar>HOME</envar>
 or <envar>DISPLAY</envar>; mostly to determine paths to look for certain
 files. The <link linkend="x11-envar">X11</link>,
@@ -36,8 +36,8 @@ additional environment variables.
  <title><envar>GTK_DEBUG</envar></title>

  <para>
-  Unless GTK+ has been configured with <option>--enable-debug=no</option>,
-  this variable can be set to a list of debug options, which cause GTK+
+  Unless GTK has been configured with <option>--enable-debug=no</option>,
+  this variable can be set to a list of debug options, which cause GTK
  to print out different types of debugging information.
  <variablelist>
    <varlistentry>
@@ -126,45 +126,45 @@ additional environment variables.
  <title><envar>GTK_PATH</envar></title>

  <para>
-    Specifies a list of directories to search when GTK+ is looking for
+    Specifies a list of directories to search when GTK is looking for
    dynamically loaded objects such as input method
    modules and print backends. If the path to
    the dynamically loaded object is given as an absolute path name,
-    then GTK+ loads it directly.
-    Otherwise, GTK+ goes in turn through the directories in <envar>GTK_PATH</envar>,
+    then GTK loads it directly.
+    Otherwise, GTK goes in turn through the directories in <envar>GTK_PATH</envar>,
    followed by the directory <filename>.gtk-4.0</filename> in the user's
    home directory, followed by the system default directory,
    which is <filename><replaceable>libdir</replaceable>/gtk-4.0/modules</filename>.
    (If <envar>GTK_EXE_PREFIX</envar> is defined, <replaceable>libdir</replaceable> is
    <filename>$GTK_EXE_PREFIX/lib</filename>. Otherwise it is the libdir
-    specified when GTK+ was configured, usually
+    specified when GTK was configured, usually
    <filename>/usr/lib</filename>, or
    <filename>/usr/local/lib</filename>.)
-    For each directory in this list, GTK+ actually looks in a
+    For each directory in this list, GTK actually looks in a
    subdirectory
    <filename><replaceable>directory</replaceable>/<replaceable>version</replaceable>/<replaceable>host</replaceable>/<replaceable>type</replaceable></filename>
    Where <replaceable>version</replaceable> is derived from the
-    version of GTK+ (use <literal>pkg-config
-    --variable=gtk_binary_version gtk+-3.0</literal> to determine this from a
+    version of GTK (use <literal>pkg-config
+    --variable=gtk_binary_version gtk4</literal> to determine this from a
    script), <replaceable>host</replaceable> is the architecture on
-    which GTK+ was built. (use <literal>pkg-config
-    --variable=gtk_host gtk+-3.0</literal> to determine this from a
+    which GTK was built. (use <literal>pkg-config
+    --variable=gtk_host gtk4</literal> to determine this from a
    script), and <replaceable>type</replaceable> is a directory
    specific to the type of modules; currently it can be
    <literal>modules</literal>, <literal>engines</literal>,
    <literal>immodules</literal>, <literal>filesystems</literal> or
    <literal>printbackends</literal>, corresponding to the types of
    modules mentioned above. Either <replaceable>version</replaceable>,
-    <replaceable>host</replaceable>, or both may be omitted. GTK+ looks
+    <replaceable>host</replaceable>, or both may be omitted. GTK looks
    first in the most specific directory, then in directories with
    fewer components.
    The components of GTK_PATH are separated by the ':' character on
    Linux and Unix, and the ';' character on Windows.
  </para>
  <warning>
-    Note that this environment variable is read by GTK+ 2.x and GTK+ 3.x too,
+    Note that this environment variable is read by GTK 2.x and GTK 3.x too,
    which makes it unsuitable for setting it system-wide (or session-wide),
-    since doing so will cause applications using different GTK+ versions
+    since doing so will cause applications using different GTK versions
    to see incompatible modules.
  </warning>
 </formalpara>
@@ -179,7 +179,7 @@ additional environment variables.
    <literal>Gtk/IMModule</literal>, that will be used for the default
    IM module.
    This also can be a colon-separated list of input-methods, which
-    GTK+ will try in turn until it finds one available on the system.
+    GTK will try in turn until it finds one available on the system.
  </para>
 </formalpara>

@@ -187,8 +187,8 @@ additional environment variables.
  <title><envar>GTK_EXE_PREFIX</envar></title>

  <para>
-    If set, GTK+ uses <filename>$GTK_EXE_PREFIX/lib</filename> instead of
-    the libdir configured when GTK+ was compiled.
+    If set, GTK uses <filename>$GTK_EXE_PREFIX/lib</filename> instead of
+    the libdir configured when GTK was compiled.
  </para>
 </formalpara>

@@ -196,8 +196,8 @@ additional environment variables.
  <title><envar>GTK_DATA_PREFIX</envar></title>

  <para>
-    If set, makes GTK+ use <filename>$GTK_DATA_PREFIX</filename>
-    instead of the prefix configured when GTK+ was compiled.
+    If set, makes GTK use <filename>$GTK_DATA_PREFIX</filename>
+    instead of the prefix configured when GTK was compiled.
  </para>
 </formalpara>

@@ -205,7 +205,7 @@ additional environment variables.
  <title><envar>GTK_THEME</envar></title>

  <para>
-    If set, makes GTK+ use the named theme instead of the theme
+    If set, makes GTK use the named theme instead of the theme
    that is specified by the gtk-theme-name setting. This is intended
    mainly for easy debugging of theme issues.
  </para>
@@ -217,7 +217,7 @@ additional environment variables.

 <para>
 The following environment variables are used by GdkPixbuf, GDK or
-Pango, not by GTK+ itself, but we list them here for completeness
+Pango, not by GTK itself, but we list them here for completeness
 nevertheless.
 </para>

@@ -229,7 +229,7 @@ nevertheless.
    This environment variable overrides the default value
    <filename><replaceable>libdir</replaceable>/gtk-4.0/4.0.0/loaders.cache</filename>
    (<replaceable>libdir</replaceable> is the sysconfdir specified when
-    GTK+ was configured, usually <filename>/usr/local/lib</filename>.)
+    GTK was configured, usually <filename>/usr/local/lib</filename>.)
  </para>
  <para>
    The <filename>loaders.cache</filename> file is generated by the
@@ -241,7 +241,7 @@ nevertheless.
  <title><envar>GDK_DEBUG</envar></title>

  <para>
-  If GTK+ has been configured with <option>--enable-debug=yes</option>,
+  If GTK has been configured with <option>--enable-debug=yes</option>,
  this variable can be set to a list of debug options, which cause GDK
  to print out different types of debugging information.
  <variablelist>
@@ -331,7 +331,7 @@ nevertheless.
  <title><envar>GSK_DEBUG</envar></title>

  <para>
-  If GTK+ has been configured with <option>--enable-debug=yes</option>,
+  If GTK has been configured with <option>--enable-debug=yes</option>,
  this variable can be set to a list of debug options, which cause GSK
  to print out different types of debugging information.
  <variablelist>
@@ -406,7 +406,7 @@ nevertheless.

  <para>
    If set, selects the GDK backend to use. Selecting a backend requires that
-    GTK+ is compiled with support for that backend. The following backends can
+    GTK is compiled with support for that backend. The following backends can
    be selected, provided they are included in the GDK libraries you are using:
    <variablelist>

@@ -498,7 +498,7 @@ nevertheless.

  <para>
    The default value of this environment variable is 1. If changed to 0, this
-    disables the default use of client-side decorations on GTK+ windows, thus
+    disables the default use of client-side decorations on GTK windows, thus
    making the window manager responsible for drawing the decorations of
    windows that do not have a custom titlebar widget.
  </para>
@@ -512,7 +512,7 @@ nevertheless.
  <title><envar>XDG_DATA_HOME</envar>, <envar>XDG_DATA_DIRS</envar></title>

  <para>
-    GTK+ uses these environment variables to locate icon themes
+    GTK uses these environment variables to locate icon themes
    and MIME information. For more information, see
    <ulink url="https://freedesktop.org/Standards/icon-theme-spec">Icon Theme Specification</ulink>,
    the <ulink url="https://freedesktop.org/Standards/shared-mime-info-spec">Shared MIME-info Database</ulink>
@@ -524,9 +524,9 @@ nevertheless.
  <title><envar>DESKTOP_STARTUP_ID</envar></title>

  <para>
-    GTK+ uses this environment variable to provide startup notification
+    GTK uses this environment variable to provide startup notification
    according to the <ulink url="https://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt">Startup Notification Spec</ulink>.
-    Following the specification, GTK+ unsets this variable after reading
+    Following the specification, GTK unsets this variable after reading
    it (to keep it from leaking to child processes). So, if you need its
    value for your own purposes, you have to read it before calling
    gtk_init().
@@ -541,20 +541,20 @@ nevertheless.
  <inlinegraphic fileref="inspector.png" format="PNG"></inlinegraphic>

  <para>
-    GTK+ includes an interactive debugger, called the GTK+ Inspector, which
-    lets you explore the widget tree of any GTK+ application at runtime, as
+    GTK includes an interactive debugger, called the GTK Inspector, which
+    lets you explore the widget tree of any GTK application at runtime, as
    well as tweak the theme and trigger visual debugging aids. You can
    easily try out changes at runtime before putting them into the code.
  </para>
  <para>
-    Note that the GTK+ inspector can only show GTK+ internals. It can not
-    understand the application-specific logic of a GTK+ application. Also,
-    the fact that the GTK+ inspector is running in the application process
+    Note that the GTK inspector can only show GTK internals. It can not
+    understand the application-specific logic of a GTK application. Also,
+    the fact that the GTK inspector is running in the application process
    limits what it can do. It is meant as a complement to full-blown debuggers
    and system tracing facilities such as DTrace, not as a replacement.
  </para>
  <para>
-    To enable the GTK+ inspector, you can use the Control-Shift-I or
+    To enable the GTK inspector, you can use the Control-Shift-I or
    Control-Shift-D keyboard shortcuts, or set the
    <envar>GTK_DEBUG=interactive</envar> environment variable.
  </para>
@@ -567,7 +567,7 @@ nevertheless.

  <para>
    In some situations, it may be inappropriate to give users access to the
-    GTK+ inspector. The keyboard shortcuts can be disabled with the
+    GTK inspector. The keyboard shortcuts can be disabled with the
    `enable-inspector-keybinding` key in the `org.gtk.Settings.Debug`
    GSettings schema.
  </para>
--- a/docs/reference/gtk/text_widget.sgml
+++ b/docs/reference/gtk/text_widget.sgml
@@ -18,14 +18,14 @@
 <title>Conceptual Overview</title>

 <para>
-GTK+ has an extremely powerful framework for multiline text editing.  The
+GTK has an extremely powerful framework for multiline text editing.  The
 primary objects involved in the process are #GtkTextBuffer, which represents the 
 text being edited, and #GtkTextView, a widget which can display a #GtkTextBuffer. 
 Each buffer can be displayed by any number of views.
 </para>

 <para>
-One of the important things to remember about text in GTK+ is that it's in the
+One of the important things to remember about text in GTK is that it's in the
 UTF-8 encoding. This means that one character can be encoded as multiple
 bytes. Character counts are usually referred to as
 <firstterm>offsets</firstterm>, while byte counts are called
@@ -197,7 +197,7 @@ foreground color &mdash; use CSS to override their default values.

 <para>
 The <application>gtk-demo</application> application that comes with
-GTK+ contains more example code for #GtkTextView.
+GTK contains more example code for #GtkTextView.
 </para>

 </refsect1>
--- a/docs/reference/gtk/tree_widget.sgml
+++ b/docs/reference/gtk/tree_widget.sgml
@@ -17,7 +17,7 @@
  <refsect1>
    <title>Overview</title>
    <para>
-      To create a tree or list in GTK+, use the #GtkTreeModel interface in
+      To create a tree or list in GTK, use the #GtkTreeModel interface in
      conjunction with the #GtkTreeView widget.  This widget is
      designed around a <firstterm>Model/View/Controller</firstterm>
      design and consists of four major parts:
@@ -46,7 +46,7 @@
  <refsect1>
    <title>Creating a model</title>
    <para>
-      GTK+ provides two simple models that can be used: the #GtkListStore
+      GTK provides two simple models that can be used: the #GtkListStore
      and the #GtkTreeStore.  GtkListStore is used to model list widgets, 
      while the GtkTreeStore models trees.  It is possible to develop a new 
      type of model, but the existing models should be satisfactory for all 
@@ -164,7 +164,7 @@ tree = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
      </para>
      <para>
        Cell renderers are used to draw the data in the tree model in a
-        way.  There are a number of cell renderers that come with GTK+,
+        way.  There are a number of cell renderers that come with GTK,
        including the #GtkCellRendererText, #GtkCellRendererPixbuf and
        the #GtkCellRendererToggle.
        It is relatively easy to write a custom renderer.
--- a/docs/reference/gtk/treeview_tutorial.xml
+++ b/docs/reference/gtk/treeview_tutorial.xml
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="TreeView-tutorial">
-  <refmeta>
-    <refentrytitle>TreeView Tutorial</refentrytitle>
-    <manvolnum>3</manvolnum>
-    <refmiscinfo>GTK Library</refmiscinfo>
-  </refmeta>
-
-  <refnamediv>
-    <refname>TreeView Tutorial</refname>
-    <refpurpose>A tutorial on the use of GtkTreeModel, GtkTreeView, and friends</refpurpose>
-  </refnamediv>
-
-  <refsect1>
-    <title>Overview</title>
-    <para>GtkTreeView is a widget that displays single- or multi-columned
-    lists and trees.</para>
-
-    <para>The purpose of this tutorial is not to provide an exhaustive
-    documentation of #GtkTreeView - that is what the API documentation is
-    for, which should be read alongside with this tutorial. The goal is
-    rather to present an introduction to the most commonly-used aspects
-    of #GtkTreeView, and to demonstrate how the various #GtkTreeView
-    components and concepts work together. Furthermore, an attempt has
-    been made to shed some light on custom tree models and custom cell
-    renderers, which seem to be often-mentioned, but rarely
-    explained.</para>
-
-    <para>Developers looking for a quick and dirty introduction that
-    teaches them everything they need to know in less than five paragraphs
-    will not find it here. In the author's experience, developers who do
-    not understand how the tree view and the models work together will run
-    into problems once they try to modify the given examples, whereas
-    developers who have worked with other toolkits that employ the
-    Model/View/Controller-design will find that the API reference provides
-    all the information they need to know in more condensed form anyway.
-    Those who disagree may jump straight to the working example code of
-    course.</para>
-
-    <para>Please note that the code examples in the following sections do
-    not necessarily demonstrate how GtkTreeView is used best in a particular
-    situation. There are different ways to achieve the same result, and the
-    examples merely show those different ways, so that developers are able
-    to decide which one is most suitable for the task at hand.</para>
-
-    <refsect2>
-      <title>Components</title>
-
-      <para>The most important concept underlying #GtkTreeView is that of
-      complete separation between data and how that data is displayed on
-      the screen. This is commonly known as Model/View/Controller-design,
-      or MVC. Data of various type (strings, numbers, images, etc.) is
-      stored in a "model". The "view" is then told which data to display,
-      where to display it, and how to display it. One of the advantages
-      of this approach is that you can have multiple views that display
-      the same data (a directory tree for example) in different ways, or
-      in the same way multiple times, with only one copy of the underlying
-      data. This avoids duplication of data and programming effort if the
-      same data is re-used in different contexts. Also, when the data in
-      the model is updated, all views automatically get updated as
-      well.</para>
-
-      <para>So, while #GtkTreeModel is used to store data, there are other
-      components that determine which data is displayed in the #GtkTreeView
-      and how it is displayed. These components are #GtkTreeViewColumn and
-      #GtkCellRenderer. A #GtkTreeView is made up of tree view columns.
-      These are the columns that users perceive as columns. They have a
-      clickable column header with a column title that can be hidden, and
-      can be resized and sorted. Tree view columns do not display any data,
-      they are only used as a device to represent the user-side of the tree
-      view (sorting etc.) and serve as packing widgets for the components
-      that do the actual rendering of data onto the screen, namely the
-      #GtkCellRenderer family of objects. There are a number of different
-      cell renderers that specialise in rendering certain data like
-      strings, pixbufs, or toggle buttons. More on this later.</para>
-
-      <para>Cell renderers are packed into tree view columns to display data.
-      A tree view column needs to contain at least one cell renderer, but can
-      contain multiple cell renderers. For example, if one wanted to display
-      a 'Filename' column where each filename has a little icon on the left
-      indicating the file type, one would pack a GtkCellRendererPixbuf and a
-      GtkCellRendererText into one tree view column. Packing renderers into a
-      tree view column is similar to packing widgets into a #GtkBox.</para>
-    </refsect2>
-
-    <refsect2>
-      <title>GtkTreeModels for Data Storage: GtkListStore and GtkTreeStore</title>
-
-      <para>It is important to realise what #GtkTreeModel is and what it is
-      not. #GtkTreeModel is basically just an 'interface' to the data store,
-      meaning that it is a standardised set of functions that allows a
-      #GtkTreeView widget (and the application programmer) to query certain
-      characteristics of a data store, for example how many rows there are,
-      which rows have children, and how many children a particular row has.
-      It also provides functions to retrieve data from the data store, and
-      tell the tree view what type of data is stored in the model. Every
-      data store must implement the #GtkTreeModel interface and provide these
-      functions. #GtkTreeModel itself only provides a way to query a data
-      store's characteristics and to retrieve existing data, it does not
-      provide a way to remove or add rows to the store or put data into the
-      store. This is done using the specific store's functions.</para>
-
-      <para>GTK comes with two built-in data stores (models): #GtkListStore
-      and #GtkTreeStore. As the names imply, #GtkListStore is used for simple
-      lists of data items where items have no hierarchical parent-child
-      relationships, and #GtkTreeStore is used for tree-like data structures,
-      where items can have parent-child relationships. A list of files in a
-      directory would be an example of a simple list structure, whereas a
-      directory tree is an example for a tree structure. A list is basically
-      just a special case of a tree with none of the items having any
-      children, so one could use a tree store to maintain a simple list of
-      items as well. The only reason #GtkListStore exists is in order to
-      provide an easier interface that does not need to cater for
-      child-parent relationships, and because a simple list model can be
-      optimised for the special case where no children exist, which makes it
-      faster and more efficient.</para>
-
-      <para>#GtkListStore and #GtkTreeStore should cater for most types of
-      data an application developer might want to display in a #GtkTreeView.
-      However, it should be noted that #GtkListStore and #GtkTreeStore have
-      been designed to cater to a large number of potential use cases, and
-      so are not overly optimized. If you already have your specialized data
-      store; if you plan to store a lot of data; or if have a large number
-      of rows, you should consider implementing your own custom model that
-      stores and manipulates data your own way and implements the
-      #GtkTreeModel interface. This will not only be more efficient, but
-      probably also lead to saner code in the long run, and give you more
-      control over your data. See below for more details on how to implement
-      custom models.</para>
-
-      <para>Tree model implementations like #GtkListStore and #GtkTreeStore
-      will take care of the view side for you once you have configured the
-      #GtkTreeView to display what you want. If you change data in the store,
-      the model will notify the tree view and your data display will be
-      updated. If you add or remove rows, the model will also notify the
-      store, and your row will appear in or disappear from the view as
-      well.</para>
-    </refsect2>
-
-  </refsect1>
--- a/docs/reference/gtk/wayland.xml
+++ b/docs/reference/gtk/wayland.xml
@@ -4,23 +4,23 @@
 ]>
 <refentry id="gtk-wayland">
 <refmeta>
-<refentrytitle>Using GTK+ with Wayland</refentrytitle>
+<refentrytitle>Using GTK with Wayland</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>

 <refnamediv>
-<refname>Using GTK+ with Wayland</refname>
+<refname>Using GTK with Wayland</refname>
 <refpurpose>
-Wayland-specific aspects of using GTK+
+Wayland-specific aspects of using GTK
 </refpurpose>
 </refnamediv>

 <refsect1>
-<title>Using GTK+ with Wayland</title>
+<title>Using GTK with Wayland</title>

 <para>
-The GDK Wayland backend provides support for running GTK+ applications
+The GDK Wayland backend provides support for running GTK applications
 under the Wayland display server. To run your application in this way,
 select the Wayland backend by setting <literal>GDK_BACKEND=wayland</literal>.
 </para>
--- a/docs/reference/gtk/windows.sgml
+++ b/docs/reference/gtk/windows.sgml
@@ -4,24 +4,24 @@
 ]>
 <refentry id="gtk-windows">
 <refmeta>
-<refentrytitle>Using GTK+ on Windows</refentrytitle>
+<refentrytitle>Using GTK on Windows</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>

 <refnamediv>
-<refname>Using GTK+ on Windows</refname>
+<refname>Using GTK on Windows</refname>
 <refpurpose>
-Windows-specific aspects of using GTK+
+Windows-specific aspects of using GTK
 </refpurpose>
 </refnamediv>

 <refsect1>
-<title>Using GTK+ on Windows</title>
+<title>Using GTK on Windows</title>

 <para>
-The Windows port of GTK+ is an implementation of GDK (and therefore GTK+)
-on top of the Win32 API. When compiling GTK+ on Windows, this backend is
+The Windows port of GTK is an implementation of GDK (and therefore GTK)
+on top of the Win32 API. When compiling GTK on Windows, this backend is
 the default.
 </para>

@@ -82,7 +82,7 @@ additional environment variables.
 <title><envar>GDK_IGNORE_WINTAB</envar></title>

 <para>
-If this variable is set, GTK+ doesn't use 
+If this variable is set, GTK doesn't use 
 the Wintab API for tablet support.
 </para>
 </formalpara>
@@ -91,7 +91,7 @@ the Wintab API for tablet support.
 <title><envar>GDK_USE_WINTAB</envar></title>

 <para>
-If this variable is set, GTK+ uses the Wintab API for 
+If this variable is set, GTK uses the Wintab API for 
 tablet support.  This is the default.
 </para>
 </formalpara>
@@ -120,7 +120,7 @@ When any other cursor theme is used, GTK will prefer cursors from that theme,
 falling back to Windows cursors and built-in X cursors.
 </para>
 <para>
-Theme can be changed by setting <literal>gtk-cursor-theme-name</literal> GTK+ setting. Users can override GTK+ settings in the <filename>settings.ini</filename> file or at runtime in the GTK+ Inspector.
+Theme can be changed by setting <literal>gtk-cursor-theme-name</literal> GTK setting. Users can override GTK settings in the <filename>settings.ini</filename> file or at runtime in the GTK Inspector.
 </para>
 <para>
 Themes are loaded from normal Windows variants of the XDG locations:
@@ -135,9 +135,9 @@ The <literal>gtk-cursor-theme-size</literal> setting is ignored, GTK will use th
 </refsect2>

 <para>
-More information about GTK+ on Windows, including detailed build
+More information about GTK on Windows, including detailed build
 instructions, binary downloads, etc, can be found
-<ulink url="https://wiki.gnome.org/Projects/GTK+/Win32">online</ulink>.
+<ulink url="https://wiki.gnome.org/Projects/GTK/Win32">online</ulink>.
 </para>

 </refsect1>
--- a/docs/reference/gtk/x11.sgml
+++ b/docs/reference/gtk/x11.sgml
@@ -4,23 +4,23 @@
 ]>
 <refentry id="gtk-x11">
 <refmeta>
-<refentrytitle>Using GTK+ on the X Window System</refentrytitle>
+<refentrytitle>Using GTK on the X Window System</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>

 <refnamediv>
-<refname>Using GTK+ on the X Window System</refname>
+<refname>Using GTK on the X Window System</refname>
 <refpurpose>
-X11-specific aspects of using GTK+
+X11-specific aspects of using GTK
 </refpurpose>
 </refnamediv>

 <refsect1>
-<title>GTK+ for the X Window System</title>
+<title>GTK for the X Window System</title>

 <para>
-On UNIX, the X backend is the default build for GTK+.
+On UNIX, the X backend is the default build for GTK.
 So you don't need to do anything special when compiling it,
 and everything should "just work."
 </para>
@@ -145,7 +145,7 @@ url="http://www.freedesktop.org/standards/">convention</ulink>.
 </para>

 <para>
-GTK+ has functions for asking the window manager to do various things;
+GTK has functions for asking the window manager to do various things;
 see for example <link
 linkend="gtk-window-iconify">gtk_window_iconify()</link> or <link
 linkend="gtk-window-maximize">gtk_window_maximize()</link> or <link
--- a/docs/tools/README.shooter
+++ b/docs/tools/README.shooter
@@ -1,8 +1,8 @@
-The doc shooter is used to take screenshots of widgets for the GTK+
+The doc shooter is used to take screenshots of widgets for the GTK
 reference manuals.  We use these images for both the headers of the
 images, and for the visual index of GNOME images.  They aren't part of
 the docs build.  Instead, the images are taken, and then copied by hand
-into gtk+/docs/reference/gtk/images/
+into gtk/docs/reference/gtk/images/

 Ideally, the images should be taken once a release, and all images
 should be updated at the same time.  A simple theme should be used to
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -160,7 +160,7 @@ create_menu_button (void)
  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);

-  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Menu Button"));
+  gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("Menu Button"));

  return new_widget_info ("menu-button", vbox, SMALL);
 }
@@ -209,8 +209,8 @@ create_lockbutton (void)
  widget = gtk_lock_button_new (g_object_new (G_TYPE_TEST_PERMISSION, NULL));

  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), widget);
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox), widget);
+  gtk_container_add (GTK_CONTAINER (vbox),
 		      gtk_label_new ("Lock Button"));
  gtk_widget_set_halign (vbox, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER);
@@ -253,11 +253,11 @@ create_radio (void)

  widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
  radio = gtk_radio_button_new_with_mnemonic (NULL, "Radio Button _One");
-  gtk_box_pack_start (GTK_BOX (widget), radio);
+  gtk_container_add (GTK_CONTAINER (widget), radio);
  radio = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (radio), "Radio Button _Two");
-  gtk_box_pack_start (GTK_BOX (widget), radio);
+  gtk_container_add (GTK_CONTAINER (widget), radio);
  radio = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (radio), "Radio Button T_hree");
-  gtk_box_pack_start (GTK_BOX (widget), radio);
+  gtk_container_add (GTK_CONTAINER (widget), radio);
  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);

@@ -409,7 +409,7 @@ create_search_bar (void)
  gtk_container_add (GTK_CONTAINER (box), widget);

  view = gtk_text_view_new ();
-  gtk_box_pack_start (GTK_BOX (box), view);
+  gtk_container_add (GTK_CONTAINER (box), view);

  info = new_widget_info ("search-bar", box, SMALL);

@@ -427,7 +427,7 @@ create_action_bar (void)

  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
  view = gtk_text_view_new ();
-  gtk_box_pack_start (GTK_BOX (box), view);
+  gtk_container_add (GTK_CONTAINER (box), view);

  widget = gtk_action_bar_new ();

@@ -538,8 +538,8 @@ create_icon_view (void)
  gtk_container_add (GTK_CONTAINER (widget), icon_view);

  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), widget);
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox), widget);
+  gtk_container_add (GTK_CONTAINER (vbox),
 		      gtk_label_new ("Icon View"));

  info = new_widget_info ("icon-view", vbox, MEDIUM);
@@ -562,8 +562,8 @@ create_color_button (void)
  picker = gtk_color_button_new_with_rgba (&color);
  gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), picker);
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox), picker);
+  gtk_container_add (GTK_CONTAINER (vbox),
 		      gtk_label_new ("Color Button"));

  return new_widget_info ("color-button", vbox, SMALL);
@@ -579,8 +579,8 @@ create_font_button (void)
  picker = gtk_font_button_new_with_font ("Sans Serif 10");
  gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), picker);
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox), picker);
+  gtk_container_add (GTK_CONTAINER (vbox),
 		      gtk_label_new ("Font Button"));

  return new_widget_info ("font-button", vbox, SMALL);
@@ -601,13 +601,13 @@ create_file_button (void)
  gtk_widget_set_size_request (picker, 150, -1);
  gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox2), picker);
-  gtk_box_pack_start (GTK_BOX (vbox2),
+  gtk_container_add (GTK_CONTAINER (vbox2), picker);
+  gtk_container_add (GTK_CONTAINER (vbox2),
 		      gtk_label_new ("File Button (Files)"));

-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox),
 		      vbox2);
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox),
 		      gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));

  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
@@ -619,10 +619,10 @@ create_file_button (void)
  g_free (path);
  gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox2), picker);
-  gtk_box_pack_start (GTK_BOX (vbox2),
+  gtk_container_add (GTK_CONTAINER (vbox2), picker);
+  gtk_container_add (GTK_CONTAINER (vbox2),
 		      gtk_label_new ("File Button (Select Folder)"));
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox),
 		      vbox2);

  return new_widget_info ("file-button", vbox, MEDIUM);
@@ -637,12 +637,12 @@ create_separator (void)
  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox),
+  gtk_container_add (GTK_CONTAINER (hbox),
 		      gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
-  gtk_box_pack_start (GTK_BOX (hbox),
+  gtk_container_add (GTK_CONTAINER (hbox),
 		      gtk_separator_new (GTK_ORIENTATION_VERTICAL));
-  gtk_box_pack_start (GTK_BOX (vbox), hbox);
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox), hbox);
+  gtk_container_add (GTK_CONTAINER (vbox),
 		      g_object_new (GTK_TYPE_LABEL,
 				    "label", "Horizontal and Vertical\nSeparators",
 				    "justify", GTK_JUSTIFY_CENTER,
@@ -671,7 +671,7 @@ create_panes (void)
 				 "shadow-type", GTK_SHADOW_IN,
 				 NULL),
 		   FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (hbox),
+  gtk_container_add (GTK_CONTAINER (hbox),
 		      pane);
  pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
  gtk_paned_pack1 (GTK_PANED (pane),
@@ -684,10 +684,10 @@ create_panes (void)
 				 "shadow-type", GTK_SHADOW_IN,
 				 NULL),
 		   FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (hbox),
+  gtk_container_add (GTK_CONTAINER (hbox),
 		      pane);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox);
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox), hbox);
+  gtk_container_add (GTK_CONTAINER (vbox),
 		      g_object_new (GTK_TYPE_LABEL,
 				    "label", "Horizontal and Vertical\nPanes",
 				    "justify", GTK_JUSTIFY_CENTER,
@@ -819,8 +819,8 @@ create_menubar (void)
  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
  gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), widget);
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox), widget);
+  gtk_container_add (GTK_CONTAINER (vbox),
 		      gtk_label_new ("Menu Bar"));

  return new_widget_info ("menubar", vbox, SMALL);
@@ -856,13 +856,13 @@ create_about_dialog (void)

  widget = gtk_about_dialog_new ();
  g_object_set (widget,
-                "program-name", "GTK+ Code Demos",
+                "program-name", "GTK Code Demos",
                "version", PACKAGE_VERSION,
-                "copyright", "© 1997-2013 The GTK+ Team",
+                "copyright", "© 1997-2013 The GTK Team",
                "website", "http://www.gtk.org",
-                "comments", "Program to demonstrate GTK+ functions.",
+                "comments", "Program to demonstrate GTK functions.",
                "logo-icon-name", "help-about",
-                "title", "About GTK+ Code Demos",
+                "title", "About GTK Code Demos",
                "authors", authors,
 		NULL);
  gtk_window_set_icon_name (GTK_WINDOW (widget), "help-about");
@@ -901,8 +901,8 @@ create_progressbar (void)
  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
  gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), widget);
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox), widget);
+  gtk_container_add (GTK_CONTAINER (vbox),
 		      gtk_label_new ("Progress Bar"));

  return new_widget_info ("progressbar", vbox, SMALL);
@@ -918,8 +918,8 @@ create_level_bar (void)
  gtk_level_bar_set_value (GTK_LEVEL_BAR (widget), 0.333);

  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), widget);
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox), widget);
+  gtk_container_add (GTK_CONTAINER (vbox),
 		      gtk_label_new ("Level Bar"));

  return new_widget_info ("levelbar", vbox, SMALL);
@@ -952,8 +952,8 @@ create_scrollbar (void)
  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
  gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), widget);
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox), widget);
+  gtk_container_add (GTK_CONTAINER (vbox),
 		      gtk_label_new ("Scrollbar"));

  return new_widget_info ("scrollbar", vbox, SMALL);
@@ -970,8 +970,8 @@ create_spinbutton (void)
  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
  gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), widget);
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox), widget);
+  gtk_container_add (GTK_CONTAINER (vbox),
 		      gtk_label_new ("Spin Button"));

  return new_widget_info ("spinbutton", vbox, SMALL);
@@ -985,13 +985,13 @@ create_statusbar (void)
  GtkWidget *vbox;

  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox),
                      gtk_label_new ("Status Bar"));
  widget = gtk_statusbar_new ();
  gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
  gtk_statusbar_push (GTK_STATUSBAR (widget), 0, "Hold on...");

-  gtk_box_pack_end (GTK_BOX (vbox), widget);
+  gtk_container_add (GTK_CONTAINER (vbox), widget);

  info = new_widget_info ("statusbar", vbox, SMALL);

@@ -1007,14 +1007,14 @@ create_scales (void)
  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox),
+  gtk_container_add (GTK_CONTAINER (hbox),
 		      gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
                                                0.0, 100.0, 1.0));
-  gtk_box_pack_start (GTK_BOX (hbox),
+  gtk_container_add (GTK_CONTAINER (hbox),
 		      gtk_scale_new_with_range (GTK_ORIENTATION_VERTICAL,
                                                0.0, 100.0, 1.0));
-  gtk_box_pack_start (GTK_BOX (vbox), hbox);
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox), hbox);
+  gtk_container_add (GTK_CONTAINER (vbox),
 		      g_object_new (GTK_TYPE_LABEL,
 				    "label", "Horizontal and Vertical\nScales",
 				    "justify", GTK_JUSTIFY_CENTER,
@@ -1033,8 +1033,8 @@ create_image (void)
  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);

  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), widget);
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox), widget);
+  gtk_container_add (GTK_CONTAINER (vbox),
 		      gtk_label_new ("Image"));

  return new_widget_info ("image", vbox, SMALL);
@@ -1053,8 +1053,8 @@ create_spinner (void)
  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), widget);
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox), widget);
+  gtk_container_add (GTK_CONTAINER (vbox),
 		      gtk_label_new ("Spinner"));

  return new_widget_info ("spinner", vbox, SMALL);
@@ -1074,7 +1074,7 @@ create_volume_button (void)
  gtk_container_add (GTK_CONTAINER (widget), box);

  button = gtk_volume_button_new ();
-  gtk_box_pack_end (GTK_BOX (box), button);
+  gtk_container_add (GTK_CONTAINER (box), button);

  gtk_scale_button_set_value (GTK_SCALE_BUTTON (button), 33);
  popup = gtk_scale_button_get_popup (GTK_SCALE_BUTTON (button));
@@ -1123,8 +1123,8 @@ create_appchooserbutton (void)
  picker = gtk_app_chooser_button_new ("text/plain");
  gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), picker);
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox), picker);
+  gtk_container_add (GTK_CONTAINER (vbox),
                      gtk_label_new ("Application Button"));

  return new_widget_info ("appchooserbutton", vbox, SMALL);
@@ -1221,9 +1221,9 @@ create_stack (void)

  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);

-  gtk_box_pack_start (GTK_BOX (vbox), switcher);
-  gtk_box_pack_start (GTK_BOX (vbox), stack);
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox), switcher);
+  gtk_container_add (GTK_CONTAINER (vbox), stack);
+  gtk_container_add (GTK_CONTAINER (vbox),
                      gtk_label_new ("Stack"));

  return new_widget_info ("stack", vbox, ASIS);
@@ -1254,9 +1254,9 @@ create_stack_switcher (void)

  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);

-  gtk_box_pack_start (GTK_BOX (vbox), switcher);
-  gtk_box_pack_start (GTK_BOX (vbox), stack);
-  gtk_box_pack_start (GTK_BOX (vbox),
+  gtk_container_add (GTK_CONTAINER (vbox), switcher);
+  gtk_container_add (GTK_CONTAINER (vbox), stack);
+  gtk_container_add (GTK_CONTAINER (vbox),
                      gtk_label_new ("Stack Switcher"));

  return new_widget_info ("stackswitcher", vbox, ASIS);
@@ -1289,9 +1289,9 @@ create_sidebar (void)
  frame = gtk_frame_new (NULL);
  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);

-  gtk_box_pack_start (GTK_BOX (hbox), sidebar);
-  gtk_box_pack_start (GTK_BOX (hbox), gtk_separator_new (GTK_ORIENTATION_VERTICAL));
-  gtk_box_pack_start (GTK_BOX (hbox), stack);
+  gtk_container_add (GTK_CONTAINER (hbox), sidebar);
+  gtk_container_add (GTK_CONTAINER (hbox), gtk_separator_new (GTK_ORIENTATION_VERTICAL));
+  gtk_container_add (GTK_CONTAINER (hbox), stack);
  gtk_container_add (GTK_CONTAINER (frame), hbox);

  return new_widget_info ("sidebar", frame, ASIS);
@@ -1383,8 +1383,8 @@ create_flow_box (void)

  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);

-  gtk_box_pack_start (GTK_BOX (vbox), widget);
-  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Flow Box"));
+  gtk_container_add (GTK_CONTAINER (vbox), widget);
+  gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("Flow Box"));
  info = new_widget_info ("flow-box", vbox, ASIS);
  info->no_focus = FALSE;

--- a/docs/widget_system.txt
+++ b/docs/widget_system.txt
@@ -1,5 +1,5 @@
-Notes about the inner workings of the widget system of GTK+
-===========================================================
+Notes about the inner workings of the widget system of GTK
+==========================================================

 This file contains some notes as to how the widget system does
 and should work. It consists of three parts:
--- a/examples/README
+++ b/examples/README
@@ -2,10 +2,10 @@

 == Building the examples ==

-The examples in this directory are built alongside the rest of GTK+.
+The examples in this directory are built alongside the rest of GTK.

 The examples under the `application[1-10]` directories are also included in
-the GTK+ API reference documentation, and can be built independently, using
+the GTK API reference documentation, and can be built independently, using
 the system libraries, by doing:

    $ cd application1
--- a/examples/application1/Makefile.example
+++ b/examples/application1/Makefile.example
@@ -1,7 +1,7 @@
 CC ?= gcc
 PKGCONFIG = $(shell which pkg-config)
-CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0)
-LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0)
+CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4)
+LIBS = $(shell $(PKGCONFIG) --libs gtk4)

 SRC = main.c exampleapp.c exampleappwin.c

--- a/examples/application10/Makefile.example
+++ b/examples/application10/Makefile.example
@@ -1,7 +1,7 @@
 CC ?= gcc
 PKGCONFIG = $(shell which pkg-config)
-CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0)
-LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0)
+CFLAGS = $(shell $(PKGCONFIG) --cflags gtk4)
+LIBS = $(shell $(PKGCONFIG) --libs gtk4)
 GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0)
 GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0)

--- a/Show More
+++ b/Show More