diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index a8c839b170..94671bbc58 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -449,7 +449,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
    * @scroll_type: a #GtkScrollType
    *
    * The ::move-active signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to move the active selection.
    */
   combo_box_signals[MOVE_ACTIVE] =
@@ -467,7 +467,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
    * @widget: the object that received the signal
    *
    * The ::popup signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to popup the combo box list.
    *
    * The default binding for this signal is Alt+Down.
@@ -485,7 +485,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
    * @button: the object which received the signal
    *
    * The ::popdown signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to popdown the combo box list.
    *
    * The default bindings for this signal are Alt+Up and Escape.
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 9be63d4a7a..11c1be5bc4 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -515,7 +515,7 @@ gtk_dialog_class_init (GtkDialogClass *class)
    * GtkDialog::close:
    *
    * The ::close signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted when the user uses a keybinding to close
    * the dialog.
    *
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 594a908e94..b063dd7a60 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -7265,7 +7265,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
    * @widget: the object which received the signal
    * @path: a string that gets put in the text entry for the file name
    *
-   * The ::location-popup signal is a [keybinding signal][GtkBindingSignal]
+   * The ::location-popup signal is a [keybinding signal][GtkSignalAction]
    * which gets emitted when the user asks for it.
    *
    * This is used to make the file chooser show a "Location" prompt which
@@ -7290,7 +7290,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
    * GtkFileChooserWidget::location-popup-on-paste:
    * @widget: the object which received the signal
    *
-   * The ::location-popup-on-paste signal is a [keybinding signal][GtkBindingSignal]
+   * The ::location-popup-on-paste signal is a [keybinding signal][GtkSignalAction]
    * which gets emitted when the user asks for it.
    *
    * This is used to make the file chooser show a "Location" prompt when the user
@@ -7311,7 +7311,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
    * GtkFileChooserWidget::location-toggle-popup:
    * @widget: the object which received the signal
    *
-   * The ::location-toggle-popup signal is a [keybinding signal][GtkBindingSignal]
+   * The ::location-toggle-popup signal is a [keybinding signal][GtkSignalAction]
    * which gets emitted when the user asks for it.
    *
    * This is used to toggle the visibility of a "Location" prompt which the user
@@ -7332,7 +7332,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
    * GtkFileChooserWidget::up-folder:
    * @widget: the object which received the signal
    *
-   * The ::up-folder signal is a [keybinding signal][GtkBindingSignal]
+   * The ::up-folder signal is a [keybinding signal][GtkSignalAction]
    * which gets emitted when the user asks for it.
    *
    * This is used to make the file chooser go to the parent of the current folder
@@ -7353,7 +7353,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
    * GtkFileChooserWidget::down-folder:
    * @widget: the object which received the signal
    *
-   * The ::down-folder signal is a [keybinding signal][GtkBindingSignal]
+   * The ::down-folder signal is a [keybinding signal][GtkSignalAction]
    * which gets emitted when the user asks for it.
    *
    * This is used to make the file chooser go to a child of the current folder
@@ -7377,7 +7377,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
    * GtkFileChooserWidget::home-folder:
    * @widget: the object which received the signal
    *
-   * The ::home-folder signal is a [keybinding signal][GtkBindingSignal]
+   * The ::home-folder signal is a [keybinding signal][GtkSignalAction]
    * which gets emitted when the user asks for it.
    *
    * This is used to make the file chooser show the user's home
@@ -7398,7 +7398,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
    * GtkFileChooserWidget::desktop-folder:
    * @widget: the object which received the signal
    *
-   * The ::desktop-folder signal is a [keybinding signal][GtkBindingSignal]
+   * The ::desktop-folder signal is a [keybinding signal][GtkSignalAction]
    * which gets emitted when the user asks for it.
    *
    * This is used to make the file chooser show the user's Desktop
@@ -7420,7 +7420,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
    * @widget: the object which received the signal
    * @bookmark_index: the number of the bookmark to switch to
    *
