Merge branch 'backport'

[chaz/openbox] / data / rc.xml

diff --git a/data/rc.xml b/data/rc.xml
index caa38c673f7a6fa0970ef3f2a7f1d64f041caa7c..e54cb04da7f41c2dd2d0dd3004b27582f2b6ef35 100644 (file)
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -116,6 +116,9 @@
     <name>desktop 2</name>
     -->
   </names>
+  <popupTime>875</popupTime>
+  <!-- The number of milliseconds to show the popup for when switching
+       desktops.  Set this to 0 to disable the popup. -->
 </desktops>
 
 <resize>
@@ -261,9 +264,9 @@
   <doubleClickTime>200</doubleClickTime>
   <!-- in milliseconds (1000 = 1 second) -->
   <screenEdgeWarpTime>400</screenEdgeWarpTime>
-  <!-- time before changing desktops when the pointer touches the edge of the
-       screen while moving a window, in milliseconds (1000 = 1 second),
-       0 disables warping -->
+  <!-- Time before changing desktops when the pointer touches the edge of the
+       screen while moving a window, in milliseconds (1000 = 1 second).
+       Set this to 0 to disable warping -->
 
   <context name="Frame">
     <mousebind button="A-Left" action="Press">