[gnumeric] Introspection: https://bugzilla.gnome.org/show_bug.cgi?id=684159

[Morten Welinder <mortenw src gnome org>]

commit 298adb22853fc425ec3acf4f53cf03a3847cc300
Author: Morten Welinder <terra gnome org>
Date:   Sat Dec 29 10:11:24 2012 -0500

    Introspection: https://bugzilla.gnome.org/show_bug.cgi?id=684159

 NEWS                              |    3 +++
 src/cell.c                        |    2 +-
 src/cell.h                        |    6 +++---
 src/cmd-edit.c                    |    5 +----
 src/collect.c                     |   10 +++++-----
 src/colrow.c                      |    7 +++----
 src/expr.c                        |    4 ++--
 src/func.c                        |    5 +----
 src/func.h                        |    4 ++--
 src/gnm-format.c                  |    4 ++--
 src/gnm-pane.c                    |   11 +++++------
 src/gnm-sheet-slicer.c            |    4 ++--
 src/gui-clipboard.c               |    4 ++--
 src/gui-util.c                    |   19 +++++++++----------
 src/hlink.c                       |    6 +++---
 src/item-cursor.c                 |    4 +++-
 src/libgnumeric.c                 |    4 ++--
 src/mstyle.c                      |    4 ++--
 src/number-match.c                |    1 -
 src/parse-util.c                  |   10 +++++-----
 src/position.c                    |   10 ++++++----
 src/position.h                    |    2 +-
 src/print-info.c                  |    4 ++--
 src/ranges.c                      |    2 +-
 src/selection.c                   |   14 ++++++--------
 src/sheet-control-gui.c           |   11 +++++------
 src/sheet-merge.c                 |    5 +----
 src/sheet-object-graph.c          |    1 +
 src/sheet-object-image.c          |    2 +-
 src/sheet-object.c                |   10 ++--------
 src/sheet-style.c                 |   31 ++++++++++++-------------------
 src/sheet-utils.c                 |    2 +-
 src/sheet-view.c                  |   21 ++++++++++-----------
 src/sheet.c                       |    7 +++----
 src/stf-parse.c                   |    2 +-
 src/stf.c                         |   18 +++++++++---------
 src/style-border.c                |    1 -
 src/style-color.c                 |    8 +++++++-
 src/style.c                       |   10 +++++-----
 src/symbol.c                      |    1 -
 src/tools/dao.c                   |    6 +++---
 src/value.c                       |    7 ++++---
 src/wbc-gtk-edit.c                |    1 -
 src/wbc-gtk.c                     |    2 +-
 src/widgets/gnumeric-expr-entry.c |   20 +++++++++-----------
 src/workbook-view.c               |   11 ++++++-----
 src/workbook.c                    |    5 ++---
 src/xml-sax-read.c                |    4 ++--
 48 files changed, 157 insertions(+), 178 deletions(-)
---
diff --git a/NEWS b/NEWS
index 59c7d3f..63c06ef 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 Gnumeric 1.12.1
 
+Alexandre Rostovtsev:
+	 * Introspection fixes.
+
 Andreas:
 	 * Some documentation fixes.
 	 * Show argument names for python functions. [#690681]
diff --git a/src/cell.c b/src/cell.c
index 77b9988..77f1bfd 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -245,7 +245,7 @@ gnm_cell_set_expr_unsafe (GnmCell *cell, GnmExprTop const *texpr)
 	cell_set_expr_internal (cell, texpr);
 }
 
-/**
+/*
  * gnm_cell_set_expr:  Stores and references the supplied expression
  *         marks the sheet as dirty.  Intented for use by import routines that
  *         do bulk assignment.  The resulting cell _is_ linked into the
diff --git a/src/cell.h b/src/cell.h
index d1a1818..9760ff9 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -31,7 +31,7 @@ struct _GnmCell {
 
 GType	    gnm_cell_get_type (void);
 
-/**
+/*
  * GnmCell state checking
  */
 #define	    gnm_cell_needs_recalc(cell)	((cell)->base.flags & DEPENDENT_NEEDS_RECALC)
@@ -50,7 +50,7 @@ GnmExprArrayCorner const *
 	    gnm_cell_is_array_corner  (GnmCell const *cell);
 gboolean    gnm_cell_array_bound	  (GnmCell const *cell, GnmRange *res);
 
-/**
+/*
  * Utilities to assign the contents of a cell
  */
 void gnm_cell_set_text		(GnmCell *c, char const *text);
@@ -72,7 +72,7 @@ gboolean gnm_cell_set_array     (Sheet *sheet,
 void gnm_cell_cleanout		(GnmCell *cell);
 void gnm_cell_convert_expr_to_value	(GnmCell *cell);
 
-/**
+/*
  * Manipulate GnmCell attributes
  */
 GnmStyle const *gnm_cell_get_style	(GnmCell const *cell);
diff --git a/src/cmd-edit.c b/src/cmd-edit.c
index bfbb80f..c9c188a 100644
--- a/src/cmd-edit.c
+++ b/src/cmd-edit.c
@@ -279,9 +279,6 @@ sv_select_cur_inputs (SheetView *sv)
 
 /**
  * cmd_paste :
- * @sheet: The destination sheet
- * @range : The range to paste to within the destination sheet.
- * @flags: Any paste special flags.
  *
  * Pastes the current cut buffer, copy buffer, or X selection to
  * the destination sheet range.
@@ -356,7 +353,7 @@ cmd_paste (WorkbookControl *wbc, GnmPasteTarget const *pt)
 /**
  * cmd_paste_to_selection :
  * @dest_sv: The sheet into which things should be pasted
- * @flags: special paste flags (eg transpose)
+ * @paste_flags: special paste flags (eg transpose)
  *
  * Using the current selection as a target
  * Full undo support.
diff --git a/src/collect.c b/src/collect.c
index 27862dd..058482d 100644
--- a/src/collect.c
+++ b/src/collect.c
@@ -596,7 +596,7 @@ collect_floats_value_with_info (GnmValue const *val, GnmEvalPos const *ep,
 
 /**
  * float_range_function:
- * @arcg:
+ * @argc:
  * @argv:
  * @ei:
  * @func: (scope call):
@@ -860,8 +860,8 @@ collect_float_pairs (GnmValue const *vx, GnmValue const *vy,
 
 /**
  * float_range_function2d:
- * @arcg:
- * @argv:
+ * @val0:
+ * @val1:
  * @ei:
  * @func: (scope call):
  * @flags:
@@ -905,8 +905,8 @@ float_range_function2d (GnmValue const *val0, GnmValue const *val1,
 
 /**
  * float_range_function2:
- * @arcg:
- * @argv:
+ * @val0:
+ * @val1:
  * @ei:
  * @func: (scope call):
  * @flags:
diff --git a/src/colrow.c b/src/colrow.c
index 67be14c..10a8271 100644
--- a/src/colrow.c
+++ b/src/colrow.c
@@ -109,7 +109,7 @@ colrow_is_default (ColRowInfo const *cri)
 
 /**
  * colrow_is_empty :
- * @colrow : #ColRowInfo
+ * @cri : #ColRowInfo
  *
  * TRUE if there is no information in col/row @cri.
  **/
@@ -178,10 +178,9 @@ colrow_free (ColRowInfo *cri)
 
 /**
  * colrow_foreach:
- * @sheet:	the sheet
  * @infos:	The Row or Column collection.
- * @start:	start position (inclusive)
- * @end	:	stop column (inclusive)
+ * @first:	start position (inclusive)
+ * @last:	stop column (inclusive)
  * @callback: (scope call): A callback function which should return TRUE to stop
  *              the iteration.
  * @user_data:	A bagage pointer.
diff --git a/src/expr.c b/src/expr.c
index 2fbfe3f..8fbaf14 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -1215,7 +1215,7 @@ gnm_expr_range_op (GnmExpr const *expr, GnmEvalPos const *ep,
 /**
  * gnm_expr_eval :
  * @expr :
- * @ep   :
+ * @pos  :
  * @flags:
  *
  * if GNM_EXPR_EVAL_PERMIT_EMPTY is not set then return int(0) if the
@@ -3200,7 +3200,7 @@ gnm_expr_top_is_err (GnmExprTop const *texpr, GnmStdError err)
 
 /**
  * gnm_expr_top_get_constant:
- * @expr :
+ * @texpr :
  *
  * If this expression consists of just a constant, return it.
  */
diff --git a/src/func.c b/src/func.c
index d111d8c..33e62cd 100644
--- a/src/func.c
+++ b/src/func.c
@@ -1039,8 +1039,6 @@ gnm_func_get_type (void)
 	return t;
 }
 
