diff --git a/client/boinc_cmd.cpp b/client/boinc_cmd.cpp
index e16d2a5..a56186d 100644
--- a/client/boinc_cmd.cpp
+++ b/client/boinc_cmd.cpp
@@ -77,7 +77,7 @@ Commands:\n\
  --lookup_account URL email passwd\n\
  --network_available                retry deferred network communication\n\
  --project URL op                   project operation\n\
-   op = reset | detach | update | suspend | resume | nomorework | allowmorework\n\
+   op = reset | detach | update | suspend | resume | nomorework | allowmorework | detach_when_done | dont_detach_when_done\n\
  --project_attach URL auth          attach to project\n\
  --quit                             tell client to exit\n\
  --quit_acct_mgr                    quit current account manager\n\
@@ -87,7 +87,8 @@ Commands:\n\
  --set_debts URL1 std1 ltd1 [URL2 std2 ltd2 ...]\n\
  --set_gpu_mode mode duration       set GPU run mode for given duration\n\
    mode = always | auto | never\n\
- --set_network_mode mode duration\n\
+ --set_network_mode mode duration   set network mode for given duration\n\
+   mode = always | auto | never\n\
  --set_proxy_settings\n\
  --set_run_mode mode duration       set run mode for given duration\n\
    mode = always | auto | never\n\
diff --git a/client/cs_cmdline.cpp b/client/cs_cmdline.cpp
index ce169fe..657bec4 100644
--- a/client/cs_cmdline.cpp
+++ b/client/cs_cmdline.cpp
@@ -70,7 +70,9 @@ static void print_options(char* prog) {
 #ifdef SANDBOX
         "    --insecure                     disable app sandboxing (Unix)\n"
 #endif
+#ifdef __APPLE__
         "    --launched_by_manager          client was launched by Manager\n"
+#endif
         "    --master_fetch_interval N      limiting period of master retry\n"
         "    --master_fetch_period N        reload master URL after N RPC failures\n"
         "    --master_fetch_retry_cap N     exponential backoff limit\n"
@@ -86,7 +88,9 @@ static void print_options(char* prog) {
         "    --retry_cap N                  exponential backoff limit\n"
         "    --run_cpu_benchmarks           run the CPU benchmarks\n"
         "    --run_by_updater               set by updater\n"
+#ifdef __APPLE__
         "    --saver                        client was launched by screensaver\n"
+#endif
         "    --sched_retry_delay_max N      max for RPC exponential backoff\n"
         "    --sched_retry_delay_min N      min for RPC exponential backoff\n"
         "    --show_projects                show attached projects\n"
diff --git a/client/scripts/boinc.bash b/client/scripts/boinc.bash
index f52e345..2fefa37 100644
--- a/client/scripts/boinc.bash
+++ b/client/scripts/boinc.bash
@@ -15,7 +15,7 @@ _boinc()
     # Handle options that require one or more arguments.
     case "$prev" in
         --attach_project|--detach_project|--reset_project|--update_prefs|\
-        --gui_rpc_port)
+        --gui_rpc_port|--start_delay|--dir)
             return 0
         ;;
     esac
@@ -74,7 +74,7 @@ _boinccmd()
 
     # Handle options/commands that require one or more arguments.
     case "$prev" in
-        --get_messages|--passwd)
+        --get_messages|--passwd|--get_notices)
             return 0
         ;;
 
@@ -83,15 +83,10 @@ _boinccmd()
             return 0
         ;;
 
-        --set_run_mode|--set_network_mode)
+        --set_run_mode|--set_network_mode|--set_gpu_mode)
             COMPREPLY=( $(compgen -W "always auto never" -- "$cur") )
             return 0
         ;;
-
-        --set_screensaver_mode)
-            COMPREPLY=( $(compgen -W "on off" -- "$cur") )
-            return 0
-        ;;
     esac
 }
 complete -F _boinccmd boinccmd
diff --git a/doc/manpages/boinc.xml b/doc/manpages/boinc.xml
index 1b28dd3..175fb54 100644
--- a/doc/manpages/boinc.xml
+++ b/doc/manpages/boinc.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- This is the manual page for the BOINC core client (boinc).
+ This is the manual page for the BOINC client (boinc).
 
- Copyright © 2007-2008 University of California
+ Copyright © 2007-2013 University of California
 
  Permission is granted to copy, distribute and/or modify this document
  under the terms of the GNU Free Documentation License, Version 1.2 or
@@ -17,13 +17,18 @@
   <!ENTITY % COMMON SYSTEM "common.ent">
   %COMMON;
 
-  <!ENTITY date "<date>April 06, 2008</date>">
+  <!ENTITY date "<date>04 March 2013</date>">
 ]>
 
 <refentry>
   <refentryinfo>
     <authorgroup>
       <author>
+        <firstname>Christian</firstname>
+        <lastname>Beer</lastname>
+        <email>djangofett@gmx.net</email>
+      </author>
+      <author>
         <firstname>Steffen</firstname>
         <lastname>Moeller</lastname>
         <email>steffen_moeller@gmx.de</email>
@@ -41,7 +46,7 @@
    </authorgroup>
     <copyright>
       <year>2007</year>
-      <year>2008</year>
+      <year>2013</year>
       <holder>University of California</holder>
     </copyright>
     &date;
@@ -54,7 +59,7 @@
 
   <refnamediv>
     <refname>&boinc;</refname>
-    <refpurpose>The BOINC core client program.</refpurpose>
+    <refpurpose>The BOINC client program.</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
@@ -66,16 +71,16 @@
 
   <refsect1>
     <title>DESCRIPTION</title>
-    <para>The BOINC "core client", &cmd_boinc;, is the heart of BOINC.
+    <para>The BOINC "client", &cmd_boinc;, is the heart of BOINC.
       It controls which project applications are run on your computer,
-      downloading "Workunits" and uploading the "Result" files from completed
+      downloading "Tasks" and uploading the resulting files from completed
       tasks. &cmd_boinc; is usually run in the background, ideally as a
       daemon. It can then be controlled either by a graphical tool called the
       BOINC Manager, &man_boincmgr;, or a command-line tool called
-      &man_boinccmd;, by means of Remote Proceedure Calls (RPCs) over port
+      &man_boinccmd;, by means of Remote Procedure Calls (RPCs) over port
       &rpc_port;.</para>
 
-    <para>The BOINC core client can be controlled by command-line options,
+    <para>The BOINC client can be controlled by command-line options,
       configuration files, and environment variables. Standard usage is simply
       to start the client running in the background.</para>
   </refsect1>
@@ -85,178 +90,349 @@
     <para>These command-line options for &cmd_boinc; can be used to control
       how BOINC is started. Once the client has started, you should use a
       separate program, (&man_boincmgr; or &man_boinccmd;) which communicates
