diff --git a/docs/reference/glib/tmpl/.gitignore b/docs/reference/glib/tmpl/.gitignore
index 1edcd06ae..fd5ae42c6 100644
--- a/docs/reference/glib/tmpl/.gitignore
+++ b/docs/reference/glib/tmpl/.gitignore
@@ -5,5 +5,6 @@ gvarianttype.sgml
 hash_tables.sgml
 option.sgml
 random_numbers.sgml
+shell.sgml
 threads.sgml
 timers.sgml
diff --git a/docs/reference/glib/tmpl/shell.sgml b/docs/reference/glib/tmpl/shell.sgml
deleted file mode 100644
index a1c797917..000000000
--- a/docs/reference/glib/tmpl/shell.sgml
+++ /dev/null
@@ -1,68 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Shell-related Utilities
-
-<!-- ##### SECTION Short_Description ##### -->
-shell-like commandline handling
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### ENUM GShellError ##### -->
-<para>
-Error codes returned by shell functions.
-</para>
-
-@G_SHELL_ERROR_BAD_QUOTING: Mismatched or otherwise mangled quoting.
-@G_SHELL_ERROR_EMPTY_STRING: String to be parsed was empty.
-@G_SHELL_ERROR_FAILED: Some other error.
-
-<!-- ##### MACRO G_SHELL_ERROR ##### -->
-<para>
-Error domain for shell functions. Errors in this domain will
-be from the #GShellError enumeration. See #GError for information on
-error domains.
-</para>
-
-
-
-<!-- ##### FUNCTION g_shell_parse_argv ##### -->
-<para>
-
-</para>
-
-@command_line: 
-@argcp: 
-@argvp: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION g_shell_quote ##### -->
-<para>
-
-</para>
-
-@unquoted_string: 
-@Returns: 
-
-
-<!-- ##### FUNCTION g_shell_unquote ##### -->
-<para>
-
-</para>
-
-@quoted_string: 
-@error: 
-@Returns: 
-
-
diff --git a/glib/gshell.c b/glib/gshell.c
index 711cdee09..d3b76f423 100644
--- a/glib/gshell.c
+++ b/glib/gshell.c
@@ -33,6 +33,28 @@
 #include "glibintl.h"
 #include "galias.h"
 
+/**
+ * SECTION: shell
+ * @title: Shell-related Utilities
+ * @short_description: shell-like commandline handling
+ **/
+
+/**
+ * G_SHELL_ERROR:
+ *
+ * Error domain for shell functions. Errors in this domain will be from
+ * the #GShellError enumeration. See #GError for information on error
+ * domains.
+ **/
+
+/**
+ * GShellError:
+ * @G_SHELL_ERROR_BAD_QUOTING: Mismatched or otherwise mangled quoting.
+ * @G_SHELL_ERROR_EMPTY_STRING: String to be parsed was empty.
+ * @G_SHELL_ERROR_FAILED: Some other error.
+ *
+ * Error codes returned by shell functions.
+ **/
 GQuark
 g_shell_error_quark (void)
 {