aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--NEWS2
-rw-r--r--configure.ac2
-rw-r--r--data/default-prefs-common.js3
-rw-r--r--doc/reference/tmpl/ephy-embed.sgml1
5 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d10ff3d7..90d483f70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-09 Christian Persch <chpe@svn.gnome.org>
+
+ === Release 2.17.5 ===
+
+ * NEWS:
+ * configure.ac:
+ * data/default-prefs-common.js:
+ * doc/reference/tmpl/ephy-embed.sgml:
+
2007-01-08 Diego Escalante Urrelo <diegoe@svn.gnome.org>
* src/ephy-python-extension.c:
diff --git a/NEWS b/NEWS
index 8885e40cb..e08347f3b 100644
--- a/NEWS
+++ b/NEWS
@@ -36,7 +36,7 @@ Changes:
Contributors to this release:
Wouter Bolsterlee, Eric Butler, Diego Escalante Urrelo, Luca Ferreti,
-Michael Hofmann, Björn Lindqvist, John Millikin, Andreas Nilsson,
+Michael Hofmann, Björn Lindqvist, John Millikin, Andreas Nilsson, Paul,
Christian Persch, Stefan Stuhr, Chris Wilson
Translation updates:
diff --git a/configure.ac b/configure.ac
index 1aee18d7a..da36d196c 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.4.90],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
+AC_INIT([GNOME Web Browser],[2.17.5],[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 0ea38d8cb..a444c0b1c 100644
--- a/data/default-prefs-common.js
+++ b/data/default-prefs-common.js
@@ -143,3 +143,6 @@ pref("dom.storage.enabled", false);
// warn about about:config
pref("general.warnOnAboutConfig", true);
+
+// enable negotiate extension
+pref("network.negotiate-auth.trusted-uris", "https://");
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index c10f33f57..c02cb7d2a 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -266,7 +266,6 @@ be done by casting).
@:
@:
@:
-@:
@:
@Param2:
@Param3: