diff --git a/docs/userguide/en/contents.html b/docs/userguide/en/contents.html
index 8a671a56d0..0e43e4410d 100644
--- a/docs/userguide/en/contents.html
+++ b/docs/userguide/en/contents.html
@@ -94,7 +94,7 @@
 	<tr><td valign="top"><a href="attributes.html">Attributes</a><ul>
 		<li><a href="attributes.html#attributes-tracker">Attributes in Tracker</a></li>
 		<li><a href="attributes.html#attributes-terminal">Attributes in Terminal</a></li></ul></td>
-		<td valign="top">One of Haiku's main features lets you add and manage any kind of data to any file.</td></tr>		
+		<td valign="top">One of Haiku's main features lets you manage and add any kind of data to any file.</td></tr>		
 	<tr><td valign="top"><a href="index.html">Index</a></td>
 		<td>Use indexing to be able to search for attributes.</td></tr>
 	<tr><td valign="top"><a href="queries.html">Queries</a><ul>
@@ -120,7 +120,7 @@
 		<td>Games and demo applications.</td></tr>
 -->
 	<tr><td valign="top"><a href="bash-scripting.html">Bash and Scripting</a></td>
-		<td>Learn of some interesting scripts in the system and about online resources for working in the shell and scripting.</td></tr>
+		<td>Learn of some interesting scripts used by the system and about online resources for working in the shell and scripting.</td></tr>
 </table>
 
 </div>
diff --git a/docs/userguide/en/preferences.html b/docs/userguide/en/preferences.html
index 8eca73ed1f..de3e93b669 100644
--- a/docs/userguide/en/preferences.html
+++ b/docs/userguide/en/preferences.html
@@ -5,7 +5,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008, Haiku. All rights reserved.
+ * Copyright 2008-2009, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -73,6 +73,8 @@
 		<td valign="top">Assign a sound to different system events.</td></tr>
 	<tr><td style="width:24px;"><img src="../images/prefs-images/time-icon_16.png" alt="icon" width="16" height="16" /></td><td><a href="preferences/prefs-time.html">Time</a></td><td>&#160;</td>
 		<td valign="top">Set time, date and timezone.</td></tr>
+	<tr><td style="width:24px;"><img src="../images/prefs-images/tracker-icon_16.png" alt="icon" width="16" height="16" /></td><td><a href="preferences/prefs-tracker.html">Tracker</a></td><td>&#160;</td>
+		<td valign="top">Configure Haiku's file manager.</td></tr>
 	<tr><td style="width:24px;"><img src="../images/prefs-images/virtualmemory-icon_16.png" alt="icon" width="16" height="16" /></td><td><a href="preferences/prefs-virtualmemory.html">VirtualMemory</a></td><td>&#160;</td>
 		<td valign="top">Set the amount of swap space.</td></tr>
 </table>
diff --git a/docs/userguide/en/preferences/prefs-time.html b/docs/userguide/en/preferences/prefs-time.html
index 8d02a01784..71fe6ee677 100644
--- a/docs/userguide/en/preferences/prefs-time.html
+++ b/docs/userguide/en/preferences/prefs-time.html
@@ -30,7 +30,7 @@
 		&#160;&#160;&#160;
 		Previous: <a href="prefs-sounds.html">Sounds</a>
 		&#160;&#160;&#160;
-		Next: <a href="prefs-virtualmemory.html">VirtualMemory</a>
+		Next: <a href="prefs-tracker.html">Tracker</a>
 	</p>
 </div>
 
@@ -68,7 +68,7 @@
 		&#160;&#160;&#160;
 		Previous: <a href="prefs-sounds.html">Sounds</a>
 		&#160;&#160;&#160;
-		Next: <a href="prefs-virtualmemory.html">VirtualMemory</a>
+		Next: <a href="prefs-tracker.html">Tracker</a>
 	</p>
 </div> </body>
 </html>
