diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
index 08093e8a0..68d3fbad0 100644
--- a/docs/reference/gio/Makefile.am
+++ b/docs/reference/gio/Makefile.am
@@ -47,6 +47,7 @@ IGNORE_HFILES = \
 	gdbusdaemon.h \
 	gdbusprivate.h \
 	gdelayedsettingsbackend.h \
+	gdocumentportal.h \
 	gdummyfile.h \
 	gdummyproxyresolver.h \
 	gdummytlsbackend.h \
@@ -56,6 +57,9 @@ IGNORE_HFILES = \
 	giomodule-priv.h \
 	gioprivate.h \
 	giowin32-priv.h \
+	gio_probes.h \
+	gio_trace.h \
+	gio-tool.h \
 	glocaldirectorymonitor.h \
 	glocalfileenumerator.h \
 	glocalfile.h \
@@ -74,7 +78,9 @@ IGNORE_HFILES = \
 	gnetworkmonitorportal.h \
 	gnotificationbackend.h \
 	gnotification-private.h \
+	gopenuriportal.h \
 	gpollfilemonitor.h \
+	gportalsupport.h \
 	gproxyresolverportal.h \
 	gregistrysettingsbackend.h \
 	gresourcefile.h \
diff --git a/docs/reference/gio/gio-docs.xml b/docs/reference/gio/gio-docs.xml
index 00001becc..98889ef60 100644
--- a/docs/reference/gio/gio-docs.xml
+++ b/docs/reference/gio/gio-docs.xml
@@ -371,6 +371,10 @@
     <title>Index of new symbols in 2.58</title>
     <xi:include href="xml/api-index-2.58.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-2-60" role="2.60">
+    <title>Index of new symbols in 2.60</title>
+    <xi:include href="xml/api-index-2.60.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 
diff --git a/docs/reference/gio/gio-sections.txt b/docs/reference/gio/gio-sections.txt
index 6ba453f28..eb024d27d 100644
--- a/docs/reference/gio/gio-sections.txt
+++ b/docs/reference/gio/gio-sections.txt
@@ -222,6 +222,13 @@ G_TYPE_FILE_MONITOR_FLAGS
 G_TYPE_FILE_QUERY_INFO_FLAGS
 <SUBSECTION Private>
 g_file_get_type
+g_file_copy_flags_get_type
+g_file_create_flags_get_type
+g_file_measure_flags_get_type
+g_file_monitor_event_get_type
+g_file_monitor_flags_get_type
+g_file_query_info_flags_get_type
+g_filesystem_preview_type_get_type
 </SECTION>
 
 <SECTION>
@@ -319,7 +326,9 @@ G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE
 G_FILE_ATTRIBUTE_UNIX_BLOCKS
 G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT
 G_FILE_ATTRIBUTE_DOS_IS_ARCHIVE
+G_FILE_ATTRIBUTE_DOS_IS_MOUNTPOINT
 G_FILE_ATTRIBUTE_DOS_IS_SYSTEM
+G_FILE_ATTRIBUTE_DOS_REPARSE_POINT_TAG
 G_FILE_ATTRIBUTE_OWNER_USER
 G_FILE_ATTRIBUTE_OWNER_USER_REAL
 G_FILE_ATTRIBUTE_OWNER_GROUP
@@ -424,6 +433,7 @@ g_file_attribute_matcher_get_type
 G_TYPE_FILE_TYPE
 <SUBSECTION Private>
 g_file_info_get_type
+g_file_type_get_type
 </SECTION>
 
 <SECTION>
@@ -448,6 +458,9 @@ G_TYPE_FILE_ATTRIBUTE_STATUS
 G_TYPE_FILE_ATTRIBUTE_TYPE
 <SUBSECTION Private>
 g_file_attribute_info_list_get_type
+g_file_attribute_info_flags_get_type
+g_file_attribute_status_get_type
+g_file_attribute_type_get_type
 </SECTION>
 
 <SECTION>
@@ -605,6 +618,7 @@ G_IS_EMBLEM
 G_IS_EMBLEM_CLASS
 G_TYPE_EMBLEM
 G_TYPE_EMBLEM_ORIGIN
+g_emblem_origin_get_type
 </SECTION>
 
 <SECTION>
@@ -788,6 +802,8 @@ G_TYPE_DATA_STREAM_NEWLINE_TYPE
 <SUBSECTION Private>
 g_data_input_stream_get_type
 GDataInputStreamPrivate
