Fix tmpl files

Signed-off-by: David Zeuthen <davidz@redhat.com>

diff --git a/docs/reference/glib/tmpl/conversions.sgml b/docs/reference/glib/tmpl/conversions.sgml
index e68cde3..2dea268 100644 (file)
--- a/docs/reference/glib/tmpl/conversions.sgml
+++ b/docs/reference/glib/tmpl/conversions.sgml
@@ -192,12 +192,12 @@ Character Set Conversion
 
 </para>
 
-@G_CONVERT_ERROR_NO_CONVERSION:
-@G_CONVERT_ERROR_ILLEGAL_SEQUENCE:
-@G_CONVERT_ERROR_FAILED:
-@G_CONVERT_ERROR_PARTIAL_INPUT:
-@G_CONVERT_ERROR_BAD_URI:
-@G_CONVERT_ERROR_NOT_ABSOLUTE_PATH:
+@G_CONVERT_ERROR_NO_CONVERSION: 
+@G_CONVERT_ERROR_ILLEGAL_SEQUENCE: 
+@G_CONVERT_ERROR_FAILED: 
+@G_CONVERT_ERROR_PARTIAL_INPUT: 
+@G_CONVERT_ERROR_BAD_URI: 
+@G_CONVERT_ERROR_NOT_ABSOLUTE_PATH: 
 
 <!-- ##### FUNCTION g_get_charset ##### -->
 <para>

diff --git a/docs/reference/glib/tmpl/glib-unused.sgml b/docs/reference/glib/tmpl/glib-unused.sgml
index 7b57189..3d551f7 100644 (file)
--- a/docs/reference/glib/tmpl/glib-unused.sgml
+++ b/docs/reference/glib/tmpl/glib-unused.sgml
@@ -937,6 +937,46 @@ Turns the argument into a string literal by using the '#' stringizing operator.
 </para>
 
 
+<!-- ##### VARIABLE glib_binary_age ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION glib_check_version ##### -->
+<para>
+
+</para>
+
+@required_major: 
+@required_minor: 
+@required_micro: 
+@Returns: 
+
+<!-- ##### VARIABLE glib_interface_age ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### VARIABLE glib_major_version ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### VARIABLE glib_micro_version ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### VARIABLE glib_minor_version ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### MACRO lseek ##### -->
 <para>
 

diff --git a/docs/reference/glib/tmpl/gregex.sgml b/docs/reference/glib/tmpl/gregex.sgml
index d342b97..8167906 100644 (file)
--- a/docs/reference/glib/tmpl/gregex.sgml
+++ b/docs/reference/glib/tmpl/gregex.sgml
@@ -25,55 +25,55 @@ Perl-compatible regular expressions
 
 </para>
 
