15 files changed, 25 insertions, 25 deletions
diff --git a/docs/tmpl/engines.sgml b/docs/tmpl/engines.sgml
index 2f8efcae..20de439f 100644
--- a/docs/tmpl/engines.sgml
+++ b/docs/tmpl/engines.sgml
@@ -45,7 +45,7 @@ engine. It contains the following fields:
 
 <!-- ##### STRUCT PangoEngineScriptInfo ##### -->
 <para>
-The PangoEngineScriptInfo structure contains
+The #PangoEngineScriptInfo structure contains
 information about how the shaper covers a particular
 script.
 </para>
diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml
index 0c917213..3253dc99 100644
--- a/docs/tmpl/fonts.sgml
+++ b/docs/tmpl/fonts.sgml
@@ -9,7 +9,7 @@ Structures representing abstract fonts
 Pango supports a flexible architecture where a
 particular rendering architecture can supply an
 implementation of fonts. The #PangoFont structure
-represents an abstract rendering-system-indepent font.
+represents an abstract rendering-system-independent font.
 Pango provides routines to list available fonts, and
 to load a font of a given description.
 </para>
@@ -551,9 +551,9 @@ The #GObject type for #PangoFontMetrics.
 The #PangoFont structure is used to represent
 a font in a rendering-system-independent matter.
 To create an implementation of a #PangoFont,
-the rendering-system specific code should malloc
+the rendering-system specific code should allocate
 a larger structure that contains a nested
-#PangoFont, fill in the klass member of
+#PangoFont, fill in the <structfield>klass</structfield> member of
 the nested #PangoFont with a pointer to
 a appropriate #PangoFontClass, then call
 pango_font_init() on the structure.
@@ -779,8 +779,8 @@ The #PangoFontMap represents the set of fonts available for a
 particular rendering system. This is a virtual object with
 implementations being specific to particular rendering systems.  To
 create an implementation of a #PangoFontMap, the rendering-system
-specific code should malloc a larger structure that contains a nested
-#PangoFontMap, fill in the klass member of the nested #PangoFontMap with a
+specific code should allocate a larger structure that contains a nested
+#PangoFontMap, fill in the <structfield>klass</structfield> member of the nested #PangoFontMap with a
 pointer to a appropriate #PangoFontMapClass, then call
 pango_font_map_init() on the structure.
 </para>
diff --git a/docs/tmpl/freetype-fonts.sgml b/docs/tmpl/freetype-fonts.sgml
index cbe92eb7..06f5006c 100644
--- a/docs/tmpl/freetype-fonts.sgml
+++ b/docs/tmpl/freetype-fonts.sgml
@@ -64,7 +64,7 @@ with the FreeType backend. See %PANGO_RENDER_TYPE_FC for the replacement.
 Function type for doing final config tweaking on prepared FcPatterns.
 </para>
 
-@pattern: the FcPattern to tweak.
+@pattern: the <type>FcPattern</type> to tweak.
 @data: user data.
 
 
diff --git a/docs/tmpl/layout.sgml b/docs/tmpl/layout.sgml
index 1bd70e60..135a706a 100644
--- a/docs/tmpl/layout.sgml
+++ b/docs/tmpl/layout.sgml
@@ -2,7 +2,7 @@
 Layout Objects
 
 <!-- ##### SECTION Short_Description ##### -->
-Highlevel layout driver objects
+High-level layout driver objects
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
@@ -212,7 +212,7 @@ has no user-visible fields.
 
 <!-- ##### ENUM PangoWrapMode ##### -->
 <para>
-A PangoWrapMode describes how to wrap the lines of a #PangoLayout to the desired width.
+A #PangoWrapMode describes how to wrap the lines of a #PangoLayout to the desired width.
 </para>
 
 @PANGO_WRAP_WORD: wrap lines at word boundaries.
@@ -390,7 +390,7 @@ The #GObject type for #PangoEllipsizeMode.
 
 <!-- ##### ENUM PangoAlignment ##### -->
 <para>
-A PangoAlignment describes how to align the lines of a #PangoLayout within the
+A #PangoAlignment describes how to align the lines of a #PangoLayout within the
 available space. If the #PangoLayout is set to justify
 using pango_layout_set_justify(), this only has effect for partial lines.
 </para>
diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml
index 0d948601..204c5de4 100644
--- a/docs/tmpl/main.sgml
+++ b/docs/tmpl/main.sgml
@@ -49,7 +49,7 @@ fields:
 @shape_engine: the engine for doing rendering-system-dependent processing.
 @lang_engine: the engine for doing rendering-system-independent processing.
 @font: the font for this segment.
-@level: the bidrectional level for this segment.
+@level: the bidirectional level for this segment.
 @gravity: the glyph orientation for this segment.
 @centered_baseline: whether this segment should be shifted to center around
 the baseline.
@@ -438,7 +438,7 @@ about the attributes of a single character.
 	and @is_word_end set for some character.
 @is_sentence_boundary: is a sentence boundary.
         There are two ways to divide sentences. The first assigns all
-	intersentence whitespace/control/format chars to some sentence,
+	inter-sentence whitespace/control/format chars to some sentence,
 	so all chars are in some sentence; @is_sentence_boundary denotes
 	the boundaries there. The second way doesn't assign
 	between-sentence spaces, etc. to any sentence, so
diff --git a/docs/tmpl/modules.sgml b/docs/tmpl/modules.sgml
index 003840a0..0fe8c42f 100644
--- a/docs/tmpl/modules.sgml
+++ b/docs/tmpl/modules.sgml
@@ -27,7 +27,7 @@ loaded module.
 
 @list: a function that lists the engines defined in this module.
 @init: a function to initialize the module.
-@exit: a function to finilize the module.
+@exit: a function to finalize the module.
 @create: a function to create an engine, given the engine name.
 
 <!-- ##### STRUCT PangoMap ##### -->
diff --git a/docs/tmpl/opentype.sgml b/docs/tmpl/opentype.sgml
index 141d71c3..f1a304fe 100644
--- a/docs/tmpl/opentype.sgml
+++ b/docs/tmpl/opentype.sgml
@@ -70,7 +70,7 @@ set of features selected from the tables in an OpenType font.
 (A feature is an operation such as adjusting glyph positioning
 that should be applied to a text feature such as a certain
 type of accent.) A #PangoOTRuleSet
-is created with pango_ot_ruleset_new(), features are addded
+is created with pango_ot_ruleset_new(), features are added
 to it with pango_ot_ruleset_add_feature(), then it is
 applied to a #PangoGlyphString with pango_ot_ruleset_shape().
 </para>
diff --git a/docs/tmpl/pango-renderer.sgml b/docs/tmpl/pango-renderer.sgml
index c7e76813..181986f0 100644
--- a/docs/tmpl/pango-renderer.sgml
+++ b/docs/tmpl/pango-renderer.sgml
@@ -7,8 +7,8 @@ Rendering driver base class
 <!-- ##### SECTION Long_Description ##### -->
 <para>
 #PangoRenderer is a base class that contains the necessary logic for
-rendering a PangoLayout or PangoLayoutLine. By subclassing
-PangoRenderer and overriding operations such as @draw_glyphs and
+rendering a #PangoLayout or #PangoLayoutLine. By subclassing
+#PangoRenderer and overriding operations such as @draw_glyphs and
 @draw_rectangle, renderers for particular font backends and
 destinations can be created.
 </para>
diff --git a/docs/tmpl/pango-version.sgml b/docs/tmpl/pango-version.sgml
index dbdb41a2..230946d2 100644
--- a/docs/tmpl/pango-version.sgml
+++ b/docs/tmpl/pango-version.sgml
@@ -72,7 +72,7 @@ A string literal containing the version of Pango available at compile-time.
 
 <!-- ##### MACRO PANGO_VERSION_CHECK ##### -->
 <para>
-Checks that the versoin of Pango available at compile-time is not older than
+Checks that the version of Pango available at compile-time is not older than
 the provided version number.
 </para>
 