+g_data_stream_byte_order_get_type
+g_data_stream_newline_type_get_type
 </SECTION>
 
 <SECTION>
@@ -860,6 +876,7 @@ G_TYPE_OUTPUT_STREAM_SPLICE_FLAGS
 <SUBSECTION Private>
 g_output_stream_get_type
 GOutputStreamPrivate
+g_output_stream_splice_flags_get_type
 </SECTION>
 
 <SECTION>
@@ -1049,6 +1066,7 @@ G_TYPE_IO_STREAM_SPLICE_FLAGS
 GIOStreamPrivate
 GIOStreamAdapter
 g_io_stream_get_type
+g_io_stream_splice_flags_get_type
 </SECTION>
 
 <SECTION>
@@ -1172,6 +1190,8 @@ G_TYPE_MOUNT_MOUNT_FLAGS
 G_TYPE_MOUNT_UNMOUNT_FLAGS
 <SUBSECTION Private>
 g_mount_get_type
+g_mount_mount_flags_get_type
+g_mount_unmount_flags_get_type
 </SECTION>
 
 <SECTION>
@@ -1258,6 +1278,8 @@ G_TYPE_DRIVE_START_FLAGS
 G_TYPE_DRIVE_START_STOP_TYPE
 <SUBSECTION Private>
 g_drive_get_type
+g_drive_start_flags_get_type
+g_drive_start_stop_type_get_type
 </SECTION>
 
 <SECTION>
@@ -1375,6 +1397,7 @@ g_io_error_from_win32_error
 G_TYPE_IO_ERROR_ENUM
 <SUBSECTION Private>
 g_io_error_quark
+g_io_error_enum_get_type
 </SECTION>
 
 <SECTION>
@@ -1519,6 +1542,8 @@ G_TYPE_PASSWORD_SAVE
 g_mount_operation_get_type
 g_ask_password_flags_get_type
 GMountOperationPrivate
+g_mount_operation_result_get_type
+g_password_save_get_type
 </SECTION>
 
 <SECTION>
@@ -1684,6 +1709,7 @@ G_IO_MODULE_GET_CLASS
 G_TYPE_IO_MODULE_SCOPE_FLAGS
 <SUBSECTION Private>
 g_io_module_get_type
+g_io_module_scope_flags_get_type
 </SECTION>
 
 <SECTION>
@@ -1809,6 +1835,7 @@ G_TYPE_SOCKET_ADDRESS
 G_TYPE_SOCKET_FAMILY
 <SUBSECTION Private>
 g_socket_address_get_type
+g_socket_family_get_type
 </SECTION>
 
 <SECTION>
@@ -1859,6 +1886,7 @@ G_UNIX_SOCKET_ADDRESS_GET_CLASS
 G_TYPE_UNIX_SOCKET_ADDRESS_TYPE
 <SUBSECTION Private>
 g_unix_socket_address_get_type
+g_unix_socket_address_type_get_type
 </SECTION>
 
 <SECTION>
@@ -1923,6 +1951,7 @@ GResolverPrivate
 g_resolver_get_type
 g_resolver_error_quark
 g_resolver_record_type_get_type
+g_resolver_error_get_type
 </SECTION>
 
 <SECTION>
@@ -2147,6 +2176,9 @@ G_TYPE_SOCKET_TYPE
 <SUBSECTION Private>
 g_socket_get_type
 GSocketPrivate
+g_socket_msg_flags_get_type
+g_socket_protocol_get_type
+g_socket_type_get_type
 </SECTION>
 
 <SECTION>
@@ -2198,6 +2230,7 @@ G_TYPE_SOCKET_CLIENT_EVENT
 <SUBSECTION Private>
 GSocketClientPrivate
 g_socket_client_get_type
+g_socket_client_event_get_type
 </SECTION>
 
 <SECTION>
@@ -2344,6 +2377,7 @@ G_TYPE_SOCKET_LISTENER_EVENT
 <SUBSECTION Private>
 GSocketListenerPrivate
 g_socket_listener_get_type
+g_socket_listener_event_get_type
 </SECTION>
 
 <SECTION>
@@ -2506,6 +2540,7 @@ G_ZLIB_COMPRESSOR_GET_CLASS
 G_TYPE_ZLIB_COMPRESSOR_FORMAT
 <SUBSECTION Private>
 g_zlib_compressor_get_type