diff --git a/docs/userguide/en/preferences/prefs-tracker.html b/docs/userguide/en/preferences/prefs-tracker.html
new file mode 100644
index 0000000000..cb7ba62ae9
--- /dev/null
+++ b/docs/userguide/en/preferences/prefs-tracker.html
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?> 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"../../../../html-dtd/xhtml1-strict.dtd"> 
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US" xml:lang="en-US">
+<head>
+<!-- 
+ *
+ * Copyright 2009, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Humdinger <humdingerb@gmail.com>
+ *
+-->
+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<meta http-equiv="Content-Style-Type" content="text/css" />
+	<meta name="robots" content="all" />
+	<title>Tracker</title>
+	<link rel="stylesheet" type="text/css" href="../../../Haiku-doc.css" />
+</head>
+<body>
+
+<div class="logo">
+	<img src="../../images/logo.png" alt="logo" width="372" height="86" />
+	<div class="title">Tracker</div>
+</div>
+<div class="topnav">
+	<p>
+		<a href="../preferences.html">Preferences</a>
+		&#160;&#160;&#160;
+		Previous: <a href="prefs-time.html">Time</a>
+		&#160;&#160;&#160;
+		Next: <a href="prefs-virtualmemory.html">VirtualMemory</a>
+	</p>
+</div>
+
+<div class="content">
+
+<h1><img src="../../images/prefs-images/tracker-icon_64.png" alt="tracker-icon_64.png" width="64" height="64" />Tracker</h1>
+<table summary="quickinfo" border="0" cellspacing="0" cellpadding="2">
+<tr><td>Deskbar:</td><td style="width:15px;"></td><td><i>Preferences</i></td></tr>
+<tr><td>Location:</td><td></td><td><tt>/boot/beos/preferences/Tracker</tt></td></tr>
+<tr><td>Settings:</td><td></td><td><tt>~/config/settings/Tracker/TrackerSettings</tt></td></tr>
+</table>
+<p><br /></p>
+<p>The Tracker preference panel is also available from every Tracker window with the menu <i>Window | Preferences...</i>.<br />
+It's functions are discussed in the topic on <a href="../tracker.html#tracker-preferences">Tracker</a>.</p>
+
+<!--
+<div class="bottomnav">
+	<p>
+		<a href="../preferences.html">Preferences</a>
+		&#160;&#160;&#160;
+		Previous: <a href="prefs-time.html">Time</a>
+		&#160;&#160;&#160;
+		Next: <a href="prefs-virtualmemory.html">VirtualMemory</a>
+	</p>
+</div>
+-->
+
+</body>
+</html>
diff --git a/docs/userguide/en/preferences/prefs-virtualmemory.html b/docs/userguide/en/preferences/prefs-virtualmemory.html
index deabcb6934..5a04cff20f 100644
--- a/docs/userguide/en/preferences/prefs-virtualmemory.html
+++ b/docs/userguide/en/preferences/prefs-virtualmemory.html
@@ -28,7 +28,7 @@
 	<p>
 		<a href="../preferences.html">Preferences</a>
 		&#160;&#160;&#160;
-		Previous: <a href="prefs-time.html">Time</a>
+		Previous: <a href="prefs-tracker.html">Tracker</a>
 	</p>
 </div>
 
@@ -57,7 +57,7 @@ Upgrading your RAM is of course the most effective way to go...</p>
 	<p>
 		<a href="../preferences.html">Preferences</a>
 		&#160;&#160;&#160;
-		Previous: <a href="prefs-time.html">Time</a>
+		Previous: <a href="prefs-tracker.html">Tracker</a>
 	</p>
 </div>
 -->
diff --git a/docs/userguide/en/tracker.html b/docs/userguide/en/tracker.html
index 73f95b473f..235634a17b 100644
--- a/docs/userguide/en/tracker.html
+++ b/docs/userguide/en/tracker.html
@@ -5,7 +5,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008, Haiku. All rights reserved.
+ * Copyright 2008-2009, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -79,7 +79,7 @@ This is also true for keyboard navigation. For more on that, see topic <a href="
 <p>The rest of the functions are pretty self-explanatory, leaving the Tracker preferences.</p>
 
 <h3><a id="tracker-preferences" name="tracker-preferences">Tracker preferences</a></h3>
