6 files changed, 17 insertions, 81 deletions
diff --git a/ChangeLog b/ChangeLog
index cdc281a9f..13fe5ae75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-06  Christian Persch  <chpe@cvs.gnome.org>
+
+	=== Release 2.17.2 ===
+
+	* configure.ac:
+	* data/default-prefs-common.js:
+	* src/ephy-notebook.c: (build_tab_label):
+
 2006-11-04  Christian Persch  <chpe@cvs.gnome.org>
 
 	* embed/mozilla/GeckoPrintService.cpp:
diff --git a/configure.ac b/configure.ac
index 97ec00a2a..68124142f 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],[2.17.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
+AC_INIT([GNOME Web Browser],[2.17.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
 
 GNOME_COMMON_INIT
 
diff --git a/data/default-prefs-common.js b/data/default-prefs-common.js
index 03231048f..4aa917f90 100644
--- a/data/default-prefs-common.js
+++ b/data/default-prefs-common.js
@@ -121,6 +121,7 @@ pref("general.useragent.locale", "en");
 // pref("extensions.spellcheck.inline.max-misspellings", -1);
 // 0: disabled, 1: only textareas, 2: check textareas and single-line input fields
 pref("layout.spellcheckDefault", 1);
+pref("spellchecker.dictionary", "");
 
 // print settings
 pref("print.print_printer", "PostScript/default");
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index aa5c6d64d..c272fdf26 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -177,177 +177,102 @@ be done by casting).
 
 @ephyembed: the object which received the signal.
 @: 
-@:
-@: 
-@:
-@: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
-@:
 @: 
 @: 
-@:
 @: 
 @: 
-@:
 @: 
 @: 
-@:
 @: 
 @: 
-@:
 @: 
 @: 
-@:
 @: 
 @: 
-@:
 @: 
 @: 
-@:
 @: 
 @: 
-@:
 @: 
 @: 
-@:
 @: 
 @: 
-@:
 @: 
 @: 
-@:
 @: 
 @: 
-@:
 @: 
 @: 
-@:
 @: 
 @: 
-@:
 @: 
 @: 
-@:
 @: 
 @: 
 @: 
+@:
+@Param2: 
+@Param3: 
+@Param4: 
 
 <!-- ##### SIGNAL EphyEmbed::ge-search-key-press ##### -->
 <para>
@@ -400,6 +325,7 @@ be done by casting).
 @search_key_press: 
 @close_request: 
 @load_url: 
+@load: 
 @stop_load: 
 @reload: 
 @can_go_back: 
diff --git a/doc/reference/tmpl/ephy-shell.sgml b/doc/reference/tmpl/ephy-shell.sgml
index 147153966..81cf01eb2 100644
--- a/doc/reference/tmpl/ephy-shell.sgml
+++ b/doc/reference/tmpl/ephy-shell.sgml
@@ -38,6 +38,7 @@ ephy-shell
 @EPHY_NEW_TAB_JUMP: 
 @EPHY_NEW_TAB_IN_NEW_WINDOW: 
 @EPHY_NEW_TAB_IN_EXISTING_WINDOW: 
+@EPHY_NEW_TAB_ALLOW_FIXUP: 
 
 <!-- ##### FUNCTION ephy_shell_new_tab ##### -->
 <para>
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index 41bf2accd..91c798bf2 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -650,7 +650,7 @@ build_tab_label (EphyNotebook *nb, EphyTab *tab)
 	rcstyle = gtk_rc_style_new ();
 	rcstyle->xthickness = rcstyle->ythickness = 0;
 	gtk_widget_modify_style (close_button, rcstyle);
-	gtk_rc_style_unref (rcstyle),
+	gtk_rc_style_unref (rcstyle);
 
 	image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
 	gtk_container_add (GTK_CONTAINER (close_button), image);