diff --git a/devel-docs/libgimp/libgimp-docs.sgml b/devel-docs/libgimp/libgimp-docs.sgml
index 40cc69623d..14dbb4ab46 100644
--- a/devel-docs/libgimp/libgimp-docs.sgml
+++ b/devel-docs/libgimp/libgimp-docs.sgml
@@ -42,12 +42,12 @@
for GIMP &version;
-
+
GIMP Constants
&GimpEnums;
-
+
-
+
GIMP Library
&Gimp;
&GimpBrushes;
@@ -77,12 +77,12 @@
&GimpTile;
&GimpTools;
&GimpUndo;
-
+
-
+
GIMP User Interface Library
&GimpUI;
&GimpExport;
&GimpMenu;
-
+
diff --git a/devel-docs/libgimpbase/libgimpbase-docs.sgml b/devel-docs/libgimpbase/libgimpbase-docs.sgml
index 19eb7242da..0508ed6e2a 100644
--- a/devel-docs/libgimpbase/libgimpbase-docs.sgml
+++ b/devel-docs/libgimpbase/libgimpbase-docs.sgml
@@ -22,7 +22,7 @@
for GIMP &version;
-
+
GIMP Base Library
&GimpBaseTypes;
&GimpVersion;
@@ -36,5 +36,5 @@
&GimpUtils;
&GimpProtocol;
&GimpWire;
-
+
diff --git a/devel-docs/libgimpcolor/.cvsignore b/devel-docs/libgimpcolor/.cvsignore
index 4191049513..dab6f7a38b 100644
--- a/devel-docs/libgimpcolor/.cvsignore
+++ b/devel-docs/libgimpcolor/.cvsignore
@@ -9,5 +9,6 @@ libgimpcolor-decl-list.txt
libgimpcolor-unused.txt
libgimpcolor-undocumented.txt
html
-sgml
+xml
+version.xml
*.stamp
diff --git a/devel-docs/libgimpcolor/Makefile.am b/devel-docs/libgimpcolor/Makefile.am
index fd676d239e..ae6956c44d 100644
--- a/devel-docs/libgimpcolor/Makefile.am
+++ b/devel-docs/libgimpcolor/Makefile.am
@@ -16,7 +16,7 @@ SCANGOBJ_OPTIONS =
SCAN_OPTIONS =
# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS =
+MKDB_OPTIONS = --sgml-mode --output-format=xml
# Extra options to supply to gtkdoc-fixref
FIXXREF_OPTIONS =
@@ -67,7 +67,7 @@ EXTRA_DIST = \
$(DOC_MODULE).types \
$(DOC_MODULE)-sections.txt
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp xml-build.stamp html-build.stamp \
$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
SCANOBJ_FILES = \
@@ -107,15 +107,15 @@ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections
tmpl.stamp: tmpl-build.stamp
@true
-#### sgml ####
+#### xml ####
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
- @echo '*** Building SGML ***'
+xml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
+ @echo '*** Building XML ***'
cd $(srcdir) && \
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
- touch sgml-build.stamp
+ touch xml-build.stamp
-sgml.stamp: sgml-build.stamp
+sgml.stamp: xml-build.stamp
@true
#### html ####
@@ -139,7 +139,7 @@ clean-local:
rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
maintainer-clean-local: clean
- cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+ cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
@@ -176,10 +176,10 @@ endif
dist-hook: dist-check-gtkdoc dist-hook-local
mkdir $(distdir)/tmpl
- mkdir $(distdir)/sgml
+ mkdir $(distdir)/xml
mkdir $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
- -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
+ -cp $(srcdir)/xml/*.xml $(distdir)/xml
-cp $(srcdir)/html/* $(distdir)/html
.PHONY : dist-hook-local
diff --git a/devel-docs/libgimpcolor/libgimpcolor-docs.sgml b/devel-docs/libgimpcolor/libgimpcolor-docs.sgml
index 7e0c44e4a3..d46d767df2 100644
--- a/devel-docs/libgimpcolor/libgimpcolor-docs.sgml
+++ b/devel-docs/libgimpcolor/libgimpcolor-docs.sgml
@@ -1,21 +1,26 @@
-
-
-
-
-
+
+
+
+
+
+
+
]>
+
GIMP Color Library Reference Manual
+ for GIMP &version;
-
+
GIMP Color Library
&GimpRGB;
&GimpHSV;
&GimpColorSpace;
&GimpAdaptiveSupersample;
&GimpBilinear;
-
+
diff --git a/devel-docs/libgimpcolor/version.xml.in b/devel-docs/libgimpcolor/version.xml.in
new file mode 100644
index 0000000000..9e02d6ea46
--- /dev/null
+++ b/devel-docs/libgimpcolor/version.xml.in
@@ -0,0 +1 @@
+@GIMP_VERSION@
diff --git a/devel-docs/libgimpmath/.cvsignore b/devel-docs/libgimpmath/.cvsignore
index 1e40975b5e..87549678ab 100644
--- a/devel-docs/libgimpmath/.cvsignore
+++ b/devel-docs/libgimpmath/.cvsignore
@@ -9,5 +9,6 @@ libgimpmath-decl-list.txt
libgimpmath-unused.txt
libgimpmath-undocumented.txt
html
-sgml
+xml
+version.xml
*.stamp
diff --git a/devel-docs/libgimpmath/Makefile.am b/devel-docs/libgimpmath/Makefile.am
index 801228f7fb..c888b756ee 100644
--- a/devel-docs/libgimpmath/Makefile.am
+++ b/devel-docs/libgimpmath/Makefile.am
@@ -16,7 +16,7 @@ SCANGOBJ_OPTIONS =
SCAN_OPTIONS =
# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS =
+MKDB_OPTIONS = --sgml-mode --output-format=xml
# Extra options to supply to gtkdoc-fixref
FIXXREF_OPTIONS =
@@ -67,7 +67,7 @@ EXTRA_DIST = \
$(DOC_MODULE).types \
$(DOC_MODULE)-sections.txt
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp xml-build.stamp html-build.stamp \
$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
SCANOBJ_FILES = \
@@ -107,15 +107,15 @@ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections
tmpl.stamp: tmpl-build.stamp
@true
-#### sgml ####
+#### xml ####
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
- @echo '*** Building SGML ***'
+xml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
+ @echo '*** Building XML ***'
cd $(srcdir) && \
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
- touch sgml-build.stamp
+ touch xml-build.stamp
-sgml.stamp: sgml-build.stamp
+sgml.stamp: xml-build.stamp
@true
#### html ####
@@ -139,7 +139,7 @@ clean-local:
rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
maintainer-clean-local: clean
- cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+ cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
@@ -176,10 +176,10 @@ endif
dist-hook: dist-check-gtkdoc dist-hook-local
mkdir $(distdir)/tmpl
- mkdir $(distdir)/sgml
+ mkdir $(distdir)/xml
mkdir $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
- -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
+ -cp $(srcdir)/xml/*.xml $(distdir)/xml
-cp $(srcdir)/html/* $(distdir)/html
.PHONY : dist-hook-local
diff --git a/devel-docs/libgimpmath/libgimpmath-docs.sgml b/devel-docs/libgimpmath/libgimpmath-docs.sgml
index b6e542575f..14467e66d5 100644
--- a/devel-docs/libgimpmath/libgimpmath-docs.sgml
+++ b/devel-docs/libgimpmath/libgimpmath-docs.sgml
@@ -1,19 +1,24 @@
-
-
-
-
+
+
+
+
+
+
]>
+
GIMP Math Library Reference Manual
+ for GIMP &version;
-
+
GIMP Math Library
&GimpMath;
&GimpMatrix;
&GimpVector;
&GimpMD5;
-
+
diff --git a/devel-docs/libgimpmath/version.xml.in b/devel-docs/libgimpmath/version.xml.in
new file mode 100644
index 0000000000..9e02d6ea46
--- /dev/null
+++ b/devel-docs/libgimpmath/version.xml.in
@@ -0,0 +1 @@
+@GIMP_VERSION@
diff --git a/devel-docs/libgimpmodule/.cvsignore b/devel-docs/libgimpmodule/.cvsignore
index 85913b2162..2240bf3886 100644
--- a/devel-docs/libgimpmodule/.cvsignore
+++ b/devel-docs/libgimpmodule/.cvsignore
@@ -11,5 +11,6 @@ libgimpmodule-decl-list.txt
libgimpmodule-unused.txt
libgimpmodule-undocumented.txt
html
-sgml
+xml
+version.xml
*.stamp
diff --git a/devel-docs/libgimpmodule/Makefile.am b/devel-docs/libgimpmodule/Makefile.am
index 7811a68f56..675191d23a 100644
--- a/devel-docs/libgimpmodule/Makefile.am
+++ b/devel-docs/libgimpmodule/Makefile.am
@@ -16,7 +16,7 @@ SCANGOBJ_OPTIONS =
SCAN_OPTIONS =
# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS =
+MKDB_OPTIONS = --sgml-mode --output-format=xml
# Extra options to supply to gtkdoc-fixref
FIXXREF_OPTIONS =
@@ -74,7 +74,7 @@ EXTRA_DIST = \
$(DOC_MODULE).types \
$(DOC_MODULE)-sections.txt
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp xml-build.stamp html-build.stamp \
$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
SCANOBJ_FILES = \
@@ -114,15 +114,15 @@ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections
tmpl.stamp: tmpl-build.stamp
@true
-#### sgml ####
+#### xml ####
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
- @echo '*** Building SGML ***'
+xml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
+ @echo '*** Building XML ***'
cd $(srcdir) && \
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
- touch sgml-build.stamp
+ touch xml-build.stamp
-sgml.stamp: sgml-build.stamp
+sgml.stamp: xml-build.stamp
@true
#### html ####
@@ -146,7 +146,7 @@ clean-local:
rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
maintainer-clean-local: clean
- cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+ cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
@@ -183,10 +183,10 @@ endif
dist-hook: dist-check-gtkdoc dist-hook-local
mkdir $(distdir)/tmpl
- mkdir $(distdir)/sgml
+ mkdir $(distdir)/xml
mkdir $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
- -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
+ -cp $(srcdir)/xml/*.xml $(distdir)/xml
-cp $(srcdir)/html/* $(distdir)/html
.PHONY : dist-hook-local
diff --git a/devel-docs/libgimpmodule/libgimpmodule-docs.sgml b/devel-docs/libgimpmodule/libgimpmodule-docs.sgml
index 88f40d9315..b9e016ad34 100644
--- a/devel-docs/libgimpmodule/libgimpmodule-docs.sgml
+++ b/devel-docs/libgimpmodule/libgimpmodule-docs.sgml
@@ -1,15 +1,20 @@
-
-
+
+
+
+
]>
+
GIMP Module Library Reference Manual
+ for GIMP &version;
-
+
GIMP Module Library
&GimpModule;
&GimpModuleDB;
-
+
diff --git a/devel-docs/libgimpmodule/version.xml.in b/devel-docs/libgimpmodule/version.xml.in
new file mode 100644
index 0000000000..9e02d6ea46
--- /dev/null
+++ b/devel-docs/libgimpmodule/version.xml.in
@@ -0,0 +1 @@
+@GIMP_VERSION@
diff --git a/devel-docs/libgimpwidgets/.cvsignore b/devel-docs/libgimpwidgets/.cvsignore
index 0151879d44..ec06a15505 100644
--- a/devel-docs/libgimpwidgets/.cvsignore
+++ b/devel-docs/libgimpwidgets/.cvsignore
@@ -11,5 +11,6 @@ libgimpwidgets-decl-list.txt
libgimpwidgets-unused.txt
libgimpwidgets-undocumented.txt
html
-sgml
+xml
+version.xml
*.stamp
diff --git a/devel-docs/libgimpwidgets/Makefile.am b/devel-docs/libgimpwidgets/Makefile.am
index 8eca805a62..cdf877c69f 100644
--- a/devel-docs/libgimpwidgets/Makefile.am
+++ b/devel-docs/libgimpwidgets/Makefile.am
@@ -16,10 +16,10 @@ SCANGOBJ_OPTIONS =
SCAN_OPTIONS =
# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS =
+MKDB_OPTIONS = --sgml-mode --output-format=xml
# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS =
+FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpmath/html --extra-dir=../libgimp/html
# Used for dependencies
HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
@@ -181,7 +181,7 @@ EXTRA_DIST = \
$(DOC_MODULE).types \
$(DOC_MODULE)-sections.txt
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp xml-build.stamp html-build.stamp \
$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
SCANOBJ_FILES = \
@@ -221,15 +221,15 @@ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections
tmpl.stamp: tmpl-build.stamp
@true
-#### sgml ####
+#### xml ####
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
- @echo '*** Building SGML ***'
+xml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
+ @echo '*** Building XML ***'
cd $(srcdir) && \
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
- touch sgml-build.stamp
+ touch xml-build.stamp
-sgml.stamp: sgml-build.stamp
+sgml.stamp: xml-build.stamp
@true
#### html ####
@@ -253,7 +253,7 @@ clean-local:
rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
maintainer-clean-local: clean
- cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+ cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
@@ -290,10 +290,10 @@ endif
dist-hook: dist-check-gtkdoc dist-hook-local
mkdir $(distdir)/tmpl
- mkdir $(distdir)/sgml
+ mkdir $(distdir)/xml
mkdir $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
- -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
+ -cp $(srcdir)/xml/*.xml $(distdir)/xml
-cp $(srcdir)/html/* $(distdir)/html
.PHONY : dist-hook-local
diff --git a/devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml b/devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml
index c64b3afe67..6c92c145a3 100644
--- a/devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml
+++ b/devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml
@@ -1,34 +1,35 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
]>
+
GIMP Widgets Library Reference Manual
+ for GIMP &version;
diff --git a/devel-docs/libgimpwidgets/tmpl/gimpdialog.sgml b/devel-docs/libgimpwidgets/tmpl/gimpdialog.sgml
index 3e70530a60..d3921e9004 100644
--- a/devel-docs/libgimpwidgets/tmpl/gimpdialog.sgml
+++ b/devel-docs/libgimpwidgets/tmpl/gimpdialog.sgml
@@ -69,8 +69,8 @@ dialog-related stuff.
The @va_list describing the action_area #GtkButton's has the following format:
-
-
+
+
diff --git a/devel-docs/libgimpwidgets/tmpl/gimpunitmenu.sgml b/devel-docs/libgimpwidgets/tmpl/gimpunitmenu.sgml
index 0f0dc51450..945424c599 100644
--- a/devel-docs/libgimpwidgets/tmpl/gimpunitmenu.sgml
+++ b/devel-docs/libgimpwidgets/tmpl/gimpunitmenu.sgml
@@ -42,8 +42,8 @@ gimp_coordinates_new()
-
-
+
+
diff --git a/devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml b/devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml
index 469620ebd0..9b8ce7124a 100644
--- a/devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml
+++ b/devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml
@@ -27,8 +27,8 @@ helper functions.
The @va_list describing the #GtkMenuItem's has the following format:
-
-
+
+
@@ -77,8 +77,8 @@ gtk_object_set_user_data().
The @va_list describing the #GtkMenuItem's has the following format:
-
-
+
+
@@ -143,8 +143,8 @@ gtk_object_set_user_data().
The @va_list describing the #GtkRadioButton's has the following format:
-
-
+
+
@@ -194,8 +194,8 @@ gtk_object_set_user_data().
The @va_list describing the #GtkRadioButton's has the following format:
-
-
+
+
diff --git a/devel-docs/libgimpwidgets/version.xml.in b/devel-docs/libgimpwidgets/version.xml.in
new file mode 100644
index 0000000000..9e02d6ea46
--- /dev/null
+++ b/devel-docs/libgimpwidgets/version.xml.in
@@ -0,0 +1 @@
+@GIMP_VERSION@
diff --git a/libgimp/gimpdrawable_pdb.c b/libgimp/gimpdrawable_pdb.c
index 34b8d4dc5d..38e4afd2a6 100644
--- a/libgimp/gimpdrawable_pdb.c
+++ b/libgimp/gimpdrawable_pdb.c
@@ -115,7 +115,7 @@ gimp_drawable_fill (gint32 drawable_ID,
* This procedure updates the specified region of the drawable. The (x,
* y) coordinate pair is relative to the drawable's origin, not to the
* image origin. Therefore, the entire drawable can be updated with:
- * {x->0, y->0, w->width, h->height }.
+ * {x->0, y->0, w->width, h->height }.
*
* Returns: TRUE on success.
*/
diff --git a/libgimp/gimpgimprc_pdb.c b/libgimp/gimpgimprc_pdb.c
index a0a1588501..f8f50542e3 100644
--- a/libgimp/gimpgimprc_pdb.c
+++ b/libgimp/gimpgimprc_pdb.c
@@ -37,9 +37,9 @@
* stored in the user gimprc file and can use this procedure to
* retrieve it. This query procedure will return the value associated
* with the specified token. This corresponds _only_ to entries with
- * the format: ( ). The value must be a string. Entries
- * not corresponding to this format will cause warnings to be issued on
- * gimprc parsing and will not be queryable.
+ * the format: (<token> <value>). The value must be a
+ * string. Entries not corresponding to this format will cause warnings
+ * to be issued on gimprc parsing and will not be queryable.
*
* Returns: The value associated with the queried token.
*/
@@ -74,9 +74,10 @@ gimp_gimprc_query (gchar *token)
* the gimprc file that is considered extraneous to the operation of
* the GIMP. Plug-ins that need configuration information can use this
* function to store it, and gimp_gimprc_query to retrieve it. This
- * will accept _only_ parameters in the format of ( ),
- * where and must be strings. Entries not corresponding
- * to this format will be eaten and no action will be performed.
+ * will accept _only_ parameters in the format of (<token>
+ * <value>), where <token> and <value> must be
+ * strings. Entries not corresponding to this format will be eaten and
+ * no action will be performed.
*
* Returns: TRUE on success.
*/
diff --git a/libgimp/gimppainttools_pdb.c b/libgimp/gimppainttools_pdb.c
index a2664e560c..5e7f14dca0 100644
--- a/libgimp/gimppainttools_pdb.c
+++ b/libgimp/gimppainttools_pdb.c
@@ -128,7 +128,7 @@ gimp_airbrush_default (gint32 drawable_ID,
* coordinates and subsequent stroke offsets exceeds the extents of the
* src drawable, then no paint is transferred. The clone tool is
* capable of transforming between any image types including
- * RGB->Indexed--although converting from any type to indexed is
+ * RGB->Indexed--although converting from any type to indexed is
* significantly slower.
*
* Returns: TRUE on success.
diff --git a/libgimp/gimpselection_pdb.c b/libgimp/gimpselection_pdb.c
index 4252e828cc..49e250755e 100644
--- a/libgimp/gimpselection_pdb.c
+++ b/libgimp/gimpselection_pdb.c
@@ -301,9 +301,9 @@ gimp_selection_invert (gint32 image_ID)
* Sharpen the selection mask.
*
* This procedure sharpens the selection mask. For every pixel in the
- * selection channel, if the value is > 0, the new pixel is assigned a
- * value of 255. This removes any \"anti-aliasing\" that might exist in
- * the selection mask's boundary.
+ * selection channel, if the value is > 0, the new pixel is assigned
+ * a value of 255. This removes any \"anti-aliasing\" that might exist
+ * in the selection mask's boundary.
*
* Returns: TRUE on success.
*/
diff --git a/libgimpbase/gimpsignal.c b/libgimpbase/gimpsignal.c
index 767433bd04..09402d038b 100644
--- a/libgimpbase/gimpsignal.c
+++ b/libgimpbase/gimpsignal.c
@@ -32,7 +32,7 @@
* @handler: Handler that maps to signum. Invoked by O/S.
* Handler gets signal that caused invocation. Corresponds
* to the @sa_handler field of the @sigaction struct.
- * @flags: Preferences. OR'ed SA_. See man sigaction. Corresponds
+ * @flags: Preferences. OR'ed SA_<xxx>. See man sigaction. Corresponds
* to the @sa_flags field of the @sigaction struct.
*
* This function furnishes a workalike for signal(2) but
diff --git a/tools/pdbgen/lib.pl b/tools/pdbgen/lib.pl
index b184c2f797..421a47dc8c 100644
--- a/tools/pdbgen/lib.pl
+++ b/tools/pdbgen/lib.pl
@@ -33,6 +33,9 @@ use Text::Wrap qw(wrap);
sub desc_wrap {
my ($str) = @_;
my $leading = ' * ';
+ $str =~ s/&/&\;/g;
+ $str =~ s/\<\;/g;
+ $str =~ s/\>/>\;/g;
$Text::Wrap::columns = 72;
wrap($leading, $leading, $str);
}