-<p><i>Window | Preferences...</i> opens a panel that offers a number of setting that, where not obvious, should become clear once tried out. Since all settings are applied live, you'll immediately see the changes.
+<p><i>Window | Preferences...</i> opens a panel that offers a number of settings that, where not obvious, should become clear once tried out. Since all settings are applied live, you'll immediately see the changes.
 <br />So, in short, the not so obvious settings:</p>
 <ul>
 <li><b>Desktop</b> - Decide if all mounted disks appear directly on the Desktop or in a window after clicking a single Disk icon sitting on the Desktop.</li>
@@ -92,6 +92,7 @@ This is also true for keyboard navigation. For more on that, see topic <a href="
 <li><b>Trash</b> - Set the behaviour when deleting a file.</li>
 <li><b>Volume Icons</b> - Set the colour of an optional indicator of free space that's shown besides a disk's icon.</li>
 </ul>
+<p>This panel, by the way, is also available as <i>Tracker</i> from Deskbar's <i>Preferences</i>.</p>
 
 <h2><a id="working-with-files" name="working-with-files">Working with files</a></h2>
 <p>When invoked on a selected file, most of the <i>File</i> menu commands are also offered in the context menu by right-clicking that file.</p>
diff --git a/docs/userguide/images/prefs-images/tracker-icon_16.png b/docs/userguide/images/prefs-images/tracker-icon_16.png
new file mode 100644
index 0000000000..9694985695
Binary files /dev/null and b/docs/userguide/images/prefs-images/tracker-icon_16.png differ
diff --git a/docs/userguide/images/prefs-images/tracker-icon_32.png b/docs/userguide/images/prefs-images/tracker-icon_32.png
new file mode 100644
index 0000000000..c93b9dcac0
Binary files /dev/null and b/docs/userguide/images/prefs-images/tracker-icon_32.png differ
diff --git a/docs/userguide/images/prefs-images/tracker-icon_64.png b/docs/userguide/images/prefs-images/tracker-icon_64.png
new file mode 100644
index 0000000000..210df1b0ce
Binary files /dev/null and b/docs/userguide/images/prefs-images/tracker-icon_64.png differ
diff --git a/docs/welcome/welcome.html b/docs/welcome/welcome.html
index 33f1cd591a..2cc8cacbb5 100644
--- a/docs/welcome/welcome.html
+++ b/docs/welcome/welcome.html
@@ -5,7 +5,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008, Haiku. All rights reserved.
+ * Copyright 2008-2009, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -43,14 +43,14 @@
 </ul>
 
 <h2><a id="system" name="system">Getting to know the system</a></h2>
-<p>The first release(s) of Haiku will be very much like the BeOS R5, the OS it is reimplementing. If you never experienced it, have a look at these links:</p>
+<p>The first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing. If you never experienced it, have a look at these links:</p>
 <ul>
 	<li><a href="../userguide/en/contents.html">Haiku User Guide</a></li>
 	<li><a href="http://www.haiku-os.org/community/">List of BeOS/Haiku websites</a></li>
 </ul>
 
 <h2><a id="software" name="software">Installing more software</a></h2>
-<p>Because of our binary and source compatibility to BeOS, many BeOS applications run on Haiku. After downloading a package, simply unzip it (double clicking should open <i>Expander</i>) to a folder in <tt>/boot/apps/</tt> and start the application from there.</p>
+<p>Because of our binary and source compatibility, many BeOS applications run on Haiku. After downloading a package, simply unzip it (double clicking should open <i>Expander</i>) to a folder in <tt>/boot/apps/</tt> and start the application from there.</p>
 
 <p>Popular software repositories are:</p>
 <ul>

Deskbar:		Preferences
Location:		`/boot/beos/preferences/Tracker`
Settings:		`~/config/settings/Tracker/TrackerSettings`