[svn-upgrade] Integrating new upstream version, ion3 (20070608)

[ion3.git] / man / ion3.in

diff --git a/man/ion3.in b/man/ion3.in
index 5ddbb3349ce79c10e86c85ac5441c78089e39edc..6626f7aadd9c7582c8338ba5b13d679f5174526e 100644 (file)
--- a/man/ion3.in
+++ b/man/ion3.in
@@ -28,11 +28,6 @@ in the DISPLAY environment variable.
 Set session name. This option affects where workspace and other save files are
 put (~/.ion3/session_name if option set).
 .TP
-.B \-xinerama 0|1
-If Ion was compiled with Xinerama support, this option can be used to
-enable/disable (1/0) the use of it. The default is to use Xinerama
-screen information.
-.TP
 .B \-help
 Show help on command line options
 .TP
@@ -40,7 +35,7 @@ Show help on command line options
 Show version
 .TP
 .B \-about
-Show about text (version, copyright)
+Show about text (version, author, license)
 
 .SH BASIC CONCEPTS
 
@@ -84,35 +79,34 @@ the module that whose configuration file defines these bindings.
 
 BINDINGS:WScreen
 
-.SS Bindings operating on top-level frames and screens and their children
-
-BINDINGS:WMPlex.toplevel
-
-.SS Bindings operating on frames and screens and their children
+.SS Bindings operating on all frames and screens
 
 BINDINGS:WMPlex
 
-.SS Bindings operating on all frames (including transient) and their children
+.SS Bindings operating on all frames
 
 BINDINGS:WFrame
 
-.SS Bindings operating on top-level (non-transient) frames and their children
+.SS Bindings operating on top-level (non-transient) frames and screens
+
+BINDINGS:WMPlex.toplevel
+
+.SS Bindings operating on top-level (non-transient) frames
 
 BINDINGS:WFrame.toplevel
 
 .SS Bindings for floating/detached frames
 
-BINDINGS:WFloatFrame
+BINDINGS:WFrame.floating
 
 .SS Bindings for tilings and tiled frames [mod_tiling]
 
 BINDINGS:WTiling
-BINDINGS:WFrame-on-WTiling
+.\" BINDINGS:WFrame.tiled
 
 .SS Bindings for client windows
 
 BINDINGS:WClientWin
-
 BINDINGS:WGroupCW
 
 .SS Move/resize mode bindings
@@ -156,7 +150,7 @@ User default main configuration file (overrides system default)
 .SH SEE ALSO
 The Ion home page, \fIhttp://iki.fi/tuomov/ion/\fP
 .PP
-The document "Ion: Configuring and extending with Lua" found on the
+The document "Configuring and extending Ion3 with Lua" found on the
 Ion home page.
 .PP
 .I DOCDIR/