diff --git a/doc/conf.py.in b/doc/conf.py.in
index 3ef303b20c..f61376e7c6 100644
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -41,7 +41,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'ownCloud Client Manual'
-copyright = u'2012, The ownCloud developers'
+copyright = u'2013, The ownCloud developers'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -248,7 +248,7 @@ texinfo_documents = [
 epub_title = u'ownCloud Client Manual'
 epub_author = u'The ownCloud developers'
 epub_publisher = u'The ownCloud developers'
-epub_copyright = u'2012, The ownCloud developers'
+epub_copyright = u'2013, The ownCloud developers'
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.
diff --git a/doc/troubleshooting.rst b/doc/troubleshooting.rst
index d54d9fe408..e8dae5274a 100644
--- a/doc/troubleshooting.rst
+++ b/doc/troubleshooting.rst
@@ -19,8 +19,12 @@ Identifying basic functionality problems
   see a red warning box on the page, your server setup is not correct or needs
   fixes. Please verify that your server installation is working correctly.
 
-:Problem: All desktop clients fail to connect to ownCloud:
-  The ownCloud syncing use the built in WebDAV server of ownCloud. 
+:Ensure the WebDAV API is working:
+  If all desktop clients fail to connect to ownCloud, but the access via the
+  web interface works, the problem often is a mis-configuration of the WebDAV
+  API.
+
+  The ownCloud client uses the built-in WebDAV access of the server content.
   Verify that you can log on to ownClouds WebDAV server. Assuming your ownCloud
   instance is installed at ``http://yourserver.com/owncloud``, type
   ``http://yourserver.com/owncloud/remote.php/webdav`` into your browsers
@@ -45,8 +49,8 @@ Isolating other issues
 If the sync result is unreliable, please ensure that the folder synced with
 ownCloud is not shared with other syncing apps.
 
-.. note:: Syncing a directory with ownCloud and other sync software such as
-          Unison, rsync, Microsoft Windows Offline Folders or cloud services
+.. note:: Syncing the same directory with ownCloud and other sync software such
+          as Unison, rsync, Microsoft Windows Offline Folders or cloud services
           such as DropBox or Microsoft SkyDrive is not supported and should
           not be attempted. In the worst case, doing so can result in data
           loss.
diff --git a/doc/usage.rst b/doc/usage.rst
index 8752941526..1023f71b54 100644
--- a/doc/usage.rst
+++ b/doc/usage.rst
@@ -7,11 +7,42 @@ application menu. In the system tray, an ownCloud icon appears.
 
 .. index:: start application
 
-A left click on the tray icon open a status dialog which gives an overview on
-the configured sync folders and allows to add and remove more sync folder
-connections as well as pausing a sync connection.
+Overview
+--------
 
-A right click on the tray icon gives other configuration options.
+ownCloud is represented by an icon in the Desktop's system tray, also known
+as notification area.
+
+The clients menu is accessed with a right click (Windows, Linux) or left click
+(Mac OS).
+
+The status of the current sync can be observed in the Status dialog, available
+trough the ``Open status...`` option. On Windows, a left click on the tray icon
+also opens the status dialog.
+
+.. note:: Until the intial setup has finished, the Connection Wizard will be
+          shown instead when left-clicking on Windows.
+ 
+The dialog provides an overview on the configured sync folders and allows to add
+and remove more sync folder connections as well as pausing a sync connection.
+
+Changing your password
+----------------------
+
+Use the ``Configure`` option. It will open the Connection Wizard, which next to
+reconfiguring your connection to use a different user or server also will allow
+to change the password for the local account, or to switch from HTTP to HTTPS.
+
+Setting up a proxy
+------------------
+
+By default, the configured system proxy will be picked up. This may not be
+working reliable on some Linux distributions, as only the ``http_proxy``
+variable gets parsed. You can configure a proxy different from your
+system default by choosing ``Configure proxy...`` from the menu.
+
+By default, ownCloud expects a HTTP proxy. If you want to specify a SOCKS5
+proxy instead, tick the "Use as SOCKSv5 proxy" option.
 
 Options
 -------