diff --git a/doc/C/images/Makefile.am b/doc/C/images/Makefile.am
index faf3e43cef6b5944945b40e1ee89f014a55b0a4a..3a4e852790bb52ae8bdb6678cd48a342d7604492 100644
--- a/doc/C/images/Makefile.am
+++ b/doc/C/images/Makefile.am
@@ -3,7 +3,8 @@ images_DATA = \
decoration_style.png \
keyboard_and_focus.png \
misc_wm_prefs.png \
- titlebar.png
+ titlebar.png \
+ workspace_margins.png
EXTRA_DIST = $(images_DATA)
diff --git a/doc/C/images/Makefile.in b/doc/C/images/Makefile.in
index 3de94337a57bedcf89a73affc42feb724e6bbd17..679aae4b183146b66cb4c3d03c81400a74f8ef8d 100644
--- a/doc/C/images/Makefile.in
+++ b/doc/C/images/Makefile.in
@@ -168,7 +168,8 @@ images_DATA = \
decoration_style.png \
keyboard_and_focus.png \
misc_wm_prefs.png \
- titlebar.png
+ titlebar.png \
+ workspace_margins.png
EXTRA_DIST = $(images_DATA)
diff --git a/doc/C/images/misc_wm_prefs.png b/doc/C/images/misc_wm_prefs.png
index eeee557b831fc0a54e26b9f4bf269cf375d23dec..e28ce9947d2139b28dab46e3a6c063b53a8851ef 100644
Binary files a/doc/C/images/misc_wm_prefs.png and b/doc/C/images/misc_wm_prefs.png differ
diff --git a/doc/C/images/workspace_margins.png b/doc/C/images/workspace_margins.png
new file mode 100644
index 0000000000000000000000000000000000000000..18285d81cb30eacbae8168e0abbe21617f5771ba
Binary files /dev/null and b/doc/C/images/workspace_margins.png differ
diff --git a/doc/C/xfwm4.html b/doc/C/xfwm4.html
index 7ddb3047a6ee4d9c7b9599c7094b38ab9050b13c..94202a54fafb8c66d7653aabb53ca22af48377b1 100644
--- a/doc/C/xfwm4.html
+++ b/doc/C/xfwm4.html
@@ -1,5 +1,5 @@
<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
- <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_misc">Miscellanous settings</a></dt></dl></dd><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
+ <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
@@ -23,11 +23,11 @@ A keyboard shortcut allows to switch the focus from a window to others : Alt + T
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 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 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 in the <a href="xfwm4.html#wm_misc" target="_top">Window Manager Preferences dialog</a>.</li><li>use keyboard shortcuts :
- <div class="itemizedlist"><ul type="circle"><li>Alt + Control + End will move a window to the next workspace</li><li>Alt + Control + Home will move a window to the previous workspace</li><li>Alt + Control + Keypad-Number will move the current window to corresponding workspace</li></ul></div></li><li>use the <a href="xfce4-panel.html#switcher-item" target="_top">graphical pager </a> by clicking on the 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 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 + 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 manager</a>. The dialog shows three tabs : Decoration style, Keyboard and focus, Misc. 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 decorations. The xfwm 4 module offers the choice between 10 different themes, but there are more than 50 supplementary themes 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 for the window title appearance. Click this button if you want to 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 the title inside the title bar, selecting one of those simple options : align it to the left, center or right.</p></dd><dt><span class="term">Button layout</span></dt><dd><p>The button layout configuration uses an intuitive interface with radio buttons. Just imagine that all selected items project themselves on the baseline of the frame. Moreover, all modifications will have an immediate effet on the title bar buttons position.</p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="wm-focus"></a>Keyboard and focus</h3></div></div><div></div></div><div class="figure"><a name="wm_focus-fig"></a><p class="title"><b>Figure 3. Keyboard and focus preferences</b></p><div class="screenshot"><div class="mediaobject"><img src="images/keyboard_and_focus.png" alt="The keyboard and focus tab"></div></div></div><div class="variablelist"><dl><dt><span class="term">Keyboard Shortcuts</span></dt><dd><p>The list on the left side of the dialog shows all avaible shortcuts themes, using the name of directories that contain a keythemerc file.</p><p>By default, there's only one theme : $(prefix)/share/xfwm4/themes/default.keys/keythemerc</p><p>You can customize keyboard shortcuts by editing this default keythemerc file (seven shorcuts entries are left empty for your convenience), or you can create a new theme, like this one (for example) : $(prefix)/share/xfwm4/themes/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 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 to receive the focus only when you click anywhere on its frame</li><li>Focus follow mouse : select this option if you want a window to receive the focus as soon as the mouse pointer is over its frame</li></ul></div><p> </p></dd><dt><span class="term">New window focus</span></dt><dd><p>Selecting this option will automatically give the focus to newly created windows, without the need to click or move the mouse 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.</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
+ <div class="itemizedlist"><ul type="circle"><li>Alt + Control + End will move a window to the next workspace</li><li>Alt + Control + Home will move a window to the previous workspace</li><li>Alt + Control + Keypad-Number will move the current window to corresponding workspace</li></ul></div></li><li>use the <a href="xfce4-panel.html#switcher-item" target="_top">graphical pager </a> by clicking on the 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 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 + 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 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 decorations. The xfwm 4 module offers the choice between 10 different themes, but there are more than 50 supplementary themes 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 for the window title appearance. Click this button if you want to 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 the title inside the title bar, selecting one of those simple options : align it to the left, center or right.</p></dd><dt><span class="term">Button layout</span></dt><dd><p>The button layout configuration uses an intuitive interface with radio buttons. Just imagine that all selected items project themselves on the baseline of the frame. Moreover, all modifications will have an immediate effet on the title bar buttons position.</p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="wm-focus"></a>Keyboard and focus</h3></div></div><div></div></div><div class="figure"><a name="wm_focus-fig"></a><p class="title"><b>Figure 3. Keyboard and focus preferences</b></p><div class="screenshot"><div class="mediaobject"><img src="images/keyboard_and_focus.png" alt="The keyboard and focus tab"></div></div></div><div class="variablelist"><dl><dt><span class="term">Keyboard Shortcuts</span></dt><dd><p>The list on the left side of the dialog shows all avaible shortcuts themes, using the name of directories that contain a keythemerc file.</p><p>By default, there's only one theme : $(prefix)/share/xfwm4/themes/default.keys/keythemerc</p><p>You can customize keyboard shortcuts by editing this default keythemerc file (seven shorcuts entries are left empty for your convenience), or you can create a new theme, like this one (for example) : $(prefix)/share/xfwm4/themes/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 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 to receive the focus only when you click anywhere on its frame</li><li>Focus follow mouse : select this option if you want a window to receive the focus as soon as the mouse pointer is over its frame</li></ul></div><p> </p></dd><dt><span class="term">New window focus</span></dt><dd><p>Selecting this option will automatically give the focus to newly created windows, without the need to click or move the mouse 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.</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 bar, borders or
corners) to raise it.
- </p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="wm_misc"></a>Miscellanous settings</h3></div></div><div></div></div><div class="figure"><a name="misc_wm_prefs-fig"></a><p class="title"><b>Figure 4. Miscellaneous preferences</b></p><div class="screenshot"><div class="mediaobject"><img src="images/misc_wm_prefs.png" alt="Miscellanous 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 this option is you want to switch to next workspace when the mouse pointer reaches the screen edges (while dragging a window or not).</p></dd><dt><span class="term">Opaque move and resize</span></dt><dd><p>Two options allow you to choose if the content of a window will appear or not, when you move or resize it (not displaying the 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="wm-copyright"></a>About <b class="application"><tt>xfwm4</tt></b></h2></div></div><div></div></div><p><b class="application"><tt>xfwm4</tt></b> was written Olivier Fourdan
+ </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 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 corresponding slider.</p></dd><dt><span class="term">Opaque move and resize</span></dt><dd><p>Two options allow you to choose if the content of a window will appear or not, when you move or resize it (not displaying the 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">XFce 4 Settings manager</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, right, top and bottom). Use this feature, for example, if you do not want maximized windows to overlap panel or iconbox frames.</p></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="wm-copyright"></a>About <b class="application"><tt>xfwm4</tt></b></h2></div></div><div></div></div><p><b class="application"><tt>xfwm4</tt></b> was written Olivier Fourdan
(<tt class="email"><<a href="mailto:fourdan@xfce.org">fourdan@xfce.org</a>></tt>). To find more information, please visit
the <a href="http://www.xfce.org" target="_top">XFce web site</a>.
</p><p>To report a bug or make a suggestion regarding this application or
diff --git a/doc/C/xfwm4.xml b/doc/C/xfwm4.xml
index 9dac1beb3f86767f54625d16b0cfabc5af68d4e7..520874947399dcdd63b876631b2a18641c57c3fa 100644
--- a/doc/C/xfwm4.xml
+++ b/doc/C/xfwm4.xml
@@ -337,7 +337,7 @@ A keyboard shortcut allows to switch the focus from a window to others : Alt + T
<sect1 id="wm-settings">
<title>Customizing &app;</title>
-<para>To open the Window Manager preferences dialog, click the button labelled "Window Manager" in the <ulink url="xfce-mcs-manager.html#manager-dialog" type="http">XFce 4 Settings manager</ulink>. The dialog shows three tabs : Decoration style, Keyboard and focus, Misc. All modifications will have an immediate effect on the behaviour of the selected module.</para>
+<para>To open the Window Manager preferences dialog, click the button labelled "Window Manager" in the <ulink url="xfce-mcs-manager.html#manager-dialog" type="http">XFce 4 Settings manager</ulink>. 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.</para>
<sect2 id="wm-style">
<title>Decoration style</title>
@@ -461,11 +461,11 @@ A keyboard shortcut allows to switch the focus from a window to others : Alt + T
</variablelist>
</sect2>
-<sect2 id="wm_misc">
-<title>Miscellanous settings</title>
+<sect2 id="wm_advanced">
+<title>Advanced settings</title>
<figure id="misc_wm_prefs-fig">
- <title>Miscellaneous preferences</title>
+ <title>Advanced preferences</title>
<screenshot>
<mediaobject>
@@ -473,7 +473,7 @@ A keyboard shortcut allows to switch the focus from a window to others : Alt + T
<imagedata fileref="images/misc_wm_prefs.png" format="PNG"/>
</imageobject>
<textobject>
- <phrase>Miscellanous tab</phrase>
+ <phrase>Advanced tab</phrase>
</textobject>
</mediaobject>
</screenshot>
@@ -491,7 +491,7 @@ A keyboard shortcut allows to switch the focus from a window to others : Alt + T
<varlistentry>
<term>Wrap workspaces</term>
<listitem>
- <para>Select this option is you want to switch to next workspace when the mouse pointer reaches the screen edges (while dragging a window or not).</para>
+ <para>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 corresponding slider.</para>
</listitem>
</varlistentry>
@@ -511,6 +511,33 @@ A keyboard shortcut allows to switch the focus from a window to others : Alt + T
</variablelist>
</sect2>
+</sect1>
+
+ <!-- extra space -->
+ <para> </para>
+
+<sect1 id="workspace-margins">
+ <title>Customizing workspace margins</title>
+
+<figure id="workspace_margins-fig">
+ <title>The workspace margins dialog</title>
+
+ <screenshot>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/workspace_margins.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>The workspace margins dialog</phrase>
+ </textobject>
+ </mediaobject>
+ </screenshot>
+</figure>
+
+<para>To open the Workspace Margins dialog, click the button labelled "Workspace Margins" in the <ulink url="xfce-mcs-manager.html#manager-dialog" type="http">XFce 4 Settings manager</ulink>.</para>
+
+<para>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, right, top and bottom). Use this feature, for example, if you do not want maximized windows to overlap panel or iconbox frames.</para>
+
</sect1>
<!-- extra space -->