-   * The ::quick-bookmark signal is a [keybinding signal][GtkBindingSignal]
+   * The ::quick-bookmark signal is a [keybinding signal][GtkSignalAction]
    * which gets emitted when the user asks for it.
    *
    * This is used to make the file chooser switch to the bookmark specified
@@ -7446,7 +7446,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
    * GtkFileChooserWidget::show-hidden:
    * @widget: the object which received the signal
    *
-   * The ::show-hidden signal is a [keybinding signal][GtkBindingSignal]
+   * The ::show-hidden signal is a [keybinding signal][GtkSignalAction]
    * which gets emitted when the user asks for it.
    *
    * This is used to make the file chooser display hidden files.
@@ -7466,7 +7466,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
    * GtkFileChooserWidget::search-shortcut:
    * @widget: the object which received the signal
    *
-   * The ::search-shortcut signal is a [keybinding signal][GtkBindingSignal]
+   * The ::search-shortcut signal is a [keybinding signal][GtkSignalAction]
    * which gets emitted when the user asks for it.
    *
    * This is used to make the file chooser show the search entry.
@@ -7486,7 +7486,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
    * GtkFileChooserWidget::recent-shortcut:
    * @widget: the object which received the signal
    *
-   * The ::recent-shortcut signal is a [keybinding signal][GtkBindingSignal]
+   * The ::recent-shortcut signal is a [keybinding signal][GtkSignalAction]
    * which gets emitted when the user asks for it.
    *
    * This is used to make the file chooser show the Recent location.
@@ -7506,7 +7506,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
    * GtkFileChooserWidget::places-shortcut:
    * @widget: the object which received the signal
    *
-   * The ::places-shortcut signal is a [keybinding signal][GtkBindingSignal]
+   * The ::places-shortcut signal is a [keybinding signal][GtkSignalAction]
    * which gets emitted when the user asks for it.
    *
    * This is used to move the focus to the places sidebar.
diff --git a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c
index 0ec12db7e4..7342369b6a 100644
--- a/gtk/gtkflowbox.c
+++ b/gtk/gtkflowbox.c
@@ -536,7 +536,7 @@ gtk_flow_box_child_class_init (GtkFlowBoxChildClass *class)
    * double-clicking, or by using the Space or Enter key.
    *
    * While this signal is used as a
-   * [keybinding signal][GtkBindingSignal],
+   * [keybinding signal][GtkSignalAction],
    * it can be used by applications for their own purposes.
    */
   child_signals[CHILD_ACTIVATE] =
