diff --git a/glib/gerror.c b/glib/gerror.c
index 2f5f8a9cf..015d70968 100644
--- a/glib/gerror.c
+++ b/glib/gerror.c
@@ -391,7 +391,7 @@ g_error_new_valist (GQuark       domain,
  * @domain: error domain
  * @code: error code
  * @format: printf()-style format for error message
- * @Varargs: parameters for message format
+ * @...: parameters for message format
  *
  * Creates a new #GError with the given @domain and @code,
  * and a message formatted with @format.
@@ -521,7 +521,7 @@ g_error_matches (const GError *error,
  * @domain: error domain
  * @code: error code
  * @format: printf()-style format
- * @Varargs: args for @format
+ * @...: args for @format
  *
  * Does nothing if @err is %NULL; if @err is non-%NULL, then *@err
  * must be %NULL. A new #GError is created and assigned to *@err.
diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index fc101bdb2..75ba0449a 100644
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -1534,7 +1534,7 @@ g_build_pathv (const gchar  *separator,
  * g_build_path:
  * @separator: a string used to separator the elements of the path.
  * @first_element: the first element in the path
- * @Varargs: remaining elements in path, terminated by %NULL
+ * @...: remaining elements in path, terminated by %NULL
  * 
  * Creates a path from a series of elements using @separator as the
  * separator between elements. At the boundary between two elements,
@@ -1728,7 +1728,7 @@ g_build_filenamev (gchar **args)
 /**
  * g_build_filename:
  * @first_element: the first element in the path
- * @Varargs: remaining elements in path, terminated by %NULL
+ * @...: remaining elements in path, terminated by %NULL
  * 
  * Creates a filename from a series of elements using the correct
  * separator for filenames.
diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index 7cc1b0dc4..b588d9108 100644
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -2454,7 +2454,7 @@ g_markup_vprintf_escaped (const gchar *format,
 /**
  * g_markup_printf_escaped:
  * @format: printf() style format string
- * @Varargs: the arguments to insert in the format string
+ * @...: the arguments to insert in the format string
  *
  * Formats arguments according to @format, escaping
  * all string and character arguments in the fashion
diff --git a/glib/gmessages.c b/glib/gmessages.c
index 43b958fb0..986087567 100644
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -1034,7 +1034,7 @@ g_set_print_handler (GPrintFunc func)
 /**
  * g_print:
  * @format: the message format. See the printf() documentation
- * @Varargs: the parameters to insert into the format string
+ * @...: the parameters to insert into the format string
  *
  * Outputs a formatted message via the print handler.
  * The default print handler simply outputs the message to stdout.
@@ -1113,7 +1113,7 @@ g_set_printerr_handler (GPrintFunc func)
 /**
  * g_printerr:
  * @format: the message format. See the printf() documentation
- * @Varargs: the parameters to insert into the format string
+ * @...: the parameters to insert into the format string
  *
  * Outputs a formatted message via the error message handler.
  * The default handler simply outputs the message to stderr.
diff --git a/glib/gprintf.c b/glib/gprintf.c
index 9108acb1b..346fd956e 100644
--- a/glib/gprintf.c
+++ b/glib/gprintf.c
@@ -31,7 +31,7 @@
  * g_printf:
  * @format: a standard printf() format string, but notice 
  *          <link linkend="string-precision">string precision pitfalls</link>.
- * @Varargs: the arguments to insert in the output.
+ * @...: the arguments to insert in the output.
  *
  * An implementation of the standard printf() function which supports 
  * positional parameters, as specified in the Single Unix Specification.
@@ -59,7 +59,7 @@ g_printf (gchar const *format,
  * @file: the stream to write to.
  * @format: a standard printf() format string, but notice 
  *          <link linkend="string-precision">string precision pitfalls</link>.
- * @Varargs: the arguments to insert in the output.
+ * @...: the arguments to insert in the output.
  *
  * An implementation of the standard fprintf() function which supports 
  * positional parameters, as specified in the Single Unix Specification.
@@ -90,7 +90,7 @@ g_fprintf (FILE        *file,
  *          enough to hold the formatted result
  * @format: a standard printf() format string, but notice
  *          <link linkend="string-precision">string precision pitfalls</link>.
- * @Varargs: the arguments to insert in the output.
+ * @...: the arguments to insert in the output.
  *
  * An implementation of the standard sprintf() function which supports
  * positional parameters, as specified in the Single Unix Specification.
@@ -126,7 +126,7 @@ g_sprintf (gchar       *string,
  *     terminating nul character).
  * @format: a standard printf() format string, but notice
  *          <link linkend="string-precision">string precision pitfalls</link>.
- * @Varargs: the arguments to insert in the output.
+ * @...: the arguments to insert in the output.
  *
  * A safer form of the standard sprintf() function. The output is guaranteed
  * to not exceed @n characters (including the terminating nul character), so
diff --git a/glib/grel.c b/glib/grel.c
index 9ad586131..f790390fe 100644
--- a/glib/grel.c
+++ b/glib/grel.c
@@ -280,9 +280,9 @@ g_relation_index (GRelation   *relation,
 /**
  * g_relation_insert:
  * @relation: a #GRelation.
- * @Varargs: the fields of the record to add. These must match the
- *           number of fields in the #GRelation, and of type #gpointer
- *           or #gconstpointer.
+ * @...: the fields of the record to add. These must match the
+ *       number of fields in the #GRelation, and of type #gpointer
+ *       or #gconstpointer.
  *
  * Inserts a record into a #GRelation.
  *
@@ -516,8 +516,8 @@ g_relation_count (GRelation     *relation,
 /**
  * g_relation_exists:
  * @relation: a #GRelation.
- * @Varargs: the fields of the record to compare. The number must match
- *           the number of fields in the #GRelation.
+ * @...: the fields of the record to compare. The number must match
+ *       the number of fields in the #GRelation.
  * @Returns: %TRUE if a record matches.
  *
  * Returns %TRUE if a record with the given values exists in a
diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 71710aad9..c695c9fe3 100644
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -259,7 +259,7 @@ g_strdup_vprintf (const gchar *format,
  * g_strdup_printf:
  * @format: a standard printf() format string, but notice
  *     <link linkend="string-precision">string precision pitfalls</link>
- * @Varargs: the parameters to insert into the format string
+ * @...: the parameters to insert into the format string
  *
  * Similar to the standard C sprintf() function but safer, since it
  * calculates the maximum space required and allocates memory to hold
@@ -285,7 +285,7 @@ g_strdup_printf (const gchar *format,
 /**
  * g_strconcat:
  * @string1: the first string to add, which must not be %NULL
- * @Varargs: a %NULL-terminated list of strings to append to the string
+ * @...: a %NULL-terminated list of strings to append to the string
  *
  * Concatenates all of the given strings into one long string.
  * The returned string should be freed with g_free() when no longer needed.
@@ -2666,7 +2666,7 @@ g_strjoinv (const gchar  *separator,
 /**
  * g_strjoin:
  * @separator: a string to insert between each of the strings, or %NULL
- * @Varargs: a %NULL-terminated list of strings to join
+ * @...: a %NULL-terminated list of strings to join
  *
  * Joins a number of strings together to form one long string, with the
  * optional @separator inserted between each of them. The returned string
diff --git a/glib/gstring.c b/glib/gstring.c
index 59df749be..cd4d12620 100644
--- a/glib/gstring.c
+++ b/glib/gstring.c
@@ -1455,7 +1455,7 @@ g_string_vprintf (GString     *string,
  * g_string_sprintf:
  * @string: a #GString
  * @format: the string format. See the sprintf() documentation
- * @Varargs: the parameters to insert into the format string
+ * @...: the parameters to insert into the format string
  *
  * Writes a formatted string into a #GString.
  * This is similar to the standard sprintf() function,
@@ -1470,7 +1470,7 @@ g_string_vprintf (GString     *string,
  * g_string_printf:
  * @string: a #GString
  * @format: the string format. See the printf() documentation
- * @Varargs: the parameters to insert into the format string
+ * @...: the parameters to insert into the format string
  *
  * Writes a formatted string into a #GString.
  * This is similar to the standard sprintf() function,
@@ -1496,7 +1496,7 @@ g_string_printf (GString     *string,
  * g_string_sprintfa:
  * @string: a #GString
  * @format: the string format. See the sprintf() documentation
- * @Varargs: the parameters to insert into the format string
+ * @...: the parameters to insert into the format string
  *
  * Appends a formatted string onto the end of a #GString.
  * This function is similar to g_string_sprintf() except that
@@ -1509,7 +1509,7 @@ g_string_printf (GString     *string,
  * g_string_append_printf:
  * @string: a #GString
  * @format: the string format. See the printf() documentation
- * @Varargs: the parameters to insert into the format string
+ * @...: the parameters to insert into the format string
  *
  * Appends a formatted string onto the end of a #GString.
  * This function is similar to g_string_printf() except 
diff --git a/glib/gtestutils.c b/glib/gtestutils.c
index 4977bdb60..623ee12c9 100644
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.c
@@ -407,7 +407,7 @@ parse_args (gint    *argc_p,
  *        Changed if any arguments were handled.
  * @argv: Address of the @argv parameter of main().
  *        Any parameters understood by g_test_init() stripped before return.
- * @Varargs: Reserved for future extension. Currently, you must pass %NULL.
+ * @...: Reserved for future extension. Currently, you must pass %NULL.
  *
  * Initialize the GLib testing framework, e.g. by seeding the
  * test random number generator, the name for g_get_prgname()
@@ -705,7 +705,7 @@ g_test_timer_last (void)
  * g_test_minimized_result:
  * @minimized_quantity: the reported value
  * @format: the format string of the report message
- * @Varargs: arguments to pass to the printf() function
+ * @...: arguments to pass to the printf() function
  *
  * Report the result of a performance or measurement test.
  * The test should generally strive to minimize the reported
@@ -736,7 +736,7 @@ g_test_minimized_result (double          minimized_quantity,
  * g_test_maximized_result:
  * @maximized_quantity: the reported value
  * @format: the format string of the report message
- * @Varargs: arguments to pass to the printf() function
+ * @...: arguments to pass to the printf() function
  *
  * Report the result of a performance or measurement test.
  * The test should generally strive to maximize the reported