Make 3.0 parallel-installable to 2.x

[~andy/gtk] / docs / reference / gtk / tmpl / gtkprogress.sgml

diff --git a/docs/reference/gtk/tmpl/gtkprogress.sgml b/docs/reference/gtk/tmpl/gtkprogress.sgml
index c4a7488fcf1cd182ebfe79dce7377695a7106d81..3b63a76c83aae2cfda77b78456152e39a4e81bce 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkprogress.sgml
+++ b/docs/reference/gtk/tmpl/gtkprogress.sgml
@@ -2,7 +2,7 @@
 GtkProgress
 
 <!-- ##### SECTION Short_Description ##### -->
-the base class for #GtkProgressBar.
+Base class for GtkProgressBar
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
@@ -16,6 +16,12 @@ the progress of a long running operation.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkProgress ##### -->
 <para>
 The #GtkProgress-struct struct contains private data only.
@@ -23,6 +29,26 @@ and should be accessed using the functions below.
 </para>
 
 
+<!-- ##### ARG GtkProgress:activity-mode ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkProgress:show-text ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkProgress:text-xalign ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkProgress:text-yalign ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_progress_set_show_text ##### -->
 <para>
 Controls whether progress text is shown.
@@ -53,29 +79,30 @@ current progress.  The string can contain the following substitution characters:
 <itemizedlist>
 <listitem>
 <para>
-&percent;v - the current progress value.
+&percnt;v - the current progress value.
 </para>
 </listitem>
 <listitem>
 <para>
-&percent;l - the lower bound for the progress value.
+&percnt;l - the lower bound for the progress value.
 </para>
 </listitem>
 <listitem>
 <para>
-&percent;u - the upper bound for the progress value.
+&percnt;u - the upper bound for the progress value.
 </para>
 </listitem>
 <listitem>
 <para>
-&percent;p - the current progress percentage.
+&percnt;p - the current progress percentage.
 </para>
 </listitem>
 </itemizedlist>
 </para>
 
 @progress: a #GtkProgress.
-@format: a string used to display progress text.
+@format: a string used to display progress text, or %NULL
+         to restore to the default format.
 
 
 <!-- ##### FUNCTION gtk_progress_set_adjustment ##### -->
@@ -186,23 +213,3 @@ the #GtkProgress.
 @max: the maximum progress value.
 
 
-<!-- ##### ARG GtkProgress:activity-mode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgress:show-text ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgress:text-xalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgress:text-yalign ##### -->
-<para>
-
-</para>
-