-@G_REGEX_ERROR_COMPILE:
-@G_REGEX_ERROR_OPTIMIZE:
-@G_REGEX_ERROR_REPLACE:
-@G_REGEX_ERROR_MATCH:
-@G_REGEX_ERROR_INTERNAL:
-@G_REGEX_ERROR_STRAY_BACKSLASH:
-@G_REGEX_ERROR_MISSING_CONTROL_CHAR:
-@G_REGEX_ERROR_UNRECOGNIZED_ESCAPE:
-@G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER:
-@G_REGEX_ERROR_QUANTIFIER_TOO_BIG:
-@G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS:
-@G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS:
-@G_REGEX_ERROR_RANGE_OUT_OF_ORDER:
-@G_REGEX_ERROR_NOTHING_TO_REPEAT:
-@G_REGEX_ERROR_UNRECOGNIZED_CHARACTER:
-@G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS:
-@G_REGEX_ERROR_UNMATCHED_PARENTHESIS:
-@G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE:
-@G_REGEX_ERROR_UNTERMINATED_COMMENT:
-@G_REGEX_ERROR_EXPRESSION_TOO_LARGE:
-@G_REGEX_ERROR_MEMORY_ERROR:
-@G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND:
-@G_REGEX_ERROR_MALFORMED_CONDITION:
-@G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES:
-@G_REGEX_ERROR_ASSERTION_EXPECTED:
-@G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME:
-@G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED:
-@G_REGEX_ERROR_HEX_CODE_TOO_LARGE:
-@G_REGEX_ERROR_INVALID_CONDITION:
-@G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND:
-@G_REGEX_ERROR_INFINITE_LOOP:
-@G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR:
-@G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME:
-@G_REGEX_ERROR_MALFORMED_PROPERTY:
-@G_REGEX_ERROR_UNKNOWN_PROPERTY:
-@G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG:
-@G_REGEX_ERROR_TOO_MANY_SUBPATTERNS:
-@G_REGEX_ERROR_INVALID_OCTAL_VALUE:
-@G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE:
-@G_REGEX_ERROR_DEFINE_REPETION:
-@G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS:
-@G_REGEX_ERROR_MISSING_BACK_REFERENCE:
+@G_REGEX_ERROR_COMPILE: 
+@G_REGEX_ERROR_OPTIMIZE: 
+@G_REGEX_ERROR_REPLACE: 
+@G_REGEX_ERROR_MATCH: 
+@G_REGEX_ERROR_INTERNAL: 
+@G_REGEX_ERROR_STRAY_BACKSLASH: 
+@G_REGEX_ERROR_MISSING_CONTROL_CHAR: 
+@G_REGEX_ERROR_UNRECOGNIZED_ESCAPE: 
+@G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER: 
+@G_REGEX_ERROR_QUANTIFIER_TOO_BIG: 
+@G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS: 
+@G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS: 
+@G_REGEX_ERROR_RANGE_OUT_OF_ORDER: 
+@G_REGEX_ERROR_NOTHING_TO_REPEAT: 
+@G_REGEX_ERROR_UNRECOGNIZED_CHARACTER: 
+@G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS: 
+@G_REGEX_ERROR_UNMATCHED_PARENTHESIS: 
+@G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE: 
+@G_REGEX_ERROR_UNTERMINATED_COMMENT: 
+@G_REGEX_ERROR_EXPRESSION_TOO_LARGE: 
+@G_REGEX_ERROR_MEMORY_ERROR: 
+@G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND: 
+@G_REGEX_ERROR_MALFORMED_CONDITION: 
+@G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES: 
+@G_REGEX_ERROR_ASSERTION_EXPECTED: 
+@G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME: 
+@G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED: 
+@G_REGEX_ERROR_HEX_CODE_TOO_LARGE: 
+@G_REGEX_ERROR_INVALID_CONDITION: 
+@G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND: 
+@G_REGEX_ERROR_INFINITE_LOOP: 
+@G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR: 
+@G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME: 
+@G_REGEX_ERROR_MALFORMED_PROPERTY: 
+@G_REGEX_ERROR_UNKNOWN_PROPERTY: 
+@G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG: 
+@G_REGEX_ERROR_TOO_MANY_SUBPATTERNS: 
+@G_REGEX_ERROR_INVALID_OCTAL_VALUE: 
+@G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE: 
+@G_REGEX_ERROR_DEFINE_REPETION: 
+@G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS: 
+@G_REGEX_ERROR_MISSING_BACK_REFERENCE: 
 
 <!-- ##### MACRO G_REGEX_ERROR ##### -->
 <para>
 
 </para>
 
-@Since:
+@Since: 
 
 
 <!-- ##### ENUM GRegexCompileFlags ##### -->
@@ -81,37 +81,35 @@ Perl-compatible regular expressions
 
 </para>
 
-@G_REGEX_CASELESS:
-@G_REGEX_MULTILINE:
-@G_REGEX_DOTALL:
-@G_REGEX_EXTENDED:
-@G_REGEX_ANCHORED:
-@G_REGEX_DOLLAR_ENDONLY:
-@G_REGEX_UNGREEDY:
-@G_REGEX_RAW:
-@G_REGEX_NO_AUTO_CAPTURE:
-@G_REGEX_OPTIMIZE:
-@G_REGEX_DUPNAMES:
-@G_REGEX_NEWLINE_CR:
-@G_REGEX_NEWLINE_LF:
-@G_REGEX_NEWLINE_CRLF:
-
+@G_REGEX_CASELESS: 
+@G_REGEX_MULTILINE: 
+@G_REGEX_DOTALL: 
+@G_REGEX_EXTENDED: 
+@G_REGEX_ANCHORED: 
+@G_REGEX_DOLLAR_ENDONLY: 
+@G_REGEX_UNGREEDY: 
+@G_REGEX_RAW: 
+@G_REGEX_NO_AUTO_CAPTURE: 
+@G_REGEX_OPTIMIZE: 
+@G_REGEX_DUPNAMES: 
+@G_REGEX_NEWLINE_CR: 
+@G_REGEX_NEWLINE_LF: 
+@G_REGEX_NEWLINE_CRLF: 
 
 <!-- ##### ENUM GRegexMatchFlags ##### -->
 <para>
 
 </para>
 
