From ea2a76b1a25b6f605234e52cb6154973f91312a3 Mon Sep 17 00:00:00 2001
From: Wirt Wolff <wirtwolff@gmail.com>
Date: Fri, 23 Oct 2009 06:26:51 +0200
Subject: Docs: use myLayout like template rather than plural

Ignore-this: 8f1814c42e90e18af636a14751ae2f58
Despite myLayouts currently being more popular in examples, make
them all myLayout as in man/xmonad.hs to avoid mixing them in the
same module as was done a few places, leading to confusion for some users.

darcs-hash:20091023042651-18562-48ea1268b6eb92d4b4d50f20aba93cead4652eb1.gz
---
 XMonad/Actions/MouseResize.hs       | 4 ++--
 XMonad/Actions/TopicSpace.hs        | 2 +-
 XMonad/Layout/Accordion.hs          | 4 ++--
 XMonad/Layout/BoringWindows.hs      | 4 ++--
 XMonad/Layout/Circle.hs             | 4 ++--
 XMonad/Layout/Cross.hs              | 4 ++--
 XMonad/Layout/Dishes.hs             | 4 ++--
 XMonad/Layout/DragPane.hs           | 4 ++--
 XMonad/Layout/FixedColumn.hs        | 4 ++--
 XMonad/Layout/Grid.hs               | 6 +++---
 XMonad/Layout/HintedGrid.hs         | 6 +++---
 XMonad/Layout/IM.hs                 | 4 ++--
 XMonad/Layout/LayoutBuilder.hs      | 4 ++--
 XMonad/Layout/LayoutCombinators.hs  | 4 ++--
 XMonad/Layout/LayoutHints.hs        | 8 ++++----
 XMonad/Layout/MagicFocus.hs         | 4 ++--
 XMonad/Layout/Magnifier.hs          | 4 ++--
 XMonad/Layout/Maximize.hs           | 4 ++--
 XMonad/Layout/Minimize.hs           | 4 ++--
 XMonad/Layout/Monitor.hs            | 2 +-
 XMonad/Layout/Mosaic.hs             | 4 ++--
 XMonad/Layout/MosaicAlt.hs          | 4 ++--
 XMonad/Layout/MouseResizableTile.hs | 8 ++++----
 XMonad/Layout/Named.hs              | 4 ++--
 XMonad/Layout/ResizableTile.hs      | 4 ++--
 XMonad/Layout/Roledex.hs            | 4 ++--
 XMonad/Layout/SimpleFloat.hs        | 4 ++--
 XMonad/Layout/Simplest.hs           | 4 ++--
 XMonad/Layout/SimplestFloat.hs      | 4 ++--
 XMonad/Layout/Spiral.hs             | 4 ++--
 XMonad/Layout/StackTile.hs          | 4 ++--
 XMonad/Layout/SubLayouts.hs         | 4 ++--
 XMonad/Layout/Tabbed.hs             | 6 +++---
 XMonad/Layout/ThreeColumns.hs       | 4 ++--
 XMonad/Layout/ToggleLayouts.hs      | 4 ++--
 XMonad/Layout/TwoPane.hs            | 4 ++--
 XMonad/Layout/WindowNavigation.hs   | 4 ++--
 XMonad/Layout/WorkspaceDir.hs       | 4 ++--
 38 files changed, 81 insertions(+), 81 deletions(-)

(limited to 'XMonad')

diff --git a/XMonad/Actions/MouseResize.hs b/XMonad/Actions/MouseResize.hs
index e60bfae..aeb248a 100644
--- a/XMonad/Actions/MouseResize.hs
+++ b/XMonad/Actions/MouseResize.hs
@@ -47,11 +47,11 @@ import XMonad.Util.XUtils
 --
 -- Then edit your @layoutHook@ by modifying a given layout:
 --
