More documentation updates.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10525 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/drd/Testing.txt b/drd/Testing.txt
index 1fdd1fd..d2b4cf2 100644
--- a/drd/Testing.txt
+++ b/drd/Testing.txt
@@ -41,16 +41,16 @@
 
 9. Test whether DRD works with standard KDE applications and whether it does
    not print any false positives. Test this both with KDE3 and KDE4.
-     ./vg-in-place --tool=drd --var-info=yes kate
-     ./vg-in-place --tool=drd --var-info=yes --check-stack-var=yes kate
-     ./vg-in-place --tool=drd --var-info=yes --trace-children=yes knode
-     ./vg-in-place --tool=drd --var-info=yes --check-stack-var=yes --trace-children=yes knode
-     ./vg-in-place --tool=drd --var-info=yes --check-stack-var=yes /usr/bin/designer
+     ./vg-in-place --tool=drd --read-var-info=yes kate
+     ./vg-in-place --tool=drd --read-var-info=yes --check-stack-var=yes kate
+     ./vg-in-place --tool=drd --read-var-info=yes --trace-children=yes knode
+     ./vg-in-place --tool=drd --read-var-info=yes --check-stack-var=yes --trace-children=yes knode
+     ./vg-in-place --tool=drd --read-var-info=yes --check-stack-var=yes /usr/bin/designer
 
 10. Test whether DRD works with standard GNOME applications. Expect
    race reports triggered by ORBit_RootObject_duplicate() and after
    having closed the GNOME terminal window:
-     ./vg-in-place --tool=drd --var-info=yes --trace-children=yes gnome-terminal
+     ./vg-in-place --tool=drd --read-var-info=yes --trace-children=yes gnome-terminal
 
 11. Rerun the GraphicsMagick test suite:
     1. Recompile gcc via drd/scripts/download-and-build-gcc.
@@ -68,7 +68,7 @@
        cd GraphicsMagick
        ./configure
        export OMP_NUM_THREADS=4
-       make -j2 -s MEMCHECK="$HOME/software/valgrind/vg-in-place --tool=drd --check-stack-var=yes --var-info=yes --quiet" check
+       make -j2 -s MEMCHECK="$HOME/software/valgrind/vg-in-place --tool=drd --check-stack-var=yes --read-var-info=yes --quiet" check
     5. Expected result: 776 tests / 23 expected failures / 147m24s user time
        on a E8400 CPU @ 3 GHz.
 
diff --git a/drd/docs/drd-manual.xml b/drd/docs/drd-manual.xml
index caf6eb7..6966439 100644
--- a/drd/docs/drd-manual.xml
+++ b/drd/docs/drd-manual.xml
@@ -584,7 +584,7 @@
 detects a data race:
 </para>
 <programlisting><![CDATA[
-$ valgrind --tool=drd --var-info=yes drd/tests/rwlock_race
+$ valgrind --tool=drd --read-var-info=yes drd/tests/rwlock_race
 ...
 ==9466== Thread 3:
 ==9466== Conflicting load by thread 3 at 0x006020b8 size 4
@@ -652,7 +652,7 @@
       displayed. For dynamically allocated data the allocation call
       stack is shown. For static variables and stack variables the
       allocation context is only shown when the option
-      <computeroutput>--var-info=yes</computeroutput> has been
+      <computeroutput>--read-var-info=yes</computeroutput> has been
       specified. Otherwise DRD will print <computeroutput>Allocation
       context: unknown</computeroutput>.
     </para>
@@ -1231,7 +1231,7 @@
 for the above code:
 </para>
 <programlisting><![CDATA[
-$ valgrind --tool=drd --check-stack-var=yes --var-info=yes drd/tests/omp_matinv 3 -t 2 -r
+$ valgrind --tool=drd --check-stack-var=yes --read-var-info=yes drd/tests/omp_matinv 3 -t 2 -r
 ...
 Conflicting store by thread 1/1 at 0x7fefffbc4 size 4
    at 0x4014A0: gj.omp_fn.0 (omp_matinv.c:203)
@@ -1353,7 +1353,7 @@
       between 1.1 and 3.6 times more memory will be needed compared to
       a native run of the client program. More memory will be needed
       if loading debug information has been enabled
-      (<literal>--var-info=yes</literal>).
+      (<literal>--read-var-info=yes</literal>).
     </para>
   </listitem>
   <listitem>