merge r6571 from trunk

diff --git a/data/rc.xml b/data/rc.xml
index d4b532829c7a758fea4e3fd87847f54b249e9632..efe9337630375064d94fab40954bdfd6a8cf6d6e 100644 (file)
--- 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 e10c5e54a4f56a9c933ea0869f3b99841839d756..ce8ca2a01993233f3d76683e85830ab61cd364fb 100644 (file)
--- 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"/>