From ab48d9fe65d09ed030ee6a3d96d83ff42963cf8e Mon Sep 17 00:00:00 2001
From: Martin Nordholts <martinn@src.gnome.org>
Date: Sun, 12 Jul 2009 12:46:21 +0200
Subject: [PATCH] Regenerate gimprc

---
 docs/gimprc.5.in | 40 ++++++++++++++++++++++++++++++++++------
 etc/gimprc       | 33 +++++++++++++++++++++++++++++----
 2 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/docs/gimprc.5.in b/docs/gimprc.5.in
index 5df8588dc6..d54cabf72c 100644
--- a/docs/gimprc.5.in
+++ b/docs/gimprc.5.in
@@ -208,8 +208,8 @@ are yes and no.
 
 .TP
 (default-image
-    (width 640)
-    (height 400)
+    (width 610)
+    (height 377)
     (unit pixels)
     (xresolution 72.000000)
     (yresolution 72.000000)
@@ -601,6 +601,30 @@ Sets the default settings for the image view.  This is a parameter list.
 Sets the default settings used when an image is viewed in fullscreen mode. 
 This is a parameter list.
 
+.TP
+(default-snap-to-guides yes)
+
+Snap to guides by default in new image windows.  Possible values are yes and
+no.
+
+.TP
+(default-snap-to-grid no)
+
+Snap to the grid by default in new image windows.  Possible values are yes and
+no.
+
+.TP
+(default-snap-to-canvas yes)
+
+Snap to the canvas edge by default in new image windows.  Possible values are
+yes and no.
+
+.TP
+(default-snap-to-path no)
+
+Snap to the active path by default in new image windows.  Possible values are
+yes and no.
+
 .TP
 (activate-on-focus yes)
 
@@ -645,6 +669,12 @@ If enabled, the move tool sets the edited layer or path as active.  This used
 to be the default behaviour in older versions.  Possible values are yes and
 no.
 
+.TP
+(image-map-tool-max-recent 10)
+
+How many recent settings to keep around in color correction tools  This is an
+integer value.
+
 .TP
 (trust-dirty-flag yes)
 
@@ -788,7 +818,7 @@ Sets the browser used by the help system.  Possible values are gimp and
 web-browser.
 
 .TP
-(web-browser "firefox %s")
+(web-browser "xdg-open %s")
 
 Sets the external web browser to be used.  This can be an absolute path or the
 name of an executable to search for in the user's PATH. If the command
@@ -802,7 +832,7 @@ When enabled, the online user manual will be used by the help system.
 Otherwise the locally installed copy is used.  Possible values are yes and no.
 
 .TP
-(user-manual-online-uri "http://docs.gimp.org/2.6")
+(user-manual-online-uri "http://docs.gimp.org/2.7")
 
 The location of the online user manual. This is used if 'user-manual-online'
 is enabled.  This is a string value.
@@ -905,5 +935,3 @@ Per-user configuration file
 
 .SH "SEE ALSO"
 .BR gimp (1),
-.BR gimptool (1),
-.BR gimp\-remote (1)
diff --git a/etc/gimprc b/etc/gimprc
index 38519c3326..79f8cdb604 100644
--- a/etc/gimprc
+++ b/etc/gimprc
@@ -159,8 +159,8 @@
 # Sets the default image in the "File/New" dialog.  This is a parameter list.
 # 
 # (default-image
-#     (width 640)
-#     (height 400)
+#     (width 610)
+#     (height 377)
 #     (unit pixels)
 #     (xresolution 72.000000)
 #     (yresolution 72.000000)
@@ -462,6 +462,26 @@
 #     (padding-mode default)
 #     (padding-color (color-rgb 1.000000 1.000000 1.000000)))
 
+# Snap to guides by default in new image windows.  Possible values are yes
+# and no.
+# 
+# (default-snap-to-guides yes)
+
+# Snap to the grid by default in new image windows.  Possible values are yes
+# and no.
+# 
+# (default-snap-to-grid no)
+
+# Snap to the canvas edge by default in new image windows.  Possible values
+# are yes and no.
+# 
+# (default-snap-to-canvas yes)
+
+# Snap to the active path by default in new image windows.  Possible values
+# are yes and no.
+# 
+# (default-snap-to-path no)
+
 # When enabled, an image will become the active image when its image window
 # receives the focus. This is useful for window managers using "click to
 # focus".  Possible values are yes and no.
@@ -500,6 +520,11 @@
 # 
 # (move-tool-changes-active no)
 
+# How many recent settings to keep around in color correction tools  This is
+# an integer value.
+# 
+# (image-map-tool-max-recent 10)
+
 # When enabled, GIMP will not save an image if it has not been changed since
 # it was opened.  Possible values are yes and no.
 # 
@@ -625,7 +650,7 @@
 # appended to the command with a space separating the two.  This is a single
 # filename.
 # 
-# (web-browser "firefox %s")
+# (web-browser "xdg-open %s")
 
 # When enabled, the online user manual will be used by the help system.
 # Otherwise the locally installed copy is used.  Possible values are yes and
@@ -636,7 +661,7 @@
 # The location of the online user manual. This is used if
 # 'user-manual-online' is enabled.  This is a string value.
 # 
-# (user-manual-online-uri "http://docs.gimp.org/2.6")
+# (user-manual-online-uri "http://docs.gimp.org/2.7")
 
 # The window type hint that is set on the toolbox. This may affect how your
 # window manager decorates and handles the toolbox window.  Possible values