merge

[dwm.git] / dwm.1

diff --git a/dwm.1 b/dwm.1
index a8dcc27..bc3de7d 100644 (file)
--- a/dwm.1
+++ b/dwm.1
@@ -19,14 +19,15 @@ layout applied.
 Windows are grouped by tags. Each window can be tagged with one or multiple
 tags. Selecting certain tags displays all windows with these tags.
 .P
 Windows are grouped by tags. Each window can be tagged with one or multiple
 tags. Selecting certain tags displays all windows with these tags.
 .P

-Each screen contains a small status bar which displays all available tags, the layout,
-the title of the focused window, and the text read from the root window name
-property, if the screen is focused. A floating window is indicated with an
-empty square and a maximised floating window is indicated with a filled square
-before the windows title.  The selected tags are indicated with a different
-color. The tags of the focused window are indicated with a filled square in the
-top left corner.  The tags which are applied to one or more windows are
-indicated with an empty square in the top left corner.
+Each screen contains a small status bar which displays all available tags, the
+layout, the number of visible windows, the title of the focused window, and the
+text read from the root window name property, if the screen is focused. A
+floating window is indicated with an empty square and a maximised floating
+window is indicated with a filled square before the windows title.  The
+selected tags are indicated with a different color. The tags of the focused
+window are indicated with a filled square in the top left corner.  The tags
+which are applied to one or more windows are indicated with an empty square in
+the top left corner.

 .P
 dwm draws a small border around windows to indicate the focus state.
 .SH OPTIONS
 .P
 dwm draws a small border around windows to indicate the focus state.
 .SH OPTIONS

@@ -55,7 +56,7 @@ click on a tag label adds/removes that tag to/from the focused window.
 .TP
 .B Mod1\-Shift\-Return
 Start
 .TP
 .B Mod1\-Shift\-Return
 Start

-.BR xterm.
+.BR uxterm .

 .TP
 .B Mod1\-,
 Focus previous screen, if any.
 .TP
 .B Mod1\-,
 Focus previous screen, if any.

@@ -66,7 +67,7 @@ Focus next screen, if any.
 .B Mod1\-Shift\-,
 Send focused window to previous screen, if any.
 .TP
 .B Mod1\-Shift\-,
 Send focused window to previous screen, if any.
 .TP

-.B Mod1\-Shift\-,
+.B Mod1\-Shift\-.

 Send focused window to next screen, if any.
 .TP
 .B Mod1\-b
 Send focused window to next screen, if any.
 .TP
 .B Mod1\-b

@@ -109,30 +110,22 @@ Toggle focused window between tiled and floating state.
 Toggles to the previously selected tags.
 .TP
 .B Mod1\-Shift\-[1..n]
 Toggles to the previously selected tags.
 .TP
 .B Mod1\-Shift\-[1..n]

-Apply
-.RB nth
-tag to focused window.
+Apply nth tag to focused window.

 .TP
 .B Mod1\-Shift\-0
 Apply all tags to focused window.
 .TP
 .B Mod1\-Control\-Shift\-[1..n]
 .TP
 .B Mod1\-Shift\-0
 Apply all tags to focused window.
 .TP
 .B Mod1\-Control\-Shift\-[1..n]

-Add/remove
-.B nth
-tag to/from focused window.
+Add/remove nth tag to/from focused window.

 .TP
 .B Mod1\-[1..n]
 .TP
 .B Mod1\-[1..n]

-View all windows with
-.BR nth
-tag.
+View all windows with nth tag.

 .TP
 .B Mod1\-0
 View all windows with any tag.
 .TP
 .B Mod1\-Control\-[1..n]
 .TP
 .B Mod1\-0
 View all windows with any tag.
 .TP
 .B Mod1\-Control\-[1..n]

-Add/remove all windows with
-.BR nth
-tag to/from the view.
+Add/remove all windows with nth tag to/from the view.

 .TP
 .B Mod1\-Shift\-q
 Quit dwm.
 .TP
 .B Mod1\-Shift\-q
 Quit dwm.

@@ -152,12 +145,6 @@ code. This keeps it fast, secure and simple.
 .SH SEE ALSO
 .BR dmenu (1)
 .SH BUGS
 .SH SEE ALSO
 .BR dmenu (1)
 .SH BUGS

-The status bar may display
-.BR "EOF"
-when dwm has been started by an X session manager like
-.BR xdm (1),
-because those close standard output before executing dwm.
-.P

 Java applications which use the XToolkit/XAWT backend may draw grey windows
 only. The XToolkit/XAWT backend breaks ICCCM-compliance in recent JDK 1.5 and early
 JDK 1.6 versions, because it assumes a reparenting window manager. As a workaround
 Java applications which use the XToolkit/XAWT backend may draw grey windows
 only. The XToolkit/XAWT backend breaks ICCCM-compliance in recent JDK 1.5 and early
 JDK 1.6 versions, because it assumes a reparenting window manager. As a workaround