Merge "veyron: making sure that files create by 'go generate' files are up-to-date"
diff --git a/tools/application/doc.go b/tools/application/doc.go
index 31b8cfa..05e41bb 100644
--- a/tools/application/doc.go
+++ b/tools/application/doc.go
@@ -40,7 +40,10 @@
    local namespace root; can be repeated to provided multiple roots
  -veyron.vtrace.cache_size=1024
    The number of vtrace traces to store in memory.
- -veyron.vtrace.dump_on_shutdown=false
+ -veyron.vtrace.collect_regexp=
+   Spans and annotations that match this regular expression will trigger trace
+   collection.
+ -veyron.vtrace.dump_on_shutdown=true
    If true, dump all stored traces on runtime shutdown.
  -veyron.vtrace.sample_rate=0
    Rate (from 0.0 to 1.0) to sample vtrace traces.
@@ -62,11 +65,12 @@
 Add the given envelope to the application for the given profiles.
 
 Usage:
-   application put <application> <profiles> <envelope>
+   application put <application> <profiles> [<envelope>]
 
 <application> is the full name of the application. <profiles> is a
 comma-separated list of profiles. <envelope> is the file that contains a
-JSON-encoded envelope.
+JSON-encoded envelope. If this file is not provided, the user will be prompted
+to enter the data manually.
 
 Application Remove
 
diff --git a/tools/binary/doc.go b/tools/binary/doc.go
index 3807988..507b951 100644
--- a/tools/binary/doc.go
+++ b/tools/binary/doc.go
@@ -38,7 +38,10 @@
    local namespace root; can be repeated to provided multiple roots
  -veyron.vtrace.cache_size=1024
    The number of vtrace traces to store in memory.
- -veyron.vtrace.dump_on_shutdown=false
+ -veyron.vtrace.collect_regexp=
+   Spans and annotations that match this regular expression will trigger trace
+   collection.
+ -veyron.vtrace.dump_on_shutdown=true
    If true, dump all stored traces on runtime shutdown.
  -veyron.vtrace.sample_rate=0
    Rate (from 0.0 to 1.0) to sample vtrace traces.
diff --git a/tools/build/doc.go b/tools/build/doc.go
index bd39613..540cf91 100644
--- a/tools/build/doc.go
+++ b/tools/build/doc.go
@@ -35,7 +35,10 @@
    local namespace root; can be repeated to provided multiple roots
  -veyron.vtrace.cache_size=1024
    The number of vtrace traces to store in memory.
- -veyron.vtrace.dump_on_shutdown=false
+ -veyron.vtrace.collect_regexp=
+   Spans and annotations that match this regular expression will trigger trace
+   collection.
+ -veyron.vtrace.dump_on_shutdown=true
    If true, dump all stored traces on runtime shutdown.
  -veyron.vtrace.sample_rate=0
    Rate (from 0.0 to 1.0) to sample vtrace traces.
diff --git a/tools/debug/doc.go b/tools/debug/doc.go
index 3bf5c2f..6ad0e77 100644
--- a/tools/debug/doc.go
+++ b/tools/debug/doc.go
@@ -39,7 +39,10 @@
    local namespace root; can be repeated to provided multiple roots
  -veyron.vtrace.cache_size=1024
    The number of vtrace traces to store in memory.
- -veyron.vtrace.dump_on_shutdown=false
+ -veyron.vtrace.collect_regexp=
+   Spans and annotations that match this regular expression will trigger trace
+   collection.
+ -veyron.vtrace.dump_on_shutdown=true
    If true, dump all stored traces on runtime shutdown.
  -veyron.vtrace.sample_rate=0
    Rate (from 0.0 to 1.0) to sample vtrace traces.
@@ -173,7 +176,7 @@
 $ debug pprof run a/b/c heap --text $ debug pprof run a/b/c profile -gv
 
 The debug pprof run flags are:
- -pprofcmd=veyron go tool pprof
+ -pprofcmd=v23 go tool pprof
    The pprof command to use.
 
 Debug Pprof Proxy
diff --git a/tools/mounttable/doc.go b/tools/mounttable/doc.go
index 15c9ec0..9109880 100644
--- a/tools/mounttable/doc.go
+++ b/tools/mounttable/doc.go
@@ -38,7 +38,10 @@
    local namespace root; can be repeated to provided multiple roots
  -veyron.vtrace.cache_size=1024
    The number of vtrace traces to store in memory.
- -veyron.vtrace.dump_on_shutdown=false
+ -veyron.vtrace.collect_regexp=
+   Spans and annotations that match this regular expression will trigger trace
+   collection.
+ -veyron.vtrace.dump_on_shutdown=true
    If true, dump all stored traces on runtime shutdown.
  -veyron.vtrace.sample_rate=0
    Rate (from 0.0 to 1.0) to sample vtrace traces.
diff --git a/tools/namespace/doc.go b/tools/namespace/doc.go
index 7aee2a4..5f86d58 100644
--- a/tools/namespace/doc.go
+++ b/tools/namespace/doc.go
@@ -44,7 +44,10 @@
    local namespace root; can be repeated to provided multiple roots
  -veyron.vtrace.cache_size=1024
    The number of vtrace traces to store in memory.
- -veyron.vtrace.dump_on_shutdown=false
+ -veyron.vtrace.collect_regexp=
+   Spans and annotations that match this regular expression will trigger trace
+   collection.
+ -veyron.vtrace.dump_on_shutdown=true
    If true, dump all stored traces on runtime shutdown.
  -veyron.vtrace.sample_rate=0
    Rate (from 0.0 to 1.0) to sample vtrace traces.
diff --git a/tools/profile/doc.go b/tools/profile/doc.go
index 2a79b38..2792797 100644
--- a/tools/profile/doc.go
+++ b/tools/profile/doc.go
@@ -39,7 +39,10 @@
    local namespace root; can be repeated to provided multiple roots
  -veyron.vtrace.cache_size=1024
    The number of vtrace traces to store in memory.
- -veyron.vtrace.dump_on_shutdown=false
+ -veyron.vtrace.collect_regexp=
+   Spans and annotations that match this regular expression will trigger trace
+   collection.
+ -veyron.vtrace.dump_on_shutdown=true
    If true, dump all stored traces on runtime shutdown.
  -veyron.vtrace.sample_rate=0
    Rate (from 0.0 to 1.0) to sample vtrace traces.
diff --git a/tools/profile/main.go b/tools/profile/main.go
index e9b7573..65f7187 100644
--- a/tools/profile/main.go
+++ b/tools/profile/main.go
@@ -1,5 +1,5 @@
 // The following enables go generate to generate the doc.go file.
-//go:generate go run $VANADIUM_ROOT/tools/go/src/tools/lib/cmdline/testdata/gendoc.go .
+//go:generate go run $VANADIUM_ROOT/release/go/src/v.io/lib/cmdline/testdata/gendoc.go .
 
 package main