docs: Improve man page consistency

Make Options sections refsect1 instead of refsect2, and use
uppercase for argument names. Also add a product name, and
shorten some argument names.

docs/reference/gio/gdbus-codegen.xml

@@ -1,5 +1,18 @@
 <refentry id="gdbus-codegen" lang="en">
 
+<refentryinfo>
+  <title>gdbus</title>
+  <productname>GIO</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>David</firstname>
+      <surname>Zeuthen</surname>
+      <email>zeuthen@gmail.com</email>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
 <refmeta>
   <refentrytitle>gdbus-codegen</refentrytitle>
   <manvolnum>1</manvolnum>
@@ -819,14 +832,6 @@ on_handle_hello_world (MyAppFrobber           *interface,
   </para>
 </refsect1>
 
-<refsect1>
-  <title>Author</title>
-  <para>
-    Written by David Zeuthen <email><![CDATA[zeuthen@gmail.com]]></email> with
-    a lot of help from many others.
-  </para>
-</refsect1>
-
 <refsect1>
   <title>Bugs</title>
   <para>

docs/reference/gio/gdbus.xml

@@ -1,5 +1,18 @@
 <refentry id="gdbus" lang="en">
 
+<refentryinfo>
+  <title>gdbus</title>
+  <productname>GIO</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>David</firstname>
+      <surname>Zeuthen</surname>
+      <email>zeuthen@gmail.com</email>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
 <refmeta>
   <refentrytitle>gdbus</refentrytitle>
   <manvolnum>1</manvolnum>
@@ -89,7 +102,8 @@
   <para>
     <command>gdbus</command> is a simple tool for working with D-Bus objects.
   </para>
-  <refsect2>
+</refsect1>
+<refsect1>
     <title>Commands</title>
     <variablelist>
       <varlistentry>
@@ -140,7 +154,6 @@
         </para></listitem>
       </varlistentry>
     </variablelist>
-  </refsect2>
 </refsect1>
 
 <refsect1>
@@ -327,15 +340,7 @@ $ gdbus emit --session --object-path /bar --signal org.bar.Bar someString --dest
 </refsect1>
 
 <refsect1>
-  <title>AUTHOR</title>
+  <title>Bugs</title>
-  <para>
-    Written by David Zeuthen <email>zeuthen@gmail.com</email> with
-    a lot of help from many others.
-  </para>
-</refsect1>
-
-<refsect1>
-  <title>BUGS</title>
   <para>
     Please send bug reports to either the distribution bug tracker
     or the upstream bug tracker at
@@ -344,7 +349,7 @@ $ gdbus emit --session --object-path /bar --signal org.bar.Bar someString --dest
 </refsect1>
 
 <refsect1>
-  <title>SEE ALSO</title>
+  <title>See Also</title>
   <para>
     <citerefentry>
       <refentrytitle>dbus-send</refentrytitle><manvolnum>1</manvolnum>

docs/reference/gio/gio-querymodules.xml

@@ -1,5 +1,17 @@
 <refentry id="gio-querymodules" lang="en">
 
+<refentryinfo>
+  <title>glib-compile-schemas</title>
+  <productname>GIO</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Alexander</firstname>
+      <surname>Larsson</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
 <refmeta>
   <refentrytitle>gio-querymodules</refentrytitle>
   <manvolnum>1</manvolnum>
@@ -14,7 +26,7 @@
 <refsynopsisdiv>
   <cmdsynopsis>
     <command>gio-querymodules</command>
-    <arg choice="req" rep="repeat">directory</arg>
+    <arg choice="req" rep="repeat">DIRECTORY</arg>
   </cmdsynopsis>
 </refsynopsisdiv>
 

docs/reference/gio/glib-compile-resources.xml

@@ -1,5 +1,17 @@
 <refentry id="glib-compile-resources" lang="en">
 
+<refentryinfo>
+  <title>glib-compile-schemas</title>
+  <productname>GIO</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Alexander</firstname>
+      <surname>Larsson</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
 <refmeta>
   <refentrytitle>glib-compile-resources</refentrytitle>
   <manvolnum>1</manvolnum>
@@ -14,14 +26,14 @@
 <refsynopsisdiv>
   <cmdsynopsis>
     <command>glib-compile-resources</command>
-    <arg choice="opt" rep="repeat">option</arg>
+    <arg choice="opt" rep="repeat">OPTION</arg>
-    <arg choice="req">file</arg>
+    <arg choice="req">FILE</arg>
   </cmdsynopsis>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 <para><command>glib-compile-resources</command> reads the resource description from
-<replaceable>file</replaceable> and the files that it references
+<replaceable>FILE</replaceable> and the files that it references
 and creates a binary resource bundle that is suitable for use with the
 <link linkend="GResource"><type>GResource</type></link> API.
 The resulting bundle is then written out as-is, or as C source for linking into
@@ -32,8 +44,9 @@ The XML resource files normally have the filename extension <filename>.gresource
 For a detailed description of the XML file format, see the
 <link linkend="GResource"><type>GResource</type></link> documentation.
 </para>
+</refsect1>
 
-<refsect2><title>Options</title>
+<refsect1><title>Options</title>
 <variablelist>
 
 <varlistentry>
@@ -44,18 +57,19 @@ Print help and exit
 </varlistentry>
 
 <varlistentry>
-<term><option>--target=<replaceable>TARGETFILE</replaceable></option></term>
+<term><option>--target=<replaceable>TARGET</replaceable></option></term>
 <listitem><para>
-Store the compiled resources in <replaceable>TARGETFILE</replaceable>. If not specified a filename based
+Store the compiled resources in the file <replaceable>TARGET</replaceable>.
-on the <replaceable>file</replaceable> basename is used.
+If not specified a filename based on the <replaceable>FILE</replaceable>
+basename is used.
 </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term><option>--sourcedir</option></term>
+<term><option>--sourcedir=<replaceable>DIRECTORY</replaceable></option></term>
 <listitem><para>
-The files references in <replaceable>file</replaceable> are loaded from this directory. If
+The files referenced in <replaceable>FILE</replaceable> are loaded from
-not specified the current directory is used.
+this directory. If not specified, the current directory is used.
 </para></listitem>
 </varlistentry>
 
@@ -83,15 +97,17 @@ Write the output file in the format selected for by its filename extension:
 <varlistentry>
 <term><option>--generate-source</option></term>
 <listitem><para>
-Instead of a writing the resource bundle in binary form create a C source file that contains the
+Instead of a writing the resource bundle in binary form create a C source file
-resource bundle. This can then be compiled into an application for easy access.
+that contains the resource bundle. This can then be compiled into an
+application for easy access.
 </para></listitem>
 </varlistentry>
 
 <varlistentry>
 <term><option>--generate-header</option></term>
 <listitem><para>
-Generate a header file for use with C code generated by <option>--generate-source</option>.
+Generate a header file for use with C code generated by
+<option>--generate-source</option>.
 </para></listitem>
 </varlistentry>
 
@@ -99,10 +115,10 @@ Generate a header file for use with C code generated by <option>--generate-sourc
 <term><option>--generate-dependencies</option></term>
 <listitem><para>
 Prints the list of files that the resource bundle references to standard output.
-This can be used to track dependencies in the build system. For example, the following
+This can be used to track dependencies in the build system. For example, the
-make rule would mark <replaceable>test.gresource</replaceable> as depending on all the
+following make rule would mark <replaceable>test.gresource</replaceable> as
-files that <replaceable>test.gresource.xml</replaceable> includes, so that is is automatically
+depending on all the files that <replaceable>test.gresource.xml</replaceable>
-rebuilt if any of them change:
+includes, so that is is automatically rebuilt if any of them change:
 <programlisting>
 test.gresource: test.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies test.gresource.xml)
 </programlisting>