+g_zlib_compressor_format_get_type
 </SECTION>
 
 <SECTION>
@@ -2709,6 +2744,7 @@ G_TYPE_SETTINGS_BIND_FLAGS
 <SUBSECTION Private>
 GSettingsPrivate
 g_settings_get_type
+g_settings_bind_flags_get_type
 </SECTION>
 
 <SECTION>
@@ -2825,6 +2861,7 @@ G_TYPE_DBUS_SERVER
 G_TYPE_DBUS_SERVER_FLAGS
 <SUBSECTION Private>
 g_dbus_server_get_type
+g_dbus_server_flags_get_type
 </SECTION>
 
 <SECTION>
@@ -2894,6 +2931,10 @@ G_TYPE_DBUS_MESSAGE_HEADER_FIELD
 G_TYPE_DBUS_MESSAGE_TYPE
 <SUBSECTION Private>
 g_dbus_message_get_type
+g_dbus_message_byte_order_get_type
+g_dbus_message_flags_get_type
+g_dbus_message_header_field_get_type
+g_dbus_message_type_get_type
 </SECTION>
 
 <SECTION>
@@ -2976,6 +3017,12 @@ G_TYPE_DBUS_SUBTREE_FLAGS
 <SUBSECTION Private>
 g_dbus_connection_get_type
 g_bus_type_get_type
+g_dbus_call_flags_get_type
+g_dbus_capability_flags_get_type
+g_dbus_connection_flags_get_type
+g_dbus_send_message_flags_get_type
+g_dbus_signal_flags_get_type
+g_dbus_subtree_flags_get_type
 </SECTION>
 
 <SECTION>
@@ -3061,6 +3108,7 @@ g_dbus_error_encode_gerror
 <SUBSECTION Standard>
 G_TYPE_DBUS_ERROR
 g_dbus_error_quark
+g_dbus_error_get_type
 </SECTION>
 
 <SECTION>
@@ -3105,6 +3153,7 @@ G_TYPE_DBUS_PROXY_FLAGS
 <SUBSECTION Private>
 GDBusProxyPrivate
 g_dbus_proxy_get_type
+g_dbus_proxy_flags_get_type
 </SECTION>
 
 <SECTION>
@@ -3158,6 +3207,7 @@ g_dbus_method_info_get_type
 g_dbus_node_info_get_type
 g_dbus_property_info_get_type
 g_dbus_signal_info_get_type
+g_dbus_property_info_flags_get_type
 </SECTION>
 
 <SECTION>
@@ -3624,6 +3674,9 @@ GTlsCertificateFlags
 G_TYPE_TLS_AUTHENTICATION_MODE
 G_TYPE_TLS_CERTIFICATE_FLAGS
 G_TYPE_TLS_ERROR
+g_tls_authentication_mode_get_type
+g_tls_certificate_flags_get_type
+g_tls_error_get_type
 </SECTION>
 
 <SECTION>
@@ -3714,6 +3767,7 @@ G_TYPE_TLS_CONNECTION
 G_TYPE_TLS_REHANDSHAKE_MODE
 <SUBSECTION Private>
 g_tls_connection_get_type
+g_tls_rehandshake_mode_get_type
 </SECTION>
 
 <SECTION>
@@ -3865,6 +3919,7 @@ G_TYPE_TLS_CERTIFICATE_REQUEST_FLAGS
 GTlsInteractionPrivate
 g_tls_interaction_get_type
 g_tls_interaction_result_get_type
+g_tls_certificate_request_flags_get_type
 </SECTION>
 
 <SECTION>
@@ -4147,6 +4202,7 @@ G_TYPE_NETWORK_MONITOR
 G_NETWORK_MONITOR
 G_IS_NETWORK_MONITOR
 G_NETWORK_MONITOR_GET_INTERFACE
+g_network_connectivity_get_type
 </SECTION>
 
 <SECTION>
@@ -4514,6 +4570,7 @@ G_TYPE_SUBPROCESS
 G_SUBPROCESS
 G_TYPE_SUBPROCESS_FLAGS
 g_subprocess_get_type
+g_subprocess_flags_get_type
 </SECTION>
 
 <SECTION>
@@ -4571,6 +4628,7 @@ G_TYPE_NOTIFICATION
 G_TYPE_NOTIFICATION_BACKEND
 g_notification_get_type
 G_TYPE_NOTIFICATION_PRIORITY
