10 files changed, 17 insertions, 16 deletions
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index aade22c1f..d4490f570 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -1682,7 +1682,7 @@ tp_account_class_init (TpAccountClass *klass)
           G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
 
   /**
-   * TpAccount:storage-provider
+   * TpAccount:storage-provider:
    *
    * The storage provider for this account.
    *
@@ -1705,12 +1705,12 @@ tp_account_class_init (TpAccountClass *klass)
         G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
 
   /**
-   * TpAccount:storage-identifier
+   * TpAccount:storage-identifier:
    *
    * The storage identifier for this account.
    *
    * A provider-specific variant type used to identify this account with the
-   * provider. This value will be %NULL if #TpAccount::storage-provider is
+   * provider. This value will be %NULL if #TpAccount:storage-provider is
    * an empty string.
    *
    * This property cannot change once an Account has been created.
@@ -1735,7 +1735,7 @@ tp_account_class_init (TpAccountClass *klass)
    *
    * A bitfield of #TpStorageRestrictionFlags that give the limitations of
    * this account imposed by the storage provider. This value will be 0
-   * if #TpAccount::storage-provider is an empty string.
+   * if #TpAccount:storage-provider is an empty string.
    *
    * This property cannot change once an Account has been created.
    *
diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
index 4f3882909..0a9815fa2 100644
--- a/telepathy-glib/connection.c
+++ b/telepathy-glib/connection.c
@@ -2256,7 +2256,7 @@ tp_connection_add_client_interest (TpConnection *self,
  * Subscribe to any opt-in change notifications for @interested_in.
  *
  * Equivalent to, but a little more efficient than, calling
- * tp_connection_add_interest() for the string value of @interested_in.
+ * tp_connection_add_client_interest() for the string value of @interested_in.
  *
  * Since: 0.11.3
  */
diff --git a/telepathy-glib/contacts-mixin.c b/telepathy-glib/contacts-mixin.c
index de4ff616f..12fc25a0e 100644
--- a/telepathy-glib/contacts-mixin.c
+++ b/telepathy-glib/contacts-mixin.c
@@ -271,7 +271,7 @@ tp_contacts_mixin_finalize (GObject *obj)
  * @assumed_interfaces: A list of additional interfaces to retrieve attributes
  *  from. This can be used for interfaces documented as automatically included,
  *  like %TP_IFACE_CONNECTION for GetContactAttributes,
- *  or %TP_IFACE_CONNECTION and %TP_IFACE_CONNECTION_CONTACT_LIST for
+ *  or %TP_IFACE_CONNECTION and %TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST for
  *  GetContactListAttributes.
  * @sender: The DBus client's unique name. If this is not NULL, the requested handles
  * will be held on behalf of this client.
diff --git a/telepathy-glib/debug.c b/telepathy-glib/debug.c
index 4d4bb9d8e..aab3da12a 100644
--- a/telepathy-glib/debug.c
+++ b/telepathy-glib/debug.c
@@ -44,7 +44,7 @@
  * <listitem><literal>im</literal> - (text) instant messaging
  *    (service)</listitem>
  * <listitem><literal>properties</literal> -
- *    #TpDBusPropertiesMixin and #TpPropertiesMixin (service)</listitem>
+ *    <link linkend="telepathy-glib-dbus-properties-mixin">TpDBusPropertiesMixin</link> and #TpPropertiesMixin (service)</listitem>
  * <listitem><literal>params</literal> - connection manager parameters
  *    (service)</listitem>
  * <listitem><literal>handles</literal> - handle reference tracking tracking
diff --git a/telepathy-glib/exportable-channel.c b/telepathy-glib/exportable-channel.c
index f3fb42b09..5e0fdd98d 100644
--- a/telepathy-glib/exportable-channel.c
+++ b/telepathy-glib/exportable-channel.c
@@ -98,9 +98,10 @@ exportable_channel_base_init (gpointer klass)
        * (possibly mutable) properties not included here may also be exposed
        * via the D-Bus properties interface.
        *