@@ -122,42 +138,41 @@ Specify the prefix used for the C identifiers in the code generated by
 <varlistentry>
 <term><option>--manual-register</option></term>
 <listitem><para>
-By default code generated by <option>--generate-source</option> uses automatic initialization
+By default code generated by <option>--generate-source</option> uses automatic
-of the resource. This works on most systems by using the compiler support for constructors.
+initialization of the resource. This works on most systems by using the
-However, some (uncommon) compilers may not support this, you can then specify <option>--manual-register</option>,
+compiler support for constructors. However, some (uncommon) compilers may not
-which will generate custom register and unregister functions that your code can manually call
+support this, you can then specify <option>--manual-register</option>,
-at initialization and uninitialization time.
+which will generate custom register and unregister functions that your code
+can manually call at initialization and uninitialization time.
 </para></listitem>
 </varlistentry>
 
 </variablelist>
-</refsect2>
+</refsect1>
 
-<refsect2><title>Environment Variables</title>
+<refsect1><title>Environment</title>
 <variablelist>
 
 <varlistentry>
 <term><envar>XMLLINT</envar></term>
 <listitem><para>
-The full path to the xmllint executable. This is used to preprocess resources with the
+The full path to the xmllint executable. This is used to preprocess resources
-<literal>xml-stripblanks</literal> preprocessing option. If this environment variable is not
+with the <literal>xml-stripblanks</literal> preprocessing option. If this
-set, xmllint is searched in the <envar>PATH</envar>.
+environment variable is not set, xmllint is searched in the
+<envar>PATH</envar>.
 </para></listitem>
 </varlistentry>
 
 <varlistentry>
 <term><envar>GDK_PIXBUF_PIXDATA</envar></term>
 <listitem><para>
