diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index ca67c3d..05503f2 100644
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -859,7 +859,7 @@
 static void usage_NORETURN ( Bool debug_help )
 {
    Char* usage1 = 
-"usage: valgrind --tool=<toolname> [options] prog-and-args\n"
+"usage: valgrind [options] prog-and-args\n"
 "\n"
 "  common user options for all Valgrind tools, with defaults in [ ]:\n"
 "    --tool=<name>             use the Valgrind tool named <name> [memcheck]\n"
diff --git a/docs/xml/manual-core.xml b/docs/xml/manual-core.xml
index b8809a6..27845b0 100644
--- a/docs/xml/manual-core.xml
+++ b/docs/xml/manual-core.xml
@@ -561,7 +561,7 @@
 <para>You invoke Valgrind like this:</para>
 
 <programlisting><![CDATA[
-valgrind --tool=<emphasis>tool_name</emphasis> [valgrind-options] your-prog [your-prog options]]]></programlisting>
+valgrind [valgrind-options] your-prog [your-prog options]]]></programlisting>
 
 <para>Valgrind's default settings succeed in giving reasonable
 behaviour in most cases.  We group the available options by rough
@@ -573,7 +573,8 @@
 <para>The single most important option.</para>
   <itemizedlist>
    <listitem id="tool_name">
-    <para><computeroutput>--tool=name</computeroutput></para>
+    <para><computeroutput>--tool=&lt;name&gt;</computeroutput>
+    [default=memcheck]</para>
     <para>Run the Valgrind tool called <emphasis>name</emphasis>,
     e.g. Memcheck, Addrcheck, Cachegrind, etc.</para>
    </listitem>
diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index dffd850..6ceb817 100644
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -1,4 +1,4 @@
-usage: valgrind --tool=<toolname> [options] prog-and-args
+usage: valgrind [options] prog-and-args
 
   common user options for all Valgrind tools, with defaults in [ ]:
     --tool=<name>             use the Valgrind tool named <name> [memcheck]
diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index d0cfa74..cd54e32 100644
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -1,4 +1,4 @@
-usage: valgrind --tool=<toolname> [options] prog-and-args
+usage: valgrind [options] prog-and-args
 
   common user options for all Valgrind tools, with defaults in [ ]:
     --tool=<name>             use the Valgrind tool named <name> [memcheck]