@@ -3732,7 +3732,7 @@ gtk_flow_box_class_init (GtkFlowBoxClass *class)
    * @box: the #GtkFlowBox on which the signal is emitted
    *
    * The ::activate-cursor-child signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted when the user activates the @box.
    */
   signals[ACTIVATE_CURSOR_CHILD] = g_signal_new (I_("activate-cursor-child"),
@@ -3748,7 +3748,7 @@ gtk_flow_box_class_init (GtkFlowBoxClass *class)
    * @box: the #GtkFlowBox on which the signal is emitted
    *
    * The ::toggle-cursor-child signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which toggles the selection of the child that has the focus.
    *
    * The default binding for this signal is Ctrl-Space.
@@ -3770,7 +3770,7 @@ gtk_flow_box_class_init (GtkFlowBoxClass *class)
    * @modify: whether to modify the selection
    *
    * The ::move-cursor signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted when the user initiates a cursor movement.
    *
    * Applications should not connect to it, but may emit it with
@@ -3804,7 +3804,7 @@ gtk_flow_box_class_init (GtkFlowBoxClass *class)
    * @box: the #GtkFlowBox on which the signal is emitted
    *
    * The ::select-all signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to select all children of the box, if
    * the selection mode permits it.
    *
@@ -3823,7 +3823,7 @@ gtk_flow_box_class_init (GtkFlowBoxClass *class)
    * @box: the #GtkFlowBox on which the signal is emitted
    *
    * The ::unselect-all signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to unselect all children of the box, if
    * the selection mode permits it.
    *
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 3c7fe70562..ac4912a06e 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -641,7 +641,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
    * GtkIconView::select-all:
    * @iconview: the object on which the signal is emitted
    *
-   * A [keybinding signal][GtkBindingSignal]
+   * A [keybinding signal][GtkSignalAction]
    * which gets emitted when the user selects all items.
    *
    * Applications should not connect to it, but may emit it with
@@ -663,7 +663,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
    * GtkIconView::unselect-all:
    * @iconview: the object on which the signal is emitted
    *
-   * A [keybinding signal][GtkBindingSignal]
+   * A [keybinding signal][GtkSignalAction]
    * which gets emitted when the user unselects all items.
    *
    * Applications should not connect to it, but may emit it with
@@ -685,7 +685,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
    * GtkIconView::select-cursor-item:
    * @iconview: the object on which the signal is emitted
    *
-   * A [keybinding signal][GtkBindingSignal]
+   * A [keybinding signal][GtkSignalAction]
    * which gets emitted when the user selects the item that is currently
    * focused.
    *
@@ -708,7 +708,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
    * GtkIconView::toggle-cursor-item:
    * @iconview: the object on which the signal is emitted
    *
-   * A [keybinding signal][GtkBindingSignal]
+   * A [keybinding signal][GtkSignalAction]
    * which gets emitted when the user toggles whether the currently
    * focused item is selected or not. The exact effect of this 
    * depend on the selection mode.
@@ -732,7 +732,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
    * GtkIconView::activate-cursor-item:
    * @iconview: the object on which the signal is emitted
    *
-   * A [keybinding signal][GtkBindingSignal]
+   * A [keybinding signal][GtkSignalAction]
    * which gets emitted when the user activates the currently 
    * focused item. 
    *
@@ -763,7 +763,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
    * @modify: whether to modify the selection
    *
    * The ::move-cursor signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted when the user initiates a cursor movement.
    *
    * Applications should not connect to it, but may emit it with
diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index 2a01b33272..6cfd14aaa7 100644
--- a/gtk/gtkinfobar.c
+++ b/gtk/gtkinfobar.c
@@ -403,7 +403,7 @@ gtk_info_bar_class_init (GtkInfoBarClass *klass)
    * GtkInfoBar::close:
    *
    * The ::close signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted when the user uses a keybinding to dismiss
    * the info bar.
    *
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 3e6cd97bb9..4e17a5ba1b 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -634,7 +634,7 @@ gtk_label_class_init (GtkLabelClass *class)
    * @extend_selection: %TRUE if the move should extend the selection
    *
    * The ::move-cursor signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted when the user initiates a cursor movement.
    * If the cursor is not visible in @entry, this signal causes
    * the viewport to be moved instead.
@@ -668,7 +668,7 @@ gtk_label_class_init (GtkLabelClass *class)
    * @self: the object which received the signal
    *
    * The ::copy-clipboard signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to copy the selection to the clipboard.
    *
    * The default binding for this signal is Ctrl-c.
@@ -686,7 +686,7 @@ gtk_label_class_init (GtkLabelClass *class)
      * GtkLabel::activate-current-link:
      * @self: The label on which the signal was emitted
      *
-     * A [keybinding signal][GtkBindingSignal]
+     * A [keybinding signal][GtkSignalAction]
      * which gets emitted when the user activates a link in the label.
      *
      * Applications may also emit the signal with g_signal_emit_by_name()
diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c
index f08e3bf559..1c256c0537 100644
--- a/gtk/gtklistbox.c
+++ b/gtk/gtklistbox.c
@@ -560,7 +560,7 @@ gtk_list_box_class_init (GtkListBoxClass *klass)
    * GtkListBox::select-all:
    * @box: the #GtkListBox on which the signal is emitted
    *
-   * The ::select-all signal is a [keybinding signal][GtkBindingSignal]
+   * The ::select-all signal is a [keybinding signal][GtkSignalAction]
    * which gets emitted to select all children of the box, if the selection
    * mode permits it.
    *
@@ -578,7 +578,7 @@ gtk_list_box_class_init (GtkListBoxClass *klass)
    * GtkListBox::unselect-all:
    * @box: the #GtkListBox on which the signal is emitted
    * 
-   * The ::unselect-all signal is a [keybinding signal][GtkBindingSignal]
+   * The ::unselect-all signal is a [keybinding signal][GtkSignalAction]
    * which gets emitted to unselect all children of the box, if the selection
    * mode permits it.
    *
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 5fe1ae3638..fccdacd3c0 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -572,7 +572,7 @@ gtk_paned_class_init (GtkPanedClass *class)
    * @reversed: whether cycling backward or forward
    *
    * The ::cycle-child-focus signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to cycle the focus between the children of the paned.
    *
    * The default binding is f6.
@@ -592,7 +592,7 @@ gtk_paned_class_init (GtkPanedClass *class)
    * @widget: the object that received the signal
    *
    * The ::toggle-handle-focus is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to accept the current position of the handle and then
    * move focus to the next widget in the focus chain.
    *
@@ -613,7 +613,7 @@ gtk_paned_class_init (GtkPanedClass *class)
    * @scroll_type: a #GtkScrollType
    *
    * The ::move-handle signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to move the handle when the user is using key bindings
    * to move it.
    */
@@ -633,7 +633,7 @@ gtk_paned_class_init (GtkPanedClass *class)
    * @reversed: whether cycling backward or forward
    *
    * The ::cycle-handle-focus signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to cycle whether the paned should grab focus to allow
    * the user to change position of the handle by using key bindings.
    *
@@ -654,7 +654,7 @@ gtk_paned_class_init (GtkPanedClass *class)
    * @widget: the object that received the signal
    *
    * The ::accept-position signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to accept the current position of the handle when
    * moving it using key bindings.
    *
@@ -674,7 +674,7 @@ gtk_paned_class_init (GtkPanedClass *class)
    * @widget: the object that received the signal
    *
    * The ::cancel-position signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to cancel moving the position of the handle using key
    * bindings. The position of the handle will be reset to the value prior to
    * moving it.
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index 240b9bb58b..0e77c612ad 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -1700,7 +1700,7 @@ gtk_popover_class_init (GtkPopoverClass *klass)
    * @self: the #GtkPopover which received the signal
    *
    * The ::activate-default signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted when the user activates the default widget
    * of @self.
    */
diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index a6d78cbdb5..bb39e7f19b 100644
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -265,7 +265,7 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass)
    * @button: the object which received the signal
    *
    * The ::popup signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to popup the scale widget.
    *
    * The default bindings for this signal are Space, Enter and Return.