-The full path to the gdk-pixbuf-pixdata executable. This is used to preprocess resources with the
+The full path to the gdk-pixbuf-pixdata executable. This is used to preprocess
-<literal>to-pixdata</literal> preprocessing option. If this environment variable is not
+resources with the <literal>to-pixdata</literal> preprocessing option. If this
-set, gdk-pixbuf-pixdata is searched in the <envar>PATH</envar>.
+environment variable is not set, gdk-pixbuf-pixdata is searched in the
+<envar>PATH</envar>.
 </para></listitem>
 </varlistentry>
 
 </variablelist>
-</refsect2>
-
-</refsect1>
-<refsect1><title>See also</title>
 </refsect1>
 </refentry>

docs/reference/gio/glib-compile-schemas.xml

@@ -1,5 +1,17 @@
 <refentry id="glib-compile-schemas" lang="en">
 
+<refentryinfo>
+  <title>glib-compile-schemas</title>
+  <productname>GIO</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Ryan</firstname>
+      <surname>Lortie</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
 <refmeta>
   <refentrytitle>glib-compile-schemas</refentrytitle>
   <manvolnum>1</manvolnum>
@@ -14,14 +26,14 @@
 <refsynopsisdiv>
   <cmdsynopsis>
     <command>glib-compile-schemas</command>
-    <arg choice="opt" rep="repeat">option</arg>
+    <arg choice="opt" rep="repeat">OPTION</arg>
-    <arg choice="req">directory</arg>
+    <arg choice="req">DIRECTORY</arg>
   </cmdsynopsis>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 <para><command>glib-compile-schemas</command> compiles all the GSettings XML
-schema files in <replaceable>directory</replaceable> into a binary file
+schema files in <replaceable>DIRECTORY</replaceable> into a binary file
 with the name <filename>gschemas.compiled</filename> that can be used
 by <link linkend="GSettings"><type>GSettings</type></link>. The XML schema
 files must have the filename extension <filename>.gschema.xml</filename>.
@@ -50,8 +62,9 @@ numbered files have higher priority (eg: if the same override is made in
 a file numbered 10 and then again in a file numbered 20, the override
 from 20 will take precedence).
 </para>
+</refsect1>
 
-<refsect2><title>Options</title>
+<refsect1><title>Options</title>
 <variablelist>
 
 <varlistentry>
@@ -62,9 +75,9 @@ Print help and exit
 </varlistentry>
 
 <varlistentry>
-<term><option>--targetdir=<replaceable>TARGETDIR</replaceable></option></term>
+<term><option>--targetdir=<replaceable>TARGET</replaceable></option></term>
 <listitem><para>
-Store <filename>gschemas.compiled</filename> in <replaceable>TARGETDIR</replaceable> instead of <replaceable>directory</replaceable>.
+Store <filename>gschemas.compiled</filename> in the <replaceable>TARGET</replaceable> directory instead of <replaceable>DIRECTORY</replaceable>.
 </para></listitem>
 </varlistentry>
 
@@ -86,9 +99,5 @@ in the future.
 </varlistentry>
 
 </variablelist>
-</refsect2>
-</refsect1>
-<refsect1><title>See also</title>
 </refsect1>
 </refentry>
-

docs/reference/gio/gresource.xml

@@ -1,5 +1,17 @@
 <refentry id="gresource-tool" lang="en">
 
+<refentryinfo>
+  <title>gresource</title>
+  <productname>GIO</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Matthias</firstname>
+      <surname>Clasen</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
 <refmeta>
   <refentrytitle>gresource</refentrytitle>
   <manvolnum>1</manvolnum>
@@ -62,8 +74,9 @@ possible to select which one to operate on with the
 <arg choice="plain">--section</arg> option. Use the
 <arg choice="plain">sections</arg> command to find available sections.
 </para>
+</refsect1>
 
-<refsect2><title>Commands</title>
+<refsect1><title>Commands</title>
 <variablelist>
 
 <varlistentry>
@@ -109,8 +122,6 @@ Prints help and exits.
 </varlistentry>
 
 </variablelist>
-</refsect2>
 
 </refsect1>
 </refentry>
-

docs/reference/gio/gsettings.xml

@@ -1,5 +1,17 @@
 <refentry id="gsettings-tool" lang="en">
 
