Refer to modm as the current modMask

Ignore-this: d097c7dc1746c55e1d4078a7148f9d5a

This makes the config suggestions consistent with the current template.

darcs-hash:20091022041126-1499c-5dd63076fdd71a61276cfc8e648bada81d9cc586.gz

12 files changed, 16 insertions, 16 deletions

diff --git a/XMonad/Prompt/AppendFile.hs b/XMonad/Prompt/AppendFile.hs
index 0760741..47139db 100644
--- a/XMonad/Prompt/AppendFile.hs
+++ b/XMonad/Prompt/AppendFile.hs
@@ -41,7 +41,7 @@ import Control.Exception
 --
 -- and adding an appropriate keybinding, for example:
 --
--- >  , ((modMask x .|. controlMask, xK_n), appendFilePrompt defaultXPConfig "/home/me/NOTES")
+-- >  , ((modm .|. controlMask, xK_n), appendFilePrompt defaultXPConfig "/home/me/NOTES")
 --
 -- For detailed instructions on editing your key bindings, see
 -- "XMonad.Doc.Extending#Editing_key_bindings".
diff --git a/XMonad/Prompt/Email.hs b/XMonad/Prompt/Email.hs
index f635b34..99c1e8f 100644
--- a/XMonad/Prompt/Email.hs
+++ b/XMonad/Prompt/Email.hs
@@ -36,7 +36,7 @@ import XMonad.Prompt.Input
 --
 -- and adding an appropriate keybinding, for example:
 --
--- >  , ((modMask x .|. controlMask, xK_e), emailPrompt defaultXPConfig addresses)
+-- >  , ((modm .|. controlMask, xK_e), emailPrompt defaultXPConfig addresses)
 --
 -- where @addresses@ is a list of email addresses that should
 -- autocomplete, for example:
diff --git a/XMonad/Prompt/Input.hs b/XMonad/Prompt/Input.hs
index e2d76a8..124fe92 100644
--- a/XMonad/Prompt/Input.hs
+++ b/XMonad/Prompt/Input.hs
@@ -59,7 +59,7 @@ import XMonad.Prompt
 -- Now all he has to do is add a keybinding to @firingPrompt@ (or
 -- @firingPrompt'@), such as
 --
--- >  , ((modMask x .|. controlMask, xK_f),  firingPrompt)
+-- >  , ((modm .|. controlMask, xK_f),  firingPrompt)
 --
 -- Now when Mr. Big hits mod-ctrl-f, a prompt will pop up saying
 -- \"Fire: \", waiting for him to type the name of someone to fire.
diff --git a/XMonad/Prompt/Layout.hs b/XMonad/Prompt/Layout.hs
index eb488eb..c3a7dfc 100644
--- a/XMonad/Prompt/Layout.hs
+++ b/XMonad/Prompt/Layout.hs
@@ -30,7 +30,7 @@ import XMonad.Layout.LayoutCombinators ( JumpToLayout(..) )
 -- > import XMonad.Prompt
 -- > import XMonad.Prompt.Layout
 --
--- >   , ((modMask x .|. shiftMask, xK_m     ), layoutPrompt defaultXPConfig)
+-- >   , ((modm .|. shiftMask, xK_m     ), layoutPrompt defaultXPConfig)
 --
 -- For detailed instruction on editing the key binding see
 -- "XMonad.Doc.Extending#Editing_key_bindings".
diff --git a/XMonad/Prompt/Man.hs b/XMonad/Prompt/Man.hs
index a9c8d0e..c069226 100644
--- a/XMonad/Prompt/Man.hs
+++ b/XMonad/Prompt/Man.hs
@@ -44,7 +44,7 @@ import Data.Maybe
 --
 -- 2. In your keybindings add something like:
 --
--- >     , ((modMask x, xK_F1), manPrompt defaultXPConfig)
+-- >     , ((modm, xK_F1), manPrompt defaultXPConfig)
 --
 -- For detailed instruction on editing the key binding see
 -- "XMonad.Doc.Extending#Editing_key_bindings".
diff --git a/XMonad/Prompt/RunOrRaise.hs b/XMonad/Prompt/RunOrRaise.hs
index bfe68b8..8ffb788 100644
--- a/XMonad/Prompt/RunOrRaise.hs
+++ b/XMonad/Prompt/RunOrRaise.hs
@@ -37,7 +37,7 @@ import System.Directory (doesDirectoryExist, doesFileExist, executable, getPermi
 
 2. In your keybindings add something like:
 
->   , ((modMask x .|. controlMask, xK_x), runOrRaisePrompt defaultXPConfig)
+>   , ((modm .|. controlMask, xK_x), runOrRaisePrompt defaultXPConfig)
 
 For detailed instruction on editing the key binding see
 "XMonad.Doc.Extending#Editing_key_bindings". -}
diff --git a/XMonad/Prompt/Shell.hs b/XMonad/Prompt/Shell.hs
index 67e8337..574fe28 100644
--- a/XMonad/Prompt/Shell.hs
+++ b/XMonad/Prompt/Shell.hs
@@ -44,7 +44,7 @@ import XMonad.Prompt
 --
 -- 2. In your keybindings add something like:
 --
--- >   , ((modMask x .|. controlMask, xK_x), shellPrompt defaultXPConfig)
+-- >   , ((modm .|. controlMask, xK_x), shellPrompt defaultXPConfig)
 --
 -- For detailed instruction on editing the key binding see
 -- "XMonad.Doc.Extending#Editing_key_bindings".
@@ -67,8 +67,8 @@ shellPrompt c = do
 -- is the program to be run with the interactive input.
 -- You would use these like this:
 --
--- >     , ((modMask,               xK_b), safePrompt "firefox" greenXPConfig)
--- >     , ((modMask .|. shiftMask, xK_c), prompt ("xterm" ++ " -e") greenXPConfig)
+-- >     , ((modm,               xK_b), safePrompt "firefox" greenXPConfig)
+-- >     , ((modm .|. shiftMask, xK_c), prompt ("xterm" ++ " -e") greenXPConfig)
 --
 -- Note that you want to use safePrompt for Firefox input, as Firefox
 -- wants URLs, and unsafePrompt for the XTerm example because this allows
diff --git a/XMonad/Prompt/Ssh.hs b/XMonad/Prompt/Ssh.hs
index e8b15a8..677bb87 100644
--- a/XMonad/Prompt/Ssh.hs
+++ b/XMonad/Prompt/Ssh.hs
@@ -37,7 +37,7 @@ import Data.Maybe
 --
 -- 2. In your keybindings add something like:
 --
--- >   , ((modMask x .|. controlMask, xK_s), sshPrompt defaultXPConfig)
+-- >   , ((modm .|. controlMask, xK_s), sshPrompt defaultXPConfig)
 --
 -- Keep in mind, that if you want to use the completion you have to
 -- disable the "HashKnownHosts" option in your ssh_config
diff --git a/XMonad/Prompt/Theme.hs b/XMonad/Prompt/Theme.hs
index 394ff4a..e67862e 100644
--- a/XMonad/Prompt/Theme.hs
+++ b/XMonad/Prompt/Theme.hs
@@ -35,7 +35,7 @@ import XMonad.Util.Themes
 --
 -- in your keybindings add:
 --
--- >   , ((modMask x .|. controlMask, xK_t), themePrompt defaultXPConfig)
+-- >   , ((modm .|. controlMask, xK_t), themePrompt defaultXPConfig)
 --
 -- For detailed instruction on editing the key binding see
 -- "XMonad.Doc.Extending#Editing_key_bindings".
diff --git a/XMonad/Prompt/Window.hs b/XMonad/Prompt/Window.hs
index 8fe9b7b..0f0ed2a 100644
--- a/XMonad/Prompt/Window.hs
+++ b/XMonad/Prompt/Window.hs
@@ -44,12 +44,12 @@ import XMonad.Actions.WindowBringer
 --
 -- and in the keys definition:
 --
--- > , ((modMask x .|. shiftMask, xK_g     ), windowPromptGoto  defaultXPConfig)
--- > , ((modMask x .|. shiftMask, xK_b     ), windowPromptBring defaultXPConfig)
+-- > , ((modm .|. shiftMask, xK_g     ), windowPromptGoto  defaultXPConfig)
+-- > , ((modm .|. shiftMask, xK_b     ), windowPromptBring defaultXPConfig)
 --
 -- The autoComplete option is a handy complement here:
 --
--- > , ((modMask x .|. shiftMask, xK_g     ), windowPromptGoto
+-- > , ((modm .|. shiftMask, xK_g     ), windowPromptGoto
 -- >                                            defaultXPConfig { autoComplete = Just 500000 } )
 --
 -- The \'500000\' is the number of microseconds to pause before sending you to
diff --git a/XMonad/Prompt/Workspace.hs b/XMonad/Prompt/Workspace.hs
index 248c17c..659c25c 100644
--- a/XMonad/Prompt/Workspace.hs
+++ b/XMonad/Prompt/Workspace.hs
@@ -29,7 +29,7 @@ import XMonad.Util.WorkspaceCompare ( getSortByIndex )
 -- > import XMonad.Prompt
 -- > import XMonad.Prompt.Workspace
 --
--- >   , ((modMask x .|. shiftMask, xK_m     ), workspacePrompt defaultXPConfig (windows . W.shift))
+-- >   , ((modm .|. shiftMask, xK_m     ), workspacePrompt defaultXPConfig (windows . W.shift))
 --
 -- For detailed instruction on editing the key binding see
 -- "XMonad.Doc.Extending#Editing_key_bindings".
diff --git a/XMonad/Prompt/XMonad.hs b/XMonad/Prompt/XMonad.hs
index 4fd5dbb..184017f 100644
--- a/XMonad/Prompt/XMonad.hs
+++ b/XMonad/Prompt/XMonad.hs
@@ -32,7 +32,7 @@ import Data.Maybe (fromMaybe)
 --
 -- in your keybindings add:
 --
--- >   , ((modMask x .|. controlMask, xK_x), xmonadPrompt defaultXPConfig)
+-- >   , ((modm .|. controlMask, xK_x), xmonadPrompt defaultXPConfig)
 --
 -- For detailed instruction on editing the key binding see
 -- "XMonad.Doc.Extending#Editing_key_bindings".