diff --git a/docs/userguide/en/applications/apps-bezillabrowser.html b/docs/userguide/en/applications/apps-bezillabrowser.html
index 2402ac43aa..4f67ccf495 100644
--- a/docs/userguide/en/applications/apps-bezillabrowser.html
+++ b/docs/userguide/en/applications/apps-bezillabrowser.html
@@ -44,7 +44,7 @@ width="64" height="64" />BeZillaBrowser</h1>
 <tr><td>Settings:</td><td></td><td><span class="path">~/config/settings/Mozilla/Firefox/*</span></td></tr>
 </table>
 <p><br/></p>
-<p>BeZillaBrowser is based on Mozilla's source code and uses patches to improve speed, stability, and other UI aspects. Currently, all BeZilla builds use Mozilla's 1.8 CVS Branch. You can contact the maintainers of this port at the <a href="http://community.livejournal.com/bezilla/">BeZilla Blog</a></p>
+<p>BeZillaBrowser is based on Mozilla's source code and uses patches to improve speed, stability, and other UI aspects. Currently, all BeZilla builds use Mozilla's 1.8 CVS Branch. You can file bug reports of this port at the <a href="http://ports.haiku-files.org/">HaikuPorts</a>.</p>
 <p>As the Mozilla browsers are very widely used on many platforms, you'll find a plethora of guides and tips online. You could start from <a href="http://support.mozilla.com/">http://support.mozilla.com/</a>.</p>
 <div class="box-info">BeZilla isn't able to print yet. Luckily, there's the add-on <a href="https://addons.mozilla.org/de/firefox/addon/10814" class="noprinturl">html2pdf</a> that uses an online service to generate a PDF from the currently displayed page. After installation, there's a little PDF symbol in the status bar that, once clicked, opens a new window with a link offering to <i>"Download PDF"</i>.<br />
 Caveat: It only works with online pages, not with your locally stored documents.</div>
diff --git a/docs/userguide/en/applications/apps-vision.html b/docs/userguide/en/applications/apps-vision.html
index 7abc6ec66b..366d00adc2 100644
--- a/docs/userguide/en/applications/apps-vision.html
+++ b/docs/userguide/en/applications/apps-vision.html
@@ -46,7 +46,7 @@ width="64" height="64" />Vision</h1>
 <p><br/></p>
 <p>Vision is an IRC client originally developed for the BeOS. Documentation and a bug tracker are available at the <a href="http://vision.sourceforge.net/">Vision website</a>.</p>
 <div class="box-info">You can find help from other Haiku users and developers on <a href="http://www.haiku-os.org/community/irc">Haiku channels</a> in various languages.<br />
-The most frequented is the english speaking #haiku at irc.freenode.org.</div>
+The most frequented is the English speaking #haiku at irc.freenode.org.</div>
 
 </div>
 <!--
diff --git a/docs/userguide/en/gui.html b/docs/userguide/en/gui.html
index fc17013983..1115a07b40 100644
--- a/docs/userguide/en/gui.html
+++ b/docs/userguide/en/gui.html
@@ -47,10 +47,10 @@
 <li>You minimize a window with a double-click on its tab (or with <span class="key">CTRL</span>&#160;<span class="key">ALT</span>&#160;<span class="key">M</span>). A such hidden window can be accessed by its entry in the <a href="deskbar.html">Deskbar</a> or the <a href="twitcher.html">Twitcher</a>.</li>
 <li>You can send a window to the back with a right-click on its tab (or its border).</li></ul></li>
 <li><p>The close button.</p></li>
-<li><p>The "alternative size" button (expands window to maximum size in most applications), also done via (or with <span class="key">CTRL</span>&#160;<span class="key">ALT</span>&#160;<span class="key">Z</span>).</p></li>
-<li><p>The resize button. Dragging anywhere else on a window's border will move the window.</p></li>
+<li><p>The "alternative size" button (or <span class="key">CTRL</span>&#160;<span class="key">ALT</span>&#160;<span class="key">Z</span>). In most applications, this will expand a window to maximum size. It doesn't have to, however. Tracker windows, for example, will resize to best fit the contents.</p></li>
+<li><p>The resize corner. Dragging anywhere else on a window's border will move the window.</p></li>
 </ol>
-While holding down <span class="key">CTRL</span>&#160;<span class="key">ALT</span>, you can click anywhere on a window to move it with the left mouse button; when you click with the right mouse button, the window is sent to the back.
+<div class="box-info">While holding <span class="key">CTRL</span>&#160;<span class="key">ALT</span>, you can click anywhere into a window to move it with the left mouse button; the right mouse button sends it to the back.</div>
 
 <h1><a id="open-save-panel" name="open-save-panel">Open and save panels</a></h1>
 <p>When opening or saving a file from any application, a panel like this opens:</p>
diff --git a/docs/userguide/en/images/prefs-images/e-mail-mailbox.png b/docs/userguide/en/images/prefs-images/e-mail-mailbox.png
index eb43ad8642..d178d92396 100644
Binary files a/docs/userguide/en/images/prefs-images/e-mail-mailbox.png and b/docs/userguide/en/images/prefs-images/e-mail-mailbox.png differ
diff --git a/docs/userguide/en/keyboard-shortcuts.html b/docs/userguide/en/keyboard-shortcuts.html
index 2ae57d7fe4..3f7bdfe269 100644
--- a/docs/userguide/en/keyboard-shortcuts.html
+++ b/docs/userguide/en/keyboard-shortcuts.html
@@ -73,7 +73,8 @@
 <tr><td><span class="key">ALT</span>&#160;<span class="key">N</span></td><td style="width:15px;"></td><td>Opens another Terminal session in a new window.</td></tr>
 <tr><td><span class="key">ALT</span>&#160;<span class="key">T</span></td><td></td><td>Opens another Terminal session in a new tab.</td></tr>
 <tr><td><span class="key">ALT</span>&#160;<span class="key">1</span>, <span class="key">2</span>, <span class="key">3</span>...</td><td></td><td>Switches to the corresponding tab.</td></tr>
-<tr><td><span class="key">ALT</span>&#160;<span class="key">G</span></td><td></td><td>Switch to the next Terminal window.</td></tr>
+<tr><td><span class="key">CTRL</span>&#160;<span class="key">SHIFT</span>&#160;<span class="key">&larr;</span>/<span class="key">&rarr;</span></td><td></td><td>Switches to the previos/next tab.</td></tr>
+<tr><td><span class="key">ALT</span>&#160;<span class="key">TAB</span></td><td></td><td>Switch to the next Terminal window.</td></tr>
 <tr><td><span class="key">ALT</span>&#160;<span class="key">+</span>, <span class="key">-</span></td><td></td><td>Increase/Decrease font size.</td></tr>
 <tr><td><span class="key">ALT</span>&#160;<span class="key">ENTER</span></td><td></td><td>Enter/leave fullscreen mode.</td></tr>
 <tr><td class="onelinetop"><span class="key">SHIFT</span>&#160;<span class="key">&uarr;</span>/<span class="key">&darr;</span></td><td></td><td>Scrolls the Terminal output up/down one line.</td></tr>
diff --git a/docs/userguide/en/twitcher.html b/docs/userguide/en/twitcher.html
index adbdf68882..1c75690b5d 100644
--- a/docs/userguide/en/twitcher.html
+++ b/docs/userguide/en/twitcher.html
@@ -39,6 +39,7 @@
 <p>The Twitcher is a task switcher to jump between running applications and their windows.</p>
 <img src="../images/twitcher-images/twitcher.png" alt="twitcher.png" />
 <p>Just tap <span class="key">CTRL</span>&#160;<span class="key">TAB</span> to switch between the current and the last application/window. Tapping <span class="key">CTRL</span>&#160;<span class="key">TAB</span> very quickly will switch between all applications. Or press and hold <span class="key">CTRL</span>&#160;<span class="key">TAB</span> to go through all running applications by repeatedly hitting <span class="key">TAB</span> or <span class="key">&larr;</span>/<span class="key">&rarr;</span>. If you need to get to a specific window of a program, move to its icon as described and then go through its open windows with the <span class="key">&uarr;</span>/<span class="key">&darr;</span> keys.</p>
+<p>You cycle through all an applications visible windows on the current workspace with <span class="key">CTRL</span>&#160;<span class="key">~</span> (which, depending on the keymap you're using, is the key below <span class="key">ESC</span>).</p>
 <p>It's also possible to invoke the Twitcher with <span class="key">CTRL</span>&#160;<span class="key">TAB</span> and then use the mouse to choose the application/window you'll jump to when releasing the <span class="key">CTRL</span> key.</p>
 <p>The Twitcher also offers a few more advanced keyboard shortcuts:</p>
 <table summary="more shortcuts" border="0" cellspacing="0" cellpadding="4">
diff --git a/docs/userguide/en/workspaces.html b/docs/userguide/en/workspaces.html
index dfc655f8c8..7889f1090e 100644
--- a/docs/userguide/en/workspaces.html
+++ b/docs/userguide/en/workspaces.html
@@ -61,7 +61,12 @@ Also, clicking on an application or one of its windows in the Deskbar will send
 <p>To move a window, you grab it in the Workspaces applet and simply drag it to another workspace. This has the advantage, that you can move it without leaving your current desktop. Of course, that only works well when there aren't too many windows in a workspace and your target isn't obscured by other windows. Another possibility is to grab a window by its tab and just holding on to it while switching workspaces with <span class="key">ALT</span>&#160;<span class="key">Fx</span>.</p>
 
 <h2><a id="special" name="special">Special functionality</a></h2>
-<p>If you click on a window in the Workspaces applet with the <span class="key">CTRL</span> key pressed, it will be activated, also holding <span class="key">SHIFT</span> will minimize it. Clicking on a window with the <span class="key">OPTION</span> key pressed will send it to the back.</p>
+<p>The Workspaces applet provides some additional functionality when clicking on a window while holding certain modifier keys:
+<table summary="functionality-thru-modifiers" border="0" cellspacing="0" cellpadding="4">
+<tr><td><span class="key">CTRL</span></td><td style="width:15px;"></td><td>Activates the window.</td></tr>
+<tr><td><span class="key">SHIFT</span></td><td></td><td>Minimizes the window.</td></tr>
+<tr><td><span class="key">OPT</span></td><td></td><td>Sends the window to the back.</td></tr>
+</table>
 
 </div>
 
diff --git a/docs/welcome/welcome.html b/docs/welcome/welcome.html
index 1715eafe6f..c25a2c48ca 100644
--- a/docs/welcome/welcome.html
+++ b/docs/welcome/welcome.html
@@ -75,11 +75,13 @@
 </ul>
 
 <h1><a id="contact" name="contact">Getting in contact</a></h1>
-<p>Get in contact with other developers and users and join the discussions in our forums or mailing lists. When many different people come together, rules have to established to keep communication effective. Please respect our <a href="http://www.haiku-os.org/node/2517">Mailing List Etiquette</a>.</p>
+<p>Get in contact with other developers and users and join the discussions on IRC, in our forums or the mailing lists. When many different people come together, rules have to established to keep communication effective. Please respect our <a href="http://www.haiku-os.org/node/2517">Mailing List Etiquette</a>.</p>
 <ul>
-	<li><a href="http://www.haiku-os.org/forum" class="printurl">Haiku Forums</a></li>
+	<li><a href="http://www.haiku-os.org/community/irc" class="printurl">IRC channels</a></li>
+	<li><a href="http://www.haiku-os.org/forum" class="printurl">Forums</a></li>
 	<li><a href="http://www.freelists.org/list/haiku" class="printurl">General mailing list</a></li>
-	<li><a href="http://www.freelists.org/list/haiku-development" class="printurl">Development mailing list</a></li>
+	<li><a href="http://www.freelists.org/list/haiku-development" class="printurl">Development mailing list concerning Haiku itself</a></li>
+	<li><a href="http://www.freelists.org/list/haiku-3rdparty-dev" class="printurl">Mailing list for 3rd party application programmers</a></li>
 	<li><a href="http://www.haiku-os.org/community/ml" class="printurl">Overview</a> of more specific mailing lists</li>
 </ul>