diff --git a/doc/C/xfwm4.html b/doc/C/xfwm4.html
index 92da2cda4425d95881e34f433d3787626ed347cd..c2511813f0f1270509c6ca1ca441cf53d3bf03d1 100644
--- a/doc/C/xfwm4.html
+++ b/doc/C/xfwm4.html
@@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>XFce 4 Window Manager</title><link rel="stylesheet" href="../xfce.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.61.2"><link rel="home" href="#xfwm4" title="XFce 4 Window Manager"><link rel="next" href="#wm-intro" title="Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="xfwm4"></a>XFce 4 Window Manager</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">François</span> <span class="surname">Le Clainche</span></h3><div class="affiliation"><div class="address"><p><tt class="email"><<a href="mailto:fleclainche@wanadoo.fr">fleclainche@wanadoo.fr</a>></tt></p></div></div></div></div></div><div><span xmlns="http://www.w3.org/TR/xhtml1/transitional" class="releaseinfo">This manual describes <b xmlns="" class="application"><tt>xfwm4</tt></b> version 3.90
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>XFce 4 Window Manager</title><link rel="stylesheet" href="../xfce.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.61.2"><link rel="home" href="#xfwm4" title="XFce 4 Window Manager"><link rel="next" href="#wm-intro" title="Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="xfwm4"></a>XFce 4 Window Manager</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">François</span> <span class="surname">Le Clainche</span></h3><div class="affiliation"><div class="address"><p><tt class="email"><<a href="mailto:fleclainche@wanadoo.fr">fleclainche@wanadoo.fr</a>></tt></p></div></div></div></div></div><div><span xmlns="http://www.w3.org/TR/xhtml1/transitional" class="releaseinfo">This manual describes <b xmlns="" class="application"><tt>xfwm4</tt></b> version 3.99.3
<br></br></span></div><div><p class="copyright">Copyright © 2003 François Le Clainche</p></div><div><p class="copyright">Copyright © 2003 Jasper Huijsmans</p></div></div><div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="#wm-intro">Introduction</a></dt><dt><a href="#wm-using">Using xfwm4</a></dt><dd><dl><dt><a href="#wm-windows">Manage windows</a></dt><dt><a href="#wm-keybindings">Keyboard shortcuts summary</a></dt></dl></dd><dt><a href="#wm-settings">Customizing xfwm4</a></dt><dd><dl><dt><a href="#wm-style">Decoration style</a></dt><dt><a href="#wm-focus">Keyboard and focus</a></dt><dt><a href="#wm_advanced">Advanced settings</a></dt></dl></dd><dt><a href="#workspace-margins">Customizing workspace margins</a></dt><dt><a href="#wm-copyright">About xfwm4</a></dt></dl></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="wm-intro"></a>Introduction</h2></div></div><div></div></div><p>The XFce 4 Window Manager is part of the <a href="http://www.xfce.org" target="_top">XFce Desktop Environment</a>.
The actual command to run is <b class="application"><tt>xfwm4</tt></b>. To run it in the background use
<b class="command"><b class="application"><tt>xfwm4</tt></b> --daemon</b>. The window manager is responsible for
@@ -45,33 +45,33 @@
settings</a>). Moreover, you can maximize a window only
vertically ou horizontally.
</p><p>To maximize a window, perform one of those actions:</p><div class="itemizedlist"><ul type="disc"><li>click the maximize button of the title bar</li><li>open the window menu from the title bar and choose the
- "maximize" item</li><li>use Alt + F5 keyboard shortcut</li></ul></div><p>To maximize a window vertically :</p><div class="itemizedlist"><ul type="disc"><li>middle-click the maximize button of the title bar</li><li>use Alt + F6 keyboard shortcut</li></ul></div><p>To maximize a window horizontally :</p><div class="itemizedlist"><ul type="disc"><li>right-click the maximize button of the title bar</li><li>use Alt + F7 keyboard shortcut</li></ul></div><p>When a window has been maximized in a way or another, it can be
- restored to its previous size doing one of these actions :</p><div class="itemizedlist"><ul type="disc"><li>click the unmaximize button of the title bar</li><li>use the same keyboard shortcut once again</li><li>choose the "Unmaximize" item in the window menu</li></ul></div><p> </p></dd><dt><span class="term">Resize windows</span></dt><dd><p>Although certain special windows can not be resized, you are
- able to resize most part of them to fit your needs.</p><div class="itemizedlist"><ul type="disc"><li>you can use the edges and corners of the window frame to
+ "maximize" item</li><li>use Alt + F5 keyboard shortcut</li></ul></div><p>To maximize a window vertically :</p><div class="itemizedlist"><ul type="disc"><li>middle-click the maximize button of the title bar</li><li>use Alt + F6 keyboard shortcut</li></ul></div><p>To maximize a window horizontally :</p><div class="itemizedlist"><ul type="disc"><li>right-click the maximize button of the title bar</li><li>use Alt + F7 keyboard shortcut</li></ul></div><p>When a window has been maximized in a way or another, it can be
+ restored to its previous size doing one of these actions :</p><div class="itemizedlist"><ul type="disc"><li>click the unmaximize button of the title bar</li><li>use the same keyboard shortcut once again</li><li>choose the "Unmaximize" item in the window menu</li></ul></div><p> </p></dd><dt><span class="term">Resize windows</span></dt><dd><p>Although certain special windows can not be resized, you are
+ able to resize most of them to fit your needs.</p><div class="itemizedlist"><ul type="disc"><li>you can use the edges and corners of the window frame to
modify its size, dragging them with the mouse</li><li>you can use the Alt + right click shortcut while you hold
the mouse pointer anywhere over the window frame; it will act as if
you were dragging the bottom-right corner of the window</li><li>you can use practical keyboard shortcuts : Control + Shift +
Alt + (up, down, right or left) Arrow</li></ul></div><p> </p></dd><dt><span class="term">Hide / unhide windows</span></dt><dd><p>You can hide a window performing one of these actions :</p><div class="itemizedlist"><ul type="disc"><li>click the hide button of the title bar</li><li>open the window menu from the title bar and choose the
- "Hide" item</li><li>use Alt + F8 keyboard shortcut </li></ul></div><p>Alternatively, you can hide all windows of current workspace,
+ "Hide" item</li><li>use Alt + F8 keyboard shortcut </li></ul></div><p>Alternatively, you can hide all windows of current workspace,
excepted the one you are using, in only one action : click the menu
- button of the title bar and choose "Hide all others".</p><p>To "unhide" a window, you will have to select its name or its
+ button of the title bar and choose "Hide all others".</p><p>To "unhide" a window, you will have to select its name or its
icon in one of those XFce 4 components :</p><div class="itemizedlist"><ul type="disc"><li><b class="application"><tt>xftaskbar4</tt></b></li><li>the <b class="application"><tt>xfce4-iconbox</tt></b></li><li>the list of windows, accessible with a right-click on the
desktop background. This list shows all opened windows, classified
by workspaces. Windows that are currently hidden are marked between
- [ ].</li></ul></div><p> </p></dd><dt><span class="term">Shade / unshade windows</span></dt><dd><p>If you "shade" a window, it will be reduced to the size of its
+ [ ].</li></ul></div><p> </p></dd><dt><span class="term">Shade / unshade windows</span></dt><dd><p>If you "shade" a window, it will be reduced to the size of its
title bar. The same repeated action makes a window to shade/unshade
- :</p><div class="itemizedlist"><ul type="disc"><li>click the shade/unshade button of the title bar</li><li>open the window menu from the title bar and choose "Shade"
- or "Unshade" item</li><li>use the mouse scrollwheel while you hold the pointer over
- the title bar</li><li>use the Alt + F9 keyboard shortcut</li></ul></div><p> </p></dd><dt><span class="term">Stick / unstick windows</span></dt><dd><p>If you "stick" a window, it will be visible at the same place on
+ :</p><div class="itemizedlist"><ul type="disc"><li>click the shade/unshade button of the title bar</li><li>open the window menu from the title bar and choose "Shade"
+ or "Unshade" item</li><li>use the mouse scrollwheel while you hold the pointer over
+ the title bar</li><li>use the Alt + F9 keyboard shortcut</li></ul></div><p> </p></dd><dt><span class="term">Stick / unstick windows</span></dt><dd><p>If you "stick" a window, it will be visible at the same place on
all your workspaces. The same repeated action make a window to
stick/unstick :
</p><div class="itemizedlist"><ul type="disc"><li>click the stick/unstick button of the title bar</li><li>open the window menu button from the title bar and choose
- "Stick" or "Unstick" item</li><li>use the Alt + F10 keyboard shortcut</li></ul></div><p> </p></dd><dt><span class="term">Move windows</span></dt><dd><p>There are several ways to move windows :</p><div class="itemizedlist"><ul type="disc"><li>left or right click on the title bar of the window and
+ "Stick" or "Unstick" item</li><li>use the Alt + F10 keyboard shortcut</li></ul></div><p> </p></dd><dt><span class="term">Move windows</span></dt><dd><p>There are several ways to move windows :</p><div class="itemizedlist"><ul type="disc"><li>left or right click on the title bar of the window and
drag it</li><li>use Alt + left click while the pointer is anywhere over
the window frame and move the mouse</li><li>use Control + Alt + Shift + (up, down, left or right)
Arrow keyboard shortcut</li></ul></div><p> </p></dd><dt><span class="term">Move a window to another workspace</span></dt><dd><p>You can send a window to another workspace by performing one of
these actions :</p><div class="itemizedlist"><ul type="disc"><li>stick the window, move to another workspace, then unstick
- the window.</li><li>use the window menu and choose one of the "Send to" submenu
+ the window.</li><li>use the window menu and choose one of the "Send to" submenu
items.</li><li>left or right click on the title bar of the window, drag it
to the screen edge : the pointer will then go to the next workspace,
still holding the window. Corresponding option needs to be selected
@@ -84,14 +84,14 @@
representation of the window, and move it to the desired
workspace.
</li></ul></div><p> </p></dd><dt><span class="term">Close a window</span></dt><dd><p>To close a window :</p><div class="itemizedlist"><ul type="disc"><li>click the close button of the title bar</li><li>Open the window menu from the title bar and choose the
- "Close" item</li><li>or use Alt + F4 keyboard shortcut</li></ul></div></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="wm-keybindings"></a>Keyboard shortcuts summary</h3></div></div><div></div></div><p>In the default configuration the following keybindings are
+ "Close" item</li><li>or use Alt + F4 keyboard shortcut</li></ul></div></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="wm-keybindings"></a>Keyboard shortcuts summary</h3></div></div><div></div></div><p>In the default configuration the following keybindings are
defined:</p><div class="itemizedlist"><ul type="disc"><li>close window : Alt + F4</li><li>Maximize window : Alt + F5</li><li>Maximize vertically : Alt + F6</li><li>Maximize horizontally : Alt + F7</li><li>Hide window : Alt + F8</li><li>Shade window : Alt + F9</li><li>Stick window : Alt + F10</li><li>Cycle windows focus : Alt + Tab</li><li>Move window : Control + Shift + Alt + Arrow (up, down, left,
or right)</li><li>Resize window : Shift + Alt + Arrow (up, down, left, or
- right)</li><li>Next workspace : Control + Alt + Right + right
- arrow</li><li>Previous workspace : Control + Alt + left arrow</li><li>Add a workspace : Alt + Inser</li><li>Delete a workspace : Alt + Delete</li><li>Go to workspace number N (1-9) : Control + F(N)</li><li>Move the window to previous|next workspace : Alt + Control +
+ right)</li><li>Next workspace : Control + Alt + Arrow right
+ arrow</li><li>Previous workspace : Control + Alt + Arrow left</li><li>Add a workspace : Alt + Inser</li><li>Delete a workspace : Alt + Delete</li><li>Go to workspace number N (1-9) : Control + F(N)</li><li>Move the window to previous|next workspace : Alt + Control +
Home|End</li><li>Move a window to workspace number N (1-9) : Alt + Control +
keypad key number N</li><li>Start xfhelp4 : Alt + F1</li><li>Start xfrun4 : Alt + F2</li><li>Lock the screen : Alt + Control + Delete</li></ul></div></div></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="wm-settings"></a>Customizing <b class="application"><tt>xfwm4</tt></b></h2></div></div><div></div></div><p>To open the Window Manager preferences dialog, click the button
- labelled "Window Manager" in the <a href="xfce-mcs-manager.html#manager-dialog" target="_top">XFce 4 Settings
+ labelled "Window Manager" in the <a href="xfce-mcs-manager.html#manager-dialog" target="_top">XFce 4 Settings
manager</a>. The dialog shows three tabs : Decoration style,
Keyboard and focus, Advanced. All modifications will have an immediate
effect on the behaviour of the selected module.</p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="wm-style"></a>Decoration style</h3></div></div><div></div></div><div class="figure"><a name="wm_decoration_style-fig"></a><p class="title"><b>Figure 2. Decoration style preferences</b></p><div class="screenshot"><div class="mediaobject"><img src="images/decoration_style.png" alt="The decoration style tab"></div></div></div><div class="variablelist"><dl><dt><span class="term">Window style</span></dt><dd><p>The list on the left side of the dialog shows all avaible window
@@ -100,9 +100,9 @@
avaible in xfwm4-theme extra package. You can preview all of them on
the official <a href="http://www.xfce.org" target="_top">XFce
Website</a>
- </p></dd><dt><span class="term">Title font</span></dt><dd><p>The "Font select" button shows the family font currently in use
+ </p></dd><dt><span class="term">Title font</span></dt><dd><p>The "Font select" button shows the family font currently in use
for the window title appearance. Click this button if you want to
- change it, and a "Font selection" dialog will appear. It works like
+ change it, and a "Font selection" dialog will appear. It works like
the font selection dialog of the <a href="xfce-mcs-plugins.html#id2811474" target="_top">user interface
settings manager plugin</a>.
</p></dd><dt><span class="term">Title alignment</span></dt><dd><p>Whatever the buttons layout is, you can choose the alignment of
@@ -125,7 +125,7 @@
(in your $HOME directory) : $HOME/.themes/xfwm4/custom.keys/keythemerc.</p><p>NOTE : $prefix is the install-prefix you used during xfwm 4
setup, usually /usr or /usr/local.
</p><p>If you do not know the names of your keyboard modifier keys, you
- can launch the "xev" application from a terminal and test
+ can launch the "xev" application from a terminal and test
them.
</p></dd><dt><span class="term">Focus model</span></dt><dd><p>A focused window receives the keyboard and mouse input. You have
the choice between two focus models :</p><div class="itemizedlist"><ul type="disc"><li>Click to focus : select this option if you want a window
@@ -139,7 +139,7 @@
pointer.
</p></dd><dt><span class="term">Raise on focus</span></dt><dd><p>If this option is selected, the frame of a newly focused window
will automatically appear over all other frames, after an amount of
- time that you can adjust with the "delay" slider.
+ time that you can adjust with the "delay" slider.
</p></dd><dt><span class="term">Raise on click</span></dt><dd><p>Choose this option if you want a window to pass over the others
when you click anywhere on its frame. If this option is not
selected, you will have to click somewhere on its decorations (title
@@ -147,7 +147,7 @@
</p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="wm_advanced"></a>Advanced settings</h3></div></div><div></div></div><div class="figure"><a name="misc_wm_prefs-fig"></a><p class="title"><b>Figure 4. Advanced preferences</b></p><div class="screenshot"><div class="mediaobject"><img src="images/misc_wm_prefs.png" alt="Advanced tab"></div></div></div><div class="variablelist"><dl><dt><span class="term">Windows snapping</span></dt><dd><p>You can choose the windows borders to be attracted by the
borders of other windows, or by the screen edges, when they are
moved. The distance from which this effect will be applied can be
- specified with the "Distance" slider.</p></dd><dt><span class="term">Wrap workspaces</span></dt><dd><p>Select the first option if you want to switch to the next
+ specified with the "Distance" slider.</p></dd><dt><span class="term">Wrap workspaces</span></dt><dd><p>Select the first option if you want to switch to the next
workspace when the mouse pointer reaches the screen edges. Select
the second one if you want the same behaviour while dragging a
window. You can specify the screen edges resistance using the
@@ -156,7 +156,7 @@
content will save some system resources).</p></dd><dt><span class="term">Double click action</span></dt><dd><p>Select what must be the behaviour of the window manager when you
double-click on the title bar of a window : shade window, hide
window, maximize window or none.</p></dd></dl></div></div></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="workspace-margins"></a>Customizing workspace margins</h2></div></div><div></div></div><div class="figure"><a name="workspace_margins-fig"></a><p class="title"><b>Figure 5. The workspace margins dialog</b></p><div class="screenshot"><div class="mediaobject"><img src="images/workspace_margins.png" alt="The workspace margins dialog"></div></div></div><p>To open the Workspace Margins dialog, click the button labelled
- "Workspace Margins" in the <a href="xfce-mcs-manager.html#manager-dialog" target="_top">settings manager
+ "Workspace Margins" in the <a href="xfce-mcs-manager.html#manager-dialog" target="_top">settings manager
dialog</a>.
</p><p>Margins are areas on the edges of the screen that maximized windows
won't cover. You can adjust the size, in pixels, of all margins (left,
diff --git a/doc/C/xfwm4.xml b/doc/C/xfwm4.xml
index f9feb38ed1efa7db00a864049a9baf17abc4547c..3a57e479e7ac022961d6cae6b0a38ea60809fcdc 100644
--- a/doc/C/xfwm4.xml
+++ b/doc/C/xfwm4.xml
@@ -1,8 +1,8 @@
<?xml version='1.0'?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY appversion "3.90">
- <!ENTITY date "May 2003">
+ <!ENTITY appversion "3.99.3">
+ <!ENTITY date "July 2003">
<!ENTITY app "<application>xfwm4</application>">
]>
@@ -224,7 +224,7 @@ maintainers, etc. Commented out by default.
<term>Resize windows</term>
<listitem>
<para>Although certain special windows can not be resized, you are
- able to resize most part of them to fit your needs.</para>
+ able to resize most of them to fit your needs.</para>
<itemizedlist>
<listitem>you can use the edges and corners of the window frame to
modify its size, dragging them with the mouse</listitem>
@@ -385,9 +385,9 @@ maintainers, etc. Commented out by default.
or right)</listitem>
<listitem>Resize window : Shift + Alt + Arrow (up, down, left, or
right)</listitem>
- <listitem>Next workspace : Control + Alt + Right + right
+ <listitem>Next workspace : Control + Alt + Arrow right
arrow</listitem>
- <listitem>Previous workspace : Control + Alt + left arrow</listitem>
+ <listitem>Previous workspace : Control + Alt + Arrow left</listitem>
<listitem>Add a workspace : Alt + Inser</listitem>
<listitem>Delete a workspace : Alt + Delete</listitem>
<listitem>Go to workspace number N (1-9) : Control + F(N)</listitem>