[libgdata: 1/2] docs: Drop use of `<!-- -->` to delimit plurals

[Philip Withnall <pwithnall src gnome org>]

commit a40954718f7f0c1fb4ff5a4cf84a0076007fa907
Author: Philip Withnall <withnall endlessm com>
Date:   Wed Jul 24 15:28:00 2019 +0100

    docs: Drop use of `<!-- -->` to delimit plurals
    
    gtk-doc gained the ability to magically strip off the ‘s’ in a plural
    many years ago, so the workaround of splitting the ‘s’ from a class or
    function name is no longer needed.
    
    This clarifies the docs in the code a bit.
    
    This commit was made mechanically using
    ```
    git search-replace -f '<!-- -->s///s'
    ```
    
    Signed-off-by: Philip Withnall <withnall endlessm com>

 gdata/app/gdata-app-categories.c                   |  2 +-
 gdata/gd/gdata-gd-when.c                           |  4 ++--
 gdata/gdata-access-handler.c                       |  6 +++---
 gdata/gdata-authorization-domain.c                 |  8 ++++----
 gdata/gdata-authorizer.c                           |  8 ++++----
 gdata/gdata-batchable.c                            |  2 +-
 gdata/gdata-client-login-authorizer.c              |  8 ++++----
 gdata/gdata-commentable.c                          | 10 +++++-----
 gdata/gdata-entry.c                                | 10 +++++-----
 gdata/gdata-feed.c                                 |  8 ++++----
 gdata/gdata-oauth1-authorizer.c                    | 12 ++++++------
 gdata/gdata-parser.c                               |  2 +-
 gdata/gdata-service.c                              | 14 +++++++-------
 gdata/gdata-service.h                              |  2 +-
 gdata/media/gdata-media-group.c                    |  6 +++---
 gdata/services/calendar/gdata-calendar-event.c     |  6 +++---
 gdata/services/contacts/gdata-contacts-contact.c   | 22 +++++++++++-----------
 gdata/services/picasaweb/gdata-picasaweb-album.c   | 10 +++++-----
 gdata/services/picasaweb/gdata-picasaweb-comment.c |  2 +-
 gdata/services/picasaweb/gdata-picasaweb-file.c    |  8 ++++----
 gdata/services/youtube/gdata-youtube-comment.c     |  4 ++--
 gdata/services/youtube/gdata-youtube-service.c     |  2 +-
 gdata/services/youtube/gdata-youtube-video.c       |  4 ++--
 gdata/tests/gdata-dummy-authorizer.c               |  4 ++--
 24 files changed, 82 insertions(+), 82 deletions(-)
---
diff --git a/gdata/app/gdata-app-categories.c b/gdata/app/gdata-app-categories.c
index c21fa104..4a526e32 100644
--- a/gdata/app/gdata-app-categories.c
+++ b/gdata/app/gdata-app-categories.c
@@ -226,7 +226,7 @@ get_content_type (void)
  *
  * Returns a list of the categories in this category list.
  *
- * Return value: (element-type GData.Category) (transfer none): a #GList of #GDataCategory<!-- -->s
+ * Return value: (element-type GData.Category) (transfer none): a #GList of #GDataCategorys
  *
  * Since: 0.7.0
  */
diff --git a/gdata/gd/gdata-gd-when.c b/gdata/gd/gdata-gd-when.c
index 98010934..4df94a22 100644
--- a/gdata/gd/gdata-gd-when.c
+++ b/gdata/gd/gdata-gd-when.c
@@ -558,9 +558,9 @@ gdata_gd_when_set_value_string (GDataGDWhen *self, const gchar *value_string)
  * gdata_gd_when_get_reminders:
  * @self: a #GDataGDWhen
  *
- * Returns a list of the #GDataGDReminder<!-- -->s which are associated with this #GDataGDWhen.
+ * Returns a list of the #GDataGDReminders which are associated with this #GDataGDWhen.
  *
- * Return value: (element-type GData.GDReminder) (transfer none): a #GList of #GDataGDReminder<!-- -->s, or 
%NULL
+ * Return value: (element-type GData.GDReminder) (transfer none): a #GList of #GDataGDReminders, or %NULL
  *
  * Since: 0.4.0
  */
diff --git a/gdata/gdata-access-handler.c b/gdata/gdata-access-handler.c
index 0f228f27..8b044ecf 100644
--- a/gdata/gdata-access-handler.c
+++ b/gdata/gdata-access-handler.c
@@ -24,15 +24,15 @@
  * @stability: Stable
  * @include: gdata/gdata-access-handler.h
  *
- * #GDataAccessHandler is an interface which can be implemented by #GDataEntry<!-- -->s which can have their 
permissions controlled by an
- * access control list (ACL). It has a set of methods which allow the #GDataAccessRule<!-- -->s for the 
access handler/entry to be retrieved,
+ * #GDataAccessHandler is an interface which can be implemented by #GDataEntrys which can have their 
permissions controlled by an
+ * access control list (ACL). It has a set of methods which allow the #GDataAccessRules for the access 
handler/entry to be retrieved,
  * added, modified and deleted, with immediate effect.
  *
  * For an example of inserting an access rule into an ACL, see the documentation for #GDataAccessRule.
  *
  * When implementing the interface, classes must implement an <function>is_owner_rule</function> function. 
It's optional to implement a
  * <function>get_authorization_domain</function> function, but if it's not implemented, any operations on 
the access handler's
- * #GDataAccessRule<!-- -->s will be performed unauthorized (i.e. as if by a non-logged-in user). This will 
not usually work.
+ * #GDataAccessRules will be performed unauthorized (i.e. as if by a non-logged-in user). This will not 
usually work.
  *
  * Since: 0.3.0
  */
diff --git a/gdata/gdata-authorization-domain.c b/gdata/gdata-authorization-domain.c
index a0c640db..1867974e 100644
--- a/gdata/gdata-authorization-domain.c
+++ b/gdata/gdata-authorization-domain.c
@@ -24,19 +24,19 @@
  * @include: gdata/gdata-authorization-domain.h
  *
  * A #GDataAuthorizationDomain represents a single data domain which a user can authorize libgdata to 
access. This might be a domain covering the
- * whole of the user's Google Contacts account, for example. Typically, #GDataService<!-- -->s map to 
#GDataAuthorizationDomains in a one-to-one
+ * whole of the user's Google Contacts account, for example. Typically, #GDataServices map to 
#GDataAuthorizationDomains in a one-to-one
  * fashion, though some services (such as #GDataDocumentsService) use multiple authorization domains.
  *
- * The #GDataAuthorizationDomains<!-- -->s used by a service can be retrieved using 
gdata_service_get_authorization_domains(). The set of domains
+ * The #GDataAuthorizationDomainss used by a service can be retrieved using 
gdata_service_get_authorization_domains(). The set of domains
  * used by a given service is static and will never change at runtime.
  *
- * #GDataAuthorizationDomain<!-- -->s are used by a #GDataAuthorizer instance to request authorization to 
interact with data in those domains when
+ * #GDataAuthorizationDomains are used by a #GDataAuthorizer instance to request authorization to interact 
with data in those domains when
  * first authenticating and authorizing with the online service. Typically, a given #GDataAuthorizer will be 
passed a set of domains (or a service
  * type, from which it can retrieve the service's set of domains) at construction time, and will use those 
domains when initially asking the user for
  * authorization and whenever the authorization is refreshed afterwards. It's not expected that the set of 
domains used by a #GDataAuthorizer will
  * change after construction time.
  *
- * Note that it's not expected that #GDataAuthorizationDomain<!-- -->s will have to be constructed manually. 
All #GDataService<!-- -->s should provide
+ * Note that it's not expected that #GDataAuthorizationDomains will have to be constructed manually. All 
#GDataServices should provide
  * accessor functions to return instances of all the authorization domains they support.
  *
  * Since: 0.9.0
diff --git a/gdata/gdata-authorizer.c b/gdata/gdata-authorizer.c
index 933e425a..ca8002a9 100644
--- a/gdata/gdata-authorizer.c
+++ b/gdata/gdata-authorizer.c
@@ -23,14 +23,14 @@
  * @stability: Stable
  * @include: gdata/gdata-authorizer.h
  *
- * The #GDataAuthorizer interface provides a uniform way to implement authentication and authorization 
processes for use by #GDataService<!-- -->s.
+ * The #GDataAuthorizer interface provides a uniform way to implement authentication and authorization 
processes for use by #GDataServices.
  * Client code will construct a new #GDataAuthorizer instance of their choosing, such as 
#GDataClientLoginAuthorizer or #GDataOAuth2Authorizer, for
- * the #GDataService<!-- -->s which will be used by the client, then authenticates and authorizes with the 
#GDataAuthorizer instead of the
+ * the #GDataServices which will be used by the client, then authenticates and authorizes with the 
#GDataAuthorizer instead of the
  * #GDataService. The #GDataService then uses the #GDataAuthorizer to authorize individual network requests 
using whatever authorization token was
  * returned to the #GDataAuthorizer by the Google Accounts service.
  *
- * All #GDataAuthorizer implementations are expected to operate against a set of 
#GDataAuthorizationDomain<!-- -->s which are provided to the
- * authorizer at construction time. These domains specify which data domains the client expects to access 
using the #GDataService<!-- -->s they
+ * All #GDataAuthorizer implementations are expected to operate against a set of #GDataAuthorizationDomains 
which are provided to the
+ * authorizer at construction time. These domains specify which data domains the client expects to access 
using the #GDataServices they
  * have using the #GDataAuthorizer instance. Following the principle of least privilege, the set of domains 
should be the minimum such set of domains
  * which still allows the client to operate normally. Note that implementations of #GDataAuthorizationDomain 
may display the list of requested
  * authorization domains to the user for verification before authorization is granted.
diff --git a/gdata/gdata-batchable.c b/gdata/gdata-batchable.c
index 763909e1..4568decf 100644
--- a/gdata/gdata-batchable.c
+++ b/gdata/gdata-batchable.c
@@ -23,7 +23,7 @@
  * @stability: Stable
  * @include: gdata/gdata-batchable.h
  *
- * #GDataBatchable is an interface which can be implemented by #GDataService<!-- -->s which support batch 
operations on their entries. It allows the
+ * #GDataBatchable is an interface which can be implemented by #GDataServices which support batch operations 
on their entries. It allows the
  * creation of a #GDataBatchOperation for the service, which allows a set of batch operations to be run.
  *
  * Since: 0.7.0
diff --git a/gdata/gdata-client-login-authorizer.c b/gdata/gdata-client-login-authorizer.c
index 9edb789f..31edee36 100644
--- a/gdata/gdata-client-login-authorizer.c
+++ b/gdata/gdata-client-login-authorizer.c
@@ -470,7 +470,7 @@ is_authorized_for_domain (GDataAuthorizer *self, GDataAuthorizationDomain *domai
  *
  * Creates a new #GDataClientLoginAuthorizer. The @client_id must be unique for your application, and as 
registered with Google.
  *
- * The #GDataAuthorizationDomain<!-- -->s for the given @service_type (i.e. as returned by 
gdata_service_get_authorization_domains()) are the ones the
+ * The #GDataAuthorizationDomains for the given @service_type (i.e. as returned by 
gdata_service_get_authorization_domains()) are the ones the
  * user will be logged in to using the provided username and password when 
gdata_client_login_authorizer_authenticate() is called. Note that the same
  * username and password will be used for all domains.
  *
@@ -491,7 +491,7 @@ gdata_client_login_authorizer_new (const gchar *client_id, GType service_type)
 /**
  * gdata_client_login_authorizer_new_for_authorization_domains:
  * @client_id: your application's client ID
- * @authorization_domains: (element-type GDataAuthorizationDomain) (transfer none): a non-empty list of 
#GDataAuthorizationDomain<!-- -->s to be
+ * @authorization_domains: (element-type GDataAuthorizationDomain) (transfer none): a non-empty list of 
#GDataAuthorizationDomains to be
  * authorized against by the #GDataClientLoginAuthorizer
  *
  * Creates a new #GDataClientLoginAuthorizer. The @client_id must be unique for your application, and as 
registered with Google. This function is
@@ -499,7 +499,7 @@ gdata_client_login_authorizer_new (const gchar *client_id, GType service_type)
  * isn't suitable. For example, this could be because the #GDataClientLoginAuthorizer will be used with 
multiple #GDataService subclasses, or because
  * the client requires a specific set of authorization domains.
  *
- * The specified #GDataAuthorizationDomain<!-- -->s are the ones the user will be logged in to using the 
provided username and password when
+ * The specified #GDataAuthorizationDomains are the ones the user will be logged in to using the provided 
username and password when
  * gdata_client_login_authorizer_authenticate() is called. Note that the same username and password will be 
used for all domains.
  *
  * Return value: (transfer full): a new #GDataClientLoginAuthorizer, or %NULL; unref with g_object_unref()
@@ -1075,7 +1075,7 @@ gdata_client_login_authorizer_authenticate_finish (GDataClientLoginAuthorizer *s
  * If the operation was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
  *
  * If the operation errors or is cancelled part-way through, gdata_authorizer_is_authorized_for_domain() is 
guaranteed to return %FALSE
- * for all #GDataAuthorizationDomain<!-- -->s, even if authentication has succeeded for some of them already.
+ * for all #GDataAuthorizationDomains, even if authentication has succeeded for some of them already.
  *
  * A %GDATA_CLIENT_LOGIN_AUTHORIZER_ERROR_BAD_AUTHENTICATION will be returned if authentication failed due 
to an incorrect username or password.
  * Other #GDataClientLoginAuthorizerError errors can be returned for other conditions.
diff --git a/gdata/gdata-commentable.c b/gdata/gdata-commentable.c
index e46630f3..4718a9ef 100644
--- a/gdata/gdata-commentable.c
+++ b/gdata/gdata-commentable.c
@@ -30,7 +30,7 @@
  * Comments may be queried, added and deleted. Note that they may not be edited.
  *
  * #GDataCommentable objects may not support all operations on comments, on an instance-by-instance basis 
(i.e. it's an invalid assumption that if,
- * for example, one #GDataYouTubeVideo doesn't support adding comments all other #GDataYouTubeVideo<!-- -->s 
don't support adding comments either).
+ * for example, one #GDataYouTubeVideo doesn't support adding comments all other #GDataYouTubeVideos don't 
support adding comments either).
  * Specific documentation for a particular type of #GDataCommentable may state otherwise, though.
  *
  * <example>
@@ -133,13 +133,13 @@ get_comment_type (GDataCommentableInterface *iface)
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @error: a #GError, or %NULL
  *
- * Retrieves a #GDataFeed containing the #GDataComment<!-- -->s representing the comments on the 
#GDataCommentable which match the given @query.
+ * Retrieves a #GDataFeed containing the #GDataComments representing the comments on the #GDataCommentable 
which match the given @query.
  *
  * If the #GDataCommentable doesn't support commenting, %NULL will be returned and @error will be set to 
%GDATA_SERVICE_ERROR_FORBIDDEN. This is in
  * contrast to if it does support commenting but hasn't had any comments added yet, in which case an empty 
#GDataFeed will be returned and no error
  * will be set.
  *
- * Return value: (transfer full) (allow-none): a #GDataFeed of #GDataComment<!-- -->s, or %NULL; unref with 
g_object_unref()
+ * Return value: (transfer full) (allow-none): a #GDataFeed of #GDataComments, or %NULL; unref with 
g_object_unref()
  *
  * Since: 0.10.0
  */
@@ -214,7 +214,7 @@ query_comments_async_cb (GDataService *service, GAsyncResult *service_result, gp
  * @callback: a #GAsyncReadyCallback to call when the query is finished
  * @user_data: (closure): data to pass to the @callback function
  *
- * Retrieves a #GDataFeed containing the #GDataComment<!-- -->s representing the comments on the 
#GDataCommentable which match the given @query.
+ * Retrieves a #GDataFeed containing the #GDataComments representing the comments on the #GDataCommentable 
which match the given @query.
  * @self, @service and @query are all reffed when this method is called, so can safely be freed after this 
method returns.
  *
  * For more details, see gdata_commentable_query_comments(), which is the synchronous version of this method.
@@ -278,7 +278,7 @@ gdata_commentable_query_comments_async (GDataCommentable *self, GDataService *se
  *
  * Finishes an asynchronous comment query operation started with gdata_commentable_query_comments_async().
  *
- * Return value: (transfer full) (allow-none): a #GDataFeed of #GDataComment<!-- -->s, or %NULL; unref with 
g_object_unref()
+ * Return value: (transfer full) (allow-none): a #GDataFeed of #GDataComments, or %NULL; unref with 
g_object_unref()
  *
  * Since: 0.10.0
  */
diff --git a/gdata/gdata-entry.c b/gdata/gdata-entry.c
index 4a4f35a5..30488a83 100644
--- a/gdata/gdata-entry.c
+++ b/gdata/gdata-entry.c
@@ -978,9 +978,9 @@ gdata_entry_add_category (GDataEntry *self, GDataCategory *category)
  * gdata_entry_get_categories:
  * @self: a #GDataEntry
  *
- * Gets a list of the #GDataCategory<!-- -->s containing this entry.
+ * Gets a list of the #GDataCategorys containing this entry.
  *
- * Return value: (element-type GData.Category) (transfer none): a #GList of #GDataCategory<!-- -->s
+ * Return value: (element-type GData.Category) (transfer none): a #GList of #GDataCategorys
  *
  * Since: 0.2.0
  */
@@ -995,9 +995,9 @@ gdata_entry_get_categories (GDataEntry *self)
  * gdata_entry_get_authors:
  * @self: a #GDataEntry
  *
- * Gets a list of the #GDataAuthor<!-- -->s for this entry.
+ * Gets a list of the #GDataAuthors for this entry.
  *
- * Return value: (element-type GData.Author) (transfer none): a #GList of #GDataAuthor<!-- -->s
+ * Return value: (element-type GData.Author) (transfer none): a #GList of #GDataAuthors
  *
  * Since: 0.7.0
  */
@@ -1184,7 +1184,7 @@ gdata_entry_look_up_link (GDataEntry *self, const gchar *rel)
  *
  * If you will only use the first link found, consider calling gdata_entry_look_up_link() instead.
  *
- * Return value: (element-type GData.Link) (transfer container): a #GList of #GDataLink<!-- -->s, or %NULL 
if none were found; free the list with
+ * Return value: (element-type GData.Link) (transfer container): a #GList of #GDataLinks, or %NULL if none 
were found; free the list with
  * g_list_free()
  *
  * Since: 0.4.0
diff --git a/gdata/gdata-feed.c b/gdata/gdata-feed.c
index 00655511..c1e6aa93 100644
--- a/gdata/gdata-feed.c
+++ b/gdata/gdata-feed.c
@@ -763,7 +763,7 @@ _gdata_feed_new_from_json (GType feed_type, const gchar *json, gint length, GTyp
  *
  * Returns a list of the entries contained in this feed.
  *
- * Return value: (element-type GData.Entry) (transfer none): a #GList of #GDataEntry<!-- -->s
+ * Return value: (element-type GData.Entry) (transfer none): a #GList of #GDataEntrys
  */
 GList *
 gdata_feed_get_entries (GDataFeed *self)
@@ -809,7 +809,7 @@ gdata_feed_look_up_entry (GDataFeed *self, const gchar *id)
  *
  * Returns a list of the categories listed in this feed.
  *
- * Return value: (element-type GData.Category) (transfer none): a #GList of #GDataCategory<!-- -->s
+ * Return value: (element-type GData.Category) (transfer none): a #GList of #GDataCategorys
  */
 GList *
 gdata_feed_get_categories (GDataFeed *self)
@@ -830,7 +830,7 @@ _gdata_feed_add_category (GDataFeed *self, GDataCategory *category)
  *
  * Returns a list of the links listed in this feed.
  *
- * Return value: (element-type GData.Link) (transfer none): a #GList of #GDataLink<!-- -->s
+ * Return value: (element-type GData.Link) (transfer none): a #GList of #GDataLinks
  */
 GList *
 gdata_feed_get_links (GDataFeed *self)
@@ -882,7 +882,7 @@ _gdata_feed_add_link (GDataFeed *self, GDataLink *_link)
  *
  * Returns a list of the authors listed in this feed.
  *
- * Return value: (element-type GData.Author) (transfer none): a #GList of #GDataAuthor<!-- -->s
+ * Return value: (element-type GData.Author) (transfer none): a #GList of #GDataAuthors
  */
 GList *
 gdata_feed_get_authors (GDataFeed *self)
diff --git a/gdata/gdata-oauth1-authorizer.c b/gdata/gdata-oauth1-authorizer.c
index 46c58373..ecea5cbe 100644
--- a/gdata/gdata-oauth1-authorizer.c
+++ b/gdata/gdata-oauth1-authorizer.c
@@ -32,7 +32,7 @@
  * moving the authentication interface to a web page under Google's control.
  *
  * The OAuth 1.0 process as implemented by Google follows the <ulink type="http" 
url="http://tools.ietf.org/html/rfc5849";>OAuth 1.0 protocol as
- * specified by IETF in RFC 5849</ulink>, with a few additions to support scopes (implemented in libgdata by 
#GDataAuthorizationDomain<!-- -->s),
+ * specified by IETF in RFC 5849</ulink>, with a few additions to support scopes (implemented in libgdata by 
#GDataAuthorizationDomains),
  * locales and custom domains. Briefly, the process is initiated by requesting an authenticated request 
token from the Google accounts service
  * (using gdata_oauth1_authorizer_request_authentication_uri()), going to the authentication URI for the 
request token, authenticating and authorizing
  * access to the desired scopes, then providing the verifier returned by Google to the Google accounts 
service again (using
@@ -629,7 +629,7 @@ sign_message (GDataOAuth1Authorizer *self, SoupMessage *message, const gchar *to
  *
  * Creates a new #GDataOAuth1Authorizer.
  *
- * The #GDataAuthorizationDomain<!-- -->s for the given @service_type (i.e. as returned by 
gdata_service_get_authorization_domains()) are the ones the
+ * The #GDataAuthorizationDomains for the given @service_type (i.e. as returned by 
gdata_service_get_authorization_domains()) are the ones the
  * user will be requested to authorize access to on the page at the URI returned by 
gdata_oauth1_authorizer_request_authentication_uri().
  *
  * The given @application_name will set the value of #GDataOAuth1Authorizer:application-name and will be 
displayed to the user on authentication pages
@@ -650,14 +650,14 @@ gdata_oauth1_authorizer_new (const gchar *application_name, GType service_type)
 /**
  * gdata_oauth1_authorizer_new_for_authorization_domains:
  * @application_name: (allow-none): a human-readable, translated application name to use on authentication 
pages, or %NULL
- * @authorization_domains: (element-type GDataAuthorizationDomain) (transfer none): a non-empty list of 
#GDataAuthorizationDomain<!-- -->s to be
+ * @authorization_domains: (element-type GDataAuthorizationDomain) (transfer none): a non-empty list of 
#GDataAuthorizationDomains to be
  * authorized against by the #GDataOAuth1Authorizer
  *
  * Creates a new #GDataOAuth1Authorizer. This function is intended to be used only when the default 
authorization domain list for a single
  * #GDataService, as used by gdata_oauth1_authorizer_new(), isn't suitable. For example, this could be 
because the #GDataOAuth1Authorizer will be used
  * with multiple #GDataService subclasses, or because the client requires a specific set of authorization 
domains.
  *
- * The specified #GDataAuthorizationDomain<!-- -->s are the ones the user will be requested to authorize 
access to on the page at the URI returned by
+ * The specified #GDataAuthorizationDomains are the ones the user will be requested to authorize access to 
on the page at the URI returned by
  * gdata_oauth1_authorizer_request_authentication_uri().
  *
  * The given @application_name will set the value of #GDataOAuth1Authorizer:application-name and will be 
displayed to the user on authentication pages
@@ -701,7 +701,7 @@ gdata_oauth1_authorizer_new_for_authorization_domains (const gchar *application_
  *
  * Requests a fresh unauthenticated token from the Google accounts service and builds and returns the URI of 
an authentication page for that token.
  * This should then be presented to the user (e.g. in an embedded or stand alone web browser). The 
authentication page will ask the user to log in
- * using their Google account, then ask them to grant access to the #GDataAuthorizationDomain<!-- -->s 
passed to the constructor of the
+ * using their Google account, then ask them to grant access to the #GDataAuthorizationDomains passed to the 
constructor of the
  * #GDataOAuth1Authorizer. If the user grants access, they will be given a verifier, which can then be 
passed to
  * gdata_oauth1_authorizer_request_authorization() (along with the @token and @token_secret values returned 
by this method) to authorize the token.
  *
@@ -1004,7 +1004,7 @@ gdata_oauth1_authorizer_request_authentication_uri_finish (GDataOAuth1Authorizer
  * as were returned by gdata_oauth1_authorizer_request_authentication_uri() if it was successful.
  *
  * If the verifier is valid (i.e. the user granted access to the application and the Google accounts service 
has no reason to distrust the client),
- * %TRUE will be returned and any operations performed from that point onwards on #GDataService<!-- -->s 
using this #GDataAuthorizer will be
+ * %TRUE will be returned and any operations performed from that point onwards on #GDataServices using this 
#GDataAuthorizer will be
  * authorized.
  *
  * If the user denies access to the application or the Google accounts service distrusts it, a bogus 
verifier could be returned. In this case, %FALSE
diff --git a/gdata/gdata-parser.c b/gdata/gdata-parser.c
index 987cb17c..c1cfe00d 100644
--- a/gdata/gdata-parser.c
+++ b/gdata/gdata-parser.c
@@ -618,7 +618,7 @@ gdata_parser_int64_from_element (xmlNode *element, const gchar *element_name, GD
  * together in a large "or" statement based on their return values, for the purposes of determining whether 
any of the calls matched
  * a given @element. If any of the calls to gdata_parser_object_from_element_setter() return %TRUE, the 
value of @success can be examined.
  *
- * @_setter and @_parent_parsable are both #gpointer<!-- -->s to avoid casts having to be put into calls to 
gdata_parser_object_from_element_setter().
+ * @_setter and @_parent_parsable are both #gpointers to avoid casts having to be put into calls to 
gdata_parser_object_from_element_setter().
  * @_setter is actually of type #GDataParserSetterFunc, and @_parent_parsable should be a subclass of 
#GDataParsable.
  * Neither parameter should be %NULL. No checks are implemented against these conditions (for efficiency 
reasons), so calling code must be correct.
  *
diff --git a/gdata/gdata-service.c b/gdata/gdata-service.c
index 527805db..3597b13f 100644
--- a/gdata/gdata-service.c
+++ b/gdata/gdata-service.c
@@ -454,11 +454,11 @@ real_parse_error_response (GDataService *self, GDataOperationType operation_type
  * gdata_service_is_authorized:
  * @self: a #GDataService
  *
- * Determines whether the service is authorized for all the #GDataAuthorizationDomain<!-- -->s it belongs to 
(as returned by
+ * Determines whether the service is authorized for all the #GDataAuthorizationDomains it belongs to (as 
returned by
  * gdata_service_get_authorization_domains()). If the service's #GDataService:authorizer is %NULL, %FALSE is 
always returned.
  *
  * This is basically a convenience method for checking that the service's #GDataAuthorizer is authorized for 
all the service's
- * #GDataAuthorizationDomain<!-- -->s.
+ * #GDataAuthorizationDomains.
  *
  * Return value: %TRUE if the service is authorized for all its domains, %FALSE otherwise
  *
@@ -545,13 +545,13 @@ gdata_service_set_authorizer (GDataService *self, GDataAuthorizer *authorizer)
  * gdata_service_get_authorization_domains:
  * @service_type: the #GType of the #GDataService subclass to retrieve the authorization domains for
  *
- * Retrieves the full list of #GDataAuthorizationDomain<!-- -->s which relate to the specified 
@service_type. All the
- * #GDataAuthorizationDomain<!-- -->s are unique and interned, so can be compared with other domains by 
simple pointer comparison.
+ * Retrieves the full list of #GDataAuthorizationDomains which relate to the specified @service_type. All the
+ * #GDataAuthorizationDomains are unique and interned, so can be compared with other domains by simple 
pointer comparison.
  *
  * Note that in addition to this method, #GDataService subclasses may expose some or all of their 
authorization domains individually by means of
  * individual accessor functions.
  *
- * Return value: (transfer container) (element-type GDataAuthorizationDomain): an unordered list of 
#GDataAuthorizationDomain<!-- -->s; free with
+ * Return value: (transfer container) (element-type GDataAuthorizationDomain): an unordered list of 
#GDataAuthorizationDomains; free with
  * g_list_free()
  *
  * Since: 0.9.0
@@ -832,7 +832,7 @@ query_thread (GTask *task, gpointer source_object, gpointer task_data, GCancella
  * @domain: (allow-none): the #GDataAuthorizationDomain the query falls under, or %NULL
  * @feed_uri: the feed URI to query, including the host name and protocol
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @entry_type: a #GType for the #GDataEntry<!-- -->s to build from the XML
+ * @entry_type: a #GType for the #GDataEntrys to build from the XML
  * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @progress_callback: (allow-none) (closure progress_user_data): a #GDataQueryProgressCallback to call when 
an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
@@ -1052,7 +1052,7 @@ real_parse_feed (GDataService *self,
  * @domain: (allow-none): the #GDataAuthorizationDomain the query falls under, or %NULL
  * @feed_uri: the feed URI to query, including the host name and protocol
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @entry_type: a #GType for the #GDataEntry<!-- -->s to build from the XML
+ * @entry_type: a #GType for the #GDataEntrys to build from the XML
  * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @progress_callback: (allow-none) (scope call) (closure progress_user_data): a #GDataQueryProgressCallback 
to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
diff --git a/gdata/gdata-service.h b/gdata/gdata-service.h
index d0c656fb..f5fbdcb8 100644
--- a/gdata/gdata-service.h
+++ b/gdata/gdata-service.h
@@ -137,7 +137,7 @@ typedef struct {
  * using the given authorization domain; new in version 0.9.0
  * @parse_error_response: a function to parse error responses to queries from the online service. It should 
set the error
  * from the status, reason phrase and response body it is passed.
- * @get_authorization_domains: a function to return a newly-allocated list of all the 
#GDataAuthorizationDomain<!-- -->s the service makes use of;
+ * @get_authorization_domains: a function to return a newly-allocated list of all the 
#GDataAuthorizationDomains the service makes use of;
  * while the list should be newly-allocated, the individual domains should not be; not implementing this 
function is equivalent to returning an
  * empty list; new in version 0.9.0
  * @parse_feed: a function to parse feed responses to queries from the online
diff --git a/gdata/media/gdata-media-group.c b/gdata/media/gdata-media-group.c
index af2bf479..39a41f6b 100644
--- a/gdata/media/gdata-media-group.c
+++ b/gdata/media/gdata-media-group.c
@@ -529,9 +529,9 @@ gdata_media_group_look_up_content (GDataMediaGroup *self, const gchar *type)
  * gdata_media_group_get_contents:
  * @self: a #GDataMediaGroup
  *
- * Returns a list of #GDataMediaContent<!-- -->s, giving the content enclosed by the group.
+ * Returns a list of #GDataMediaContents, giving the content enclosed by the group.
  *
- * Return value: (element-type GData.MediaContent) (transfer none): a #GList of #GDataMediaContent<!-- -->s, 
 or %NULL
+ * Return value: (element-type GData.MediaContent) (transfer none): a #GList of #GDataMediaContents,  or 
%NULL
  */
 GList *
 gdata_media_group_get_contents (GDataMediaGroup *self)
@@ -649,7 +649,7 @@ gdata_media_group_get_media_rating (GDataMediaGroup *self, const gchar *rating_t
  *
  * Gets a list of the thumbnails available for the group.
  *
- * Return value: (element-type GData.MediaThumbnail) (transfer none): a #GList of #GDataMediaThumbnail<!-- 
-->s, or %NULL
+ * Return value: (element-type GData.MediaThumbnail) (transfer none): a #GList of #GDataMediaThumbnails, or 
%NULL
  */
 GList *
 gdata_media_group_get_thumbnails (GDataMediaGroup *self)
diff --git a/gdata/services/calendar/gdata-calendar-event.c b/gdata/services/calendar/gdata-calendar-event.c
index 7602798f..d11f0455 100644
--- a/gdata/services/calendar/gdata-calendar-event.c
+++ b/gdata/services/calendar/gdata-calendar-event.c
@@ -1595,7 +1595,7 @@ gdata_calendar_event_add_person (GDataCalendarEvent *self, GDataGDWho *who)
  *
  * Gets a list of the people attending the event.
  *
- * Return value: (element-type GData.GDWho) (transfer none): a #GList of #GDataGDWho<!-- -->s, or %NULL
+ * Return value: (element-type GData.GDWho) (transfer none): a #GList of #GDataGDWhos, or %NULL
  *
  * Since: 0.2.0
  */
@@ -1631,7 +1631,7 @@ gdata_calendar_event_add_place (GDataCalendarEvent *self, GDataGDWhere *where)
  *
  * Gets a list of the locations associated with the event.
  *
- * Return value: (element-type GData.GDWhere) (transfer none): a #GList of #GDataGDWhere<!-- -->s, or %NULL
+ * Return value: (element-type GData.GDWhere) (transfer none): a #GList of #GDataGDWheres, or %NULL
  *
  * Since: 0.2.0
  */
@@ -1677,7 +1677,7 @@ gdata_calendar_event_add_time (GDataCalendarEvent *self, GDataGDWhen *when)
  *
  * Gets a list of the time periods associated with the event.
  *
- * Return value: (element-type GData.GDWhen) (transfer none): a #GList of #GDataGDWhen<!-- -->s, or %NULL
+ * Return value: (element-type GData.GDWhen) (transfer none): a #GList of #GDataGDWhens, or %NULL
  *
  * Since: 0.2.0
  */
diff --git a/gdata/services/contacts/gdata-contacts-contact.c 
b/gdata/services/contacts/gdata-contacts-contact.c
index 389eceea..3fed49c6 100644
--- a/gdata/services/contacts/gdata-contacts-contact.c
+++ b/gdata/services/contacts/gdata-contacts-contact.c
@@ -2084,7 +2084,7 @@ gdata_contacts_contact_add_phone_number (GDataContactsContact *self, GDataGDPhon
  *
  * Gets a list of the phone numbers owned by the contact.
  *
- * Return value: (element-type GData.GDPhoneNumber) (transfer none): a #GList of #GDataGDPhoneNumber<!-- 
-->s, or %NULL
+ * Return value: (element-type GData.GDPhoneNumber) (transfer none): a #GList of #GDataGDPhoneNumbers, or 
%NULL
  *
  * Since: 0.2.0
  */
@@ -2256,7 +2256,7 @@ gdata_contacts_contact_add_organization (GDataContactsContact *self, GDataGDOrga
  *
  * Gets a list of the organizations to which the contact belongs.
  *
- * Return value: (element-type GData.GDOrganization) (transfer none): a #GList of #GDataGDOrganization<!-- 
-->s, or %NULL
+ * Return value: (element-type GData.GDOrganization) (transfer none): a #GList of #GDataGDOrganizations, or 
%NULL
  *
  * Since: 0.2.0
  */
@@ -2337,7 +2337,7 @@ gdata_contacts_contact_add_jot (GDataContactsContact *self, GDataGContactJot *jo
  *
  * Gets a list of the jots attached to the contact.
  *
- * Return value: (element-type GData.GContactJot) (transfer none): a #GList of #GDataGContactJot<!-- -->s, 
or %NULL
+ * Return value: (element-type GData.GContactJot) (transfer none): a #GList of #GDataGContactJots, or %NULL
  *
  * Since: 0.7.0
  */
@@ -2394,7 +2394,7 @@ gdata_contacts_contact_add_relation (GDataContactsContact *self, GDataGContactRe
  *
  * Gets a list of the relations of the contact.
  *
- * Return value: (element-type GData.GContactRelation) (transfer none): a #GList of 
#GDataGContactRelation<!-- -->s, or %NULL
+ * Return value: (element-type GData.GContactRelation) (transfer none): a #GList of #GDataGContactRelations, 
or %NULL
  *
  * Since: 0.7.0
  */
@@ -2431,7 +2431,7 @@ gdata_contacts_contact_remove_all_relations (GDataContactsContact *self)
  *
  * Adds a website to the contact's list of websites and increments its reference count.
  *
- * Duplicate websites will not be added to the list, though the same URI may appear in several 
#GDataGContactWebsite<!-- -->s with different
+ * Duplicate websites will not be added to the list, though the same URI may appear in several 
#GDataGContactWebsites with different
  * relation types or labels.
  *
  * Since: 0.7.0
@@ -2452,7 +2452,7 @@ gdata_contacts_contact_add_website (GDataContactsContact *self, GDataGContactWeb
  *
  * Gets a list of the websites of the contact.
  *
- * Return value: (element-type GData.GContactWebsite) (transfer none): a #GList of #GDataGContactWebsite<!-- 
-->s, or %NULL
+ * Return value: (element-type GData.GContactWebsite) (transfer none): a #GList of #GDataGContactWebsites, 
or %NULL
  *
  * Since: 0.7.0
  */
@@ -2534,7 +2534,7 @@ gdata_contacts_contact_add_event (GDataContactsContact *self, GDataGContactEvent
  *
  * Gets a list of the events of the contact.
  *
- * Return value: (element-type GData.GContactEvent) (transfer none): a #GList of #GDataGContactEvent<!-- 
-->s, or %NULL
+ * Return value: (element-type GData.GContactEvent) (transfer none): a #GList of #GDataGContactEvents, or 
%NULL
  *
  * Since: 0.7.0
  */
@@ -2571,7 +2571,7 @@ gdata_contacts_contact_remove_all_events (GDataContactsContact *self)
  *
  * Adds a calendar to the contact's list of calendars and increments its reference count.
  *
- * Duplicate calendars will not be added to the list, though the same URI may appear in several 
#GDataGContactCalendar<!-- -->s with different
+ * Duplicate calendars will not be added to the list, though the same URI may appear in several 
#GDataGContactCalendars with different
  * relation types or labels.
  *
  * Since: 0.7.0
@@ -2592,7 +2592,7 @@ gdata_contacts_contact_add_calendar (GDataContactsContact *self, GDataGContactCa
  *
  * Gets a list of the calendars of the contact.
  *
- * Return value: (element-type GData.GContactCalendar) (transfer none): a #GList of 
#GDataGContactCalendar<!-- -->s, or %NULL
+ * Return value: (element-type GData.GContactCalendar) (transfer none): a #GList of #GDataGContactCalendars, 
or %NULL
  *
  * Since: 0.7.0
  */
@@ -2674,7 +2674,7 @@ gdata_contacts_contact_add_external_id (GDataContactsContact *self, GDataGContac
  *
  * Gets a list of the external IDs of the contact.
  *
- * Return value: (element-type GData.GContactExternalID) (transfer none): a #GList of 
#GDataGContactExternalID<!-- -->s, or %NULL
+ * Return value: (element-type GData.GContactExternalID) (transfer none): a #GList of 
#GDataGContactExternalIDs, or %NULL
  *
  * Since: 0.7.0
  */
@@ -2788,7 +2788,7 @@ gdata_contacts_contact_add_language (GDataContactsContact *self, GDataGContactLa
  *
  * Gets a list of the languages of the contact.
  *
- * Return value: (element-type GData.GContactLanguage) (transfer none): a #GList of 
#GDataGContactLanguage<!-- -->s, or %NULL
+ * Return value: (element-type GData.GContactLanguage) (transfer none): a #GList of #GDataGContactLanguages, 
or %NULL
  *
  * Since: 0.7.0
  */
diff --git a/gdata/services/picasaweb/gdata-picasaweb-album.c 
b/gdata/services/picasaweb/gdata-picasaweb-album.c
index 515d34a9..cb55c04e 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-album.c
+++ b/gdata/services/picasaweb/gdata-picasaweb-album.c
@@ -35,10 +35,10 @@
  *     GDataFeed *album_feed;
  *     GList *album_entries;
  *
- *     /<!-- -->* Query for a feed of GDataPicasaWebAlbum<!-- -->s owned by user "libgdata.picasaweb" *<!-- 
-->/
+ *     /<!-- -->* Query for a feed of GDataPicasaWebAlbums owned by user "libgdata.picasaweb" *<!-- -->/
  *     album_feed = gdata_picasaweb_service_query_all_albums (service, NULL, "libgdata.picasaweb", NULL, 
NULL, NULL, NULL);
  *
- *     /<!-- -->* Get a list of GDataPicasaWebAlbum<!-- -->s from the query's feed *<!-- -->/
+ *     /<!-- -->* Get a list of GDataPicasaWebAlbums from the query's feed *<!-- -->/
  *     for (album_entries = gdata_feed_get_entries (album_feed); album_entries != NULL; album_entries = 
album_entries->next) {
  *             GDataPicasaWebAlbum *album;
  *             guint num_photos;
@@ -63,7 +63,7 @@
  *
  *                     thumbnail = GDATA_MEDIA_THUMBNAIL (thumbnails->data);
  *                     /<!-- -->* Do something fun with the thumbnails, like download and display them. We 
could just as easily download them into
- *                      * files using g_file_create() and g_output_stream_splice(), rather than create 
GdkPixbuf<!-- -->s directly from them.
+ *                      * files using g_file_create() and g_output_stream_splice(), rather than create 
GdkPixbufs directly from them.
  *                      * Note that this is a blocking operation. *<!-- -->/
  *                     download_stream = gdata_media_thumbnail_download (thumbnail, GDATA_SERVICE (service), 
NULL, NULL);
  *                     pixbuf = gdk_pixbuf_new_from_stream (G_INPUT_STREAM (download_stream), NULL, NULL);
@@ -173,7 +173,7 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass)
        /**
         * GDataPicasaWebAlbum:album-id:
         *
-        * The ID of the album. This is a substring of the ID returned by gdata_entry_get_id() for 
#GDataPicasaWebAlbum<!-- -->s; for example,
+        * The ID of the album. This is a substring of the ID returned by gdata_entry_get_id() for 
#GDataPicasaWebAlbums; for example,
         * if gdata_entry_get_id() returned 
"http://picasaweb.google.com/data/entry/user/libgdata.picasaweb/albumid/5328889949261497249"; for a
         * particular #GDataPicasaWebAlbum, the #GDataPicasaWebAlbum:album-id property would be 
"5328889949261497249".
         *
@@ -1208,7 +1208,7 @@ gdata_picasaweb_album_get_contents (GDataPicasaWebAlbum *self)
  *
  * Returns a list of thumbnails, often at different sizes, for this album.
  *
- * Return value: (element-type GData.MediaThumbnail) (transfer none): a #GList of #GDataMediaThumbnail<!-- 
-->s, or %NULL
+ * Return value: (element-type GData.MediaThumbnail) (transfer none): a #GList of #GDataMediaThumbnails, or 
%NULL
  *
  * Since: 0.4.0
  */
diff --git a/gdata/services/picasaweb/gdata-picasaweb-comment.c 
b/gdata/services/picasaweb/gdata-picasaweb-comment.c
index d43ea213..bb8b8ee4 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-comment.c
+++ b/gdata/services/picasaweb/gdata-picasaweb-comment.c
@@ -26,7 +26,7 @@
  * #GDataPicasaWebComment is a subclass of #GDataComment to represent a comment on a #GDataPicasaWebFile. It 
is returned by the #GDataCommentable
  * interface implementation on #GDataPicasaWebFile.
  *
- * It's possible to query for, add and delete #GDataPicasaWebComment<!-- -->s from #GDataPicasaWebFile<!-- 
-->s.
+ * It's possible to query for, add and delete #GDataPicasaWebComments from #GDataPicasaWebFiles.
  *
  * Since: 0.10.0
  */
diff --git a/gdata/services/picasaweb/gdata-picasaweb-file.c b/gdata/services/picasaweb/gdata-picasaweb-file.c
index dc80c865..d669d084 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-file.c
+++ b/gdata/services/picasaweb/gdata-picasaweb-file.c
@@ -39,10 +39,10 @@
  *     GDataFeed *photo_feed;
  *     GList *photo_entries;
  *
- *     /<!-- -->* Query for a feed of GDataPicasaWebFile<!-- -->s belonging to the given GDataPicasaWebAlbum 
album *<!-- -->/
+ *     /<!-- -->* Query for a feed of GDataPicasaWebFiles belonging to the given GDataPicasaWebAlbum album 
*<!-- -->/
  *     photo_feed = gdata_picasaweb_service_query_files (service, album, NULL, NULL, NULL, NULL, NULL);
  *
- *     /<!-- -->* Get a list of GDataPicasaWebFile<!-- -->s from the query's feed *<!-- -->/
+ *     /<!-- -->* Get a list of GDataPicasaWebFiles from the query's feed *<!-- -->/
  *     for (photo_entries = gdata_feed_get_entries (photo_feed); photo_entries != NULL; photo_entries = 
photo_entries->next) {
  *             GDataPicasaWebFile *photo;
  *             guint height, width;
@@ -207,7 +207,7 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
        /**
         * GDataPicasaWebFile:file-id:
         *
-        * The ID of the file. This is a substring of the ID returned by gdata_entry_get_id() for 
#GDataPicasaWebFile<!-- -->s; for example,
+        * The ID of the file. This is a substring of the ID returned by gdata_entry_get_id() for 
#GDataPicasaWebFiles; for example,
         * if gdata_entry_get_id() returned
         * 
"http://picasaweb.google.com/data/entry/user/libgdata.picasaweb/albumid/5328889949261497249/photoid/5328890138794566386";
 for a
         * particular #GDataPicasaWebFile, the #GDataPicasaWebFile:file-id property would be 
"5328890138794566386".
@@ -1588,7 +1588,7 @@ gdata_picasaweb_file_get_contents (GDataPicasaWebFile *self)
  * not be larger than the actual image, so thumbnails may be smaller
  * than the widths listed above.
  *
- * Return value: (element-type GData.MediaThumbnail) (transfer none): a #GList of #GDataMediaThumbnail<!-- 
-->s, or %NULL
+ * Return value: (element-type GData.MediaThumbnail) (transfer none): a #GList of #GDataMediaThumbnails, or 
%NULL
  *
  * Since: 0.4.0
  */
diff --git a/gdata/services/youtube/gdata-youtube-comment.c b/gdata/services/youtube/gdata-youtube-comment.c
index 7133e45e..1a19847b 100644
--- a/gdata/services/youtube/gdata-youtube-comment.c
+++ b/gdata/services/youtube/gdata-youtube-comment.c
@@ -26,10 +26,10 @@
  * #GDataYouTubeComment is a subclass of #GDataComment to represent a comment on a #GDataYouTubeVideo. It is 
returned by the #GDataCommentable
  * interface implementation on #GDataYouTubeVideo.
  *
- * It's possible to query for and add #GDataYouTubeComment<!-- -->s, but it is not possible to delete 
#GDataYouTubeComment<!-- -->s from any video
+ * It's possible to query for and add #GDataYouTubeComments, but it is not possible to delete 
#GDataYouTubeComments from any video
  * using the GData API.
  *
- * Comments on YouTube videos can be arranged in a hierarchy by their 
#GDataYouTubeComment:parent-comment-uri<!-- -->s. If a
+ * Comments on YouTube videos can be arranged in a hierarchy by their 
#GDataYouTubeComment:parent-comment-uris. If a
  * #GDataYouTubeComment<!-- -->'s parent comment URI is non-%NULL, it should match the %GDATA_LINK_SELF 
#GDataLink of another #GDataYouTubeComment on
  * the same video (as retrieved using gdata_entry_look_up_link() on the comments). Comments with 
#GDataYouTubeComment:parent-comment-uri set to %NULL
  * are top-level comments.
diff --git a/gdata/services/youtube/gdata-youtube-service.c b/gdata/services/youtube/gdata-youtube-service.c
index e408b2e2..8719bd45 100644
--- a/gdata/services/youtube/gdata-youtube-service.c
+++ b/gdata/services/youtube/gdata-youtube-service.c
@@ -1107,7 +1107,7 @@ gdata_youtube_service_get_developer_key (GDataYouTubeService *self)
  * @cancellable: (allow-none): a #GCancellable, or %NULL
  * @error: a #GError, or %NULL
  *
- * Gets a list of the categories currently in use on YouTube. The returned #GDataAPPCategories contains a 
list of #GDataYouTubeCategory<!-- -->s which
+ * Gets a list of the categories currently in use on YouTube. The returned #GDataAPPCategories contains a 
list of #GDataYouTubeCategorys which
  * enumerate the current YouTube categories.
  *
  * The category labels (#GDataCategory:label) are localised based on the value of #GDataService:locale.
diff --git a/gdata/services/youtube/gdata-youtube-video.c b/gdata/services/youtube/gdata-youtube-video.c
index dd1907d3..79019bc7 100644
--- a/gdata/services/youtube/gdata-youtube-video.c
+++ b/gdata/services/youtube/gdata-youtube-video.c
@@ -50,7 +50,7 @@
  *     published = gdata_entry_get_published (GDATA_ENTRY (video)); /<!-- -->* Date and time the video was 
originally published *<!-- -->/
  *     updated = gdata_entry_get_updated (GDATA_ENTRY (video)); /<!-- -->* When the video was most recently 
updated by the author *<!-- -->/
  *
- *     /<!-- -->* Get a list of GDataMediaThumbnail<!-- -->s for the video *<!-- -->/
+ *     /<!-- -->* Get a list of GDataMediaThumbnails for the video *<!-- -->/
  *     for (thumbnails = gdata_youtube_video_get_thumbnails (video); thumbnails != NULL; thumbnails = 
thumbnails->next)
  *             download_and_do_something_with_thumbnail (gdata_media_thumbnail_get_uri (thumbnail));
  *
@@ -2043,7 +2043,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
  *
  * Gets a list of the thumbnails available for the video.
  *
- * Return value: (element-type GData.MediaThumbnail) (transfer none): a #GList of #GDataMediaThumbnail<!-- 
-->s, or %NULL
+ * Return value: (element-type GData.MediaThumbnail) (transfer none): a #GList of #GDataMediaThumbnails, or 
%NULL
  */
 GList *
 gdata_youtube_video_get_thumbnails (GDataYouTubeVideo *self)
diff --git a/gdata/tests/gdata-dummy-authorizer.c b/gdata/tests/gdata-dummy-authorizer.c
index 5a73cc2b..b9b246e0 100644
--- a/gdata/tests/gdata-dummy-authorizer.c
+++ b/gdata/tests/gdata-dummy-authorizer.c
@@ -150,7 +150,7 @@ is_authorized_for_domain (GDataAuthorizer *self,
  *
  * Creates a new #GDataDummyAuthorizer.
  *
- * The #GDataAuthorizationDomain<!-- -->s for the given @service_type (i.e. as
+ * The #GDataAuthorizationDomains for the given @service_type (i.e. as
  * returned by gdata_service_get_authorization_domains()) will be authorized,
  * and all others will not.
  *
@@ -178,7 +178,7 @@ gdata_dummy_authorizer_new (GType service_type)
 /*
  * gdata_dummy_authorizer_new_for_authorization_domains:
  * @authorization_domains: (element-type GDataAuthorizationDomain) (transfer none):
- * a non-empty list of #GDataAuthorizationDomain<!-- -->s to be authorized
+ * a non-empty list of #GDataAuthorizationDomains to be authorized
  * against by the #GDataDummyAuthorizer
  *
  * Creates a new #GDataDummyAuthorizer. This function is intended to be used