diff --git a/docs/tmpl/pangofc-font.sgml b/docs/tmpl/pangofc-font.sgml
index 6bea63f4..95ac1dd3 100644
--- a/docs/tmpl/pangofc-font.sgml
+++ b/docs/tmpl/pangofc-font.sgml
@@ -6,8 +6,8 @@ Base font class for Fontconfig-based backends
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-PangoFcFont is a base class for font implementation using the
-FontConfig and FreeType libraries. It is used in the
+#PangoFcFont is a base class for font implementation using the
+Fontconfig and FreeType libraries. It is used in the
 <link linkend="pango-Xft-Fonts-and-Rendering">Xft</link> and
 <link linkend="pango-FreeType-Fonts-and-Rendering">FreeType</link>
 backends shipped with Pango, but can also be used when creating
diff --git a/docs/tmpl/pangofc-fontmap.sgml b/docs/tmpl/pangofc-fontmap.sgml
index 7e3c0ae1..340ad03a 100644
--- a/docs/tmpl/pangofc-fontmap.sgml
+++ b/docs/tmpl/pangofc-fontmap.sgml
@@ -7,7 +7,7 @@ Base fontmap class for Fontconfig-based backends
 <!-- ##### SECTION Long_Description ##### -->
 <para>
 PangoFcFontMap is a base class for font map implementations using the
-FontConfig and FreeType libraries. It is used in the
+Fontconfig and FreeType libraries. It is used in the
 <link linkend="pango-Xft-Fonts-and-Rendering">Xft</link> and
 <link linkend="pango-FreeType-Fonts-and-Rendering">FreeType</link>
 backends shipped with Pango, but can also be used when creating
diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml
index b0872b0c..bcb109c6 100644
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@ -513,7 +513,7 @@ The scale factor for three magnification steps (1.2 * 1.2 * 1.2).
 <!-- ##### STRUCT PangoColor ##### -->
 <para>
 The #PangoColor structure is used to
-represent a color in an uncalibrated RGB colorspace.
+represent a color in an uncalibrated RGB color-space.
 </para>
 
 @red: The red component of the color. This is a value between 0 and 65535, 
diff --git a/docs/tmpl/win32-fonts.sgml b/docs/tmpl/win32-fonts.sgml
index e4a95d7f..3896e33a 100644
--- a/docs/tmpl/win32-fonts.sgml
+++ b/docs/tmpl/win32-fonts.sgml
@@ -147,7 +147,7 @@ g_quark_from_string()) is used to identify the renderer in pango_find_map().
 <!-- ##### STRUCT PangoWin32FontCache ##### -->
 <para>
 A #PangoWin32FontCache caches
-#HFONTs by their #LOGFONT descriptions. 
+HFONTs by their LOGFONT descriptions. 
 </para>
 
 
diff --git a/docs/tmpl/x-fonts.sgml b/docs/tmpl/x-fonts.sgml
index 7d358f25..ca76af76 100644
--- a/docs/tmpl/x-fonts.sgml
+++ b/docs/tmpl/x-fonts.sgml
@@ -271,7 +271,7 @@ glyph index.
 <!-- ##### STRUCT PangoXFontCache ##### -->
 <para>
 A #PangoXFontCache caches
-#XFontStructs for a single display by their XLFD name. 
+<type>XFontStructs</type> for a single display by their XLFD name. 
 </para>
 
 
diff --git a/docs/tmpl/xft-fonts.sgml b/docs/tmpl/xft-fonts.sgml
index 9be166db..80c10207 100644
--- a/docs/tmpl/xft-fonts.sgml
+++ b/docs/tmpl/xft-fonts.sgml
@@ -17,7 +17,7 @@ Using the Xft backend is generally straightforward;
 pango_xft_get_context() creates a context for a specified display
 and screen. You can then create a #PangoLayout with that context
 and render it with pango_xft_render_layout(). At a more advanced
-level, the lowlevel fontconfig options used for rendering fonts
+level, the low-level fontconfig options used for rendering fonts
 can be affected using pango_xft_set_default_substitute(), and
 pango_xft_substitute_changed().
 </para>
@@ -30,7 +30,7 @@ is useful to derive from #PangoXftRenderer. Deriving from
 support custom attributes by overriding #PangoRendererClass virtual
 functions like 'prepare_run' or 'draw_shape'. The reason is to
 customize exactly how the final bits are drawn to the destination by
-overring the #PangoXftRendererClass virtual functions
+overriding the #PangoXftRendererClass virtual functions
 'composite_glyphs' and 'composite_trapezoids'.
 </para>