-      with it by means of Remote Proceedure Calls (RPCs).</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>--help</option></term>
-        <listitem>
-          <para>show options</para>
-        </listitem>
-      </varlistentry>
-
-
-      <varlistentry>
-        <term><option>--version</option></term>
-        <listitem>
-          <para>show version info</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--exit_when_idle</option></term>
-        <listitem>
-          <para>exit when there are no results</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--show_projects</option></term>
-        <listitem>
-          <para>show attached projects</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>
-          <option>--detach_project <replaceable>URL</replaceable></option>
-        </term>
-        <listitem>
-          <para>detach from a project</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>
-          <option>--reset_project <replaceable>URL</replaceable></option>
-        </term>
-        <listitem>
-          <para>reset (clear) a project</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>
-          <option>--attach_project <replaceable>URL</replaceable> 
-            <replaceable>key</replaceable></option>
-        </term>
-        <listitem>
-          <para>attach to a project</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>
-          <option>--update_prefs <replaceable>URL</replaceable></option>
-        </term>
-        <listitem>
-          <para>contact a project to update preferences</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--run_cpu_benchmarks</option></term>
-        <listitem>
-          <para>run the CPU benchmarks</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--check_all_logins</option></term>
-        <listitem>
-          <para>for idle detection, check remote logins too</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--allow_remote_gui_rpc</option></term>
-        <listitem>
-          <para>allow remote GUI RPC connections</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>
-          <option>--gui_rpc_port <replaceable>port</replaceable></option>
-        </term>
-        <listitem>
-          <para>port for GUI RPCs</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--redirectio</option></term>
-        <listitem>
-          <para>redirect stdout and stderr to log files</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--dir <replaceable>path</replaceable></option></term>
-        <listitem>
-          <para>use given dir as BOINC home</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--no_gui_rpc</option></term>
-        <listitem>
-          <para>Omits creation of a socket as required for the remote control
-            of the client. Consequently the client cannot be controlled by
-            external tools like GUIs (&cmd_boincmgr; etc.) or the console
-            command tool (&cmd_boinccmd;).</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--daemon</option></term>
-        <listitem>
-          <para>run as daemon</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--exit_before_start</option></term>
-        <listitem>
-          <para>exit right before starting a job</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--exit_after_finish</option></term>
-        <listitem>
-          <para>exit right after finishing a job</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--insecure</option></term>
-        <listitem>
-          <para>disable app sandboxing</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--launched_by_manager</option></term>
-        <listitem>
-          <para>core client was launched by Manager</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--run_by_updater</option></term>
-        <listitem>
-          <para>set by updater</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+      with it by means of Remote Procedure Calls (RPCs).</para>
+
+    <refsect2>
+      <title>General options</title>
+      <variablelist>
+
+        <varlistentry>
+          <term><option>--help</option></term>
+          <listitem>
+           <para>Show options.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--version</option></term>
+          <listitem>
+            <para>Show version info.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--run_cpu_benchmarks</option></term>
+          <listitem>
+            <para>Run the CPU benchmarks.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--check_all_logins</option></term>
+          <listitem>
+            <para>For idle detection, check remote logins too.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--daemon</option></term>
+          <listitem>
+            <para>Run as daemon. Will redirect stderr and stdout to syslog.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--dir <replaceable>path</replaceable></option></term>
+          <listitem>
+            <para>Use given dir as the client working directory.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--no_gpus</option></term>
+          <listitem>
+            <para>Don't check for GPUs.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--no_info_fetch</option></term>
+          <listitem>
+            <para>Don't fetch project list or client version info from
+              boinc.berkeley.edu.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--skip_cpu_benchmarks</option></term>
+          <listitem>
+            <para>Don't run CPU benchmarks.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <option>--start_delay <replaceable>X</replaceable></option>
+          </term>
+          <listitem>
+            <para>Delay starting apps for X secs.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2>
+      <title>Project options</title>
+      <variablelist>
+        <title>PROJECT CONTROL</title>
+
+        <varlistentry>
+          <term>
+            <option>--attach_project <replaceable>URL</replaceable>
+              <replaceable>key</replaceable></option>
+          </term>
+          <listitem>
+            <para>Attach to a project using URL and authenticator.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--show_projects</option></term>
+          <listitem>
+            <para>Show attached projects.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <option>--detach_project <replaceable>URL</replaceable></option>
+          </term>
+          <listitem>
+            <para>Detach from project specified by URL.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <option>--reset_project <replaceable>URL</replaceable></option>
+          </term>
+          <listitem>
+            <para>Reset (clear) the projectspecified by URL.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <option>--update_prefs <replaceable>URL</replaceable></option>
+          </term>
+          <listitem>
+            <para>Contact the project specified by URL to update preferences</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2>
+      <title>Communication options</title>
+      <variablelist>
+        <varlistentry>
+          <term><option>--allow_remote_gui_rpc</option></term>
+          <listitem>
+            <para>Allow RPC connections from remote hosts.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <option>--gui_rpc_port <replaceable>port</replaceable></option>
+          </term>
+          <listitem>
+            <para>Port for RPCs.</para>
+          </listitem>
+        </varlistentry>
+<!-- this option is for Apple only
+        <varlistentry>
+          <term><option>--launched_by_manager</option></term>
+          <listitem>
+            <para>Client was launched by Manager.</para>
+          </listitem>
+        </varlistentry>
+-->
+        <varlistentry>
+          <term><option>--no_gui_rpc</option></term>
+          <listitem>
+            <para>Omits creation of a socket as required for the remote control
+              of the client. Consequently the client cannot be controlled by
+              external tools like GUIs (&cmd_boincmgr; etc.) or the console
+              command tool (&cmd_boinccmd;).</para>
+          </listitem>
+        </varlistentry>
+<!-- this option is for Apple only
+        <varlistentry>
+          <term><option>--saver</option></term>
+          <listitem>
+            <para>client was launched by screensaver</para>
+          </listitem>
+        </varlistentry>
+-->
+      </variablelist>
+    </refsect2>
+
+    <refsect2>
+      <title>Debugging options</title>
+      <variablelist>
+        <varlistentry>
+          <term><option>--abort_jobs_on_exit</option></term>
+          <listitem>
+            <para>When client exits, abort and report tasks.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--allow_multiple_clients</option></term>
+          <listitem>
+            <para>Allow more than one client instance per host.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <option>--exit_after_app_start <replaceable>N</replaceable></option>
+          </term>
+          <listitem>
+            <para>Exit N seconds after an app starts. Useful to look at the
+              files in the slot directory.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--exit_after_finish</option></term>
+          <listitem>
+            <para>Exit right after finishing a task. Useful to look at the
+              files in the slot directory.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--exit_before_start</option></term>
+          <listitem>
+            <para>Exit right before starting a task. Useful to look at the
+                files in the slot directory.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--exit_before_upload</option></term>
+          <listitem>
+            <para>Exit right before starting an upload.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--exit_when_idle</option></term>
+          <listitem>
+            <para>Exit when there are no more tasks to work on.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--fetch_minimal_work</option></term>
+          <listitem>
+            <para>Fetch only 1 task per device.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--file_xfer_giveup_period <replaceable>N</replaceable></option></term>
+          <listitem>
+            <para>Give up on file transfers after N sec.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--master_fetch_interval <replaceable>N</replaceable></option></term>
+          <listitem>
+            <para>Limiting the period of project master file dowload retries.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--master_fetch_period <replaceable>N</replaceable></option></term>
+          <listitem>
+            <para>Reload a project's master file after N RPC failures.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--master_fetch_retry_cap <replaceable>N</replaceable></option></term>
+          <listitem>
+            <para>Exponential backoff limit for downloading project master files.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--no_priority_change</option></term>
+          <listitem>
+            <para>Run applications at same priority as client.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--pers_giveup <replaceable>N</replaceable></option></term>
+          <listitem>
+            <para>Giveup time for persistent file transfer errors.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--pers_retry_delay_max <replaceable>N</replaceable></option></term>
+          <listitem>
+            <para>Maximum time (sec) for file transfer exponential backoff.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--pers_retry_delay_min <replaceable>N</replaceable></option></term>
+          <listitem>
+            <para>Minimum time (sec) for file transfer exponential backoff.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--redirectio</option></term>
+          <listitem>
+              <para>Redirect stdout and stderr to log files
+                (<filename>stdoutdae.txt</filename> and <filename>stderrdae.txt</filename>).
+              </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--retry_cap <replaceable>N</replaceable></option></term>
+          <listitem>
+            <para>Limit the maximum exponential backoff time.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--sched_retry_delay_max <replaceable>N</replaceable></option></term>
+          <listitem>
+            <para>Maximum time (sec) for project RPC exponential backoff.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--sched_retry_delay_min <replaceable>N</replaceable></option></term>
+          <listitem>
+            <para>Minimum time (sec) for project RPC exponential backoff.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--unsigned_apps_ok</option></term>
+          <listitem>
+            <para>Allow unsigned apps (for testing).</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
   </refsect1>
 
   <refsect1>
     <title>Access control for GUI RPC</title>
