diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
index aee0baaef..72bfc81b5 100644
--- a/docs/reference/glib/Makefile.am
+++ b/docs/reference/glib/Makefile.am
@@ -35,6 +35,7 @@ IGNORE_HFILES = \
 	gunicomp.h		\
 	gunidecomp.h		\
 	gunichartables.h	\
+	glib_probes.h		\
 	glib_trace.h		\
 	libcharset.h		\
 	gdebug.h		\
diff --git a/docs/reference/glib/building.sgml b/docs/reference/glib/building.sgml
index 73eb03d6f..b88823743 100644
--- a/docs/reference/glib/building.sgml
+++ b/docs/reference/glib/building.sgml
@@ -517,7 +517,7 @@ How to compile GLib itself
           flag to avoid intra-library PLT jumps. A side-effect
           of this is that it is no longer possible to override
           internal uses of GLib functions with
-          <envvar>LD_PRELOAD</envvar>. Therefore, it may make
+          <envar>LD_PRELOAD</envar>. Therefore, it may make
           sense to turn this feature off in some situations.
           The <option>--disable-Bsymbolic</option> option allows
           to do that.
diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 2e0ba3ee6..d63ca6bec 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -744,6 +744,7 @@ g_static_private_free
 
 <SUBSECTION Private>
 GThreadFunctions
+g_thread_init_with_errorcheck_mutexes
 G_THREADS_ENABLED
 g_static_mutex_get_mutex_impl
 g_thread_use_default_impl
@@ -830,9 +831,6 @@ g_atomic_pointer_xor
 
 <SUBSECTION>
 g_atomic_int_exchange_and_add
-
-<SUBSECTION Private>
-G_ATOMIC_OP_USE_GCC_BUILTINS
 </SECTION>
 
 <SECTION>
diff --git a/glib/giochannel.c b/glib/giochannel.c
index 70e375aae..ff971f3e3 100644
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -955,7 +955,6 @@ g_io_channel_get_line_term (GIOChannel *channel,
  *                         This flag cannot be changed.
  * @G_IO_FLAG_IS_WRITABLE: indicates that the io channel is writable.
  *                          This flag cannot be changed.
- * @G_IO_FLAG_IS_WRITEABLE: misspelled alternate to @G_IO_FLAG_IS_WRITABLE.
  * @G_IO_FLAG_IS_SEEKABLE: indicates that the io channel is seekable,
  *                         i.e. that g_io_channel_seek_position() can
  *                         be used on it.  This flag cannot be changed.
@@ -969,6 +968,15 @@ g_io_channel_get_line_term (GIOChannel *channel,
  * read with g_io_channel_get_flags(), but not changed with
  * g_io_channel_set_flags().
  **/
+/**
+ * G_IO_FLAG_IS_WRITEABLE:
+ *
+ * This is a misspelled version of G_IO_FLAG_IS_WRITABLE that existed
+ * before the spelling was fixed in GLib 2.30.  It is kept here for
+ * compatibility reasons.
+ *
+ * Deprecated:2.30:Use G_IO_FLAG_IS_WRITABLE instead.
+ **/
 GIOStatus
 g_io_channel_set_flags (GIOChannel  *channel,
                         GIOFlags     flags,
diff --git a/glib/gmessages.c b/glib/gmessages.c
index b0c1cadda..3edb67c8a 100644
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -531,7 +531,7 @@ g_log_set_handler (const gchar	 *log_domain,
 
 /**
  * g_log_set_default_handler:
- * log_func: the log handler function
+ * @log_func: the log handler function
  * @user_data: data passed to the log handler
  *
  * Installs a default log handler which is used if no