=== Release 2.14.0 ===RELEASE_2_14_0GNOME_2_14_BRANCHPOINT

2006-03-12  Christian Persch  <chpe@cvs.gnome.org>

	=== Release 2.14.0 ===

	* NEWS:
	* configure.ac:

	Updated for 2.14.0.

	* src/prefs-dialog.c: (prefs_dialog_show_help),
	(font_prefs_dialog_response_cb):

	Fix the documentation ID the Help button points to.

4 files changed, 65 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index f47c7464a..137d6eed3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2006-03-12  Christian Persch  <chpe@cvs.gnome.org>
 
+	=== Release 2.14.0 ===
+
+	* NEWS:
+	* configure.ac:
+
+	Updated for 2.14.0.
+
+	* src/prefs-dialog.c: (prefs_dialog_show_help),
+	(font_prefs_dialog_response_cb):
+
+	Fix the documentation ID the Help button points to.
+
+2006-03-12  Christian Persch  <chpe@cvs.gnome.org>
+
 	* src/window-commands.c:
 
 	Add Victor to documenters in About dialogue.
diff --git a/NEWS b/NEWS
index 7c5148607..23567a0e9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,49 @@
- ==============
+===============
+Epiphany 2.14.0
+===============
+
+Contributors to the Epiphany 2.14.0 release:
+
+Jorn Baayen, Emmanuele Bassi, Robert O'Callahan, Piers Cornwell,
+Crispin Flowerday, Gustavo Gama, Peter Harvey, Philip Langdale,
+Robert Marcano, Bastien Nocera, Guilherme de S. Pastore,
+Brian Pepple, Christian Persch, Jean-François Rameau, 
+Sergey Al. Safonov, Reinout van Schouwen, Raphael Slinckx,
+thetroublemaker, and Matthew P. Thomas.
+
+Documentation:
+Victor Osadci.
+
+Documentation translations:
+Alexander Shopov (bg), Francisco Javier F. Serrador (es),
+Reinout van Schouwen (nl).
+
+Translations:
+Ales Nyakhaychyk (be), Rostislav "zbrox" Raykov (bg), Progga (bn),
+Gil Forcada (ca), Petr Tomeš (cs), Rhys Jones (cy), Ole Laursen (da),
+Hendrik Richter (de), Kostas Papadimas (el), Adam Weinberger (en_CA),
+Crispin Flowerday (en_GB), Francisco Javier F. Serrador (es),
+Ivar Smolin (et), Iñaki Larrañaga (eu), Roozbeh Pournader (fa),
+Ilkka Tuohela (fi), Christophe Merlet (RedFox) (fr),
+Ignacio Casal Quinteiro (gl), Ankit Patel (gu), Gil Osher (he),
+Rajesh Ranjan (hi), Gabor Kelemen (hu), Mohammad DAMT (id),
+Satoru SATOH (ja), Vladimer Sichinava (ka), Young-Ho Cha (ko),
+Erdal Ronahi (ku), Žygimantas Beručka (lt), Kjartan Maraas (nb, no),
+Pawan Chitrakar (ne), Reinout van Schouwen (nl), GNOME PL Team (pl),
+Licio Fernando Nascimento da Fonseca (pt_BR), Duarte Loreto (pt),
+Mugurel Tudor (ro), Leonid Kanter (ru), Steve Murphy (rw),
+Marcel Telka (sk), Laurent Dhima (sq), Слободан Д. Средојевић (sr, sr@Latn),
+Daniel Nylander (sv), Theppitak Karoonboonyanan (th), Maxim Dziumanenko (uk),
+Clytie Siddall (vi), Liu Songhe (zh_CN), and Woodman Tuen (zh_HK, zh_TW).
+
+
+===============
+Epiphany 1.9.99
+===============
+
+No news.
+
+==============
 Epiphany 1.9.8
 ==============
 
diff --git a/configure.ac b/configure.ac
index 1263b29bf..8f1c7fb17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
-AC_INIT([GNOME Web Browser],[1.9.99],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
+AC_INIT([GNOME Web Browser],[2.14.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
 
 GNOME_COMMON_INIT
 
@@ -25,8 +25,8 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
 
-EPIPHANY_MAJOR=1.9
-EPIPHANY_API_VERSION=1.10
+EPIPHANY_MAJOR=2.14
+EPIPHANY_API_VERSION=2.14
 AC_SUBST([EPIPHANY_MAJOR])
 AC_SUBST([EPIPHANY_API_VERSION])
 
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index b0b518f70..eef03a5fe 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -373,7 +373,7 @@ prefs_dialog_show_help (EphyDialog *dialog)
 
 	static char * const help_preferences[] = {
 		"general-preferences",
-		"fonts-and-colors-preferences",
+		"fonts-and-style-preferences",
 		"privacy-preferences",
 		"language-preferences"
 	};
@@ -494,7 +494,7 @@ font_prefs_dialog_response_cb (GtkWidget *widget,
 {
 	if (response == GTK_RESPONSE_HELP)
 	{
-		/* FIXME */
+		ephy_gui_help (GTK_WINDOW (widget), "epiphany", "fonts-and-style-preferences");
 		return;
 	}