-    <para>By default the core client accepts GUI RPC connections only from
+    <para>By default the client accepts GUI RPC connections only from
       programs on the same host, which means that any user on this host can
-      control the core client.</para>
+      control the client.</para>
   </refsect1>
 
   <refsect1>
@@ -264,13 +440,13 @@
     <para>&man_boinccmd;, &man_boincmgr;</para>
     <para>
       <ulink
-        url="http://boinc.berkeley.edu/wiki/Client_configuration_(advanced)"/>
+        url="http://boinc.berkeley.edu/wiki/Client_configuration#Command-line_options"/>
     </para>
   </refsect1>
 
   <refsect1>
     <title>COPYRIGHT</title>
-    <para>Copyright © 2007-2008 University of California.</para>
+    <para>Copyright © 2007-2013 University of California.</para>
     <para>Permission is granted to copy, distribute and/or modify this
       document under the terms of the &gnu; Free Documentation License,
       Version 1.2 or any later version published by the Free Software
diff --git a/doc/manpages/boinccmd.xml b/doc/manpages/boinccmd.xml
index f5aac57..36a96c1 100644
--- a/doc/manpages/boinccmd.xml
+++ b/doc/manpages/boinccmd.xml
@@ -2,9 +2,9 @@
 
 <!--
  This is the manual page for boinccmd, a command tool that provides an
- interactive command-line interface for the core client.
+ interactive command-line interface for the client.
 
- Copyright © 2007-2008 University of California
+ Copyright © 2007-2013 University of California
 
  Permission is granted to copy, distribute and/or modify this document
  under the terms of the GNU Free Documentation License, Version 1.2 or
@@ -18,18 +18,22 @@
   <!ENTITY % COMMON SYSTEM "common.ent">
   %COMMON;
 
-  <!ENTITY date "<date>11 January 2008</date>">
+  <!ENTITY date "<date>04 March 2013</date>">
 ]>
 
 <refentry>
   <refentryinfo>
     <authorgroup>
       <author>
+        <firstname>Christian</firstname>
+        <lastname>Beer</lastname>
+        <email>djangofett@gmx.net</email>
+      </author>
+      <author>
         <firstname>Frank</firstname>
         <lastname>Thomas</lastname>
         <email>frank@thomas-alfeld.de</email>
       </author>
-
       <author>
         <firstname>Peter</firstname>
         <lastname>Bailis</lastname>
@@ -38,7 +42,7 @@
     </authorgroup>
     <copyright>
       <year>2007</year>
-      <year>2008</year>
+      <year>2013</year>
       <holder>University of California</holder>
     </copyright>
     &date;
@@ -50,8 +54,8 @@
   </refmeta>
 
   <refnamediv>
-    <refname>&boinccmd;</refname> 
-    <refpurpose>command line interface to the BOINC core client</refpurpose>
+    <refname>&boinccmd;</refname>
+    <refpurpose>The command line interface to the BOINC client.</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
@@ -76,7 +80,9 @@
   <refsect1>
     <title>DESCRIPTION</title>
     <para>The BOINC command tool (&cmd_boinccmd;) provides a command line