-@G_REGEX_MATCH_ANCHORED:
-@G_REGEX_MATCH_NOTBOL:
-@G_REGEX_MATCH_NOTEOL:
-@G_REGEX_MATCH_NOTEMPTY:
-@G_REGEX_MATCH_PARTIAL:
-@G_REGEX_MATCH_NEWLINE_CR:
-@G_REGEX_MATCH_NEWLINE_LF:
-@G_REGEX_MATCH_NEWLINE_CRLF:
-@G_REGEX_MATCH_NEWLINE_ANY:
-
+@G_REGEX_MATCH_ANCHORED: 
+@G_REGEX_MATCH_NOTBOL: 
+@G_REGEX_MATCH_NOTEOL: 
+@G_REGEX_MATCH_NOTEMPTY: 
+@G_REGEX_MATCH_PARTIAL: 
+@G_REGEX_MATCH_NEWLINE_CR: 
+@G_REGEX_MATCH_NEWLINE_LF: 
+@G_REGEX_MATCH_NEWLINE_CRLF: 
+@G_REGEX_MATCH_NEWLINE_ANY: 
 
 <!-- ##### STRUCT GRegex ##### -->
 <para>
@@ -124,10 +122,10 @@ Perl-compatible regular expressions
 
 </para>
 
-@match_info:
-@result:
-@user_data:
-@Returns:
+@match_info: 
+@result: 
+@user_data: 
+@Returns: 
 
 
 <!-- ##### FUNCTION g_regex_new ##### -->

diff --git a/docs/reference/glib/tmpl/messages.sgml b/docs/reference/glib/tmpl/messages.sgml
index 245a775..2c4e8d8 100644 (file)
--- a/docs/reference/glib/tmpl/messages.sgml
+++ b/docs/reference/glib/tmpl/messages.sgml
@@ -117,18 +117,15 @@ documentation.
 @args: the parameters to insert into the format string.
 
 
-<!-- ##### FUNCTION g_message ##### -->
+<!-- ##### MACRO g_message ##### -->
 <para>
 A convenience function/macro to log a normal message.
 </para>
 
-@format: 
-@Varargs: 
-<!-- # Unused Parameters # -->
 @...: format string, followed by parameters to insert into the format string (as with printf())
 
 
-<!-- ##### FUNCTION g_warning ##### -->
+<!-- ##### MACRO g_warning ##### -->
 <para>
 A convenience function/macro to log a warning message.
 </para>
@@ -138,13 +135,10 @@ You can make warnings fatal at runtime by setting the %G_DEBUG environment
 variable (see <ulink url="glib-running.html">Running GLib Applications</ulink>).
 </para>
 
-@format: 
-@Varargs: 
-<!-- # Unused Parameters # -->
 @...: format string, followed by parameters to insert into the format string (as with printf())
 
 
-<!-- ##### FUNCTION g_critical ##### -->
+<!-- ##### MACRO g_critical ##### -->
 <para>
 Logs a "critical warning" (#G_LOG_LEVEL_CRITICAL). It's more or less
 application-defined what constitutes a critical vs. a regular
@@ -159,13 +153,10 @@ the %G_DEBUG environment variable (see
 <ulink url="glib-running.html">Running GLib Applications</ulink>).
 </para>
 
-@format: 
-@Varargs: 
-<!-- # Unused Parameters # -->
 @...: format string, followed by parameters to insert into the format string (as with printf())
 
 
-<!-- ##### FUNCTION g_error ##### -->
+<!-- ##### MACRO g_error ##### -->
 <para>
 A convenience function/macro to log an error message.
 Error messages are always fatal, resulting in a call to
@@ -175,22 +166,16 @@ expect. Using this function indicates a bug in your program, i.e. an
 assertion failure.
 </para>
 
-@format: 
-@Varargs: 
-<!-- # Unused Parameters # -->
 @...: format string, followed by parameters to insert into the format string (as with printf())
 
 
-<!-- ##### FUNCTION g_debug ##### -->
+<!-- ##### MACRO g_debug ##### -->
 <para>
 A convenience function/macro to log a debug message.
 </para>
 
-@format: 
-@Varargs: 
-@Since: 2.6
-<!-- # Unused Parameters # -->
 @...: format string, followed by parameters to insert into the format string (as with printf())
+@Since: 2.6
 
 
 <!-- ##### FUNCTION g_log_set_handler ##### -->

diff --git a/docs/reference/glib/tmpl/version.sgml b/docs/reference/glib/tmpl/version.sgml
index 027a0f4..dca4ac9 100644 (file)
--- a/docs/reference/glib/tmpl/version.sgml
+++ b/docs/reference/glib/tmpl/version.sgml
@@ -22,47 +22,6 @@ typically use the features described here.
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### VARIABLE glib_major_version ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### VARIABLE glib_minor_version ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### VARIABLE glib_micro_version ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### VARIABLE glib_binary_age ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### VARIABLE glib_interface_age ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION glib_check_version ##### -->
-<para>
-
-</para>
-
-@required_major: 
-@required_minor: 
-@required_micro: 
-@Returns: 
-
-
 <!-- ##### MACRO GLIB_MAJOR_VERSION ##### -->
 <para>
 The major version number of the GLib library.