-       * If the channel implementation uses #TpDBusPropertiesMixin, this
-       * property can implemented using
-       * #tp_dbus_properties_mixin_make_properties_hash as follows:
+       * If the channel implementation uses
+       * <link linkend="telepathy-glib-dbus-properties-mixin">TpDBusPropertiesMixin</link>,
+       * this property can implemented using
+       * tp_dbus_properties_mixin_make_properties_hash() as follows:
        *
        * <informalexample><programlisting>
        *  case PROP_CHANNEL_PROPERTIES:
diff --git a/telepathy-glib/handle-repo-dynamic.c b/telepathy-glib/handle-repo-dynamic.c
index b36a97b0c..1ba48ea68 100644
--- a/telepathy-glib/handle-repo-dynamic.c
+++ b/telepathy-glib/handle-repo-dynamic.c
@@ -36,7 +36,7 @@
  * perform validation and normalization on handle ID strings.
  *
  * Most connection managers will use this for all supported handle types
- * except %TP_HANDLE_TYPE_CONTACT_LIST.
+ * except %TP_HANDLE_TYPE_LIST.
  *
  * Changed in 0.13.8: handles are no longer reference-counted, and
  * the reference-count-related functions are stubs. Instead, handles remain
diff --git a/telepathy-glib/handle-repo.c b/telepathy-glib/handle-repo.c
index 2455e5067..a33ae6402 100644
--- a/telepathy-glib/handle-repo.c
+++ b/telepathy-glib/handle-repo.c
@@ -136,7 +136,7 @@ tp_handles_are_valid (TpHandleRepoIface *self,
  * Do nothing. Since version 0.13.8, handles always last as long as
  * the connection; previously, this function provided refcounting for handles.
  *
- * Changed in 0.13.6: %handle is now returned; previously,
+ * Changed in 0.13.6: @handle is now returned; previously,
  * this function didn't return anything.
  *
  * Returns: the same @handle
diff --git a/telepathy-glib/protocol.c b/telepathy-glib/protocol.c
index cba422a89..90238f77d 100644
--- a/telepathy-glib/protocol.c
+++ b/telepathy-glib/protocol.c
@@ -630,7 +630,7 @@ tp_protocol_class_init (TpProtocolClass *klass)
    * The name of an icon in the system's icon theme. If none was supplied
    * by the Protocol, or the %TP_PROTOCOL_FEATURE_CORE feature has not been
    * prepared, a default is used; currently, this is "im-" plus
-   * #TpProtocol:name.
+   * #TpProtocol:protocol-name.
    *
    * Since: 0.11.11
    */
diff --git a/telepathy-glib/signalled-message.c b/telepathy-glib/signalled-message.c
index d940d23a6..b42215890 100644
--- a/telepathy-glib/signalled-message.c
+++ b/telepathy-glib/signalled-message.c
@@ -128,8 +128,8 @@ tp_signalled_message_class_init (TpSignalledMessageClass *klass)
   /**
    * TpSignalledMessage:sender:
    *
-   * A #TpContat representing the sender of the message if known,
-   * otherwise %NULL.
+   * A #TpContact representing the sender of the message, if known, or %NULL
+   * otherwise.
    *
    * Since: 0.13.9
    */
diff --git a/telepathy-glib/stream-tube-connection.c b/telepathy-glib/stream-tube-connection.c
index c8e09a32d..5498dfad3 100644
--- a/telepathy-glib/stream-tube-connection.c
+++ b/telepathy-glib/stream-tube-connection.c
@@ -269,7 +269,7 @@ _tp_stream_tube_connection_new (
  *
  * Return the #TpStreamTubeConnection:socket-connection property
  *
- * Returns: (transfer none): the value of #TpStreamTubeConnection:connection
+ * Returns: (transfer none): the value of #TpStreamTubeConnection:socket-connection
  *
  * Since: 0.13.2
  */