+g_notification_priority_get_type
 </SECTION>
 
 <SECTION>
diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build
index f1880cc0c..20bdeaf97 100644
--- a/docs/reference/gio/meson.build
+++ b/docs/reference/gio/meson.build
@@ -28,6 +28,7 @@ if get_option('gtk_doc')
     'gdbusdaemon.h',
     'gdbusprivate.h',
     'gdelayedsettingsbackend.h',
+    'gdocumentportal.h',
     'gdummyfile.h',
     'gdummyproxyresolver.h',
     'gdummytlsbackend.h',
@@ -37,6 +38,9 @@ if get_option('gtk_doc')
     'giomodule-priv.h',
     'gioprivate.h',
     'giowin32-priv.h',
+    'gio_probes.h',
+    'gio_trace.h',
+    'gio-tool.h',
     'glocaldirectorymonitor.h',
     'glocalfileenumerator.h',
     'glocalfile.h',
@@ -55,7 +59,9 @@ if get_option('gtk_doc')
     'gnetworkmonitorportal.h',
     'gnotificationbackend.h',
     'gnotification-private.h',
+    'gopenuriportal.h',
     'gpollfilemonitor.h',
+    'gportalsupport.h',
     'gproxyresolverportal.h',
     'gregistrysettingsbackend.h',
     'gresourcefile.h',
diff --git a/docs/reference/gio/overview.xml b/docs/reference/gio/overview.xml
index c15ad447d..d35b26254 100644
--- a/docs/reference/gio/overview.xml
+++ b/docs/reference/gio/overview.xml
@@ -112,7 +112,7 @@
           <listitem><para>network connectivity monitoring</para></listitem>
        </varlistentry>
     </variablelist>
-    There is support for connecting to <link linkend="http://www.freedesktop.org/wiki/Software/dbus">D-Bus</link>,
+    There is support for connecting to <ulink url="http://www.freedesktop.org/wiki/Software/dbus">D-Bus</ulink>,
     sending and receiving messages, owning and watching bus names,
     and making objects available on the bus:
     <variablelist>
diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
index dfefa25ff..4d4c8d80c 100644
--- a/docs/reference/glib/Makefile.am
+++ b/docs/reference/glib/Makefile.am
@@ -36,6 +36,8 @@ IGNORE_HFILES = \
 	gbsearcharray.h		\
 	glib-private.h		\
 	gmoduleconf.h		\
+	grcboxprivate.h		\
+	gstdioprivate.h		\
 	gthreadprivate.h	\
 	gunibreak.h		\
 	gunicomp.h		\
diff --git a/docs/reference/glib/glib-docs.xml b/docs/reference/glib/glib-docs.xml
index afebbec8b..8fe9569bf 100644
--- a/docs/reference/glib/glib-docs.xml
+++ b/docs/reference/glib/glib-docs.xml
@@ -264,6 +264,10 @@
     <title>Index of new symbols in 2.58</title>
     <xi:include href="xml/api-index-2.58.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-2-60" role="2.60">
+    <title>Index of new symbols in 2.60</title>
+    <xi:include href="xml/api-index-2.60.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 
diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index e59a1c1e4..1369012ce 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -132,6 +132,8 @@ GLIB_VERSION_2_50
 GLIB_VERSION_2_52
 GLIB_VERSION_2_54
 GLIB_VERSION_2_56
+GLIB_VERSION_2_58
+GLIB_VERSION_2_60
 GLIB_VERSION_MIN_REQUIRED
 GLIB_VERSION_MAX_ALLOWED
 GLIB_DISABLE_DEPRECATION_WARNINGS
@@ -155,6 +157,8 @@ GLIB_AVAILABLE_IN_2_50
 GLIB_AVAILABLE_IN_2_52
 GLIB_AVAILABLE_IN_2_54
 GLIB_AVAILABLE_IN_2_56
+GLIB_AVAILABLE_IN_2_58
+GLIB_AVAILABLE_IN_2_60
 GLIB_DEPRECATED_IN_2_26
 GLIB_DEPRECATED_IN_2_26_FOR
 GLIB_DEPRECATED_IN_2_28
@@ -187,6 +191,10 @@ GLIB_DEPRECATED_IN_2_54
 GLIB_DEPRECATED_IN_2_54_FOR
 GLIB_DEPRECATED_IN_2_56
 GLIB_DEPRECATED_IN_2_56_FOR
