Index: doc/reference/tmpl/gnome-program.sgml
===================================================================
RCS file: /cvs/gnome/libgnome/doc/reference/tmpl/gnome-program.sgml,v
retrieving revision 1.9
diff -p -u -u -p -r1.9 gnome-program.sgml
--- doc/reference/tmpl/gnome-program.sgml	29 Sep 2005 18:34:18 -0000	1.9
+++ doc/reference/tmpl/gnome-program.sgml	13 Jan 2006 14:04:35 -0000
@@ -81,8 +81,9 @@ required modules are initialized (althou
 @class_init: A function to call to initialise this module prior to creating any
 instances (can be %NULL).
 @opt_prefix: Unused.
-@expansion1: A #GOptionGroup for the special arguments this module supports when
-parsing options with GOption (can be %NULL).
+@expansion1: A function pointer to a function of type GOptionGroup* (*func)(void) to
+get the GOption group for parsing options for this module with GOption, or %NULL if
+this module does not support GOption option parsing.
 
 <!-- ##### STRUCT GnomeModuleRequirement ##### -->
 <para>
@@ -148,21 +149,24 @@ gnome_program_preinit(), gnome_program_p
 gnome_program_postinit().
 </para>
 <para>The following example shows how one might initialise a typical program
-using a popt table that is defined elsewhere (in other words, this is how to
-remove the use of the deprecated gnome_init_with_popt_table() from code).
+using a goption table that is defined elsewhere.
 </para>
 <example>
 <title>Initializing a GNOME application</title>
 <programlisting>
 int main(int argc, char **argv) {
 	GnomeProgram *my_app;
-	
+	GOptionContext *option_context;
+
 	/* We assume PACKAGE and VERSION are set the program name and version
 	 * number respectively. Also, assume the 'options' is a global array of
-	 * poptOptions.
+	 * GOptionEntry.
 	 */
+	option_context = g_option_context_new (PACKAGE);
+	g_option_context_add_main_entries (option_context, options, NULL);
 	my_app = gnome_program_init(PACKAGE, VERSION, LIBGNOMEUI_MODULE,
-	                            argc, argv, GNOME_PARAM_POPT_TABLE, options,
+	                            argc, argv,
+				    GNOME_PARAM_OPTION_CONTEXT, option_context,
 				    GNOME_PARAM_NONE);
 	/* Now process any extra args, etc ... */
 }
@@ -317,6 +321,8 @@ init only). Mutually exclusive with usin
 parameter.
 </para>
 
+@Deprecated: 2.14. Use GOption argument parsing instead,
+with #GNOME_PARAM_GOPTION_CONTEXT.
 
 
 <!-- ##### MACRO GNOME_PARAM_POPT_FLAGS ##### -->
@@ -324,6 +330,7 @@ parameter.
 This parameter contains the flags to use for popt (write on init only).
 </para>
 
+@Deprecated: 2.14. Use GOption argument parsing instead.
 
 
 <!-- ##### MACRO GNOME_PARAM_POPT_CONTEXT ##### -->
@@ -332,6 +339,7 @@ This parameter contains the context poin
 popt parsing (readable).
 </para>
 
+@Deprecated: 2.14. Use GOption argument parsing instead.
 
 
 <!-- ##### MACRO GNOME_PARAM_GOPTION_CONTEXT ##### -->
