Fix docs generation.

4 files changed, 76 insertions, 353 deletions

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 5f5083081..08615abef 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -46,18 +46,14 @@ IGNORE_HFILES=		\
 	gedit-documents-panel.h			\
 	gedit-io-error-info-bar.h		\
 	gedit-languages-manager.h		\
-	gedit-message-area.h			\
 	gedit-object-module.h			\
-	gedit-plugin-manager.h			\
 	gedit-plugins-engine.h			\
-	gedit-prefs-manager-private.h		\
 	gedit-session.h				\
 	gedit-ui.h				\
 	gedit-window-private.h			\
 	gedit-output-window.h			\
 	gedit-close-confirmation-dialog.h	\
 	gedit-encodings-dialog.h		\
-	gedit-open-location-dialog.h		\
 	gedit-page-setup-dialog.h		\
 	gedit-preferences-dialog.h		\
 	gedit-search-dialog.h			\
@@ -92,7 +88,8 @@ GTKDOC_CFLAGS=	\
 	$(GEDIT_CFLAGS)
 
 GTKDOC_LIBS=	\
-	$(top_builddir)/gedit/libgedit.la	\
+	$(top_builddir)/gedit/libgedit.la		\
+	$(top_builddir)/gedit/libgedit-private.la	\
 	$(GEDIT_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/docs/reference/gedit-docs.sgml b/docs/reference/gedit-docs.sgml
index f2199b5b7..eb1ef1aba 100644
--- a/docs/reference/gedit-docs.sgml
+++ b/docs/reference/gedit-docs.sgml
@@ -10,28 +10,24 @@
     <title>gedit</title>
     <xi:include href="xml/gedit-app.xml"/>
     <xi:include href="xml/gedit-document.xml"/>
-    <xi:include href="xml/gedit-encodings-option-menu.xml"/>
+    <xi:include href="xml/gedit-encodings-combo-box.xml"/>
     <xi:include href="xml/gedit-file-chooser-dialog.xml"/>
     <xi:include href="xml/gedit-message-bus.xml"/>
     <xi:include href="xml/gedit-message-type.xml"/>
     <xi:include href="xml/gedit-message.xml"/>
-    <xi:include href="xml/gedit-notebook.xml"/>
     <xi:include href="xml/gedit-panel.xml"/>
-    <xi:include href="xml/gedit-plugin.xml"/>
     <xi:include href="xml/gedit-print-job-preview.xml"/>
-    <xi:include href="xml/gedit-print.xml"/>
-    <xi:include href="xml/gedit-progress-message-area.xml"/>
+    <xi:include href="xml/gedit-print-job.xml"/>
+    <xi:include href="xml/gedit-progress-info-bar.xml"/>
     <xi:include href="xml/gedit-statusbar.xml"/>
     <xi:include href="xml/gedit-tab.xml"/>
     <xi:include href="xml/gedit-view.xml"/>
+    <xi:include href="xml/gedit-view-activatable.xml"/>
     <xi:include href="xml/gedit-window.xml"/>
-    <xi:include href="xml/gedit-convert.xml"/>
+    <xi:include href="xml/gedit-window-activatable.xml"/>
     <xi:include href="xml/gedit-debug.xml"/>
     <xi:include href="xml/gedit-encodings.xml"/>
     <xi:include href="xml/gedit-help.xml"/>
-    <xi:include href="xml/gedit-metadata-manager.xml"/>
-    <xi:include href="xml/gedit-prefs-manager-app.xml"/>
-    <xi:include href="xml/gedit-prefs-manager.xml"/>
     <xi:include href="xml/gedit-utils.xml"/>
   </chapter>
 </book>
diff --git a/docs/reference/gedit-sections.txt b/docs/reference/gedit-sections.txt
index 5ad2ac247..9d707db7c 100644
--- a/docs/reference/gedit-sections.txt
+++ b/docs/reference/gedit-sections.txt
@@ -31,7 +31,7 @@ GeditDocumentSaveFlags
 GEDIT_DOCUMENT_ERROR
 gedit_document_error_quark
 gedit_document_new
-gedit_document_get_uri
+gedit_document_get_location
 gedit_document_get_uri_for_display
 gedit_document_get_short_name_for_display
 gedit_document_get_mime_type
@@ -71,21 +71,21 @@ GEDIT_DOCUMENT_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>gedit-encodings-option-menu</FILE>
-GeditEncodingsOptionMenuPrivate
-<TITLE>GeditEncodingsOptionMenu</TITLE>
-GeditEncodingsOptionMenu
-gedit_encodings_option_menu_new
-gedit_encodings_option_menu_get_selected_encoding
-gedit_encodings_option_menu_set_selected_encoding
+<FILE>gedit-encodings-combo-box</FILE>
+GeditEncodingsComboBoxPrivate
+<TITLE>GeditEncodingsComboBox</TITLE>
+GeditEncodingsComboBox
+gedit_encodings_combo_box_new
+gedit_encodings_combo_box_get_selected_encoding
+gedit_encodings_combo_box_set_selected_encoding
 <SUBSECTION Standard>
-GEDIT_ENCODINGS_OPTION_MENU
-GEDIT_IS_ENCODINGS_OPTION_MENU
-GEDIT_TYPE_ENCODINGS_OPTION_MENU
-gedit_encodings_option_menu_get_type
-GEDIT_ENCODINGS_OPTION_MENU_CLASS
-GEDIT_IS_ENCODINGS_OPTION_MENU_CLASS
-GEDIT_ENCODINGS_OPTION_MENU_GET_CLASS
+GEDIT_ENCODINGS_COMBO_BOX
+GEDIT_IS_ENCODINGS_COMBO_BOX
+GEDIT_TYPE_ENCODINGS_COMBO_BOX
+gedit_encodings_combo_box_get_type
+GEDIT_ENCODINGS_COMBO_BOX_CLASS
+GEDIT_IS_ENCODINGS_COMBO_BOX_CLASS
+GEDIT_ENCODINGS_COMBO_BOX_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -239,30 +239,6 @@ GEDIT_PANEL_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>gedit-plugin</FILE>
-<TITLE>GeditPlugin</TITLE>
-GeditPlugin
-gedit_plugin_activate
-gedit_plugin_deactivate
-gedit_plugin_update_ui
-gedit_plugin_is_configurable
-gedit_plugin_create_configure_dialog
-GEDIT_PLUGIN_REGISTER_TYPE
-<SUBSECTION Standard>
-GEDIT_PLUGIN
-GEDIT_IS_PLUGIN
-GEDIT_TYPE_PLUGIN
-gedit_plugin_get_type
-GEDIT_PLUGIN_CLASS
-GEDIT_IS_PLUGIN_CLASS
-GEDIT_PLUGIN_GET_CLASS
-GEDIT_PLUGIN_REGISTER_TYPE_WITH_CODE
-GEDIT_PLUGIN_REGISTER_TYPE
-GEDIT_PLUGIN_DEFINE_TYPE_WITH_CODE
-GEDIT_PLUGIN_DEFINE_TYPE
-</SECTION>
-
-<SECTION>
 <FILE>gedit-print-job-preview</FILE>
 GeditPrintJobPreviewPrivate
 <TITLE>GeditPrintJobPreview</TITLE>
@@ -279,7 +255,7 @@ GEDIT_PRINT_JOB_PREVIEW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>gedit-print</FILE>
+<FILE>gedit-print-job</FILE>
 <TITLE>GeditPrintJob</TITLE>
 GeditPrintJob
 gedit_print_job_new
@@ -296,24 +272,24 @@ GEDIT_PRINT_JOB_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>gedit-progress-message-area</FILE>
-GeditProgressMessageAreaPrivate
-<TITLE>GeditProgressMessageArea</TITLE>
-GeditProgressMessageArea
-gedit_progress_message_area_new
-gedit_progress_message_area_set_stock_image
-gedit_progress_message_area_set_markup
-gedit_progress_message_area_set_text
-gedit_progress_message_area_set_fraction
-gedit_progress_message_area_pulse
+<FILE>gedit-progress-info-bar</FILE>
+GeditProgressInfoBarPrivate
+<TITLE>GeditProgressInfoBar</TITLE>
+GeditProgressInfoBar
+gedit_progress_info_bar_new
+gedit_progress_info_bar_set_stock_image
+gedit_progress_info_bar_set_markup
+gedit_progress_info_bar_set_text
+gedit_progress_info_bar_set_fraction
+gedit_progress_info_bar_pulse
 <SUBSECTION Standard>
-GEDIT_PROGRESS_MESSAGE_AREA
-GEDIT_IS_PROGRESS_MESSAGE_AREA
-GEDIT_TYPE_PROGRESS_MESSAGE_AREA
-gedit_progress_message_area_get_type
-GEDIT_PROGRESS_MESSAGE_AREA_CLASS
-GEDIT_IS_PROGRESS_MESSAGE_AREA_CLASS
-GEDIT_PROGRESS_MESSAGE_AREA_GET_CLASS
+GEDIT_PROGRESS_INFO_BAR
+GEDIT_IS_PROGRESS_INFO_BAR
+GEDIT_TYPE_PROGRESS_INFO_BAR
+gedit_progress_info_bar_get_type
+GEDIT_PROGRESS_INFO_BAR_CLASS
+GEDIT_IS_PROGRESS_INFO_BAR_CLASS
+GEDIT_PROGRESS_INFO_BAR_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -387,13 +363,29 @@ GEDIT_VIEW_GET_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>gedit-view-activatable</FILE>
+<TITLE>GeditWiewActivatable</TITLE>
+GeditWiewActivatable
+gedit_view_activatable_activate
+gedit_view_activatable_deactivate
+gedit_view_activatable_update_state
+<SUBSECTION Standard>
+GEDIT_TYPE_VIEW_ACTIVATABLE
+GEDIT_VIEW_ACTIVATABLE
+GEDIT_VIEW_ACTIVATABLE_IFACE
+GEDIT_IS_VIEW_ACTIVATABLE
+GEDIT_VIEW_ACTIVATABLE_GET_IFACE
+gedit_view_activatable_get_type
+</SECTION>
+
+<SECTION>
 <FILE>gedit-window</FILE>
 GeditWindowState
 GeditWindowPrivate
 <TITLE>GeditWindow</TITLE>
 GeditWindow
 gedit_window_create_tab
-gedit_window_create_tab_from_uri
+gedit_window_create_tab_from_location
 gedit_window_close_tab
 gedit_window_close_all_tabs
 gedit_window_close_tabs
@@ -411,7 +403,6 @@ gedit_window_get_statusbar
 gedit_window_get_ui_manager
 gedit_window_get_state
 gedit_window_get_tab_from_location
-gedit_window_get_tab_from_uri
 gedit_window_get_message_bus
 <SUBSECTION Standard>
 GEDIT_WINDOW
@@ -424,12 +415,19 @@ GEDIT_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>gedit-convert</FILE>
-GeditConvertError
-GEDIT_CONVERT_ERROR
-gedit_convert_error_quark
-gedit_convert_to_utf8
-gedit_convert_from_utf8
+<FILE>gedit-window-activatable</FILE>
+<TITLE>GeditWindowActivatable</TITLE>
+GeditWindowActivatable
+gedit_window_activatable_activate
+gedit_window_activatable_deactivate
+gedit_window_activatable_update_state
+<SUBSECTION Standard>
+GEDIT_TYPE_WINDOW_ACTIVATABLE
+GEDIT_WINDOW_ACTIVATABLE
+GEDIT_WINDOW_ACTIVATABLE_IFACE
+GEDIT_IS_WINDOW_ACTIVATABLE
+GEDIT_WINDOW_ACTIVATABLE_GET_IFACE
+gedit_window_activatable_get_type
 </SECTION>
 
 <SECTION>
@@ -484,276 +482,6 @@ gedit_metadata_manager_set
 </SECTION>
 
 <SECTION>
-<FILE>gedit-prefs-manager-app</FILE>
-gedit_prefs_manager_app_init
-gedit_prefs_manager_app_shutdown
-gedit_prefs_manager_get_window_state
-gedit_prefs_manager_set_window_state
-gedit_prefs_manager_window_state_can_set
-gedit_prefs_manager_get_window_size
-gedit_prefs_manager_get_default_window_size
-gedit_prefs_manager_set_window_size
-gedit_prefs_manager_window_size_can_set
-gedit_prefs_manager_get_side_panel_size
-gedit_prefs_manager_get_default_side_panel_size
-gedit_prefs_manager_set_side_panel_size
-gedit_prefs_manager_side_panel_size_can_set
-gedit_prefs_manager_get_bottom_panel_size
-gedit_prefs_manager_get_default_bottom_panel_size
-gedit_prefs_manager_set_bottom_panel_size
-gedit_prefs_manager_bottom_panel_size_can_set
-</SECTION>
-
-<SECTION>
-<FILE>gedit-prefs-manager</FILE>
-GEDIT_BASE_KEY
-GPM_PREFS_DIR
-GPM_FONT_DIR
-GPM_USE_DEFAULT_FONT
-GPM_EDITOR_FONT
-GPM_COLORS_DIR
-GPM_USE_DEFAULT_COLORS
-GPM_BACKGROUND_COLOR
-GPM_TEXT_COLOR
-GPM_SELECTED_TEXT_COLOR
-GPM_SELECTION_COLOR
-GPM_SAVE_DIR
-GPM_CREATE_BACKUP_COPY
-GPM_BACKUP_COPY_EXTENSION
-GPM_AUTO_SAVE
-GPM_AUTO_SAVE_INTERVAL
-GPM_UNDO_DIR
-GPM_UNDO_ACTIONS_LIMIT
-GPM_WRAP_MODE_DIR
-GPM_WRAP_MODE
-GPM_TABS_DIR
-GPM_TABS_SIZE
-GPM_INSERT_SPACES
-GPM_AUTO_INDENT_DIR
-GPM_AUTO_INDENT
-GPM_LINE_NUMBERS_DIR
-GPM_DISPLAY_LINE_NUMBERS
-GPM_CURRENT_LINE_DIR
-GPM_HIGHLIGHT_CURRENT_LINE
-GPM_BRACKET_MATCHING_DIR
-GPM_BRACKET_MATCHING
-GPM_RIGHT_MARGIN_DIR
-GPM_DISPLAY_RIGHT_MARGIN
-GPM_RIGHT_MARGIN_POSITION
-GPM_CURSOR_POSITION_DIR
-GPM_RESTORE_CURSOR_POSITION
-GPM_SEARCH_HIGHLIGHTING_DIR
-GPM_SEARCH_HIGHLIGHTING_ENABLE
-GPM_TOOLBAR_DIR
-GPM_TOOLBAR_VISIBLE
-GPM_TOOLBAR_BUTTONS_STYLE
-GPM_STATUSBAR_DIR
-GPM_STATUSBAR_VISIBLE
-GPM_SIDE_PANE_DIR
-GPM_SIDE_PANE_VISIBLE
-GPM_BOTTOM_PANEL_DIR
-GPM_BOTTOM_PANEL_VISIBLE
-GPM_RECENTS_DIR
-GPM_MAX_RECENTS
-GPM_PRINT_PAGE_DIR
-GPM_PRINT_SYNTAX
-GPM_PRINT_HEADER
-GPM_PRINT_WRAP_MODE
-GPM_PRINT_LINE_NUMBERS
-GPM_PRINT_FONT_DIR
-GPM_PRINT_FONT_BODY
-GPM_PRINT_FONT_BODY_PANGO
-GPM_PRINT_FONT_HEADER
-GPM_PRINT_FONT_HEADER_PANGO
-GPM_PRINT_FONT_NUMBERS
-GPM_PRINT_FONT_NUMBERS_PANGO
-GPM_WINDOW_DIR
-GPM_WINDOW_STATE
-GPM_WINDOW_WIDTH
-GPM_WINDOW_HEIGHT
-GPM_SIDE_PANEL_SIZE
-GPM_BOTTOM_PANEL_SIZE
-GPM_ENCODINGS_DIR
-GPM_AUTO_DETECTED_ENCODINGS
-GPM_SHOWN_IN_MENU_ENCODINGS
-GPM_SYNTAX_HL_DIR
-GPM_SYNTAX_HL_ENABLE
-GPM_WRITABLE_VFS_SCHEMES
-GPM_LOCKDOWN_DIR
-GPM_LOCKDOWN_COMMAND_LINE
-GPM_LOCKDOWN_PRINTING
-GPM_LOCKDOWN_PRINT_SETUP
-GPM_LOCKDOWN_SAVE_TO_DISK
-GPM_DEFAULT_USE_DEFAULT_FONT
-GPM_DEFAULT_EDITOR_FONT
-GPM_DEFAULT_USE_DEFAULT_COLORS
-GPM_DEFAULT_BACKGROUND_COLOR
-GPM_DEFAULT_TEXT_COLOR
-GPM_DEFAULT_SELECTED_TEXT_COLOR
-GPM_DEFAULT_SELECTION_COLOR
-GPM_DEFAULT_CREATE_BACKUP_COPY
-GPM_DEFAULT_BACKUP_COPY_EXTENSION
-GPM_DEFAULT_AUTO_SAVE
-GPM_DEFAULT_AUTO_SAVE_INTERVAL
-GPM_DEFAULT_UNDO_ACTIONS_LIMIT
-GPM_DEFAULT_WRAP_MODE
-GPM_DEFAULT_TABS_SIZE
-GPM_DEFAULT_INSERT_SPACES
-GPM_DEFAULT_AUTO_INDENT
-GPM_DEFAULT_DISPLAY_LINE_NUMBERS
-GPM_DEFAULT_AUTO_DETECTED_ENCODINGS
-GPM_DEFAULT_TOOLBAR_VISIBLE
-GPM_DEFAULT_TOOLBAR_BUTTONS_STYLE
-GPM_DEFAULT_TOOLBAR_SHOW_TOOLTIPS
-GPM_DEFAULT_STATUSBAR_VISIBLE
-GPM_DEFAULT_SIDE_PANE_VISIBLE
-GPM_DEFAULT_BOTTOM_PANEL_VISIBLE
-GPM_DEFAULT_PRINT_SYNTAX
-GPM_DEFAULT_PRINT_HEADER
-GPM_DEFAULT_PRINT_WRAP_MODE
-GPM_DEFAULT_PRINT_LINE_NUMBERS
-GPM_DEFAULT_PRINT_FONT_BODY_PANGO
-GPM_DEFAULT_PRINT_FONT_HEADER_PANGO
-GPM_DEFAULT_PRINT_FONT_NUMBERS_PANGO
-GPM_DEFAULT_MAX_RECENTS
-GPM_DEFAULT_WINDOW_STATE
-GPM_DEFAULT_WINDOW_WIDTH
-GPM_DEFAULT_WINDOW_HEIGHT
-GPM_DEFAULT_WINDOW_STATE_STR
-GPM_DEFAULT_WINDOW_WIDTH_STR
-GPM_DEFAULT_WINDOW_HEIGHT_STR
-GPM_DEFAULT_SIDE_PANEL_SIZE
-GPM_DEFAULT_BOTTOM_PANEL_SIZE
-GPM_DEFAULT_SIDE_PANEL_SIZE_STR
-GPM_DEFAULT_BOTTOM_PANEL_SIZE_STR
-GPM_DEFAULT_HIGHLIGHT_CURRENT_LINE
-GPM_DEFAULT_BRACKET_MATCHING
-GPM_DEFAULT_DISPLAY_RIGHT_MARGIN
-GPM_DEFAULT_RIGHT_MARGIN_POSITION
-GPM_DEFAULT_SYNTAX_HL_ENABLE
-GPM_DEFAULT_WRITABLE_VFS_SCHEMES
-GPM_DEFAULT_RESTORE_CURSOR_POSITION
-GPM_DEFAULT_SEARCH_HIGHLIGHTING_ENABLE
-GeditToolbarSetting
-gedit_prefs_manager_init
-gedit_prefs_manager_shutdown
-gedit_prefs_manager_get_use_default_font
-gedit_prefs_manager_set_use_default_font
-gedit_prefs_manager_use_default_font_can_set
-gedit_prefs_manager_get_editor_font
-gedit_prefs_manager_set_editor_font
-gedit_prefs_manager_editor_font_can_set
-gedit_prefs_manager_get_use_default_colors
-gedit_prefs_manager_set_use_default_colors
-gedit_prefs_manager_use_default_colors_can_set
-gedit_prefs_manager_get_background_color
-gedit_prefs_manager_set_background_color
-gedit_prefs_manager_background_color_can_set
-gedit_prefs_manager_get_text_color
-gedit_prefs_manager_set_text_color
-gedit_prefs_manager_text_color_can_set
-gedit_prefs_manager_get_selection_color
-gedit_prefs_manager_set_selection_color
-gedit_prefs_manager_selection_color_can_set
-gedit_prefs_manager_get_selected_text_color
-gedit_prefs_manager_set_selected_text_color
-gedit_prefs_manager_selected_text_color_can_set
-gedit_prefs_manager_get_create_backup_copy
-gedit_prefs_manager_set_create_backup_copy
-gedit_prefs_manager_create_backup_copy_can_set
-gedit_prefs_manager_get_backup_extension
-gedit_prefs_manager_get_auto_save
-gedit_prefs_manager_set_auto_save
-gedit_prefs_manager_auto_save_can_set
-gedit_prefs_manager_get_auto_save_interval
-gedit_prefs_manager_set_auto_save_interval
-gedit_prefs_manager_auto_save_interval_can_set
-gedit_prefs_manager_get_undo_actions_limit
-gedit_prefs_manager_set_undo_actions_limit
-gedit_prefs_manager_undo_actions_limit_can_set
-gedit_prefs_manager_get_wrap_mode
-gedit_prefs_manager_set_wrap_mode
-gedit_prefs_manager_wrap_mode_can_set
-gedit_prefs_manager_get_tabs_size
-gedit_prefs_manager_set_tabs_size
-gedit_prefs_manager_tabs_size_can_set
-gedit_prefs_manager_get_insert_spaces
-gedit_prefs_manager_set_insert_spaces
-gedit_prefs_manager_insert_spaces_can_set
-gedit_prefs_manager_get_auto_indent
-gedit_prefs_manager_set_auto_indent
-gedit_prefs_manager_auto_indent_can_set
-gedit_prefs_manager_get_display_line_numbers
-gedit_prefs_manager_set_display_line_numbers
-gedit_prefs_manager_display_line_numbers_can_set
-gedit_prefs_manager_get_toolbar_visible
-gedit_prefs_manager_set_toolbar_visible
-gedit_prefs_manager_toolbar_visible_can_set
-gedit_prefs_manager_get_toolbar_buttons_style
-gedit_prefs_manager_set_toolbar_buttons_style
-gedit_prefs_manager_toolbar_buttons_style_can_set
-gedit_prefs_manager_get_statusbar_visible
-gedit_prefs_manager_set_statusbar_visible
-gedit_prefs_manager_statusbar_visible_can_set
-gedit_prefs_manager_get_side_pane_visible
-gedit_prefs_manager_set_side_pane_visible
-gedit_prefs_manager_side_pane_visible_can_set
-gedit_prefs_manager_get_bottom_panel_visible
-gedit_prefs_manager_set_bottom_panel_visible
-gedit_prefs_manager_bottom_panel_visible_can_set
-gedit_prefs_manager_get_print_syntax_hl
-gedit_prefs_manager_set_print_syntax_hl
-gedit_prefs_manager_print_syntax_hl_can_set
-gedit_prefs_manager_get_print_header
-gedit_prefs_manager_set_print_header
-gedit_prefs_manager_print_header_can_set
-gedit_prefs_manager_get_print_wrap_mode
-gedit_prefs_manager_set_print_wrap_mode
-gedit_prefs_manager_print_wrap_mode_can_set
-gedit_prefs_manager_get_print_line_numbers
-gedit_prefs_manager_set_print_line_numbers
-gedit_prefs_manager_print_line_numbers_can_set
-gedit_prefs_manager_get_print_font_body
-gedit_prefs_manager_set_print_font_body
-gedit_prefs_manager_print_font_body_can_set
-gedit_prefs_manager_get_default_print_font_body
-gedit_prefs_manager_get_print_font_header
-gedit_prefs_manager_set_print_font_header
-gedit_prefs_manager_print_font_header_can_set
-gedit_prefs_manager_get_default_print_font_header
-gedit_prefs_manager_get_print_font_numbers
-gedit_prefs_manager_set_print_font_numbers
-gedit_prefs_manager_print_font_numbers_can_set
-gedit_prefs_manager_get_default_print_font_numbers
-gedit_prefs_manager_get_max_recents
-gedit_prefs_manager_get_auto_detected_encodings
-gedit_prefs_manager_get_shown_in_menu_encodings
-gedit_prefs_manager_set_shown_in_menu_encodings
-gedit_prefs_manager_shown_in_menu_encodings_can_set
-gedit_prefs_manager_get_highlight_current_line
-gedit_prefs_manager_set_highlight_current_line
-gedit_prefs_manager_highlight_current_line_can_set
-gedit_prefs_manager_get_bracket_matching
-gedit_prefs_manager_set_bracket_matching
-gedit_prefs_manager_bracket_matching_can_set
-gedit_prefs_manager_get_display_right_margin
-gedit_prefs_manager_set_display_right_margin
-gedit_prefs_manager_display_right_margin_can_set
-gedit_prefs_manager_get_right_margin_position
-gedit_prefs_manager_set_right_margin_position
-gedit_prefs_manager_right_margin_position_can_set
-gedit_prefs_manager_get_enable_syntax_highlighting
-gedit_prefs_manager_set_enable_syntax_highlighting
-gedit_prefs_manager_enable_syntax_highlighting_can_set
-gedit_prefs_manager_get_writable_vfs_schemes
-gedit_prefs_manager_get_restore_cursor_position
-gedit_prefs_manager_get_enable_search_highlighting
-gedit_prefs_manager_set_enable_search_highlighting
-gedit_prefs_manager_enable_search_highlighting_can_set
-gedit_prefs_manager_get_lockdown
-</SECTION>
-
-<SECTION>
 <FILE>gedit-utils</FILE>
 GBOOLEAN_TO_POINTER
 GPOINTER_TO_BOOLEAN
diff --git a/docs/reference/gedit.types b/docs/reference/gedit.types
index 3cb6ce8b7..2b8fd9aba 100644
--- a/docs/reference/gedit.types
+++ b/docs/reference/gedit.types
@@ -8,12 +8,13 @@
 #include "gedit-message-type.h"
 #include "gedit-notebook.h"
 #include "gedit-panel.h"
-#include "gedit-plugin.h"
-#include "gedit-progress-message-area.h"
+#include "gedit-progress-info-bar.h"
 #include "gedit-statusbar.h"
 #include "gedit-tab.h"
 #include "gedit-view.h"
+#include "gedit-view-activatable.h"
 #include "gedit-window.h"
+#include "gedit-window-activatable.h"
 gedit_app_get_type
 gedit_document_get_type
 gedit_encoding_get_type
@@ -24,9 +25,10 @@ gedit_message_bus_get_type
 gedit_message_type_get_type
 gedit_notebook_get_type
 gedit_panel_get_type
-gedit_plugin_get_type
-gedit_progress_message_area_get_type
+gedit_progress_info_bar_get_type
 gedit_statusbar_get_type
 gedit_tab_get_type
 gedit_view_get_type
+gedit_view_activatable_get_type
 gedit_window_get_type
+gedit_window_activatable_get_type