+GLIB_DEPRECATED_IN_2_58
+GLIB_DEPRECATED_IN_2_58_FOR
+GLIB_DEPRECATED_IN_2_60
+GLIB_DEPRECATED_IN_2_60_FOR
 GLIB_VERSION_CUR_STABLE
 GLIB_VERSION_PREV_STABLE
 </SECTION>
@@ -476,6 +484,7 @@ G_CAN_INLINE
 inline
 G_HAVE___INLINE
 G_HAVE___INLINE__
+G_INLINE_DEFINE_NEEDED
 G_HAVE_GNUC_VARARGS
 G_HAVE_ISO_VARARGS
 G_HAVE_GROWING_STACK
@@ -486,6 +495,10 @@ GLIB_UNAVAILABLE
 G_ANALYZER_ANALYZING
 G_ANALYZER_NORETURN
 g_autoptr_cleanup_generic_gfree
+g_has_typeof
+g_macro__has_attribute
+g_macro__has_builtin
+g_macro__has_feature
 </SECTION>
 
 <SECTION>
@@ -1213,6 +1226,9 @@ g_log_writer_format_fields
 g_log_writer_journald
 g_log_writer_standard_streams
 g_log_writer_default
+
+<SUBSECTION Private>
+g_log_structured_standard
 </SECTION>
 
 <SECTION>
@@ -1888,6 +1904,7 @@ g_spaced_primes_closest
 
 <SUBSECTION>
 g_atexit
+g_abort
 
 <SUBSECTION>
 g_parse_debug_string
@@ -1908,6 +1925,9 @@ G_NATIVE_ATEXIT
 g_ATEXIT
 g_win32_get_system_data_dirs_for_module
 ATEXIT
+g_bit_nth_lsf_impl
+g_bit_nth_msf_impl
+g_bit_storage_impl
 
 </SECTION>
 
@@ -2600,6 +2620,8 @@ g_ptr_array_remove_index
 g_ptr_array_remove_fast
 g_ptr_array_remove_index_fast
 g_ptr_array_remove_range
+g_ptr_array_steal_index
+g_ptr_array_steal_index_fast
 g_ptr_array_sort
 g_ptr_array_sort_with_data
 g_ptr_array_set_size
@@ -3188,6 +3210,7 @@ GTestConfig
 GTestLogType
 GTestLogMsg
 GTestLogBuffer
+GTestResult
 
 g_test_log_type_name
 g_test_log_buffer_new
@@ -3407,6 +3430,7 @@ g_variant_builder_open
 g_variant_builder_close
 
 <SUBSECTION>
+G_VARIANT_DICT_INIT
 GVariantDict
 g_variant_dict_unref
 g_variant_dict_ref
@@ -3499,6 +3523,7 @@ g_atomic_rc_box_get_size
 
 <SECTION>
 <FILE>refstring</FILE>
+GRefString
 g_ref_string_new
 g_ref_string_new_intern
 g_ref_string_new_len
diff --git a/docs/reference/glib/meson.build b/docs/reference/glib/meson.build
index f14824bff..eca891a20 100644
--- a/docs/reference/glib/meson.build
+++ b/docs/reference/glib/meson.build
@@ -8,6 +8,8 @@ if get_option('gtk_doc')
     'gbsearcharray.h',
     'glib-private.h',
     'gmoduleconf.h',
+    'grcboxprivate.h',
+    'gstdioprivate.h',
     'gthreadprivate.h',
     'gunibreak.h',
     'gunicomp.h',
diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
index 6efe781e1..63ed6faf5 100644
--- a/docs/reference/gobject/Makefile.am
+++ b/docs/reference/gobject/Makefile.am
@@ -28,6 +28,7 @@ CFILE_GLOB=$(top_srcdir)/gobject/*.c
 IGNORE_HFILES = \
 	tests			\
 	gatomicarray.h		\
+	gobject_probes.h	\
 	gobject_trace.h		\
 	gtype-private.h
 
diff --git a/docs/reference/gobject/meson.build b/docs/reference/gobject/meson.build
index 014fe5405..7a7f1b81d 100644
--- a/docs/reference/gobject/meson.build
+++ b/docs/reference/gobject/meson.build
@@ -4,6 +4,7 @@ if get_option('gtk_doc')
   ignore_headers = [
     'tests',
     'gatomicarray.h',
+    'gobject_probes.h',
     'gobject_trace.h',
     'gtype-private.h'
   ]
diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 646b8ef2e..47cd73366 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -769,7 +769,7 @@ g_app_info_launch_default_for_uri (const char         *uri,
  * @uri: the uri to show
  * @context: (nullable): an optional #GAppLaunchContext
  * @cancellable: (nullable): a #GCancellable
- * @callback: (nullable): a #GASyncReadyCallback to call when the request is done
+ * @callback: (nullable): a #GAsyncReadyCallback to call when the request is done
  * @user_data: (nullable): data to pass to @callback
  *
  * Async version of g_app_info_launch_default_for_uri().
diff --git a/gio/gapplication.c b/gio/gapplication.c
index d4a0cd7ca..5a2f5adf7 100644
--- a/gio/gapplication.c
+++ b/gio/gapplication.c
@@ -208,8 +208,8 @@
  *     If this function returns %TRUE, registration will proceed; otherwise
  *     registration will abort. Since: 2.34
  * @dbus_unregister: invoked locally during unregistration, if the application
- *     is using its D-Bus backend. Use this to undo anything done by the
- *     @dbus_register vfunc. Since: 2.34
+ *     is using its D-Bus backend. Use this to undo anything done by
+ *     the @dbus_register vfunc. Since: 2.34
  * @handle_local_options: invoked locally after the parsing of the commandline
  *  options has occurred. Since: 2.40
  *
diff --git a/gio/gcancellable.c b/gio/gcancellable.c
index 48c736cca..de6d43495 100644
--- a/gio/gcancellable.c
+++ b/gio/gcancellable.c
@@ -339,7 +339,7 @@ g_cancellable_set_error_if_cancelled (GCancellable  *cancellable,
  *
  * See also g_cancellable_make_pollfd().
  *
- * Returns: A valid file descriptor. %-1 if the file descriptor 
+ * Returns: A valid file descriptor. `-1` if the file descriptor
  * is not supported, or on errors. 
  **/
 int