--- > myLayouts = mouseResize $ windowArrange $ layoutHook defaultConfig
+-- > myLayout = mouseResize $ windowArrange $ layoutHook defaultConfig
 --
 -- and then:
 --
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Actions/TopicSpace.hs b/XMonad/Actions/TopicSpace.hs
index be5af3e..5b2d096 100644
--- a/XMonad/Actions/TopicSpace.hs
+++ b/XMonad/Actions/TopicSpace.hs
@@ -180,7 +180,7 @@ import XMonad.Util.StringProp(getStringListProp,setStringListProp)
 --      return $ defaultConfig
 --           { borderWidth = 1 -- Width of the window border in pixels.
 --           , workspaces = myTopics
---           , layoutHook = myModifiers myLayouts
+--           , layoutHook = myModifiers myLayout
 --           , manageHook = myManageHook
 --           , logHook = myLogHook
 --           , handleEventHook = myHandleEventHook
diff --git a/XMonad/Layout/Accordion.hs b/XMonad/Layout/Accordion.hs
index 0516b4a..a3c1efd 100644
--- a/XMonad/Layout/Accordion.hs
+++ b/XMonad/Layout/Accordion.hs
@@ -30,8 +30,8 @@ import Data.Ratio
 --
 -- Then edit your @layoutHook@ by adding the Accordion layout:
 --
--- > myLayouts = Accordion ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = Accordion ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/BoringWindows.hs b/XMonad/Layout/BoringWindows.hs
index bc675a9..c74b655 100644
--- a/XMonad/Layout/BoringWindows.hs
+++ b/XMonad/Layout/BoringWindows.hs
@@ -46,8 +46,8 @@ import qualified XMonad.StackSet as W
 --
 -- Then edit your @layoutHook@ by adding the layout modifier:
 --
--- > myLayouts = boringWindows (Full ||| etc..)
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = boringWindows (Full ||| etc..)
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- Then to your keybindings, add:
 --
diff --git a/XMonad/Layout/Circle.hs b/XMonad/Layout/Circle.hs
index d2cf26f..5bd10d2 100644
--- a/XMonad/Layout/Circle.hs
+++ b/XMonad/Layout/Circle.hs
@@ -31,8 +31,8 @@ import XMonad.StackSet (integrate, peek)
 --
 -- Then edit your @layoutHook@ by adding the Circle layout:
 --
--- > myLayouts = Circle ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = Circle ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/Cross.hs b/XMonad/Layout/Cross.hs
index ec62a56..9f37b06 100644
--- a/XMonad/Layout/Cross.hs
+++ b/XMonad/Layout/Cross.hs
@@ -28,8 +28,8 @@ import Control.Monad( msum )
 --
 -- Then edit your @layoutHook@ by adding one of the Cross layouts:
 --
--- > myLayouts =  simpleCross ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout =  simpleCross ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 
 -- apply a factor to a Rectangle Dimension
diff --git a/XMonad/Layout/Dishes.hs b/XMonad/Layout/Dishes.hs
index b83daf6..821f0df 100644
--- a/XMonad/Layout/Dishes.hs
+++ b/XMonad/Layout/Dishes.hs
@@ -33,8 +33,8 @@ import Control.Monad (ap)
 --
 -- Then edit your @layoutHook@ by adding the Dishes layout:
 --
--- > myLayouts = Dishes 2 (1/6) ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = Dishes 2 (1/6) ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/DragPane.hs b/XMonad/Layout/DragPane.hs
index f78ca98..37d70b5 100644
--- a/XMonad/Layout/DragPane.hs
+++ b/XMonad/Layout/DragPane.hs
@@ -40,8 +40,8 @@ import XMonad.Util.XUtils
 --
 -- Then edit your @layoutHook@ by adding the DragPane layout:
 --
--- > myLayouts = dragPane Horizontal 0.1 0.5 ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = dragPane Horizontal 0.1 0.5 ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/FixedColumn.hs b/XMonad/Layout/FixedColumn.hs
index 29c5f81..ad0c004 100644
--- a/XMonad/Layout/FixedColumn.hs
+++ b/XMonad/Layout/FixedColumn.hs
@@ -42,8 +42,8 @@ import XMonad.StackSet as W
 --
 -- Then edit your @layoutHook@ by adding the FixedColumn layout:
 --
--- > myLayouts = FixedColumn 1 20 80 10 ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = FixedColumn 1 20 80 10 ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/Grid.hs b/XMonad/Layout/Grid.hs
index 05af46b..a2d39e0 100644
--- a/XMonad/Layout/Grid.hs
+++ b/XMonad/Layout/Grid.hs
@@ -30,14 +30,14 @@ import XMonad.StackSet
 --
 -- Then edit your @layoutHook@ by adding the Grid layout:
 --
--- > myLayouts = Grid ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = Grid ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- You can also specify an aspect ratio for Grid to strive for with the
 -- GridRatio constructor.  For example, if you want Grid to try to make a grid
 -- four windows wide and three windows tall, you could use
 --
--- > myLayouts = GridRatio (4/3) ||| etc.
+-- > myLayout = GridRatio (4/3) ||| etc.
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/HintedGrid.hs b/XMonad/Layout/HintedGrid.hs
index c4317da..0d9e17d 100644
--- a/XMonad/Layout/HintedGrid.hs
+++ b/XMonad/Layout/HintedGrid.hs
@@ -41,13 +41,13 @@ infixr 9 .
 --
 -- Then edit your @layoutHook@ by adding the 'Grid' layout:
 --
--- > myLayouts = Grid False ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = Grid False ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- You can also specify an aspect ratio for Grid to strive for with the
 -- GridRatio constructor:
 --
--- > myLayouts = GridRatio (4/3) False ||| etc.
+-- > myLayout = GridRatio (4/3) False ||| etc.
 --
 -- For more detailed instructions on editing the layoutHook see
 -- "XMonad.Doc.Extending#Editing_the_layout_hook".
diff --git a/XMonad/Layout/IM.hs b/XMonad/Layout/IM.hs
index 2a27700..a88d8ef 100644
--- a/XMonad/Layout/IM.hs
+++ b/XMonad/Layout/IM.hs
@@ -45,8 +45,8 @@ import XMonad.Util.WindowProperties
 -- for managing your chat windows (Grid in this example, another useful choice
 -- to consider is Tabbed layout).
 --
--- > myLayouts = withIM (1%7) (ClassName "Tkabber") Grid ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = withIM (1%7) (ClassName "Tkabber") Grid ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- Here @1%7@ is the part of the screen which your roster will occupy,
 -- @ClassName \"Tkabber\"@ tells xmonad which window is actually your roster.
diff --git a/XMonad/Layout/LayoutBuilder.hs b/XMonad/Layout/LayoutBuilder.hs
index 29972b9..7b21087 100644
--- a/XMonad/Layout/LayoutBuilder.hs
+++ b/XMonad/Layout/LayoutBuilder.hs
@@ -41,7 +41,7 @@ import Control.Monad
 --
 -- Then edit your @layoutHook@ by adding something like:
 --
--- > myLayouts = ( (layoutN 1 (relBox 0 0 0.5 1) (Just $ relBox 0 0 1 1) $ simpleTabbed)
+-- > myLayout = ( (layoutN 1 (relBox 0 0 0.5 1) (Just $ relBox 0 0 1 1) $ simpleTabbed)
 -- >             $ (layoutAll (relBox 0.5 0 1 1)                         $ simpleTabbed)
 -- >             ) |||
 -- >             ( (layoutN 1       (relBox (1/3) 0 (1/2) 1) (Just $ relBox 0 0 1 1) $ Tall 0 0.01 0.5)
@@ -52,7 +52,7 @@ import Control.Monad
 -- >             $ (layoutN 1 (absBox (-200)     0 0          0) Nothing                 $ simpleTabbed)
 -- >             $ (layoutAll (absBox 0          0 (-512-200) 0)                         $ simpleTabbed)
 -- >             ) ||| Full ||| etc...
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- This will produce a layout similar to DragPane, but with the possibility to have multiple windows in the left half
 -- and tabs that show the available windows. It will also produce a layout similar to ThreeColMid and a special layout
diff --git a/XMonad/Layout/LayoutCombinators.hs b/XMonad/Layout/LayoutCombinators.hs
index b052759..13b03b3 100644
--- a/XMonad/Layout/LayoutCombinators.hs
+++ b/XMonad/Layout/LayoutCombinators.hs
@@ -64,8 +64,8 @@ import XMonad.Layout.DragPane
 -- Then edit your @layoutHook@ to use the new layout combinators. For
 -- example:
 --
--- > myLayouts = (Tall 1 (3/100) (1/2) *//* Full)  ||| (Tall 1 (3/100) (1/2) ***||** Full) ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = (Tall 1 (3/100) (1/2) *//* Full)  ||| (Tall 1 (3/100) (1/2) ***||** Full) ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the @layoutHook@ see:
 --
diff --git a/XMonad/Layout/LayoutHints.hs b/XMonad/Layout/LayoutHints.hs
index 29a7d3d..d3859b1 100644
--- a/XMonad/Layout/LayoutHints.hs
+++ b/XMonad/Layout/LayoutHints.hs
@@ -47,17 +47,17 @@ import qualified Data.Set as Set
 -- Then edit your @layoutHook@ by adding the 'layoutHints' layout modifier
 -- to some layout:
 --
--- > myLayouts = layoutHints (Tall 1 (3/100) (1/2))  ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = layoutHints (Tall 1 (3/100) (1/2))  ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- Or, to center the adapted window in its available area:
 --
--- > myLayouts = layoutHintsWithPlacement (0.5, 0.5) (Tall 1 (3/100) (1/2))
+-- > myLayout = layoutHintsWithPlacement (0.5, 0.5) (Tall 1 (3/100) (1/2))
 -- >                   ||| Full ||| etc..
 --
 -- Or, to make a reasonable attempt to eliminate gaps between windows:
 --
--- > myLayouts = layoutHintsToCenter (Tall 1 (3/100) (1/2))
+-- > myLayout = layoutHintsToCenter (Tall 1 (3/100) (1/2))
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/MagicFocus.hs b/XMonad/Layout/MagicFocus.hs
index 10d075c..bf3b31a 100644
--- a/XMonad/Layout/MagicFocus.hs
+++ b/XMonad/Layout/MagicFocus.hs
@@ -39,8 +39,8 @@ import qualified Data.Map as M
 -- Then edit your @layoutHook@ by adding the magicFocus layout
 -- modifier:
 --
--- > myLayouts = magicFocus (Tall 1 (3/100) (1/2)) ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts,
+-- > myLayout = magicFocus (Tall 1 (3/100) (1/2)) ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout,
 -- >                               handleEventHook = promoteWarp }
 --
 -- For more detailed instructions on editing the layoutHook see:
diff --git a/XMonad/Layout/Magnifier.hs b/XMonad/Layout/Magnifier.hs
index 82e1789..7f812ce 100644
--- a/XMonad/Layout/Magnifier.hs
+++ b/XMonad/Layout/Magnifier.hs
@@ -41,8 +41,8 @@ import XMonad.Layout.LayoutModifier
 -- Then edit your @layoutHook@ by adding the 'magnifier' layout modifier
 -- to some layout:
 --
--- > myLayouts = magnifier (Tall 1 (3/100) (1/2))  ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = magnifier (Tall 1 (3/100) (1/2))  ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- By default magnifier increases the focused window's size by 1.5.
 -- You can also use:
diff --git a/XMonad/Layout/Maximize.hs b/XMonad/Layout/Maximize.hs
index 875d895..2cf0087 100644
--- a/XMonad/Layout/Maximize.hs
+++ b/XMonad/Layout/Maximize.hs
@@ -34,8 +34,8 @@ import Data.List ( partition )
 --
 -- Then edit your @layoutHook@ by adding the Maximize layout modifier:
 --
--- > myLayouts = maximize (Tall 1 (3/100) (1/2)) ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = maximize (Tall 1 (3/100) (1/2)) ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/Minimize.hs b/XMonad/Layout/Minimize.hs
index 37462a4..f8aa4c8 100644
--- a/XMonad/Layout/Minimize.hs
+++ b/XMonad/Layout/Minimize.hs
@@ -34,8 +34,8 @@ import Data.List
 --
 -- Then edit your @layoutHook@ by adding the Minimize layout modifier:
 --
--- > myLayouts = minimize (Tall 1 (3/100) (1/2)) ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = minimize (Tall 1 (3/100) (1/2)) ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/Monitor.hs b/XMonad/Layout/Monitor.hs
index 516c763..8fccba2 100644
--- a/XMonad/Layout/Monitor.hs
+++ b/XMonad/Layout/Monitor.hs
@@ -76,7 +76,7 @@ import Control.Monad
 --
 -- Apply layout modifier.
 --
--- > myLayouts = ModifiedLayout clock $ tall ||| Full ||| ...
+-- > myLayout = ModifiedLayout clock $ tall ||| Full ||| ...
 --
 -- After that, if there exists a window with specified properties, it will be
 -- displayed on top of all /tiled/ (not floated) windows on specified
diff --git a/XMonad/Layout/Mosaic.hs b/XMonad/Layout/Mosaic.hs
index 7eac5e9..557c0ac 100644
--- a/XMonad/Layout/Mosaic.hs
+++ b/XMonad/Layout/Mosaic.hs
@@ -46,8 +46,8 @@ import Data.Monoid(Monoid,mempty, mappend)
 --
 -- Then edit your @layoutHook@ by adding the Mosaic layout:
 --
--- > myLayouts = mosaic 2 [3,2] ||| Full ||| etc..
--- > main = xmonad $ defaultConfig { layoutHook = myLayouts }
+-- > myLayout = mosaic 2 [3,2] ||| Full ||| etc..
+-- > main = xmonad $ defaultConfig { layoutHook = myLayout }
 --
 -- Unfortunately, infinite lists break serialization, so don't use them. And if
 -- the list is too short, it is extended with @++ repeat 1@, which covers the
diff --git a/XMonad/Layout/MosaicAlt.hs b/XMonad/Layout/MosaicAlt.hs
index 4faf0d6..808053f 100644
--- a/XMonad/Layout/MosaicAlt.hs
+++ b/XMonad/Layout/MosaicAlt.hs
@@ -41,8 +41,8 @@ import Data.Ratio
 --
 -- Then edit your @layoutHook@ by adding the MosaicAlt layout:
 --
--- > myLayouts = MosaicAlt M.empty ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = MosaicAlt M.empty ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/MouseResizableTile.hs b/XMonad/Layout/MouseResizableTile.hs
index d82c80e..6af586b 100644
--- a/XMonad/Layout/MouseResizableTile.hs
+++ b/XMonad/Layout/MouseResizableTile.hs
@@ -35,13 +35,13 @@ import XMonad.Util.XUtils
 -- Either in its normal form or the mirrored version. (The mirror layout modifier
 -- will not work correctly here because of the use of the mouse.)
 --
--- > myLayouts = mouseResizableTile ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = mouseResizableTile ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- or
 --
--- > myLayouts = mouseResizableTileMirrored ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = mouseResizableTileMirrored ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/Named.hs b/XMonad/Layout/Named.hs
index f742acb..54071d9 100644
--- a/XMonad/Layout/Named.hs
+++ b/XMonad/Layout/Named.hs
@@ -32,8 +32,8 @@ import XMonad.Layout.LayoutModifier
 -- Then edit your @layoutHook@ by adding the Named layout modifier
 -- to some layout:
 --
--- > myLayouts = named "real big" Full ||| (nameTail $ named "real big" $ Full) ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = named "real big" Full ||| (nameTail $ named "real big" $ Full) ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/ResizableTile.hs b/XMonad/Layout/ResizableTile.hs
index cf5994a..20a5ea4 100644
--- a/XMonad/Layout/ResizableTile.hs
+++ b/XMonad/Layout/ResizableTile.hs
@@ -33,8 +33,8 @@ import Data.List ((\\))
 --
 -- Then edit your @layoutHook@ by adding the ResizableTile layout:
 --
--- > myLayouts =  ResizableTall 1 (3/100) (1/2) [] ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout =  ResizableTall 1 (3/100) (1/2) [] ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/Roledex.hs b/XMonad/Layout/Roledex.hs
index 2a130c1..cc1ca50 100644
--- a/XMonad/Layout/Roledex.hs
+++ b/XMonad/Layout/Roledex.hs
@@ -32,8 +32,8 @@ import Data.Ratio
 --
 -- Then edit your @layoutHook@ by adding the Roledex layout:
 --
--- > myLayouts =  Roledex ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout =  Roledex ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/SimpleFloat.hs b/XMonad/Layout/SimpleFloat.hs
index 884a241..e536e40 100644
--- a/XMonad/Layout/SimpleFloat.hs
+++ b/XMonad/Layout/SimpleFloat.hs
@@ -38,8 +38,8 @@ import XMonad.Layout.WindowArranger
 --
 -- Then edit your @layoutHook@ by adding the SimpleFloat layout:
 --
--- > myLayouts = simpleFloat ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = simpleFloat ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/Simplest.hs b/XMonad/Layout/Simplest.hs
index 7136eb2..a167c68 100644
--- a/XMonad/Layout/Simplest.hs
+++ b/XMonad/Layout/Simplest.hs
@@ -29,8 +29,8 @@ import qualified XMonad.StackSet as S
 --
 -- Then edit your @layoutHook@ by adding the Simplest layout:
 --
--- > myLayouts = Simplest ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = Simplest ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/SimplestFloat.hs b/XMonad/Layout/SimplestFloat.hs
index 699fafa..f9433ee 100644
--- a/XMonad/Layout/SimplestFloat.hs
+++ b/XMonad/Layout/SimplestFloat.hs
@@ -33,8 +33,8 @@ import XMonad.Util.XUtils (fi)
 --
 -- Then edit your @layoutHook@ by adding the SimplestFloat layout:
 --
--- > myLayouts = simplestFloat ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = simplestFloat ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/Spiral.hs b/XMonad/Layout/Spiral.hs
index a6ea36d..6dab65f 100644
--- a/XMonad/Layout/Spiral.hs
+++ b/XMonad/Layout/Spiral.hs
@@ -34,8 +34,8 @@ import XMonad.StackSet ( integrate )
 --
 -- Then edit your @layoutHook@ by adding the Spiral layout:
 --
--- > myLayouts =  spiral (6/7) ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout =  spiral (6/7) ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/StackTile.hs b/XMonad/Layout/StackTile.hs
index 602ff37..a86cc0e 100644
--- a/XMonad/Layout/StackTile.hs
+++ b/XMonad/Layout/StackTile.hs
@@ -32,8 +32,8 @@ import Control.Monad
 --
 -- Then edit your @layoutHook@ by adding the StackTile layout:
 --
--- > myLayouts =  StackTile 1 (3/100) (1/2) ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout =  StackTile 1 (3/100) (1/2) ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/SubLayouts.hs b/XMonad/Layout/SubLayouts.hs
index e769ef9..53e7e8f 100644
--- a/XMonad/Layout/SubLayouts.hs
+++ b/XMonad/Layout/SubLayouts.hs
@@ -122,9 +122,9 @@ import Data.Map(Map)
 --
 -- Then edit your @layoutHook@ by adding the 'subTabbed' layout modifier:
 --
--- > myLayouts = windowNavigation $ subTabbed $ boringWindows $
+-- > myLayout = windowNavigation $ subTabbed $ boringWindows $
 -- >                        Tall 1 (3/100) (1/2) ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- "XMonad.Layout.WindowNavigation" is used to specify which windows to merge,
 -- and it is not integrated into the modifier because it can be configured, and
diff --git a/XMonad/Layout/Tabbed.hs b/XMonad/Layout/Tabbed.hs
index 5948119..469c5d5 100644
--- a/XMonad/Layout/Tabbed.hs
+++ b/XMonad/Layout/Tabbed.hs
@@ -43,15 +43,15 @@ import XMonad.Layout.Simplest ( Simplest(Simplest) )
 --
 -- Then edit your @layoutHook@ by adding the Tabbed layout:
 --
--- > myLayouts = simpleTabbed ||| Full ||| etc..
+-- > myLayout = simpleTabbed ||| Full ||| etc..
 --
 -- or, if you want a specific theme for you tabbed layout:
 --
--- > myLayouts = tabbed shrinkText defaultTheme ||| Full ||| etc..
+-- > myLayout = tabbed shrinkText defaultTheme ||| Full ||| etc..
 --
 -- and then:
 --
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- This layout has hardcoded behaviour for mouse clicks on tab decorations:
 -- Left click on the tab switches focus to that window.
diff --git a/XMonad/Layout/ThreeColumns.hs b/XMonad/Layout/ThreeColumns.hs
index 7fe0d22..58a625a 100644
--- a/XMonad/Layout/ThreeColumns.hs
+++ b/XMonad/Layout/ThreeColumns.hs
@@ -38,8 +38,8 @@ import Control.Monad
 --
 -- Then edit your @layoutHook@ by adding the ThreeCol layout:
 --
--- > myLayouts = ThreeCol 1 (3/100) (1/2) ||| ThreeColMid 1 (3/100) (1/2) ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = ThreeCol 1 (3/100) (1/2) ||| ThreeColMid 1 (3/100) (1/2) ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- The first argument specifies how many windows initially appear in the main
 -- window. The second argument argument specifies the amount to resize while
diff --git a/XMonad/Layout/ToggleLayouts.hs b/XMonad/Layout/ToggleLayouts.hs
index 233f5ff..4ae6e66 100644
--- a/XMonad/Layout/ToggleLayouts.hs
+++ b/XMonad/Layout/ToggleLayouts.hs
@@ -29,8 +29,8 @@ import XMonad.StackSet (Workspace (..))
 --
 -- Then edit your @layoutHook@ by adding the ToggleLayouts layout:
 --
--- > myLayouts = toggleLayouts Full (Tall 1 (3/100) (1/2)) ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = toggleLayouts Full (Tall 1 (3/100) (1/2)) ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/TwoPane.hs b/XMonad/Layout/TwoPane.hs
index ef43ae1..3736e4d 100644
--- a/XMonad/Layout/TwoPane.hs
+++ b/XMonad/Layout/TwoPane.hs
@@ -32,8 +32,8 @@ import XMonad.StackSet ( focus, up, down)
 --
 -- Then edit your @layoutHook@ by adding the TwoPane layout:
 --
--- > myLayouts = TwoPane (3/100) (1/2)  ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = TwoPane (3/100) (1/2)  ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/WindowNavigation.hs b/XMonad/Layout/WindowNavigation.hs
index 6a8cba4..b19f25c 100644
--- a/XMonad/Layout/WindowNavigation.hs
+++ b/XMonad/Layout/WindowNavigation.hs
@@ -40,8 +40,8 @@ import XMonad.Util.XUtils
 -- Then edit your @layoutHook@ by adding the WindowNavigation layout modifier
 -- to some layout:
 --
--- > myLayouts = windowNavigation (Tall 1 (3/100) (1/2))  ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = windowNavigation (Tall 1 (3/100) (1/2))  ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
diff --git a/XMonad/Layout/WorkspaceDir.hs b/XMonad/Layout/WorkspaceDir.hs
index ccfaafe..775653b 100644
--- a/XMonad/Layout/WorkspaceDir.hs
+++ b/XMonad/Layout/WorkspaceDir.hs
@@ -46,8 +46,8 @@ import XMonad.StackSet ( tag, currentTag )
 -- Then edit your @layoutHook@ by adding the Workspace layout modifier
 -- to some layout:
 --
--- > myLayouts = workspaceDir "~" (Tall 1 (3/100) (1/2))  ||| Full ||| etc..
--- > main = xmonad defaultConfig { layoutHook = myLayouts }
+-- > myLayout = workspaceDir "~" (Tall 1 (3/100) (1/2))  ||| Full ||| etc..
+-- > main = xmonad defaultConfig { layoutHook = myLayout }
 --
 -- For more detailed instructions on editing the layoutHook see:
 --
-- 
cgit v1.2.3