+<refentryinfo>
+  <title>gsettings</title>
+  <productname>GIO</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Ryan</firstname>
+      <surname>Lortie</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
 <refmeta>
   <refentrytitle>gsettings</refentrytitle>
   <manvolnum>1</manvolnum>
@@ -104,8 +116,9 @@ so e.g. a string
 must include explicit quotes: "'foo'". This format is also used when printing
 out values.
 </para>
+</refsect1>
 
-<refsect2><title>Commands</title>
+<refsect1><title>Commands</title>
 <variablelist>
 
 <varlistentry>
@@ -211,8 +224,6 @@ Prints help and exits.
 </varlistentry>
 
 </variablelist>
-</refsect2>
 
 </refsect1>
 </refentry>
-

docs/reference/glib/glib-gettextize.xml

@@ -1,5 +1,17 @@
 <refentry id="glib-gettextize" lang="en">
 
+<refentryinfo>
+<title>glib-gettextize</title>
+<productname>GLib</productname>
+<authorgroup>
+<author>
+<contrib>Developer</contrib>
+<firstname>Owen</firstname>
+<surname>Taylor</surname>
+</author>
+</authorgroup>
+</refentryinfo>
+
 <refmeta>
 <refentrytitle>glib-gettextize</refentrytitle>
 <manvolnum>1</manvolnum>
@@ -14,8 +26,8 @@
 <refsynopsisdiv>
 <cmdsynopsis>
 <command>glib-gettextize</command>
-<arg choice="opt" rep="repeat">option</arg>
+<arg choice="opt" rep="repeat">OPTION</arg>
-<arg choice="opt">directory</arg>
+<arg choice="opt">DIRECTORY</arg>
 </cmdsynopsis>
 </refsynopsisdiv>
 
@@ -33,7 +45,9 @@ from <command>gettextize</command> in that it doesn't create an
 <command>gettextize</command> behave like this when called with the
 <option>--no-changelog</option> option).
 </para>
-<refsect2><title>Options</title>
+</refsect1>
+
+<refsect1><title>Options</title>
 <variablelist>
 
 <varlistentry>
@@ -64,7 +78,6 @@ force writing of new files even if old ones exist
 </para></listitem>
 </varlistentry>
 </variablelist>
-</refsect2>
 </refsect1>
 
 <refsect1><title>See also</title>
@@ -73,5 +86,3 @@ force writing of new files even if old ones exist
 </para>
 </refsect1>
 </refentry>
-
-

docs/reference/glib/gtester-report.xml

@@ -1,5 +1,17 @@
 <refentry id="gtester-report">
 
+<refentryinfo>
+<title>gtester-report</title>
+<productname>GLib</productname>
+<authorgroup>
+<author>
+<contrib>Developer</contrib>
+<firstname>Tim</firstname>
+<surname>Janik</surname>
+</author>
+</authorgroup>
+</refentryinfo>
+
 <refmeta>
 <refentrytitle>gtester-report</refentrytitle>
 <manvolnum>1</manvolnum>
@@ -23,8 +35,9 @@
 <para><command>gtester-report</command> is a script which converts
 the XML output generated by gtester into HTML.
 </para>
+</refsect1>
 
-<refsect2><title>Options</title>
+<refsect1><title>Options</title>
 <variablelist>
 
 <varlistentry>
@@ -42,7 +55,6 @@ print version information and exit
 </varlistentry>
 
 </variablelist>
-</refsect2>
 </refsect1>
 
 <refsect1><title>See also</title>
@@ -54,5 +66,3 @@ print version information and exit
 </para>
 </refsect1>
 </refentry>
-
-

docs/reference/glib/gtester.xml

@@ -1,5 +1,22 @@
 <refentry id="gtester">
 
+<refentryinfo>
+<title>gtester</title>
+<productname>GLib</productname>
+<authorgroup>
+<author>
+<contrib>Developer</contrib>
+<firstname>Tim</firstname>
+<surname>Janik</surname>
+</author>
+<author>
+<contrib>Developer</contrib>
+<firstname>Sven</firstname>
+<surname>Herzberg</surname>
+</author>
+</authorgroup>
+</refentryinfo>
+
 <refmeta>
 <refentrytitle>gtester</refentrytitle>
 <manvolnum>1</manvolnum>
@@ -14,7 +31,7 @@
 <refsynopsisdiv>
 <cmdsynopsis>
 <command>gtester</command>
-<arg choice="opt" rep="repeat">option</arg>
+<arg choice="opt" rep="repeat">OPTION</arg>
 <arg>testprogram</arg>
 </cmdsynopsis>
 </refsynopsisdiv>
@@ -28,8 +45,9 @@ When called with the <option>-o</option> option, <command>gtester</command>
 writes an XML report of the test results, which can be converted
 into HTML using the <command>gtester-report</command> utility.
 </para>