-      interface to a running BOINC core client (&man_boinc;).</para>
+      interface to control a running BOINC client (&man_boinc;). It communicates
+      with a running client using port &rpc_port; over TCP/IP. It can only
+      connect to one client at a time.</para>
   </refsect1>
 
   <refsect1>
@@ -163,7 +169,9 @@
             <replaceable>account_key</replaceable>
           </term>
           <listitem>
-            <para>Attach to an account.</para>
+              <para>Attach to an account using the project URL and authenticator
+                (send via email after <option>--create_account</option> was
+                succesfull).</para>
           </listitem>
         </varlistentry>
 
@@ -175,8 +183,9 @@
             <replaceable>passwd</replaceable>
           </term>
           <listitem>
-            <para>Attach to an account manager (or do RPC if already
-              attached).</para>
+            <para>Attach to an account manager (or do RPC if already attached).
+              The account has to be created via the account manager website.
+            </para>
           </listitem>
         </varlistentry>
 
@@ -201,16 +210,25 @@
         </varlistentry>
 
         <varlistentry>
-          <term><option>--get_results</option></term>
+          <term><option>--get_cc_status</option></term>
+	      <listitem>
+            <para>Show only current CPU, GPU and network modes.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>--get_tasks</option></term>
           <listitem>
-            <para>Show all results.</para>
+            <para>Show all tasks of the client (in progress, waiting and
+              completed only). Tasks that where reported to the project server
+              are not shown here.</para>
           </listitem>
         </varlistentry>
 
         <varlistentry>
           <term><option>--get_simple_gui_info</option></term>
           <listitem>
-            <para>Show status of projects and active results.</para>
+            <para>Show status of projects and active tasks.</para>
           </listitem>
         </varlistentry>
 
@@ -252,6 +270,25 @@
           </listitem>
         </varlistentry>
 
+	<varlistentry>
+          <term>
+            <option>--get_message_count</option>
+          </term>
+          <listitem>
+            <para>Show largest message sequence number.</para>
+          </listitem>
+        </varlistentry>
+
+	<varlistentry>
+          <term>
+            <option>--get_notices</option> <replaceable>seqno</replaceable>
+          </term>
+          <listitem>
+            <para>Show project notices with sequence numbers beyond
+              <replaceable>seqno</replaceable>.</para>
+          </listitem>
+        </varlistentry>
+
         <varlistentry>
           <term><option>--get_host_info</option></term>
           <listitem>
@@ -259,6 +296,13 @@
               client is running.</para>
           </listitem>
         </varlistentry>
+
+        <varlistentry>
+          <term><option>--get_daily_xfer_history</option></term>
+          <listitem>
+            <para>Show network traffic history of the BOINC client.</para>
+          </listitem>
+        </varlistentry>
       </variablelist>
     </refsect2>
 
@@ -268,54 +312,33 @@
       <variablelist>
         <varlistentry>
           <term>
-            <option>--result</option>
+            <option>--task</option>
             <replaceable>URL</replaceable>
-            <replaceable>result_name</replaceable>
-            {suspend | resume | abort | graphics_window | graphics_fullscreen}
-            <optional>
-              <option>--desktop</option> <replaceable>dt</replaceable> |
-              <option>--window_station</option> <replaceable>ws</replaceable> |
-              <option>--display</option> <replaceable>dp</replaceable>
-            </optional>
+            <replaceable>task_name</replaceable>
+            {suspend | resume | abort}
           </term>
           <listitem>
-            <para>Do operation on a result.</para>
+            <para>Do operation on a task.</para>
 
             <variablelist>
               <varlistentry>
                 <term><option>suspend</option></term>
                 <listitem>
-                  <para>Temporarily stop work on result.</para>
+                  <para>Temporarily stop work on task.</para>
                 </listitem>
               </varlistentry>
 
               <varlistentry>
                 <term><option>resume</option></term>
                 <listitem>
-                  <para>Allow work on result.</para>
+                  <para>Allow work on task.</para>
                 </listitem>
               </varlistentry>
 
               <varlistentry>
                 <term><option>abort</option></term>
                 <listitem>
-                  <para>Permanently stop work on result.</para>
-                </listitem>
-              </varlistentry>
-
-              <varlistentry>
-                <term><option>graphics_window</option></term>
-                <listitem>
-                  <para>Open graphics in a window. The optional desktop /
-                    window_station (Windows) or display (X11) arguments
-                    specify the display.</para>
-                </listitem>
-              </varlistentry>
-
-              <varlistentry>
-                <term><option>graphics_fullscreen</option></term>
-                <listitem>
-                  <para>Open graphics fullscreen.</para>
+                  <para>Permanently stop work on task.</para>
                 </listitem>
               </varlistentry>
             </variablelist>
@@ -326,8 +349,8 @@
           <term>
             <option>--project</option>
             <replaceable>URL</replaceable>