-/**
- */
 GnmFunc *
 gnm_func_lookup (char const *name, Workbook *scope)
 {
@@ -1982,8 +1980,7 @@ function_iterate_do_value (GnmEvalPos const  *ep,
 }
 
 /**
- * function_iterate_argument_values
- *
+ * function_iterate_argument_values:
  * @ep:               The position in a workbook at which to evaluate
  * @callback: (scope call): The routine to be invoked for every value computed
  * @callback_closure: Closure for the callback.
diff --git a/src/func.h b/src/func.h
index d839f09..e3de9fe 100644
--- a/src/func.h
+++ b/src/func.h
@@ -46,7 +46,7 @@ GnmFuncGroup *gnm_func_group_fetch (char const *name,
  * processing.
  */
 
-/**
+/*
  *  Argument tokens passed in 'args'
  *
  * With intersection and iteration support
@@ -63,7 +63,7 @@ GnmFuncGroup *gnm_func_group_fetch (char const *name,
  *
  *  For optional arguments do:
  * "ff|ss" where the strings are optional
- **/
+ */
 
 typedef enum {
 	GNM_FUNC_TYPE_ARGS,	/* Arguments get marshalled by type */
diff --git a/src/gnm-format.c b/src/gnm-format.c
index e6dcd72..2366323 100644
--- a/src/gnm-format.c
+++ b/src/gnm-format.c
@@ -201,7 +201,7 @@ gnm_format_layout (PangoLayout *layout,
  * @str : append the result here.
  * @format : #GOFormat.
  * @value : #GnmValue to convert
- * col_width : optional
+ * @col_width : optional
  * @date_conv : #GODateConventions.
  *
  **/
@@ -233,7 +233,7 @@ format_value_gstring (GString *str,
 
 /**
  * format_value_layout :
- * @layout
+ * @layout :
  * @format : #GOFormat.
  * @value : #GnmValue to convert
  * col_width : optional
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index a1b478e..2397eb7 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -53,7 +53,7 @@ static void cb_pane_popup_menu (GnmPane *pane);
 static void gnm_pane_clear_obj_size_tip (GnmPane *pane);
 static void gnm_pane_display_obj_size_tip (GnmPane *pane, GocItem *ctrl_pt);
 
-/**
+/*
  * For now, application/x-gnumeric is disabled. It handles neither
  * images nor graphs correctly.
  */
@@ -1112,7 +1112,7 @@ cb_pane_drag_end (GtkWidget *widget, GdkDragContext *context,
 	source_pane->drag.button = 0;
 }
 
-/**
+/*
  * Move the rubber bands back to original position when curser leaves
  * the scg, but not when it moves to another pane. We use object data,
  * and rely on gtk sending drag_move to the new widget before sending
@@ -2097,7 +2097,7 @@ gnm_pane_size_guide_stop (GnmPane *pane)
 }
 
 /**
- * gnm_pane_size_guide_motion
+ * gnm_pane_size_guide_motion:
  * @p: #GnmPane
  * @vert: TRUE for a vertical guide, FALSE for horizontal
  * @guide_pos: in unscaled sheet pixel coords
@@ -2496,7 +2496,7 @@ target_list_add_list (GtkTargetList *targets, GtkTargetList *added_targets)
 	gtk_target_table_free (gte, n);
 }
 
-/**
+/*
  * Drag one or more sheet objects using GTK drag and drop, to the same
  * sheet, another workbook, another gnumeric or a different application.
  */
@@ -2813,7 +2813,7 @@ static GSF_CLASS (ItemAcetate, item_acetate,
 		  GOC_TYPE_RECTANGLE)
 
 /**
- * new_control_point
+ * new_control_point:
  * @pane: #GnmPane
  * @idx:    control point index to be created
  * @x:      x coordinate of control point
@@ -3049,7 +3049,6 @@ gnm_pane_object_register (SheetObject *so, GocItem *view, gboolean selectable)
 
 /**
  * gnm_pane_object_widget_register:
- *
  * @so: A sheet object
  * @widget: The widget for the sheet object view
  * @view: A canvas item acting as a view for @so
diff --git a/src/gnm-sheet-slicer.c b/src/gnm-sheet-slicer.c
index cbbe0db..5fd9d22 100644
--- a/src/gnm-sheet-slicer.c
+++ b/src/gnm-sheet-slicer.c
@@ -238,10 +238,10 @@ gnm_sheet_slicer_set_range (GnmSheetSlicer *gss, GnmRange const *r)
 
 /**
  * gnm_sheet_slicer_overlaps_range :
- * @filter : #GnmFilter
+ * @gss : #GnmSheetSlicer
  * @r : #GnmRange
  *
- * Returns: %TRUE if @filter overlaps @r.
+ * Returns: %TRUE if @gss overlaps @r.
  **/
 gboolean
 gnm_sheet_slicer_overlaps_range (GnmSheetSlicer const *gss, GnmRange const *r)
diff --git a/src/gui-clipboard.c b/src/gui-clipboard.c
index caeff63..f4dc794 100644
--- a/src/gui-clipboard.c
+++ b/src/gui-clipboard.c
@@ -273,7 +273,7 @@ utf8_content_received (GtkClipboard *clipboard,  const gchar *text,
 	g_free (ctxt);
 }
 
-/**
+/*
  * Use the file_opener plugin service to read into a temporary workbook, in
  * order to copy from it to the paste target. A temporary sheet would do just
  * as well, but the file_opener service makes workbooks, not sheets.
@@ -824,7 +824,7 @@ object_write (GnmCellRegion *cr, gchar const *mime_type, int *size)
 	return ret;
 }
 
-/**
+/*
  * x_clipboard_get_cb
  *
  * Callback invoked when another application requests we render the selection.
diff --git a/src/gui-util.c b/src/gui-util.c
index cb59899..c1b4e36 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -164,7 +164,7 @@ gnumeric_go_error_info_dialog_create (GOErrorInfo *error)
 }
 
 /**
- * gnumeric_go_error_info_dialog_show
+ * gnumeric_go_error_info_dialog_show:
  *
  */
 void
@@ -295,11 +295,10 @@ gnumeric_restore_window_geometry (GtkWindow *dialog, const char *key)
 }
 
 /**
- * gnumeric_keyed_dialog
- *
- * @wbcg    A WBCGtk
- * @dialog  A transient window
- * @key     A key to identify the dialog
+ * gnumeric_keyed_dialog:
+ * @wbcg:    A WBCGtk
+ * @dialog:  A transient window
+ * @key:     A key to identify the dialog
  *
  * Make dialog a transient child of wbcg, attaching to wbcg object data to
  * identify the dialog. The object data makes it possible to ensure that
@@ -338,7 +337,6 @@ gnumeric_keyed_dialog (WBCGtk *wbcg, GtkWindow *dialog, char const *key)
 
 /**
  * gnumeric_dialog_raise_if_exists:
- *
  * @wbcg:    A WBCGtk
  * @key:     A key to identify the dialog
  *
@@ -376,11 +374,12 @@ cb_activate_default (GtkWindow *window)
 
 
 /**
- * gnumeric_editable_enters: Make the "activate" signal of an editable click
- * the default dialog button.
+ * gnumeric_editable_enters:
  * @window: dialog to affect.
  * @editable: Editable to affect.
  *
+ * Make the "activate" signal of an editable click the default dialog button.
+ *
  * This is a literal copy of gnome_dialog_editable_enters, but not restricted
  * to GnomeDialogs.
  *
@@ -975,7 +974,7 @@ float_to_entry (GtkEntry *entry, gnm_float the_float)
 /**
  * int_to_entry:
  * @entry:
- * @the_float:
+ * @the_int:
  *
  *
   **/
diff --git a/src/hlink.c b/src/hlink.c
index 1e323eb..2e9af5f 100644
--- a/src/hlink.c
+++ b/src/hlink.c
@@ -44,14 +44,14 @@
 
 #define GET_CLASS(instance) G_TYPE_INSTANCE_GET_CLASS (instance, GNM_HLINK_TYPE, GnmHLinkClass)
 
-/**
+/*
  * WARNING WARNING WARNING
  *
  * The type names are used in the xml persistence DO NOT CHANGE THEM
- **/
+ */
 /**
  * gnm_hlink_activate:
- * @link:
+ * @lnk:
  * @wbcg: the wbcg that activated the link
  *
  * Returns: TRUE if the link successfully activated.
diff --git a/src/item-cursor.c b/src/item-cursor.c
index ae9e6b8..582d007 100644
--- a/src/item-cursor.c
+++ b/src/item-cursor.c
@@ -473,7 +473,9 @@ item_cursor_bound_set (ItemCursor *ic, GnmRange const *new_bound)
 }
 
 /**
- * item_cursor_reposition : Re-compute the pixel position of the cursor.
+ * item_cursor_reposition:
+ *
+ * Re-compute the pixel position of the cursor.
  *
  * When a sheet is zoomed.  The pixel coords shift slightly.  The item cursor
  * must regenerate to stay in sync.
diff --git a/src/libgnumeric.c b/src/libgnumeric.c
index 2ebd458..88a5b92 100644
--- a/src/libgnumeric.c
+++ b/src/libgnumeric.c
@@ -286,10 +286,10 @@ gnm_init (void)
 	                          gnm_app_display_dpi_get (FALSE));
 }
 
-/**
+/*
  * TODO : do we really want this here ?
  * seems like a better fit in main-application.c
- **/
+ */
 int
 gnm_dump_func_defs (char const* filename, int dump_type)
 {
diff --git a/src/mstyle.c b/src/mstyle.c
index e5cc8f5..2d1fdff 100644
--- a/src/mstyle.c
+++ b/src/mstyle.c
@@ -750,7 +750,7 @@ gnm_style_get_type (void)
 	return t;
 }
 
-/**
+/*
  * Replace auto pattern color in style with sheet's auto pattern color.
  * make_copy tells if we are allowed to modify the style in place or we must
  * make a copy first.
@@ -772,7 +772,7 @@ link_pattern_color (GnmStyle *style, GnmColor *auto_color, gboolean make_copy)
 	return style;
 }
 
-/**
+/*
  * Replace auto border colors in style with sheet's auto pattern
  * color. (pattern is *not* a typo.)
  * make_copy tells if we are allowed to modify the style in place or we must
diff --git a/src/number-match.c b/src/number-match.c
index b7a56a2..8681b25 100644
--- a/src/number-match.c
+++ b/src/number-match.c
@@ -1285,7 +1285,6 @@ format_match (char const *text, GOFormat const *cur_fmt,
 
 /**
  * format_match_number :
- *
  * @text    : The text to parse
  * @cur_fmt : The current format for the value (potentially NULL)
  * @date_conv: optional date convention
diff --git a/src/parse-util.c b/src/parse-util.c
index 2d5f3a8..bbfd30e 100644
--- a/src/parse-util.c
+++ b/src/parse-util.c
@@ -255,7 +255,7 @@ wb_rel_uri (Workbook *wb, Workbook *ref_wb)
 /**
  * cellref_as_string :
  * @out : #GnmConventionsOut
- * @ref :
+ * @cell_ref :
  * @no_sheetname :
  *
  * Returns a string that the caller needs to free containing the A1 format
@@ -740,14 +740,14 @@ gnm_expr_char_start_p (char const * c)
 }
 
 /**
- * parse_text_value_or_expr : Utility routine to parse a string and convert it
- *     into an expression or value.
- *
+ * parse_text_value_or_expr:
  * @pos: If the string looks like an expression parse it at this location.
  * @text: The text to be parsed.
  * @val: Returns a GnmValue* if the text was a value, otherwise NULL.
  * @texpr: Returns a GnmExprTop* if the text was an expression, otherwise NULL.
  *
+ * Utility routine to parse a string and convert it into an expression or value.
+ *
  * If there is a parse failure for an expression an error GnmValue with the syntax
  * error is returned.
  */
@@ -1099,7 +1099,7 @@ r1c1_rangeref_parse (GnmRangeRef *res, char const *ptr, GnmParsePos const *pp)
  * rangeref_parse :
  * @res : where to store the result
  * @start : the start of the string to parse
- * @pos : the location to parse relative to
+ * @pp : the location to parse relative to
  *
  * Returns a pointer to the first invalid character.
  * If the result != @start then @res is valid.
diff --git a/src/position.c b/src/position.c
index 335adc0..d9aa098 100644
--- a/src/position.c
+++ b/src/position.c
@@ -192,9 +192,9 @@ eval_pos_init_cell (GnmEvalPos *ep, GnmCell const *cell)
 }
 
 /**
- * eval_pos_init_cell:
+ * eval_pos_init_sheet:
  * @ep: The position to init.
- * @cell: A cell
+ * @sheet: A sheet
  *
  * The function initializes an evalpos with the given sheet.
  *
@@ -563,8 +563,10 @@ gnm_rangeref_get_type (void)
 }
 
 /**
- * gnm_rangeref_normalize :  Take a range_ref and normalize it
- *     by converting to absolute coords and handling inversions.
+ * gnm_rangeref_normalize:
+ *
+ * Take a range_ref and normalize it by converting to absolute coords and handling
+ * inversions.
  */
 void
 gnm_rangeref_normalize_pp (GnmRangeRef const *ref, GnmParsePos const *pp,
diff --git a/src/position.h b/src/position.h
index fcefafa..a02500c 100644
--- a/src/position.h
+++ b/src/position.h
@@ -21,7 +21,7 @@ struct _GnmParsePos {
 	Workbook   *wb;
 };
 
-/**
+/*
  * Used for getting a valid Sheet *from a GnmCellRef
  * Syntax is GnmCellRef, valid Sheet *
  */
diff --git a/src/print-info.c b/src/print-info.c
index 52c171b..4842bb2 100644
--- a/src/print-info.c
+++ b/src/print-info.c
@@ -1654,7 +1654,7 @@ gnm_page_breaks_set_break (GnmPageBreaks *breaks,
 }
 
 /**
- * gnm_page_break_type_from_str
+ * gnm_page_break_type_from_str:
  * @str :
  *
  **/
@@ -1674,11 +1674,11 @@ gnm_page_break_type_from_str (char const *str)
 
 
 /**
+ * gnm_page_breaks_clean:
  *
  * Remove all auto page breaks
  *
  **/
-
 void
 gnm_page_breaks_clean (GnmPageBreaks *breaks)
 {
diff --git a/src/ranges.c b/src/ranges.c
index 1a58b97..085fb78 100644
--- a/src/ranges.c
+++ b/src/ranges.c
@@ -889,7 +889,7 @@ undo_cell_pos_name (Sheet const *sheet, GnmCellPos const *pos)
 }
 
 /**
- * char *undo_range_name
+ * undo_range_name:
  * @sheet:
  * @r:
  *
diff --git a/src/selection.c b/src/selection.c
index 80eda83..a8fda74 100644
--- a/src/selection.c
+++ b/src/selection.c
@@ -153,7 +153,6 @@ sv_is_range_selected (SheetView const *sv, GnmRange const *r)
 
 /**
  * sv_is_full_range_selected:
- *
  * @sv:
  * @r:
  *
@@ -215,7 +214,7 @@ sv_is_colrow_selected (SheetView const *sv, int colrow, gboolean is_col)
 }
 
 /**
- * sv_is_full_colrow_selected
+ * sv_is_full_colrow_selected:
  * @sv:
  * @is_cols:
  * @index:
@@ -390,7 +389,7 @@ sv_menu_enable_insert (SheetView *sv, gboolean col, gboolean row)
 }
 
 /**
- * selection_first_range
+ * selection_first_range:
  * @sv: The #SheetView whose selection we are testing.
  * @cc: The command context to report errors to
  * @cmd_name: A string naming the operation requiring a single range.
@@ -425,7 +424,6 @@ selection_first_range (SheetView const *sv,
 
 /**
  * sv_selection_extend_to:
- *
  * @sv: the sheet
  * @col:   column that gets covered (negative indicates all cols)
  * @row:   row that gets covered (negative indicates all rows)
@@ -719,7 +717,7 @@ sv_selection_add_pos (SheetView *sv, int col, int row, GnmSelectionMode mode)
 }
 
 /**
- * sv_selection_free
+ * sv_selection_free:
  * @sv: #SheetView
  *
  * Releases the selection associated with @sv
@@ -736,7 +734,7 @@ sv_selection_free (SheetView *sv)
 }
 
 /**
- * sv_selection_simplified_free
+ * sv_selection_simplified_free:
  * @sv: #SheetView
  *
  * Releases the simplified selection associated with @sv
@@ -1231,7 +1229,7 @@ sheet_selection_is_allowed (Sheet const *sheet, GnmCellPos const *pos)
 		return sheet->protected_allow.select_unlocked_cells;
 }
 
-/**
+/*
  * walk_boundaries: Iterates through a region by row then column.
  * @sv: The sheet being iterated in
  * @bound: The bounding range
@@ -1241,7 +1239,7 @@ sheet_selection_is_allowed (Sheet const *sheet, GnmCellPos const *pos)
  * @res: The result.
  *
  * Returns: TRUE if the cursor leaves the boundary region.
- **/
+ */
 static gboolean
 walk_boundaries (SheetView const *sv, GnmRange const * const bound,
 		 gboolean const forward, gboolean const horizontal,
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index ef9f857..853ad71 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -1017,7 +1017,7 @@ gnm_pane_make_cell_visible (GnmPane *pane, int col, int row,
 }
 
 /**
- * scg_make_cell_visible
+ * scg_make_cell_visible:
  * @scg: The gui control
  * @col:
  * @row:
@@ -2530,7 +2530,7 @@ calc_obj_place (GnmPane *pane, gint64 canvas_coord, gboolean is_col,
 #define SO_CLASS(so) SHEET_OBJECT_CLASS (G_OBJECT_GET_CLASS(so))
 
 /**
- * scg_object_select
+ * scg_object_select:
  * @scg: The #SheetControl to edit in.
  * @so: The #SheetObject to select.
  *
@@ -3474,7 +3474,6 @@ scg_rangesel_extend (SheetControlGUI *scg, int n,
 
 /**
  * scg_cursor_move:
- *
  * @scg: The scg
  * @dir: Number of units to move the cursor
  * @jump_to_bound: skip from the start to the end of ranges
@@ -3514,11 +3513,11 @@ scg_cursor_move (SheetControlGUI *scg, int n,
 
 /**
  * scg_cursor_extend :
- * @sheet              : Sheet to operate in.
+ * @scg                : The scg
  * @n                  : Units to extend the selection
- * @jump_to_boundaries : Move to transitions between cells and blanks,
+ * @jump_to_bound      : Move to transitions between cells and blanks,
  *                       or move in single steps.
- * @horizontal         : extend vertically or horizontally.
+ * @horiz              : extend vertically or horizontally.
  */
 void
 scg_cursor_extend (SheetControlGUI *scg, int n,
diff --git a/src/sheet-merge.c b/src/sheet-merge.c
index 0f5ace2..bfcf900 100644
--- a/src/sheet-merge.c
+++ b/src/sheet-merge.c
@@ -48,7 +48,6 @@ range_row_cmp (GnmRange const *a, GnmRange const *b)
 
 /**
  * gnm_sheet_merge_add:
- *
  * @sheet: the sheet which will contain the region
  * @r: The region to merge
  * @clear: should the non-corner content of the region be cleared and the
@@ -152,7 +151,6 @@ gnm_sheet_merge_add (Sheet *sheet, GnmRange const *r, gboolean clear,
 
 /**
  * gnm_sheet_merge_remove:
- *
  * @sheet: the sheet which will contain the region
  * @r: The region
  * @cc: the calling context
@@ -282,7 +280,6 @@ gnm_sheet_merge_get_adjacent (Sheet const *sheet, GnmCellPos const *pos,
 
 /**
  * gnm_sheet_merge_is_corner:
- *
  * @sheet:
  * @pos: cellpos if top left corner
  *
@@ -357,7 +354,7 @@ gnm_sheet_merge_relocate (GnmExprRelocateInfo const *ri)
 }
 
 /**
- * gnm_sheet_merge_find_container
+ * gnm_sheet_merge_find_container:
  * @sheet: sheet
  * @r: the range to test
  */
diff --git a/src/sheet-object-graph.c b/src/sheet-object-graph.c
index aa4f733..e1eb766 100644
--- a/src/sheet-object-graph.c
+++ b/src/sheet-object-graph.c
@@ -787,6 +787,7 @@ sheet_object_graph_guru (WBCGtk *wbcg, GogGraph *graph,
 }
 
 /**
+ * sheet_object_graph_ensure_size:
  * @so: #SheetObject
  *
  * Updates the size of the graph item in the canvas for graph sheets objects.
diff --git a/src/sheet-object-image.c b/src/sheet-object-image.c
index 808008b..3d2ff36 100644
--- a/src/sheet-object-image.c
+++ b/src/sheet-object-image.c
@@ -124,7 +124,7 @@ enum {
 
 /**
  * sheet_object_image_set_image :
- * @so : #SheetObjectImage
+ * @soi  : #SheetObjectImage
  * @type :
  * @data :
  * @data_len
diff --git a/src/sheet-object.c b/src/sheet-object.c
index 28f1270..60180f6 100644
--- a/src/sheet-object.c
+++ b/src/sheet-object.c
@@ -455,7 +455,6 @@ sheet_object_get_view (SheetObject const *so, SheetObjectViewContainer *containe
 
 /**
  * sheet_object_update_bounds:
- *
  * @so: The sheet object
  * @p: An optional position marking the top left of the region
  *        needing relocation (default == A1)
@@ -675,10 +674,9 @@ sheet_object_foreach_dep (SheetObject *so,
 /**
  * sheet_object_new_view:
  * @so:
- * @sc:
- * @key:
+ * @container:
  *
- * Asks @so to create a view for the (@sc,@key) pair.
+ * Asks @so to create a view for @container.
  * Returns: (transfer none): the new #SheetObjectView.
  **/
 SheetObjectView *
@@ -841,7 +839,6 @@ sheet_object_default_size (SheetObject *so, double *w, double *h)
 
 /**
  * sheet_object_position_pts_get:
- *
  * @so: The sheet object
  * @coords: array of 4 doubles
  *
@@ -923,7 +920,6 @@ clear_sheet (SheetObject *so, GOUndo **pundo)
 
 /**
  * sheet_objects_relocate:
- *
  * @rinfo: details on what should be moved.
  * @update: Should we do the bound_update now, or leave it for later.
  *		if FALSE honour the move_with_cells flag.
@@ -1001,7 +997,6 @@ sheet_objects_relocate (GnmExprRelocateInfo const *rinfo, gboolean update,
 
 /**
  * sheet_objects_get:
- *
  * @sheet: the sheet.
  * @r: an optional range to look in
  * @t: The type of object to lookup
@@ -1033,7 +1028,6 @@ sheet_objects_get (Sheet const *sheet, GnmRange const *r, GType t)
 
 /**
  * sheet_objects_clear:
- *
  * @sheet: the sheet.
  * @r: an optional range to look in
  *
diff --git a/src/sheet-style.c b/src/sheet-style.c
index b6209c1..dccd295 100644
--- a/src/sheet-style.c
+++ b/src/sheet-style.c
@@ -169,7 +169,7 @@ cell_tile_optimize (CellTile **tile, int level, CellTileOptimize *data,
 		    int ccol, int crow);
 
 
-/**
+/*
  * sheet_style_unlink
  * For internal use only
  */
@@ -182,7 +182,6 @@ sheet_style_unlink (Sheet *sheet, GnmStyle *st)
 
 /**
  * sheet_style_find :
- *
  * @sheet: (transfer full): the sheet
  * @s: a style
  *
@@ -285,7 +284,7 @@ rstyle_dtor (ReplacementStyle *rs)
 	}
 }
 
-/**
+/*
  * rstyle_apply :  Utility routine that is at the core of applying partial
  * styles or storing complete styles.  It will eventually be smarter
  * and will maintain the cache of styles associated with each sheet
@@ -837,6 +836,8 @@ sheet_style_get_auto_pattern_color (Sheet const *sheet)
 }
 
 /**
+ * sheet_style_update_grid_color:
+ *
  * This function updates the color of gnm_style_border_none when the sheet to be
  * rendered is known. gnm_style_border_none tells how to render the
  * grid. Because the grid color may be different for different sheets, the
@@ -929,7 +930,7 @@ row_indicies (int corner_row, int h, GnmRange const *apply_to,
 	return TRUE;
 }
 
-/**
+/*
  * cell_tile_apply : This is the primary logic for making changing areas in the
  * tree.  It could be further optimised if it becomes a bottle neck.
  */
@@ -1187,7 +1188,7 @@ foreach_tile (CellTile *tile, int level,
 	}
 }
 
-/**
+/*
  * cell_tile_apply_pos : This is an simplified version of cell_tile_apply.  It
  * does not need all the bells and whistles because it operates on single cells.
  */
@@ -1661,7 +1662,6 @@ apply_border (Sheet *sheet, GnmRange const *r,
 
 /**
  * sheet_style_apply_border :
- *
  * @sheet   :
  * @range   :
  * @borders :
@@ -1862,7 +1862,6 @@ border_mask_vec (gboolean *known, GnmBorder **borders,
 
 /**
  * sheet_style_get_uniform :
- *
  * @sheet   :
  * @range   :
  * @borders :
@@ -1987,8 +1986,7 @@ sheet_style_find_conflicts (Sheet const *sheet, GnmRange const *r,
 }
 
 /**
- * sheet_style_relocate
- *
+ * sheet_style_relocate:
  * @rinfo :
  *
  * Slide the styles from the origin region to the new position.
@@ -2012,8 +2010,7 @@ sheet_style_relocate (GnmExprRelocateInfo const *rinfo)
 }
 
 /**
- * sheet_style_insert_colrow
- *
+ * sheet_style_insert_colrow:
  * @rinfo :
  *
  * A utility routine to give the effect of stretching the styles when a col/row
@@ -2096,7 +2093,6 @@ cb_style_extent (GnmStyle *style,
 
 /**
  * sheet_style_get_extent:
- *
  * @sheet: sheet to measure
  * @r: starting range and resulting range
  *
@@ -2766,7 +2762,7 @@ internal_style_list (Sheet const *sheet, GnmRange const *r,
 /**
  * sheet_style_get_range:
  * @sheet: the sheet in which to find styles
- * @range: optional range to scan
+ * @r:     optional range to scan
  *
  * Get a list of rectangles and their associated styles.
  * Caller is responsible for freeing.  Note that when a range is given,
@@ -2797,7 +2793,7 @@ style_conditions_filter (GnmStyle const *style)
 /**
  * sheet_style_collect_conditions:
  * @sheet:
- * @range:
+ * @r:
  *
  * Returns: (transfer full): a list of areas with conditionals, Caller is
  * responsible for freeing.
@@ -2826,7 +2822,7 @@ style_hlink_filter (GnmStyle const *style)
 /**
  * sheet_style_collect_hlinks:
  * @sheet:
- * @range:
+ * @r:
  *
  * Returns: (transfer full): a list of areas with hyperlinks, Caller is
  * responsible for freeing.
@@ -2857,7 +2853,7 @@ style_validation_filter (GnmStyle const *style)
 /**
  * sheet_style_collect_validations:
  * @sheet:
- * @range:
+ * @r:
  *
  * Returns: (transfer full): a list of areas with validation, Caller is
  * responsible for freeing.
@@ -2910,7 +2906,6 @@ sheet_style_set_list (Sheet *sheet, GnmCellPos const *corner,
 
 /**
  * style_list_free :
- *
  * @list : the list to free
  *
  * Free up the ressources in the style list.  Including unreferencing the
@@ -2924,7 +2919,6 @@ style_list_free (GnmStyleList *list)
 
 /**
  * style_list_get_style :
- *
  * @list : A style list.
  * @col  :
  * @row  :
@@ -3005,7 +2999,6 @@ sheet_style_foreach (Sheet const *sheet, GHFunc func, gpointer user_data)
  * @r: optional range
  * @func: (scope call): callback.
  * @user_data: user data
- * @optimize:
  *
  **/
 void
diff --git a/src/sheet-utils.c b/src/sheet-utils.c
index de4f463..eb8d198 100644
--- a/src/sheet-utils.c
+++ b/src/sheet-utils.c
@@ -36,7 +36,7 @@ sheet_cell_or_one_below_is_not_empty (Sheet *sheet, int col, int row)
 /**
  * gnm_sheet_guess_region :
  * @sheet : #Sheet
- * @range : #GnmRange
+ * @region: #GnmRange
  *
  * Makes a guess at the logical containing @region and returns the possibly
  * expanded result in @region.
diff --git a/src/sheet-view.c b/src/sheet-view.c
index 4cb0958..2c61045 100644
--- a/src/sheet-view.c
+++ b/src/sheet-view.c
@@ -568,14 +568,13 @@ sv_flag_status_update_pos (SheetView *sv, GnmCellPos const *pos)
 }
 
 /**
- * sheet_flag_status_update_range:
- *    flag the sheet as requiring an update to the status display
- *    if the supplied cell location contains the edit cursor, or intersects of
- *    the selected region.
- *
- * @sheet:
+ * sv_flag_status_update_range:
+ * @sv:
  * @range: If NULL then force an update.
  *
+ * flag the sheet as requiring an update to the status display if the supplied
+ * cell location contains the edit cursor, or intersects of the selected region.
+ *
  * Will cause the format toolbar, the edit area, and the auto expressions to be
  * updated if appropriate.
  */
@@ -608,7 +607,7 @@ sv_flag_status_update_range (SheetView *sv, GnmRange const *range)
 
 /**
  * sv_flag_style_update_range :
- * @sheet : The sheet being changed
+ * @sv : The sheet being changed
  * @range : the range that is changing.
  *
  * Flag style  changes that will require updating the style  indicators.
@@ -624,9 +623,9 @@ sv_flag_style_update_range (SheetView *sv, GnmRange const *range)
 
 /**
  * sv_flag_selection_change :
- *    flag the sheet as requiring an update to the status display
+ * @sv :
  *
- * @sheet :
+ * flag the sheet as requiring an update to the status display
  *
  * Will cause auto expressions to be updated
  */
@@ -752,7 +751,7 @@ sv_editpos_in_slicer (SheetView const *sv)
 
 /**
  * sv_freeze_panes :
- * @sheet    : the sheet
+ * @sv       : the sheet
  * @frozen   : top left corner of the frozen region
  * @unfrozen : top left corner of the unfrozen region
  *
@@ -880,7 +879,7 @@ sv_is_frozen (SheetView const *sv)
 }
 
 /**
- * sv_set_initial_top_left
+  sv_set_initial_top_left:
  * @sv: the sheet view.
  * @col:
  * @row:
diff --git a/src/sheet.c b/src/sheet.c
index 87824a3..a30d213 100644
--- a/src/sheet.c
+++ b/src/sheet.c
@@ -3991,7 +3991,6 @@ cb_sheet_cells_collect (G_GNUC_UNUSED gpointer unused,
 
 /**
  * sheet_cell_positions:
- *
  * @sheet: The sheet to find cells in.
  * @comments: If true, include cells with only comments also.
  *
@@ -5545,7 +5544,7 @@ sheet_col_get_distance_pixels (Sheet const *sheet, int from, int to)
  * sheet_col_set_size_pts:
  * @sheet:	 The sheet
  * @col:	 The col
- * @widtht_pts:	 The desired widtht in pts
+ * @width_pts:	 The desired widtht in pts
  * @set_by_user: TRUE if this was done by a user (ie, user manually
  *               set the width)
  *
@@ -5735,7 +5734,7 @@ sheet_row_set_size_pts (Sheet *sheet, int row, double height_pts,
  * sheet_row_set_size_pixels:
  * @sheet:	 The sheet
  * @row:	 The row
- * @height:	 The desired height
+ * @height_pixels: The desired height
  * @set_by_user: TRUE if this was done by a user (ie, user manually
  *                      set the width)
  *
@@ -6110,7 +6109,7 @@ cb_queue_respan (GnmColRowIter const *iter, void *user_data)
 }
 
 /**
- * sheet_queue_respan *
+ * sheet_queue_respan:
  * @sheet:
  * @start_row:
  * @end_row:
diff --git a/src/stf-parse.c b/src/stf-parse.c
index c9358be..7c7b16e 100644
--- a/src/stf-parse.c
+++ b/src/stf-parse.c
@@ -360,7 +360,7 @@ stf_parse_options_csv_set_indicator_2x_is_single (StfParseOptions_t *parseoption
 
 /**
  * stf_parse_options_csv_set_duplicates:
- * @pareseoptions:
+ * @parseoptions:
  * @duplicates: a boolean value indicating whether we want to see two
  *               separators right behind each other as one
  **/
diff --git a/src/stf.c b/src/stf.c
index 1065697..7ecf449 100644
--- a/src/stf.c
+++ b/src/stf.c
@@ -82,8 +82,8 @@ stf_warning (GOIOContext *context, char const *msg)
 }
 
 
-/**
- * stf_open_and_read
+/*
+ * stf_open_and_read:
  * @filename : name of the file to open&read
  *
  * Will open filename, read the file into a g_alloced memory buffer
@@ -91,7 +91,7 @@ stf_warning (GOIOContext *context, char const *msg)
  * NOTE : The returned buffer has to be g_freed by the calling routine.
  *
  * returns : a buffer containing the file contents
- **/
+ */
 static char *
 stf_open_and_read (G_GNUC_UNUSED GOIOContext *context, GsfInput *input, size_t *readsize)
 {
@@ -209,8 +209,8 @@ resize_columns (Sheet *sheet)
 }
 
 
-/**
- * stf_read_workbook
+/*
+ * stf_read_workbook:
  * @fo       : file opener
  * @enc      : encoding of file
  * @context  : command context
@@ -218,7 +218,7 @@ resize_columns (Sheet *sheet)
  * @input    : file to read from+convert
  *
  * Main routine, handles importing a file including all dialog mumbo-jumbo
- **/
+ */
 static void
 stf_read_workbook (G_GNUC_UNUSED GOFileOpener const *fo,  gchar const *enc,
 		   GOIOContext *context, GoView *view, GsfInput *input)
@@ -411,8 +411,8 @@ clear_stray_NULs (GOIOContext *context, GString *utf8data)
 	}
 }
 
-/**
- * stf_read_workbook_auto_csvtab
+/*
+ * stf_read_workbook_auto_csvtab:
  * @fo       : file opener
  * @enc      : optional encoding
  * @context  : command context
@@ -420,7 +420,7 @@ clear_stray_NULs (GOIOContext *context, GString *utf8data)
  * @input    : file to read from+convert
  *
  * Attempt to auto-detect CSV or tab-delimited file
- **/
+ */
 static void
 stf_read_workbook_auto_csvtab (G_GNUC_UNUSED GOFileOpener const *fo, gchar const *enc,
 			       GOIOContext *context,
diff --git a/src/style-border.c b/src/style-border.c
index 0474af2..eea2270 100644
--- a/src/style-border.c
+++ b/src/style-border.c
@@ -183,7 +183,6 @@ gnm_style_border_none_set_color (GnmColor *color)
 
 /**
  * gnm_style_border_fetch :
- *
  * @line_type : dash style
  * @color : colour
  * @orientation : Not currently used.
diff --git a/src/style-color.c b/src/style-color.c
index 9a7fdf0..0b4f920 100644
--- a/src/style-color.c
+++ b/src/style-color.c
@@ -130,11 +130,13 @@ style_color_grid (void)
 	return style_color_ref (sc_grid);
 }
 
-/**
+/*
  * Support for Excel auto-colors.
  */
 
 /**
+ * style_color_auto_font:
+ *
  * Always black, as far as we know.
  */
 GnmColor *
@@ -148,6 +150,8 @@ style_color_auto_font (void)
 }
 
 /**
+ * style_color_auto_back:
+ *
  * Always white, as far as we know.
  */
 GnmColor *
@@ -161,6 +165,8 @@ style_color_auto_back (void)
 }
 
 /**
+ * style_color_auto_pattern:
+ *
  * Normally black, but follows grid color if so told.
  */
 GnmColor *
diff --git a/src/style.c b/src/style.c
index 0f2e05c..9dd9869 100644
--- a/src/style.c
+++ b/src/style.c
@@ -102,8 +102,8 @@ gnm_font_override_codepage (gchar const *font_name)
 }
 
 