+</refsect1>
 
-<refsect2><title>Options</title>
+<refsect1><title>Options</title>
 <variablelist>
 
 <varlistentry>
@@ -73,33 +91,43 @@ list paths of available test cases
     run test cases in <replaceable>MODE</replaceable>, which can be one of:
 
     <variablelist>
+      <varlistentry>
       <term><option>perf</option></term>
       <listitem><para>
           run performance tests
       </para></listitem>
+      </varlistentry>
 
+      <varlistentry>
       <term><option>slow</option>, <option>thorough</option></term>
       <listitem><para>
           run slow tests, or repeat non-deterministic tests more often
       </para></listitem>
+      </varlistentry>
 
+      <varlistentry>
       <term><option>quick</option></term>
       <listitem><para>
           do not run slow or performance tests, or do extra repeats
           of non-deterministic tests (default)
       </para></listitem>
+      </varlistentry>
 
+      <varlistentry>
       <term><option>undefined</option></term>
       <listitem><para>
           run test cases that deliberately provoke checks or assertion
           failures, if implemented (default)
       </para></listitem>
+      </varlistentry>
 
+      <varlistentry>
       <term><option>no-undefined</option></term>
       <listitem><para>
           do not run test cases that deliberately provoke checks or
           assertion failures
       </para></listitem>
+      </varlistentry>
     </variablelist>
 
 </para></listitem>
@@ -148,7 +176,6 @@ report success per testcase
 </varlistentry>
 
 </variablelist>
-</refsect2>
 </refsect1>
 
 <refsect1><title>See also</title>

docs/reference/gobject/glib-genmarshal.xml

@@ -1,5 +1,17 @@
 <refentry id="glib-genmarshal" lang="en">
 
+<refentryinfo>
+  <title>glib-genmarshal</title>
+  <productname>GObject</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Tim</firstname>
+      <surname>Janik</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
 <refmeta>
 <refentrytitle>glib-genmarshal</refentrytitle>
 <manvolnum>1</manvolnum>
@@ -14,8 +26,8 @@
 <refsynopsisdiv>
 <cmdsynopsis>
 <command>glib-genmarshal</command>
-<arg choice="opt" rep="repeat">options</arg>
+<arg choice="opt" rep="repeat">OPTION</arg>
-<arg choice="opt" rep="repeat">files</arg>
+<arg choice="opt" rep="repeat">FILE</arg>
 </cmdsynopsis>
 </refsynopsisdiv>
 
@@ -29,98 +41,12 @@ of the callback. The marshaller is then responsible to call the respective C
 code function of the closure with all the parameters on the stack and to
 collect its return value.
 </para>
-</refsect1>
 
-<refsect1><title>Invocation</title>
 <para><command>glib-genmarshal</command> takes a list of marshallers to generate as
 input. The marshaller list is either read from standard input or from files
 passed as additional arguments on the command line.
 </para>
 
-<refsect2><title>Options</title>
-<variablelist>
-
-<varlistentry>
-<term><option>--header</option></term>
-<listitem><para>
-Generate header file contents of the marshallers.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--body</option></term>
-<listitem><para>
-Generate C code file contents of the marshallers.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--prefix=string</option>, <option>--prefix string</option></term>
-<listitem><para>
-Specify marshaller prefix. The default prefix is <literal>`g_cclosure_marshal'</literal>.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--skip-source</option></term>
-<listitem><para>
-Skip source location remarks in generated comments.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--nostdinc</option></term>
-<listitem><para>
-Do not use the standard marshallers of the GObject library, and skip 
-<filename>gmarshal.h</filename> include directive in generated header files.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--internal</option></term>
-<listitem><para>
-Mark generated functions as internal, using G_GNUC_INTERNAL.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--valist-marshallers</option></term>
-<listitem><para>
-Generate valist marshallers, for use with g_signal_set_va_marshaller().
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>-v</option>, <option>--version</option></term>
-<listitem><para>
-Print version information.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--g-fatal-warnings</option></term>
-<listitem><para>
-Make warnings fatal, that is, exit immediately once a warning occurs.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>-h</option>, <option>--help</option></term>
-<listitem><para>
-Print brief help and exit.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>-v</option>, <option>--version</option></term>
-<listitem><para>
-Print version and exit.
-</para></listitem>
-</varlistentry>
-
-</variablelist>
-</refsect2>
-
 <refsect2><title>Marshaller list format</title>
 <para>
 The marshaller lists are processed line by line, a line can contain a
@@ -306,6 +232,91 @@ deprecated alias for <replaceable>BOOLEAN</replaceable>
 </para>
 </refsect2>
 </refsect1>
+
+<refsect1><title>Options</title>
+<variablelist>
+
+<varlistentry>
+<term><option>--header</option></term>
+<listitem><para>
+Generate header file contents of the marshallers.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--body</option></term>
+<listitem><para>
+Generate C code file contents of the marshallers.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--prefix=<replaceable>PREFIX</replaceable></option></term>
+<listitem><para>
+Specify marshaller prefix. The default prefix is <literal>`g_cclosure_marshal'</literal>.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--skip-source</option></term>
+<listitem><para>
+Skip source location remarks in generated comments.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--nostdinc</option></term>
+<listitem><para>
+Do not use the standard marshallers of the GObject library, and skip
+<filename>gmarshal.h</filename> include directive in generated header files.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--internal</option></term>
+<listitem><para>
+Mark generated functions as internal, using G_GNUC_INTERNAL.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--valist-marshallers</option></term>
+<listitem><para>
+Generate valist marshallers, for use with g_signal_set_va_marshaller().
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>-v</option>, <option>--version</option></term>
+<listitem><para>
+Print version information.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--g-fatal-warnings</option></term>
+<listitem><para>
+Make warnings fatal, that is, exit immediately once a warning occurs.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>-h</option>, <option>--help</option></term>
+<listitem><para>
+Print brief help and exit.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>-v</option>, <option>--version</option></term>
+<listitem><para>
+Print version and exit.
+</para></listitem>
+</varlistentry>
+
+</variablelist>
+</refsect1>
+
 <refsect1><title>Example</title>
 <para>
 To generate marshallers for the following callback functions:
@@ -355,22 +366,10 @@ g_closure_set_marshal (cc_baz, g_cclosure_marshal_FLOAT__BOOLEAN_UCHAR);
 </refsect1>
 <refsect1><title>See also</title>
 <para>
-<command>glib-mkenums</command>(1)
+<citerefentry>
-</para>
+<refentrytitle>glib-mkenums</refentrytitle>
-</refsect1>
+<manvolnum>1</manvolnum>
-<refsect1><title>Bugs</title>
+</citerefentry>
-<para>
-None known yet.
-</para>
-</refsect1>
-<refsect1><title>Author</title>
-<para><command>glib-genmarshal</command> has been written by Tim Janik 
-<email>timj@gtk.org</email>.
-</para>
-<para>
-This manual page was provided by Tim Janik <email>timj@gtk.org</email>.
 </para>
 </refsect1>
 </refentry>
-
-

docs/reference/gobject/glib-mkenums.xml

@@ -1,5 +1,17 @@
 <refentry id="glib-mkenums" lang="en">
 
+<refentryinfo>
+  <title>gdbus</title>
+  <productname>GObject</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Owen</firstname>
+      <surname>Taylor</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
 <refmeta>
 <refentrytitle>glib-mkenums</refentrytitle>
 <manvolnum>1</manvolnum>
@@ -14,150 +26,25 @@
 <refsynopsisdiv>
 <cmdsynopsis>
 <command>glib-mkenums</command>
-<arg choice="opt" rep="repeat">options</arg>
+<arg choice="opt" rep="repeat">OPTION</arg>
-<arg choice="opt" rep="repeat">files</arg>
+<arg choice="opt" rep="repeat">FILE</arg>
 </cmdsynopsis>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
-<para><command>glib-mkenums</command> is a small perl-script utility that parses C
+<para><command>glib-mkenums</command> is a small perl-script utility that
-code to extract enum definitions and produces enum descriptions based on text
+parses C code to extract enum definitions and produces enum descriptions based
-templates specified by the user. Most frequently this script is used to 
+on text templates specified by the user. Most frequently this script is used to
 produce C code that contains enum values as strings so programs can provide
 value name strings for introspection.
 </para>
-</refsect1>
 
-<refsect1><title>Invocation</title>
 <para><command>glib-mkenums</command> takes a list of valid C code files as
 input. The options specified control the text that is output, certain
 substitutions are performed on the text templates for keywords enclosed
 in @ characters.
 </para>
 