-            {reset | detach | update | suspend | resume | nomorework 
-            | allowmorework | detach_when_done}
+            {reset | detach | update | suspend | resume | nomorework
+            | allowmorework | detach_when_done | dont_detach_when_done}
           </term>
           <listitem>
             <para>Do operation on a project, identified by its master
@@ -337,42 +360,44 @@
               <varlistentry>
                 <term><option>reset</option></term>
                 <listitem>
-                  <para>Delete current work and get more.</para>
+                  <para>Delete current tasks, applications and other files from
+                    this project, request new tasks.</para>
                 </listitem>
               </varlistentry>
 
               <varlistentry>
                 <term><option>detach</option></term>
                 <listitem>
-                  <para>Delete current work and don't get more.</para>
+                  <para>Delete current tasks applications and other files from
+                    this project, don't request any new tasks.</para>
                 </listitem>
               </varlistentry>
 
               <varlistentry>
                 <term><option>update</option></term>
                 <listitem>
-                  <para>Contact scheduling server.</para>
+                  <para>Contact project scheduling server.</para>
                 </listitem>
               </varlistentry>
 
               <varlistentry>
                 <term><option>suspend</option></term>
                 <listitem>
-                  <para>Stop work for project.</para>
+                  <para>Stop all tasks for project.</para>
                 </listitem>
               </varlistentry>
 
               <varlistentry>
                 <term><option>resume</option></term>
                 <listitem>
-                  <para>Resume work for project.</para>
+                  <para>Resume tasks for project.</para>
                 </listitem>
               </varlistentry>
 
               <varlistentry>
                 <term><option>nomorework</option></term>
                 <listitem>
-                  <para>Finish current work but don't get more.</para>
+                  <para>Finish all downloaded tasks but don't get more.</para>
                 </listitem>
               </varlistentry>
 
@@ -386,7 +411,14 @@
               <varlistentry>
                 <term><option>detach_when_done</option></term>
                 <listitem>
-                  <para>Detach project.</para>
+                  <para>Detach project after all tasks are finished.</para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><option>dont_detach_when_done</option></term>
+                <listitem>
+                  <para>Undo <option>detach_when_done</option>.</para>
                 </listitem>
               </varlistentry>
             </variablelist>
@@ -402,6 +434,21 @@
           </term>
           <listitem>
             <para>Do operation on a file transfer.</para>
+            <variablelist>
+              <varlistentry>
+                <term><option>retry</option></term>
+                <listitem>
+                  <para>Retry file transfer.</para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><option>abort</option></term>
+                <listitem>
+                  <para>Permanently abort file transfer.</para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
           </listitem>
         </varlistentry>
 
@@ -412,13 +459,13 @@
             <optional><replaceable>duration</replaceable></optional>
           </term>
           <listitem>
-            <para>Set run mode.</para>
+            <para>Set run mode (applies to CPU and GPU).</para>
 
             <variablelist>
               <varlistentry>
                 <term><option>always</option></term>
                 <listitem>
-                  <para>Do CPU work always.</para>
+                  <para>Do work always.</para>
                 </listitem>
               </varlistentry>
 
@@ -437,8 +484,8 @@
               </varlistentry>
             </variablelist>
             <para>If <replaceable>duration</replaceable> is zero or absent,
-              this mode is permanent. Otherwise, after <replaceable
-              >duration</replaceable> seconds elapse, revert to last
+              this mode is permanent. Otherwise, after
+              <replaceable>duration</replaceable> seconds elapse, revert to last
               permanent mode.</para>
           </listitem>
         </varlistentry>
@@ -457,6 +504,18 @@
 
         <varlistentry>
           <term>
+            <option>--set_gpu_mode</option>
+            {always | auto | never}
+            <optional><replaceable>duration</replaceable></optional>
+          </term>
+          <listitem>
+            <para>Set GPU mode. Like <option>--set_run_mode</option> but
+              applies to GPU processing only.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
             <option>--set_proxy_settings</option>
             <replaceable>http_server_name</replaceable>
             <replaceable>http_server_port</replaceable>
@@ -464,12 +523,12 @@
             <replaceable>http_user_passwd</replaceable>
             <replaceable>socks_server_name</replaceable>
             <replaceable>socks_server_port</replaceable>
-            <replaceable>socks_version</replaceable>
             <replaceable>socks5_user_name</replaceable>
             <replaceable>socks5_user_passwd</replaceable>
+            <replaceable>noproxy_hosts</replaceable>
           </term>
           <listitem>
-            <para>Set proxy settings. All fields are mandantory.</para>
+            <para>Set proxy settings. All fields are mandatory.</para>
           </listitem>
         </varlistentry>
 
@@ -481,29 +540,10 @@
         </varlistentry>
 
         <varlistentry>