-/**
- * get_substitute_font
+/*
+ * get_substitute_font:
  * @font_name    The font name
  *
  * Tries to find a gnome font which matches the Excel font.
@@ -528,7 +528,7 @@ gnm_font_shutdown (void)
 }
 
 /**
- * gnm_style_required_spanflags
+ * gnm_style_required_spanflags:
  * @style: the style
  *
  * What changes are required after applying the supplied style.
@@ -572,8 +572,8 @@ gnm_style_required_spanflags (GnmStyle const *style)
 
 /**
  * gnm_style_default_halign :
- * @style :
- * @cell  :
+ * @mstyle :
+ * @c  :
  *
  * Select the appropriate horizontal alignment depending on the style and cell
  * value.
diff --git a/src/symbol.c b/src/symbol.c
index 4780535..00e3a01 100644
--- a/src/symbol.c
+++ b/src/symbol.c
@@ -72,7 +72,6 @@ symbol_names (SymbolTable *st, GSList *list, char const *prefix)
 
 /**
  * symbol_install:
- *
  * @st: The symbol table
  * @str: the string name
  * @type: in which hash table we perform the lookup
diff --git a/src/tools/dao.c b/src/tools/dao.c
index 3400201..27c7a2d 100644
--- a/src/tools/dao.c
+++ b/src/tools/dao.c
@@ -115,7 +115,7 @@ void dao_free (data_analysis_output_t *dao)
 /**
  * dao_load_from_value: (skip)
  * @dao:
- * @value:
+ * @output_range:
  *
  **/
 data_analysis_output_t *