diff --git a/gio/gdatainputstream.c b/gio/gdatainputstream.c
index 9f207b158..c2b19fdc9 100644
--- a/gio/gdatainputstream.c
+++ b/gio/gdatainputstream.c
@@ -323,7 +323,7 @@ read_data (GDataInputStream  *stream,
  * 
  * Reads an unsigned 8-bit/1-byte value from @stream.
  *
- * Returns: an unsigned 8-bit/1-byte value read from the @stream or %0 
+ * Returns: an unsigned 8-bit/1-byte value read from the @stream or `0`
  * if an error occurred.
  **/
 guchar
@@ -353,7 +353,7 @@ g_data_input_stream_read_byte (GDataInputStream  *stream,
  * In order to get the correct byte order for this read operation, 
  * see g_data_input_stream_get_byte_order() and g_data_input_stream_set_byte_order().
  * 
- * Returns: a signed 16-bit/2-byte value read from @stream or %0 if 
+ * Returns: a signed 16-bit/2-byte value read from @stream or `0` if
  * an error occurred.
  **/
 gint16
@@ -397,7 +397,7 @@ g_data_input_stream_read_int16 (GDataInputStream  *stream,
  * In order to get the correct byte order for this read operation, 
  * see g_data_input_stream_get_byte_order() and g_data_input_stream_set_byte_order(). 
  * 
- * Returns: an unsigned 16-bit/2-byte value read from the @stream or %0 if 
+ * Returns: an unsigned 16-bit/2-byte value read from the @stream or `0` if
  * an error occurred. 
  **/
 guint16
@@ -445,7 +445,7 @@ g_data_input_stream_read_uint16 (GDataInputStream  *stream,
  * triggering the cancellable object from another thread. If the operation
  * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
  *   
- * Returns: a signed 32-bit/4-byte value read from the @stream or %0 if 
+ * Returns: a signed 32-bit/4-byte value read from the @stream or `0` if
  * an error occurred. 
  **/
 gint32
@@ -493,7 +493,7 @@ g_data_input_stream_read_int32 (GDataInputStream  *stream,
  * triggering the cancellable object from another thread. If the operation
  * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
  * 
- * Returns: an unsigned 32-bit/4-byte value read from the @stream or %0 if 
+ * Returns: an unsigned 32-bit/4-byte value read from the @stream or `0` if
  * an error occurred. 
  **/
 guint32
@@ -541,7 +541,7 @@ g_data_input_stream_read_uint32 (GDataInputStream  *stream,
  * triggering the cancellable object from another thread. If the operation
  * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
  * 
- * Returns: a signed 64-bit/8-byte value read from @stream or %0 if 
+ * Returns: a signed 64-bit/8-byte value read from @stream or `0` if
  * an error occurred.  
  **/
 gint64
@@ -589,7 +589,7 @@ g_data_input_stream_read_int64 (GDataInputStream  *stream,
  * triggering the cancellable object from another thread. If the operation
  * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
  * 
- * Returns: an unsigned 64-bit/8-byte read from @stream or %0 if 
+ * Returns: an unsigned 64-bit/8-byte read from @stream or `0` if
  * an error occurred. 
  **/
 guint64
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index c55a0abe2..0741c0eff 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -4548,7 +4548,7 @@ g_desktop_app_info_get_boolean (GDesktopAppInfo *info,
  *  a %NULL-terminated string array or %NULL if the specified
  *  key cannot be found. The array should be freed with g_strfreev().
  *
- * Since: 2.59.0
+ * Since: 2.60.0
  */
 gchar **
 g_desktop_app_info_get_string_list (GDesktopAppInfo *info,
diff --git a/gio/gmountoperation.c b/gio/gmountoperation.c
index d59acb3b5..c3f5d25d8 100644
--- a/gio/gmountoperation.c
+++ b/gio/gmountoperation.c
@@ -548,7 +548,7 @@ g_mount_operation_class_init (GMountOperationClass *klass)
    * GMountOperation:is-tcrypt-hidden-volume:
    *
    * Whether the device to be unlocked is a TCRYPT hidden volume.
-   * See https://www.veracrypt.fr/en/Hidden%20Volume.html.
+   * See [the VeraCrypt documentation](https://www.veracrypt.fr/en/Hidden%20Volume.html).
    *
    * Since: 2.58
    */
@@ -568,7 +568,7 @@ g_mount_operation_class_init (GMountOperationClass *klass)
   * In this context, a system volume is a volume with a bootloader
   * and operating system installed. This is only supported for Windows
   * operating systems. For further documentation, see
-  * https://www.veracrypt.fr/en/System%20Encryption.html.
+  * [the VeraCrypt documentation](https://www.veracrypt.fr/en/System%20Encryption.html).
   *
   * Since: 2.58
   */
@@ -585,7 +585,7 @@ g_mount_operation_class_init (GMountOperationClass *klass)
   * GMountOperation:pim:
   *
   * The VeraCrypt PIM value, when unlocking a VeraCrypt volume. See
-  * https://www.veracrypt.fr/en/Personal%20Iterations%20Multiplier%20(PIM).html.
+  * [the VeraCrypt documentation](https://www.veracrypt.fr/en/Personal%20Iterations%20Multiplier%20(PIM).html).
   *
   * Since: 2.58
   */
diff --git a/gio/gtlsdatabase.c b/gio/gtlsdatabase.c
index 4725d8c81..821af97e0 100644
--- a/gio/gtlsdatabase.c
+++ b/gio/gtlsdatabase.c
@@ -779,7 +779,7 @@ g_tls_database_lookup_certificate_for_handle_finish (GTlsDatabase            *se
  *
  * Lookup the issuer of @certificate in the database.
  *
- * The %issuer property
+ * The #GTlsCertificate:issuer property
  * of @certificate is not modified, and the two certificates are not hooked
  * into a chain.
  *
diff --git a/gio/gvolume.c b/gio/gvolume.c
index d3bd3b288..dd49df7d6 100644
--- a/gio/gvolume.c
+++ b/gio/gvolume.c
@@ -50,10 +50,10 @@
  * for credentials.
  *
  * The callback will be fired when the operation has resolved (either
- * with success or failure), and a #GAsyncReady structure will be
+ * with success or failure), and a #GAsyncResult instance will be
  * passed to the callback.  That callback should then call
  * g_volume_mount_finish() with the #GVolume instance and the
- * #GAsyncReady data to see if the operation was completed
+ * #GAsyncResult data to see if the operation was completed
  * successfully.  If an @error is present when g_volume_mount_finish()
  * is called, then it will be filled with any error information.
  *
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 39163aa7f..e072b8829 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -456,6 +456,7 @@ gtester_LDADD	 = libglib-2.0.la
 
 bin_SCRIPTS = gtester-report
 EXTRA_DIST += gtester-report.in
+CLEANFILES += gtester-report
 
 gtester-report: gtester-report.in Makefile
 	$(AM_V_GEN) set -e ; \
diff --git a/glib/docs.c b/glib/docs.c
index 562fef0aa..f45a1fee8 100644
--- a/glib/docs.c
+++ b/glib/docs.c
@@ -2835,6 +2835,54 @@
  * Since: 2.44
  */
 
+/* Warnings and Assertions {{{1 */
+
+/**
+ * SECTION:warnings
+ * @title: Warnings and Assertions
+ * @short_description: warnings and assertions to use in runtime code
+ *
+ * GLib defines several warning functions and assertions which can be used to
+ * warn of programmer errors when calling functions, and print error messages
+ * from command line programs.
+ *
+ * The g_return_if_fail(), g_return_val_if_fail(), g_return_if_reached() and
+ * g_return_val_if_reached() macros are intended as pre-condition assertions, to
+ * be used at the top of a public function to check that the function’s
+ * arguments are acceptable. Any failure of such a pre-condition assertion is
+ * considered a programming error on the part of the caller of the public API,
+ * and the program is considered to be in an undefined state afterwards. They
+ * are similar to the libc assert() function, but provide more context on
+ * failures.
+ *
+ * For example:
+ * |[<!-- language="C" -->
+ * gboolean
+ * g_dtls_connection_shutdown (GDtlsConnection  *conn,
+ *                             gboolean          shutdown_read,
+ *                             gboolean          shutdown_write,
+ *                             GCancellable     *cancellable,
+ *                             GError          **error)
+ * {
+ *   // local variable declarations
+ *
+ *   g_return_val_if_fail (G_IS_DTLS_CONNECTION (conn), FALSE);
+ *   g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), FALSE);
+ *   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ *
+ *   // function body
+ *
+ *   return return_val;
+ * }
+ * ]|
+ *
+ * g_print(), g_printerr() and g_set_print_handler() are intended to be used for
+ * output from command line applications, since they output to standard output
+ * and standard error by default — whereas functions like g_message() and
+ * g_log() may be redirected to special purpose message windows, files, or the
+ * system journal.
+ */
+
 /* Windows Compatibility Functions {{{1 */
 
 /**
diff --git a/glib/gmessages.c b/glib/gmessages.c
index a43ff0e58..0210b7a8e 100644
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -2752,9 +2752,12 @@ _g_log_writer_fallback (GLogLevelFlags   log_level,
 
 /**
  * g_return_if_fail_warning: (skip)
- * @log_domain: (nullable):
- * @pretty_function:
- * @expression: (nullable):
+ * @log_domain: (nullable): log domain
+ * @pretty_function: function containing the assertion
+ * @expression: (nullable): expression which failed
+ *
+ * Internal function used to print messages from the public g_return_if_fail()
+ * and g_return_val_if_fail() macros.
  */
 void
 g_return_if_fail_warning (const char *log_domain,
@@ -2770,11 +2773,14 @@ g_return_if_fail_warning (const char *log_domain,
 
 /**
  * g_warn_message: (skip)
- * @domain: (nullable):
- * @file:
- * @line:
- * @func:
- * @warnexpr: (nullable):
+ * @domain: (nullable): log domain
+ * @file: file containing the warning
+ * @line: line number of the warning
+ * @func: function containing the warning
+ * @warnexpr: (nullable): expression which failed
+ *
+ * Internal function used to print messages from the public g_warn_if_reached()
+ * and g_warn_if_fail() macros.
  */
 void
 g_warn_message (const char     *domain,
diff --git a/glib/gtestutils.c b/glib/gtestutils.c
index ac85f4b2b..874d5dc06 100644
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.c
@@ -2623,11 +2623,14 @@ g_assertion_message (const char     *domain,
 
 /**
  * g_assertion_message_expr: (skip)
- * @domain: (nullable):
- * @file:
- * @line:
- * @func:
- * @expr: (nullable):
+ * @domain: (nullable): log domain
+ * @file: file containing the assertion
+ * @line: line number of the assertion
+ * @func: function containing the assertion
+ * @expr: (nullable): expression which failed
+ *
+ * Internal function used to print messages from the public g_assert() and
+ * g_assert_not_reached() macros.
  */
 void
 g_assertion_message_expr (const char     *domain,