5 files changed, 20 insertions, 37 deletions
diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml
index ece5f072..4efada71 100644
--- a/docs/tmpl/fonts.sgml
+++ b/docs/tmpl/fonts.sgml
@@ -245,10 +245,11 @@ a font. It contains the following members:
 </para>
 
 @font: 
-@lang: 
+@language: 
 @ch: 
 @Returns: 
 <!-- # Unused Parameters # -->
+@lang: 
 @char: 
 
 
@@ -267,8 +268,10 @@ a font. It contains the following members:
 </para>
 
 @font: 
-@lang: 
+@language: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@lang: 
 
 
 <!-- ##### FUNCTION pango_font_get_glyph_extents ##### -->
@@ -288,8 +291,10 @@ a font. It contains the following members:
 </para>
 
 @font: 
-@lang: 
+@language: 
 @metrics: 
+<!-- # Unused Parameters # -->
+@lang: 
 
 
 <!-- ##### MACRO PANGO_TYPE_FONT ##### -->
diff --git a/docs/tmpl/freetype-fonts.sgml b/docs/tmpl/freetype-fonts.sgml
index 1847ec0d..af453165 100644
--- a/docs/tmpl/freetype-fonts.sgml
+++ b/docs/tmpl/freetype-fonts.sgml
@@ -144,8 +144,10 @@ FreeType Fonts and Rendering
 </para>
 
 @font: 
-@lang: 
+@language: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@lang: 
 
 
 <!-- ##### FUNCTION pango_ft2_get_face ##### -->
diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml
index b4512b60..e9fc6b12 100644
--- a/docs/tmpl/main.sgml
+++ b/docs/tmpl/main.sgml
@@ -80,7 +80,6 @@ a segment of text. It contains the following fields:
 @offset: 
 @length: 
 @num_chars: 
-@extra_attrs: 
 @analysis: 
 
 <!-- ##### STRUCT PangoAnalysis ##### -->
@@ -115,6 +114,8 @@ fields:
 @lang_engine: 
 @font: 
 @level: 
+@language: 
+@extra_attrs: 
 
 <!-- ##### STRUCT PangoLangRange ##### -->
 <para>
@@ -145,9 +146,6 @@ It contains the following fields:
 </tbody></tgroup></informaltable>
 </para>
 
-@start: 
-@length: 
-@lang: 
 
 <!-- ##### ENUM PangoDirection ##### -->
 <para>
@@ -286,24 +284,6 @@ for text.
 @direction: 
 
 
-<!-- ##### FUNCTION pango_context_get_lang ##### -->
-<para>
-
-</para>
-
-@context: 
-@Returns: 
-
-
-<!-- ##### FUNCTION pango_context_set_lang ##### -->
-<para>
-
-</para>
-
-@context: 
-@lang: 
-
-
 <!-- ##### FUNCTION pango_context_load_font ##### -->
 <para>
 
diff --git a/docs/tmpl/modules.sgml b/docs/tmpl/modules.sgml
index 8fa14679..47ea089a 100644
--- a/docs/tmpl/modules.sgml
+++ b/docs/tmpl/modules.sgml
@@ -42,10 +42,12 @@ modules
 
 </para>
 
-@lang: 
+@language: 
 @engine_type_id: 
 @render_type_id: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@lang: 
 
 
 <!-- ##### FUNCTION pango_map_get_entry ##### -->
diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml
index 466318ed..70256d69 100644
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@ -28,7 +28,7 @@ attribute is listed in parentheses after the description.
 </para>
 
 @PANGO_ATTR_INVALID: 
-@PANGO_ATTR_LANG: language tag (#PangoAttrString)
+@PANGO_ATTR_LANGUAGE: 
 @PANGO_ATTR_FAMILY: font family name list (#PangoAttrString)
 @PANGO_ATTR_STYLE: font slant style (#PangoAttrInt)
 @PANGO_ATTR_WEIGHT: font weight (#PangoAttrInt)
@@ -182,15 +182,6 @@ sets all aspects of the font description at once.
 @attr: 
 
 
-<!-- ##### FUNCTION pango_attr_lang_new ##### -->
-<para>
-
-</para>
-
-@lang: 
-@Returns: 
-
-
 <!-- ##### FUNCTION pango_attr_family_new ##### -->
 <para>
 
@@ -589,7 +580,10 @@ attributes currently in effect can be queried.
 @iterator: 
 @base: 
 @current: 
+@language: 
 @extra_attrs: 
+<!-- # Unused Parameters # -->
+@lang: 
 
 
 <!-- ##### FUNCTION pango_attr_iterator_destroy ##### -->