@@ -284,7 +284,7 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass)
    * @button: the object which received the signal
    *
    * The ::popdown signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to popdown the scale widget.
    *
    * The default binding for this signal is Escape.
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 09624cdc02..ffefb0f7d9 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -769,7 +769,7 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
    *   horizontally or not
    *
    * The ::scroll-child signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted when a keybinding that scrolls is pressed.
    * The horizontal or vertical adjustment is updated which triggers a
    * signal that the scrolled window’s child may listen to and scroll itself.
@@ -792,7 +792,7 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
    *   %GTK_DIR_TAB_BACKWARD
    *
    * The ::move-focus-out signal is a
-   * [keybinding signal][GtkBindingSignal] which gets
+   * [keybinding signal][GtkSignalAction] which gets
    * emitted when focus is moved away from the scrolled window by a
    * keybinding. The #GtkWidget::move-focus signal is emitted with
    * @direction_type on this scrolled window’s toplevel parent in the
diff --git a/gtk/gtksearchentry.c b/gtk/gtksearchentry.c
index 86338ee3b4..5fc31bf9e4 100644
--- a/gtk/gtksearchentry.c
+++ b/gtk/gtksearchentry.c
@@ -338,7 +338,7 @@ gtk_search_entry_class_init (GtkSearchEntryClass *klass)
    * GtkSearchEntry::next-match:
    * @entry: the entry on which the signal was emitted
    *
