From: Dana Jansens <danakj@orodu.net>
Date: Wed, 16 May 2007 00:29:04 +0000 (+0000)
Subject: merge r6571 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~28
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=b3128bcd8a157082a863f8d3107d922e31c58668;p=dana%2Fopenbox.git

merge r6571 from trunk
---

diff --git a/data/rc.xml b/data/rc.xml
index d4b53282..efe93376 100644
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -158,13 +158,13 @@
     <action name="Desktop"><desktop>1</desktop></action>
   </keybind>
   <keybind key="W-F2">
-    <action name="Desktop"><desktop>1</desktop></action>
+    <action name="Desktop"><desktop>2</desktop></action>
   </keybind>
   <keybind key="W-F3">
-    <action name="Desktop"><desktop>1</desktop></action>
+    <action name="Desktop"><desktop>3</desktop></action>
   </keybind>
   <keybind key="W-F4">
-    <action name="Desktop"><desktop>1</desktop></action>
+    <action name="Desktop"><desktop>4</desktop></action>
   </keybind>
   <keybind key="W-d">
     <action name="ToggleShowDesktop"/>
diff --git a/doc/rc-mouse-focus.xml b/doc/rc-mouse-focus.xml
index e10c5e54..ce8ca2a0 100644
--- a/doc/rc-mouse-focus.xml
+++ b/doc/rc-mouse-focus.xml
@@ -158,13 +158,13 @@
     <action name="Desktop"><desktop>1</desktop></action>
   </keybind>
   <keybind key="W-F2">
-    <action name="Desktop"><desktop>1</desktop></action>
+    <action name="Desktop"><desktop>2</desktop></action>
   </keybind>
   <keybind key="W-F3">
-    <action name="Desktop"><desktop>1</desktop></action>
+    <action name="Desktop"><desktop>3</desktop></action>
   </keybind>
   <keybind key="W-F4">
-    <action name="Desktop"><desktop>1</desktop></action>
+    <action name="Desktop"><desktop>4</desktop></action>
   </keybind>
   <keybind key="W-d">
     <action name="ToggleShowDesktop"/>