-          <term>
-            <option>--set_screensaver_mode</option> {on | off}
-            <replaceable>blank_time</replaceable>
-            <optional>
-              <option>--desktop</option> <replaceable>dt</replaceable> |
-              <option>--window_station</option> <replaceable>ws</replaceable> |
-              <option>--display</option> <replaceable>dp</replaceable>
-            </optional>
-          </term>
-          <listitem>
-            <para>Tell the core client to start or stop doing fullscreen
-              graphics, and going to black after
-              <replaceable>blank_time</replaceable> seconds. The optional
-              arguments specify which desktop / windows_station (Windows)
-              or display (X11) to use.</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
           <term><option>--read_global_prefs_override</option></term>
           <listitem>
-            <para>Tell the core client to read the <filename
-              >global_prefs_override.xml</filename> file and
+            <para>Tell the client to read the
+              <filename>global_prefs_override.xml</filename> file and
               incorporate any global preferences indicated there.</para>
           </listitem>
         </varlistentry>
@@ -511,59 +551,36 @@
         <varlistentry>
           <term><option>--quit</option></term>
           <listitem>
-            <para>Tell the core client to quit.</para>
+            <para>Tell the client to quit.</para>
           </listitem>
         </varlistentry>
 
         <varlistentry>
           <term><option>--read_cc_config</option></term>
           <listitem>
-            <para>Reread the configuration file
+            <para>Tell the client to reread the configuration file
               (<filename>cc_config.xml</filename>).</para>
           </listitem>
         </varlistentry>
 
         <varlistentry>
           <term>
-            <option>--set_debts</option>
-            <replaceable>URL1</replaceable>
-            <replaceable>STD1</replaceable>
-            <replaceable>LTD1</replaceable>
-            <optional><replaceable>URL2</replaceable>
-              <replaceable>STD2</replaceable>
-              <replaceable>LTD2</replaceable>
-              ...</optional>
-          </term>
-          <listitem>
-            <para>Set the short- and long-term debts of one or more projects.
-              Note, if you adjust the debts of a single project, the debts of
-              other projects are changed. So if you want to set the debts of
-              multiple projects, do it in a single command.</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
             <option>--get_project_config</option>
             <replaceable>URL</replaceable>
           </term>
           <listitem>
-            <para>Fetch configuration at project located at
+            <para>Fetch configuration of project located at
               <replaceable>URL</replaceable>.</para>
           </listitem>
         </varlistentry>
 
         <varlistentry>
-          <term><option>--get_project_config_poll</option></term>
-        </varlistentry>
-
-        <varlistentry>
           <term><option>--network_available</option></term>
+	      <listitem>
+            <para>Tell the client to retry deferred network communication.</para>
+          </listitem>
         </varlistentry>
 
-        <varlistentry>
-          <term><option>--get_cc_status</option></term>
-        </varlistentry>
       </variablelist>
     </refsect2>
   </refsect1>
@@ -576,7 +593,7 @@
 
   <refsect1>
     <title>COPYRIGHT</title>
-    <para>Copyright © 2007-2008 University of California.</para>
+    <para>Copyright © 2007-2013 University of California.</para>
     <para>Permission is granted to copy, distribute and/or modify this
       document under the terms of the &gnu; Free Documentation License,
       Version 1.2 or any later version published by the Free Software
diff --git a/doc/manpages/boincmgr.xml b/doc/manpages/boincmgr.xml
index 0f1ec04..dd54e36 100644
--- a/doc/manpages/boincmgr.xml
+++ b/doc/manpages/boincmgr.xml
@@ -2,7 +2,7 @@
 
 <!--
  This is the manual page for the BOINC manager (boincmgr), a monitor
- and control utility for the core client.
+ and control utility for the client.
 
  Copyright © 2007-2008 University of California
 
@@ -18,19 +18,26 @@
   <!ENTITY % COMMON SYSTEM "common.ent">
   %COMMON;
 
-  <!ENTITY date "<date>13 January 2008</date>">
+  <!ENTITY date "<date>04 March 2013</date>">
 ]>
 
 <refentry>
   <refentryinfo>
-    <author>
-      <firstname>Frank</firstname>
-      <lastname>Thomas</lastname>
-      <email>frank@thomas-alfeld.de</email>
-    </author>
+    <authorgroup>
+      <author>
+        <firstname>Christian</firstname>
+        <lastname>Beer</lastname>
+        <email>djangofett@gmx.net</email>
+      </author>
+      <author>
+        <firstname>Frank</firstname>
+        <lastname>Thomas</lastname>
+        <email>frank@thomas-alfeld.de</email>
+      </author>
+    </authorgroup>
     <copyright>
       <year>2007</year>
-      <year>2008</year>
+      <year>2013</year>
       <holder>University of California</holder>
     </copyright>
     &date;
@@ -42,17 +49,24 @@
   </refmeta>
 
   <refnamediv>