-   * The ::next-match signal is a [keybinding signal][GtkBindingSignal]
+   * The ::next-match signal is a [keybinding signal][GtkSignalAction]
    * which gets emitted when the user initiates a move to the next match
    * for the current search string.
    *
@@ -360,7 +360,7 @@ gtk_search_entry_class_init (GtkSearchEntryClass *klass)
    * GtkSearchEntry::previous-match:
    * @entry: the entry on which the signal was emitted
    *
-   * The ::previous-match signal is a [keybinding signal][GtkBindingSignal]
+   * The ::previous-match signal is a [keybinding signal][GtkSignalAction]
    * which gets emitted when the user initiates a move to the previous match
    * for the current search string.
    *
@@ -382,7 +382,7 @@ gtk_search_entry_class_init (GtkSearchEntryClass *klass)
    * GtkSearchEntry::stop-search:
    * @entry: the entry on which the signal was emitted
    *
-   * The ::stop-search signal is a [keybinding signal][GtkBindingSignal]
+   * The ::stop-search signal is a [keybinding signal][GtkSignalAction]
    * which gets emitted when the user stops a search via keyboard input.
    *
    * Applications should connect to it, to implement hiding the search
diff --git a/gtk/gtkshortcutaction.h b/gtk/gtkshortcutaction.h
index 2fa2760324..9c874a641b 100644
--- a/gtk/gtkshortcutaction.h
+++ b/gtk/gtkshortcutaction.h
@@ -132,6 +132,9 @@ GtkShortcutAction *     gtk_activate_action_get                 (void);
  * GtkSignalAction:
  *
  * A #GtkShortcutAction that emits a signal.
+ *
+ * Signals that are used in this way are referred to as keybinding signals,
+ * and they are expected to be defined with the %G_SIGNAL_ACTION flag.
  */
 GDK_AVAILABLE_IN_ALL
 GDK_DECLARE_INTERNAL_TYPE (GtkSignalAction, gtk_signal_action, GTK, SIGNAL_ACTION, GtkShortcutAction)
diff --git a/gtk/gtkshortcutswindow.c b/gtk/gtkshortcutswindow.c
index 4eaa82a46e..ea0032bc26 100644
--- a/gtk/gtkshortcutswindow.c
+++ b/gtk/gtkshortcutswindow.c
@@ -775,7 +775,7 @@ gtk_shortcuts_window_class_init (GtkShortcutsWindowClass *klass)
    * GtkShortcutsWindow::close:
    *
    * The ::close signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted when the user uses a keybinding to close
    * the window.
    *
@@ -793,7 +793,7 @@ gtk_shortcuts_window_class_init (GtkShortcutsWindowClass *klass)
    * GtkShortcutsWindow::search:
    *
    * The ::search signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted when the user uses a keybinding to start a search.
    *
    * The default binding for this signal is Control-F.
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index cdba319f93..7ebe279677 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -528,7 +528,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
    * @spin_button: the object on which the signal was emitted
    * @scroll: a #GtkScrollType to specify the speed and amount of change
    *
-   * The ::change-value signal is a [keybinding signal][GtkBindingSignal] 
+   * The ::change-value signal is a [keybinding signal][GtkSignalAction] 
    * which gets emitted when the user initiates a value change. 
    *
    * Applications should not connect to it, but may emit it with 
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 76d371ec97..83ea98cf3a 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -972,7 +972,7 @@ gtk_text_class_init (GtkTextClass *class)
    * @extend: %TRUE if the move should extend the selection
    *
    * The ::move-cursor signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted when the user initiates a cursor movement.
    * If the cursor is not visible in @self, this signal causes
    * the viewport to be moved instead.
