=== Released 1.1.6 ===

Mon Dec 16 21:16:31 2002  Owen Taylor  <otaylor@redhat.com>

        * === Released 1.1.6 ===

        * NEWS: Updated.

        * configure.in: Version 1.1.6, interface age 2.

        * configure.in: Bump PANGO_MODULE_VERSION to 1.2.0.

12 files changed, 70 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 239defdf..c8e3bb49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Dec 16 21:16:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.6 ===
+
+	* NEWS: Updated.
+
+	* configure.in: Version 1.1.6, interface age 2.
+
+	* configure.in: Bump PANGO_MODULE_VERSION to 1.2.0.
+
 Mon Dec 16 19:28:18 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/hangul/hangul-xft.c (render_isolated_tone):
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 239defdf..c8e3bb49 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,13 @@
+Mon Dec 16 21:16:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.6 ===
+
+	* NEWS: Updated.
+
+	* configure.in: Version 1.1.6, interface age 2.
+
+	* configure.in: Bump PANGO_MODULE_VERSION to 1.2.0.
+
 Mon Dec 16 19:28:18 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/hangul/hangul-xft.c (render_isolated_tone):
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 239defdf..c8e3bb49 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,13 @@
+Mon Dec 16 21:16:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.6 ===
+
+	* NEWS: Updated.
+
+	* configure.in: Version 1.1.6, interface age 2.
+
+	* configure.in: Bump PANGO_MODULE_VERSION to 1.2.0.
+
 Mon Dec 16 19:28:18 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/hangul/hangul-xft.c (render_isolated_tone):
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 239defdf..c8e3bb49 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,13 @@
+Mon Dec 16 21:16:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.6 ===
+
+	* NEWS: Updated.
+
+	* configure.in: Version 1.1.6, interface age 2.
+
+	* configure.in: Bump PANGO_MODULE_VERSION to 1.2.0.
+
 Mon Dec 16 19:28:18 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/hangul/hangul-xft.c (render_isolated_tone):
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 239defdf..c8e3bb49 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,13 @@
+Mon Dec 16 21:16:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.6 ===
+
+	* NEWS: Updated.
+
+	* configure.in: Version 1.1.6, interface age 2.
+
+	* configure.in: Bump PANGO_MODULE_VERSION to 1.2.0.
+
 Mon Dec 16 19:28:18 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/hangul/hangul-xft.c (render_isolated_tone):
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 239defdf..c8e3bb49 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,13 @@
+Mon Dec 16 21:16:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.6 ===
+
+	* NEWS: Updated.
+
+	* configure.in: Version 1.1.6, interface age 2.
+
+	* configure.in: Bump PANGO_MODULE_VERSION to 1.2.0.
+
 Mon Dec 16 19:28:18 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/hangul/hangul-xft.c (render_isolated_tone):
diff --git a/NEWS b/NEWS
index 1de96a4d..919daa77 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Changes between 1.1.5 and 1.1.6
+
+* Fix crash with isolated Hangul tone marks.
+* Improve font solection for Hangul tone marks
+* Improve range definitions for basic-xft [Jungshik Shin]
+* Docs improvements [Matthias Clasen]
+
 Changes between 1.1.4 and 1.1.5
 
 * Fix wrap-around coordinate problems for X, Xt.
diff --git a/configure.in b/configure.in
index 57ea903f..02d0007a 100644
--- a/configure.in
+++ b/configure.in
@@ -18,14 +18,14 @@ dnl set PANGO_BINARY_AGE _and_ PANGO_INTERFACE_AGE to 0.
 dnl The triplet 
 PANGO_MAJOR_VERSION=1
 PANGO_MINOR_VERSION=1
-PANGO_MICRO_VERSION=5
+PANGO_MICRO_VERSION=6
 PANGO_VERSION=$PANGO_MAJOR_VERSION.$PANGO_MINOR_VERSION.$PANGO_MICRO_VERSION
 
 dnl The X.Y in -lpango-X.Y line. This is expected to stay 1.0 until Pango 2.
 PANGO_API_VERSION=1.0
 
 dnl Number of releases since we've added interfaces
-PANGO_INTERFACE_AGE=1
+PANGO_INTERFACE_AGE=2
 
 dnl Number of releases since we've broken binary compatibility.
 # PANGO_BINARY_AGE=0
@@ -35,7 +35,7 @@ dnl This is the last version with which we have compatibility with
 dnl with the modules for; it isn't the same as
 dnl PANGO_API_VERSION.'PANGO_MICRO_VERSION - PANGO_BINARY_AGE' since we have
 dnl engine only API    
-PANGO_MODULE_VERSION=1.1.0
+PANGO_MODULE_VERSION=1.2.0
 
 AC_SUBST(PANGO_MAJOR_VERSION)
 AC_SUBST(PANGO_MINOR_VERSION)
diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml
index e5385006..15ee3268 100644
--- a/docs/tmpl/fonts.sgml
+++ b/docs/tmpl/fonts.sgml
@@ -691,7 +691,6 @@ The #PangoFontMapClass structure holds the virtual functions for
 a particular #PangoFontMap implementation.
 </para>
 
-@parent_class: 
 @load_font: a function to load a font with a given description. See
             pango_font_map_load_font()
 @list_families: A function to list available font families. See
@@ -779,7 +778,6 @@ The #PangoFontsetClass structure holds the virtual functions for
 a particular #PangoFontset implementation.
 </para>
 
-@parent_class: 
 @get_font: a function to get the font in the fontset that contains the 
    best glyph for the given unicode character; see pango_fontset_get_font().
 @get_metrics: a function to get overall metric information for the fonts 
diff --git a/docs/tmpl/freetype-fonts.sgml b/docs/tmpl/freetype-fonts.sgml
index e402f02c..8d175001 100644
--- a/docs/tmpl/freetype-fonts.sgml
+++ b/docs/tmpl/freetype-fonts.sgml
@@ -4,7 +4,6 @@ FreeType Fonts and Rendering
 <!-- ##### SECTION Short_Description ##### -->
 Functions for shape engines to manipulate FreeType fonts
 
-
 <!-- ##### SECTION Long_Description ##### -->
 <para>
 
diff --git a/docs/tmpl/win32-fonts.sgml b/docs/tmpl/win32-fonts.sgml
index 90588157..5f997876 100644
--- a/docs/tmpl/win32-fonts.sgml
+++ b/docs/tmpl/win32-fonts.sgml
@@ -4,7 +4,6 @@ Win32 Fonts and Rendering
 <!-- ##### SECTION Short_Description ##### -->
 Functions for shape engines to manipulate Win32 fonts
 
-
 <!-- ##### SECTION Long_Description ##### -->
 <para>
 
diff --git a/docs/tmpl/xft-fonts.sgml b/docs/tmpl/xft-fonts.sgml
index 74411d21..954ed04e 100644
--- a/docs/tmpl/xft-fonts.sgml
+++ b/docs/tmpl/xft-fonts.sgml
@@ -4,7 +4,6 @@ Xft Fonts and Rendering
 <!-- ##### SECTION Short_Description ##### -->
 Functions for shape engines to manipulate Xft fonts
 
-
 <!-- ##### SECTION Long_Description ##### -->
 <para>