[yelp] Version 2.31.5

[Shaun McCance <shaunm src gnome org>]

commit 785599bc769865a437caa0830f09da4f44cb0d8e
Author: Shaun McCance <shaunm gnome org>
Date:   Mon Jun 7 17:29:47 2010 -0500

    Version 2.31.5

 NEWS             |   20 ++++++++++++++++++++
 configure.ac     |    4 ++--
 po/POTFILES.in   |    1 +
 po/POTFILES.skip |    1 -
 4 files changed, 23 insertions(+), 3 deletions(-)
---
diff --git a/NEWS b/NEWS
index 2ec7547..ad657d4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,23 @@
+Changes in 2.31.5:
+------------------
+* New "Read Later" feature
+* Support for proposed XDG help: URI scheme
+* Use entire search path when loading Mallard docs
+* Updated for new yelp-xsl common HTML output
+* New bookmarks editor window
+* Man pages are back again
+* Recognize Mallard docs by index.page.stub in editor mode
+* Fix for incorrect bookmarks titles when switching docs
+* Updated translations:
+  de    (Mario Blättermann)
+  es    (Jorge González)
+  et    (Ivar Smolin)
+  gl    (Fran Diéguez)
+  he    (Yaron Shahrabani)
+  nb    (Kjartan Maraas)
+  sl    (Matej UrbanÄ?iÄ?)
+  zh_CN (Funda Wang)
+
 Changes in 2.31.4:
 ------------------
 * Build fixes for gsettings and bumped yelp-xsl requirement
diff --git a/configure.ac b/configure.ac
index 3797fb0..8fefea2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([Yelp],[2.31.4],[http://bugzilla.gnome.org/enter_bug.cgi?product=yelp],[yelp])
+AC_INIT([Yelp],[2.31.5],[http://bugzilla.gnome.org/enter_bug.cgi?product=yelp],[yelp])
 
 AC_CONFIG_SRCDIR([src/yelp.c])
 AC_CONFIG_HEADERS([config.h])
@@ -36,7 +36,7 @@ PKG_CHECK_MODULES(YELP,
 	libexslt >= 0.8.1
 	dbus-glib-1
 	webkit-1.0 >= 1.1.15
-	yelp-xsl >= 2.31.2
+	yelp-xsl >= 2.31.3
 ])
 AC_SUBST([YELP_CFLAGS])
 AC_SUBST([YELP_LIBS])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 32b1b9d..5d85fd5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,6 +14,7 @@ libyelp/yelp-location-entry.c
 libyelp/yelp-lzma-decompressor.c
 libyelp/yelp-magic-decompressor.c
 libyelp/yelp-mallard-document.c
+libyelp/yelp-man-document.c
 libyelp/yelp-settings.c
 libyelp/yelp-simple-document.c
 libyelp/yelp-transform.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index b4e8b5c..c62653f 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,4 +1,3 @@
-src/yelp-man.c
 src/yelp-print.c
 src/yelp-search-parser.c
 src/yelp-search.c