@@ -1007,7 +1007,7 @@ gtk_text_class_init (GtkTextClass *class)
    * @string: the string to insert
    *
    * The ::insert-at-cursor signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted when the user initiates the insertion of a
    * fixed string at the cursor.
    *
@@ -1030,7 +1030,7 @@ gtk_text_class_init (GtkTextClass *class)
    * @count: the number of @type units to delete
    *
    * The ::delete-from-cursor signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted when the user initiates a text deletion.
    *
    * If the @type is %GTK_DELETE_CHARS, GTK deletes the selection
@@ -1057,7 +1057,7 @@ gtk_text_class_init (GtkTextClass *class)
    * @self: the object which received the signal
    *
    * The ::backspace signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted when the user asks for it.
    *
    * The default bindings for this signal are
@@ -1077,7 +1077,7 @@ gtk_text_class_init (GtkTextClass *class)
    * @self: the object which received the signal
    *
    * The ::cut-clipboard signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to cut the selection to the clipboard.
    *
    * The default bindings for this signal are
@@ -1097,7 +1097,7 @@ gtk_text_class_init (GtkTextClass *class)
    * @self: the object which received the signal
    *
    * The ::copy-clipboard signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to copy the selection to the clipboard.
    *
    * The default bindings for this signal are
@@ -1117,7 +1117,7 @@ gtk_text_class_init (GtkTextClass *class)
    * @self: the object which received the signal
    *
    * The ::paste-clipboard signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to paste the contents of the clipboard
    * into the text view.
    *
@@ -1138,7 +1138,7 @@ gtk_text_class_init (GtkTextClass *class)
    * @self: the object which received the signal
    *
    * The ::toggle-overwrite signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to toggle the overwrite mode of the self.
    *
    * The default bindings for this signal is Insert.
@@ -1177,7 +1177,7 @@ gtk_text_class_init (GtkTextClass *class)
    * @self: the object which received the signal
    *
    * The ::insert-emoji signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to present the Emoji chooser for the @self.
    *
    * The default bindings for this signal are Ctrl-. and Ctrl-;
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 22f6d84b71..59a4c41a8a 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -1094,7 +1094,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    * @extend_selection: %TRUE if the move should extend the selection
    *  
    * The ::move-cursor signal is a 
-   * [keybinding signal][GtkBindingSignal] 
+   * [keybinding signal][GtkSignalAction] 
    * which gets emitted when the user initiates a cursor movement. 
    * If the cursor is not visible in @text_view, this signal causes
    * the viewport to be moved instead.
@@ -1135,7 +1135,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    * @count: the number of @step units to move
    *
    * The ::move-viewport signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which can be bound to key combinations to allow the user
    * to move the viewport, i.e. change what part of the text view
    * is visible in a containing scrolled window.
@@ -1161,7 +1161,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    * @text_view: the object which received the signal
    *
    * The ::set-anchor signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted when the user initiates setting the "anchor" 
    * mark. The "anchor" mark gets placed at the same position as the
    * "insert" mark.
@@ -1183,7 +1183,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    * @string: the string to insert
    *
    * The ::insert-at-cursor signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted when the user initiates the insertion of a 
    * fixed string at the cursor.
    *
@@ -1206,7 +1206,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    * @count: the number of @type units to delete
    *
    * The ::delete-from-cursor signal is a 
-   * [keybinding signal][GtkBindingSignal] 
+   * [keybinding signal][GtkSignalAction] 
    * which gets emitted when the user initiates a text deletion.
    *
    * If the @type is %GTK_DELETE_CHARS, GTK+ deletes the selection
@@ -1237,7 +1237,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    * @text_view: the object which received the signal
    *
    * The ::backspace signal is a 