@@ -979,13 +979,13 @@ dao_append_date (GString *buf)
 }
 
 /**
- * dao_write_header: Writes the titles of a report.
+ * dao_write_header:
  * @dao:
  * @toolname: name of the tool, like Solver or Risk simulation
  * @title:
  * @sheet:
  *
- *
+ * Writes the titles of a report.
  *
  **/
 void
diff --git a/src/value.c b/src/value.c
index dcc0a63..0275a70 100644
--- a/src/value.c
+++ b/src/value.c
@@ -263,7 +263,9 @@ value_new_cellrange_unsafe (GnmCellRef const *a, GnmCellRef const *b)
 }
 
 /**
- * value_new_cellrange: Create a new range reference.
+ * value_new_cellrange:
+ *
+ * Create a new range reference.
  *
  * Attempt to do a sanity check for inverted ranges.
  * NOTE : This is no longer necessary and will be removed.
@@ -1163,7 +1165,6 @@ compare_float_float (GnmValue const *va, GnmValue const *vb)
 
 /**
  * value_diff:
- *
  * @a: value a
  * @b: value b
  *
@@ -1269,7 +1270,7 @@ gnm_string_cmp_ignorecase (gconstpointer gstr_a, gconstpointer gstr_b)
 }
 
 
-/**
+/*
  * value_compare:
  *
  * @a: value a
diff --git a/src/wbc-gtk-edit.c b/src/wbc-gtk-edit.c
index 2b03f8b..8c0fccb 100644
--- a/src/wbc-gtk-edit.c
+++ b/src/wbc-gtk-edit.c
@@ -805,7 +805,6 @@ cb_warn_toggled (GtkToggleButton *button, gboolean *b)
 
 /**
  * wbcg_edit_start:
- *
  * @wbcg:       The workbook to be edited.
  * @blankp:   If true, erase current cell contents first.  If false, leave the
  *            contents alone.
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index af5b65c..122ed25 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -1741,7 +1741,7 @@ wbcg_show_save_dialog (WBCGtk *wbcg,
 	return ret;
 }
 
-/**
+/*
  * wbcg_close_if_user_permits : If the workbook is dirty the user is
  *		prompted to see if they should exit.
  *
diff --git a/src/widgets/gnumeric-expr-entry.c b/src/widgets/gnumeric-expr-entry.c
index 2aeff4a..ad8bedc 100644
--- a/src/widgets/gnumeric-expr-entry.c
+++ b/src/widgets/gnumeric-expr-entry.c
@@ -1926,7 +1926,7 @@ gee_find_lexer_token (GnmLexerItem const *gli, guint token_pos,
 }
 
 /**
- * gnm_expr_entry_find_range
+ * gnm_expr_entry_find_range:
  * @gee:   a #GnmExprEntry
  *
  * Look at the current selection to see how much of it needs to be changed when
@@ -2130,7 +2130,7 @@ gnm_expr_entry_find_range (GnmExprEntry *gee)
 }
 
 /**
- * gnm_expr_entry_rangesel_stop
+ * gnm_expr_entry_rangesel_stop:
  * @gee:   a #GnmExprEntry
  * @clear_string: clear string flag
  *
@@ -2336,7 +2336,7 @@ gnm_expr_entry_set_flags (GnmExprEntry *gee,
 }
 
 /**
- * gnm_expr_entry_set_scg
+ * gnm_expr_entry_set_scg:
  * @gee: a #GnmExprEntry
  * @scg: a #SheetControlGUI
  *
@@ -2403,7 +2403,7 @@ gnm_expr_entry_load_from_text (GnmExprEntry *gee, char const *txt)
 }
 
 /**
- * gnm_expr_entry_load_from_dep
+ * gnm_expr_entry_load_from_dep:
  * @gee: a #GnmExprEntry
  * @dep: A dependent
  *
@@ -2437,7 +2437,7 @@ gnm_expr_entry_load_from_dep (GnmExprEntry *gee, GnmDependent const *dep)
 }
 
 /**
- * gnm_expr_entry_load_from_expr
+ * gnm_expr_entry_load_from_expr:
  * @gee: a #GnmExprEntry
  * @texpr: An expression
  * @pp: The parse position
@@ -2469,7 +2469,7 @@ gnm_expr_entry_load_from_expr (GnmExprEntry *gee,
 }
 
 /**
- * gnm_expr_entry_load_from_range
+ * gnm_expr_entry_load_from_range:
  * @gee: a #GnmExprEntry
  * @r:          a #GnmRange
  * @sheet:      a #sheet
@@ -2530,7 +2530,7 @@ gnm_expr_entry_load_from_range (GnmExprEntry *gee,
 }
 
 /**
- * gnm_expr_entry_get_rangesel
+ * gnm_expr_entry_get_rangesel:
  * @gee: a #GnmExprEntry
  * @r:          address to receive #GnmRange
  * @sheet:      address to receive #sheet
@@ -2571,7 +2571,7 @@ gnm_expr_entry_get_rangesel (GnmExprEntry const *gee,
 }
 
 /**
- * gnm_expr_entry_can_rangesel
+ * gnm_expr_entry_can_rangesel:
  * @gee:   a #GnmExprEntry
  *
  * Returns TRUE if a range selection is meaningful at current position.
@@ -2692,7 +2692,7 @@ gnm_expr_entry_parse (GnmExprEntry *gee, GnmParsePos const *pp,
 }
 
 /**
- * gnm_expr_entry_get_text
+ * gnm_expr_entry_get_text:
  * @gee:
  *
  * A small convenience routine.  Think long and hard before using this.
@@ -2709,7 +2709,6 @@ gnm_expr_entry_get_text	(GnmExprEntry const *gee)
 
 /**
  * gnm_expr_entry_parse_as_value:
- *
  * @gee: GnmExprEntry
  * @sheet: the sheet where the cell range is evaluated.
  *
@@ -2749,7 +2748,6 @@ gnm_expr_entry_parse_as_value (GnmExprEntry *gee, Sheet *sheet)
 
 /**
  * gnm_expr_entry_parse_as_list:
- *
  * @gee: GnmExprEntry
  * @sheet: the sheet where the cell range is evaluated. This really only needed if
  *         the range given does not include a sheet specification.
diff --git a/src/workbook-view.c b/src/workbook-view.c
index 4358d48..6e49db6 100644
--- a/src/workbook-view.c
+++ b/src/workbook-view.c
@@ -414,10 +414,11 @@ wb_view_selection_desc (WorkbookView *wbv, gboolean use_pos,
 }
 
 /**
- * Load the edit line with the value of the cell in @sheet's edit_pos.
- *
+ * wb_view_edit_line_set:
  * @wbv : The view
- * @wbc : An Optional control
+ * @optional_wbc : An Optional control
+ *
+ * Load the edit line with the value of the cell in @sheet's edit_pos.
  *
  * Calculate what to display on the edit line then display it either in the
  * control @wbc,  or if that is NULL, in all controls.
@@ -1095,7 +1096,7 @@ wb_view_save_to_uri (WorkbookView *wbv, GOFileSaver const *fs,
  * wb_view_save_as:
  * @wbv: Workbook View
  * @fs: GOFileSaver object
- * @file_name: URI to save as.
+ * @uri: URI to save as.
  * @context:
  *
  * Saves @wbv and workbook it's attached to into @uri file using
@@ -1198,7 +1199,7 @@ wb_view_save (WorkbookView *wbv, GOCmdContext *context)
 }
 
 /**
- * workbook_view_new_from_uri:
+ * workbook_view_new_from_input:
  * @input: #GsfInput to read data from.
  * @optional_format: Optional GOFileOpener
  * @io_context: Optional context to display errors.
diff --git a/src/workbook.c b/src/workbook.c
index 72a56be..55cfa01 100644
--- a/src/workbook.c
+++ b/src/workbook.c
@@ -508,7 +508,6 @@ workbook_set_last_export_uri (Workbook *wb, gchar *uri)
 
 /**
  * workbook_foreach_cell_in_range:
- *
  * @pos: The position the range is relative to.
  * @cell_range: A value containing a range;
  * @flags: if TRUE only existing cells are sent to the handler.
@@ -570,7 +569,6 @@ workbook_foreach_cell_in_range (GnmEvalPos const *pos,
 
 /**
  * workbook_cells:
- *
  * @wb: The workbook to find cells in.
  * @comments: If true, include cells with only comments also.
  * @vis: How visible a sheet needs to be in order to be considered.
@@ -643,7 +641,6 @@ workbook_optimize_style (Workbook *wb)
 
 /**
  * workbook_foreach_name:
- *
  * @wb: #Workbook
  * @globals_only: whether to apply only to global names.
  * @func: (scope call): The operator to apply to each cell.
@@ -1104,6 +1101,8 @@ workbook_sheet_delete (Sheet *sheet)
 }
 
 /**
+ * workbook_sheet_move:
+ *
  * Moves the sheet up or down @direction spots in the sheet list
  * If @direction is negative, move left. If positive, move right.
  */
diff --git a/src/xml-sax-read.c b/src/xml-sax-read.c
index e069d86..c818b0d 100644
--- a/src/xml-sax-read.c
+++ b/src/xml-sax-read.c
@@ -1896,7 +1896,7 @@ xml_sax_cell (GsfXMLIn *xin, xmlChar const **attrs)
 	state->value_fmt = value_fmt;
 }
 
-/**
+/*
  * xml_cell_set_array_expr : Utility routine to parse an expression
  *     and store it as an array.
  *
@@ -1937,7 +1937,7 @@ xml_cell_set_array_expr (XMLSaxParseState *state,
 	gnm_expr_top_unref (texpr);
 }
 
-/**
+/*
  * xml_not_used_old_array_spec : See if the string corresponds to
  *     a pre-0.53 style array expression.
  *     If it is the upper left corner	 - assign it.