-<refsect2><title>Options</title>
-<variablelist>
-
-<varlistentry>
-<term><option>--fhead</option> <replaceable>text</replaceable></term>
-<listitem><para>
-Put out <replaceable>text</replaceable> prior to processing input files.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--fprod</option> <replaceable>text</replaceable></term>
-<listitem><para>
-Put out <replaceable>text</replaceable> everytime a new input file 
-is being processed.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--ftail</option> <replaceable>text</replaceable></term>
-<listitem><para>
-Put out <replaceable>text</replaceable> after all input files have been 
-processed.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--eprod</option> <replaceable>text</replaceable></term>
-<listitem><para>
-Put out <replaceable>text</replaceable> everytime an enum is encountered 
-in the input files.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--vhead</option> <replaceable>text</replaceable></term>
-<listitem><para>
-Put out <replaceable>text</replaceable> before iterating over the set of 
-values of an enum.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--vprod</option> <replaceable>text</replaceable></term>
-<listitem><para>
-Put out <replaceable>text</replaceable> for every value of an enum.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--vtail</option> <replaceable>text</replaceable></term>
-<listitem><para>
-Put out <replaceable>text</replaceable> after iterating over all values 
-of an enum.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--comments</option> <replaceable>text</replaceable></term>
-<listitem><para>
-Template for auto-generated comments, the default (for C code generations) is
-<literal>"/* @comment@ */"</literal>.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--template</option> <replaceable>file</replaceable></term>
-<listitem><para>
-Read templates from the given file. The templates are enclosed in
-specially-formatted C comments
-<programlisting>
-/*** BEGIN section ***/
-/*** END section ***/
-</programlisting>
-where section may be <literal>file-header</literal>, 
-<literal>file-production</literal>, <literal>file-tail</literal>,
-<literal>enumeration-production</literal>, <literal>value-header</literal>, 
-<literal>value-production</literal>, <literal>value-tail</literal> or
-<literal>comment</literal>.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--identifier-prefix</option> <replaceable>prefix</replaceable></term>
-<listitem><para>
-Indicates what portion of the enum name should be intepreted as the
-prefix (eg, the "<literal>Gtk</literal>" in
-"<literal>GtkDirectionType</literal>"). Normally this will be figured
-out automatically, but you may need to override the default if your
-namespace is capitalized oddly.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--symbol-prefix</option> <replaceable>prefix</replaceable></term>
-<listitem><para>
-Indicates what prefix should be used to correspond to the identifier
-prefix in related C function names (eg, the "<literal>gtk</literal>"
-in "<literal>gtk_direction_type_get_type</literal>". Equivalently,
-this is the lowercase version of the prefix component of the enum
-value names (eg, the "<literal>GTK</literal>" in
-"<literal>GTK_DIR_UP</literal>". The default value is the identifier
-prefix, converted to lowercase.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--help</option></term>
-<listitem><para>
-Print brief help and exit.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--version</option></term>
-<listitem><para>
-Print version and exit.
-</para></listitem>
-</varlistentry>
-
-</variablelist>
-</refsect2>
-
 <refsect2><title>Production text substitutions</title>
 <para>
 Certain keywords enclosed in @ characters will be substituted in the
@@ -307,6 +194,130 @@ typedef enum /*&lt; flags,prefix=PREFIX &gt;*/
 </para>
 </refsect2>
 </refsect1>
+
+<refsect1><title>Options</title>
+<variablelist>
+
+<varlistentry>
+<term><option>--fhead</option> <replaceable>TEXT</replaceable></term>
+<listitem><para>
+Put out <replaceable>TEXT</replaceable> prior to processing input files.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--fprod</option> <replaceable>TEXT</replaceable></term>
+<listitem><para>
+Put out <replaceable>TEXT</replaceable> everytime a new input file
+is being processed.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--ftail</option> <replaceable>TEXT</replaceable></term>
+<listitem><para>
+Put out <replaceable>TEXT</replaceable> after all input files have been
+processed.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--eprod</option> <replaceable>TEXT</replaceable></term>
+<listitem><para>
+Put out <replaceable>TEXT</replaceable> everytime an enum is encountered
+in the input files.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--vhead</option> <replaceable>TEXT</replaceable></term>
+<listitem><para>
+Put out <replaceable>TEXT</replaceable> before iterating over the set of
+values of an enum.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--vprod</option> <replaceable>TEXT</replaceable></term>
+<listitem><para>
+Put out <replaceable>TEXT</replaceable> for every value of an enum.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--vtail</option> <replaceable>TEXT</replaceable></term>
+<listitem><para>
+Put out <replaceable>TEXT</replaceable> after iterating over all values
+of an enum.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--comments</option> <replaceable>TEXT</replaceable></term>
+<listitem><para>
+Template for auto-generated comments, the default (for C code generations) is
+<literal>"/* @comment@ */"</literal>.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--template</option> <replaceable>FILE</replaceable></term>
+<listitem><para>
+Read templates from the given file. The templates are enclosed in
+specially-formatted C comments
+<programlisting>
+/*** BEGIN section ***/
+/*** END section ***/
+</programlisting>
+where section may be <literal>file-header</literal>,
+<literal>file-production</literal>, <literal>file-tail</literal>,
+<literal>enumeration-production</literal>, <literal>value-header</literal>,
+<literal>value-production</literal>, <literal>value-tail</literal> or
+<literal>comment</literal>.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--identifier-prefix</option> <replaceable>PREFIX</replaceable></term>
+<listitem><para>
+Indicates what portion of the enum name should be intepreted as the
+prefix (eg, the "<literal>Gtk</literal>" in
+"<literal>GtkDirectionType</literal>"). Normally this will be figured
+out automatically, but you may need to override the default if your
+namespace is capitalized oddly.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--symbol-prefix</option> <replaceable>PREFIX</replaceable></term>
+<listitem><para>
+Indicates what prefix should be used to correspond to the identifier
+prefix in related C function names (eg, the "<literal>gtk</literal>"
+in "<literal>gtk_direction_type_get_type</literal>". Equivalently,
+this is the lowercase version of the prefix component of the enum
+value names (eg, the "<literal>GTK</literal>" in
+"<literal>GTK_DIR_UP</literal>". The default value is the identifier
+prefix, converted to lowercase.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--help</option></term>
+<listitem><para>
+Print brief help and exit.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--version</option></term>
+<listitem><para>
+Print version and exit.
+</para></listitem>
+</varlistentry>
+
+</variablelist>
+</refsect1>
+
 <refsect1><title>See also</title>
 <para>
 <citerefentry>
@@ -316,5 +327,3 @@ typedef enum /*&lt; flags,prefix=PREFIX &gt;*/
 </para>
 </refsect1>
 </refentry>
-
-

docs/reference/gobject/gobject-query.xml

@@ -1,5 +1,17 @@
 <refentry id="gobject-query" lang="en">
 
+<refentryinfo>
+  <title>gobject-query</title>
+  <productname>GObject</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Tim</firstname>
+      <surname>Janik</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
 <refmeta>
 <refentrytitle>gobject-query</refentrytitle>
 <manvolnum>1</manvolnum>
@@ -15,12 +27,12 @@
 <cmdsynopsis>
 <command>gobject-query</command>
 <arg choice="plain">froots</arg>
-<arg choice="opt" rep="repeat">options</arg>
+<arg choice="opt" rep="repeat">OPTION</arg>
 </cmdsynopsis>
 <cmdsynopsis>
 <command>gobject-query</command>
 <arg choice="plain">tree</arg>
-<arg choice="opt" rep="repeat">options</arg>
+<arg choice="opt" rep="repeat">OPTION</arg>
 </cmdsynopsis>
 </refsynopsisdiv>
 
@@ -29,33 +41,35 @@
 <command>gobject-query</command> is a small utility that draws a tree of
 types.
 </para>
-</refsect1>
 
-<refsect1><title>Invocation</title>
 <para>
 <command>gobject-query</command> takes a mandatory argument that specifies
 whether it should iterate over the fundamental types or print a type tree.
 </para>
+</refsect1>
 
-<refsect2><title>Options</title>
+<refsect1><title>Commands</title>
 <variablelist>
-
 <varlistentry>
 <term><option>froots</option></term>
 <listitem><para>
 iterate over fundamental roots
 </para></listitem>
 </varlistentry>
-
 <varlistentry>
 <term><option>tree</option></term>
 <listitem><para>
 print type tree
 </para></listitem>
 </varlistentry>
+</variablelist>
+</refsect1>
+
+<refsect1><title>Options</title>
+<variablelist>
 
 <varlistentry>
-<term><option>-r</option> <replaceable>type</replaceable></term>
+<term><option>-r</option> <replaceable>TYPE</replaceable></term>
 <listitem><para>
 specify the root type
 </para></listitem>
@@ -69,14 +83,14 @@ don't descend type tree
 </varlistentry>
 
 <varlistentry>
-<term><option>-b</option> <replaceable>string</replaceable></term>
+<term><option>-b</option> <replaceable>STRING</replaceable></term>
 <listitem><para>
 specify indent string
 </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term><option>-i</option> <replaceable>string</replaceable></term>
+<term><option>-i</option> <replaceable>STRING</replaceable></term>
 <listitem><para>
 specify incremental indent string
 </para></listitem>
@@ -84,7 +98,7 @@ specify incremental indent string
 
 
 <varlistentry>
-<term><option>-s</option> <replaceable>number</replaceable></term>
+<term><option>-s</option> <replaceable>NUMBER</replaceable></term>
 <listitem><para>
 specify line spacing
 </para></listitem>
@@ -105,8 +119,5 @@ Print version and exit.
 </varlistentry>
 
 </variablelist>
-</refsect2>
 </refsect1>
 </refentry>
-
-