-   * [keybinding signal][GtkBindingSignal] 
+   * [keybinding signal][GtkSignalAction] 
    * which gets emitted when the user asks for it.
    * 
    * The default bindings for this signal are
@@ -1257,7 +1257,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    * @text_view: the object which received the signal
    *
    * The ::cut-clipboard signal is a 
-   * [keybinding signal][GtkBindingSignal] 
+   * [keybinding signal][GtkSignalAction] 
    * which gets emitted to cut the selection to the clipboard.
    * 
    * The default bindings for this signal are
@@ -1277,7 +1277,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    * @text_view: the object which received the signal
    *
    * The ::copy-clipboard signal is a 
-   * [keybinding signal][GtkBindingSignal] 
+   * [keybinding signal][GtkSignalAction] 
    * which gets emitted to copy the selection to the clipboard.
    * 
    * The default bindings for this signal are
@@ -1297,7 +1297,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    * @text_view: the object which received the signal
    *
    * The ::paste-clipboard signal is a 
-   * [keybinding signal][GtkBindingSignal] 
+   * [keybinding signal][GtkSignalAction] 
    * which gets emitted to paste the contents of the clipboard 
    * into the text view.
    * 
@@ -1318,7 +1318,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    * @text_view: the object which received the signal
    *
    * The ::toggle-overwrite signal is a 
-   * [keybinding signal][GtkBindingSignal] 
+   * [keybinding signal][GtkSignalAction] 
    * which gets emitted to toggle the overwrite mode of the text view.
    * 
    * The default bindings for this signal is Insert.
@@ -1338,7 +1338,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    * @select: %TRUE to select, %FALSE to unselect
    *
    * The ::select-all signal is a 
-   * [keybinding signal][GtkBindingSignal] 
+   * [keybinding signal][GtkSignalAction] 
    * which gets emitted to select or unselect the complete
    * contents of the text view.
    *
@@ -1359,7 +1359,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    * @text_view: the object which received the signal
    *
    * The ::toggle-cursor-visible signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to toggle the #GtkTextView:cursor-visible
    * property.
    *
@@ -1431,7 +1431,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    * @text_view: the object which received the signal
    *
    * The ::insert-emoji signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted to present the Emoji chooser for the @text_view.
    *
    * The default bindings for this signal are Ctrl-. and Ctrl-;
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 4c76f0405d..8cfb238deb 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1333,7 +1333,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
    * @modify: whether to modify the selection
    *
    * The #GtkTreeView::move-cursor signal is a [keybinding
-   * signal][GtkBindingSignal] which gets emitted when the user
+   * signal][GtkSignalAction] which gets emitted when the user
    * presses one of the cursor keys.
    *
    * Applications should not connect to it, but may emit it with
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 085e54b788..fe0e3fdf83 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -932,7 +932,7 @@ gtk_window_class_init (GtkWindowClass *klass)
    * @window: the window which received the signal
    *
    * The ::activate-focus signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted when the user activates the currently
    * focused widget of @window.
    */
@@ -951,7 +951,7 @@ gtk_window_class_init (GtkWindowClass *klass)
    * @window: the window which received the signal
    *
    * The ::activate-default signal is a
-   * [keybinding signal][GtkBindingSignal]
+   * [keybinding signal][GtkSignalAction]
    * which gets emitted when the user activates the default widget
    * of @window.
    */
@@ -987,7 +987,7 @@ gtk_window_class_init (GtkWindowClass *klass)
    * @window: the window on which the signal is emitted
    * @toggle: toggle the debugger
    *
-   * The ::enable-debugging signal is a [keybinding signal][GtkBindingSignal]
+   * The ::enable-debugging signal is a [keybinding signal][GtkSignalAction]
    * which gets emitted when the user enables or disables interactive
    * debugging. When @toggle is %TRUE, interactive debugging is toggled
    * on or off, when it is %FALSE, the debugger will be pointed at the