-    <refname>&boincmgr;</refname> 
-    <refpurpose>The graphical BOINC manager for the core client.</refpurpose>
+    <refname>&boincmgr;</refname>
+    <refpurpose>The graphical BOINC manager for the client.</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
     <cmdsynopsis>
       &cmd_boincmgr;
       <arg><option>--verbose</option></arg>
-      <arg><option>-s</option></arg>
+      <arg><option>-a</option></arg>
+      <arg><option>-e</option> <replaceable>client_dir</replaceable></arg>
+      <arg><option>-d</option> <replaceable>data_dir</replaceable></arg>
+      <arg><option>-n</option> <replaceable>hostname</replaceable></arg>
+      <arg><option>-g</option> <replaceable>port</replaceable></arg>
+      <arg><option>-p</option> <replaceable>passwd</replaceable></arg>
       <arg><option>-b</option> <replaceable>BOINC_ARGS</replaceable></arg>
       <arg><option>-i</option></arg>
+      <arg><option>-c</option></arg>
+      <arg><option>-m</option></arg>
     </cmdsynopsis>
     <cmdsynopsis>
       &cmd_boincmgr;
@@ -65,13 +79,15 @@
 
   <refsect1>
     <title>DESCRIPTION</title>
-    <para>The BOINC manager (&cmd_boincmgr;) is a controling and monitoring
-      utility for the BOINC core client (&man_boinc;).</para>
+    <para>The BOINC manager (&cmd_boincmgr;) is a graphical controlling and monitoring
+      utility for the BOINC client (&man_boinc;). It communicates with a running
+      client using port &rpc_port; over TCP/IP. It can only connect to one client at a time.
+    </para>
   </refsect1>
 
   <refsect1>
     <title>OPTIONS</title>
-    <para>A full summary of options is included below.</para>
+    <para></para>
 
     <variablelist>
       <varlistentry>
@@ -89,10 +105,67 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>-s</option>, <option>--systray</option></term>
+        <term><option>-a</option>, <option>--autostart</option></term>
+        <listitem>
+          <para>Tells the BOINC Manager that it was started by the operating system
+                automatically. Use this if the Manager is started at login time.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <option>-e</option> <replaceable>client_dir</replaceable>,
+          <option>--clientdir=</option><replaceable>client_dir</replaceable>
+        </term>
+        <listitem>
+            <para>Directory containing the <filename>locale</filename> directory
+            containing the Manager localisation files.
+            </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <option>-d</option> <replaceable>data_dir</replaceable>,
+          <option>--datadir=</option><replaceable>data_dir</replaceable>
+        </term>
+        <listitem>
+          <para>Directory containing the configuration files .
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <option>-n</option> <replaceable>hostname</replaceable>,
+          <option>--namehost=</option><replaceable>hostname</replaceable>
+        </term>
+        <listitem>
+          <para>Hostname or IP address of client to which the manager should connect to.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <option>-g</option> <replaceable>port</replaceable>,
+          <option>--gui_rpc_port=</option><replaceable>port</replaceable>
+        </term>
         <listitem>
-          <para>Startup BOINC Manager so only the system tray icon is
-            visible.</para>
+          <para>RPC port number used to communicate with the client. Has to be the same value as on the client (see &man_boinc;).</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <option>-p</option> <replaceable>passwd</replaceable>,
+          <option>--password=</option><replaceable>passwd</replaceable>
+        </term>
+        <listitem>
+          <para>Use <replaceable>passwd</replaceable> as password for RPC
+            authentication. If the current working directory contains a file
+            <filename>gui_rpc_auth.cfg</filename>, &cmd_boincmgr; will read
+            the password from this file.</para>
         </listitem>
       </varlistentry>
 
@@ -102,7 +175,7 @@
           <option>--boincargs=</option><replaceable>BOINC_ARGS</replaceable>
         </term>
         <listitem>
-          <para>Startup BOINC with these optional arguments.</para>
+          <para>Startup the BOINC client with these optional arguments if necessary.</para>
         </listitem>
       </varlistentry>
 
@@ -112,6 +185,20 @@
           <para>Disable BOINC security users and permissions.</para>
         </listitem>
       </varlistentry>
+
+      <varlistentry>
+        <term><option>-c</option>, <option>--checkskins</option></term>
+        <listitem>
+          <para>Set skin debugging mode to enable skin manager error messages.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-m</option>, <option>--multiple</option></term>
+        <listitem>
+          <para>Allow multiple instances of BOINC manager on this host.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
 
@@ -125,7 +212,7 @@
 
   <refsect1>
     <title>COPYRIGHT</title>
-    <para>Copyright © 2007-2008 University of California.</para>
+    <para>Copyright © 2007-2013 University of California.</para>
     <para>Permission is granted to copy, distribute and/or modify this
       document under the terms of the &gnu; Free Documentation License,
       Version 1.2 or any later version published by the Free Software
