diff --git a/Documentation/usage/dlv.md b/Documentation/usage/dlv.md
index b58b50f9..84bd1bad 100644
--- a/Documentation/usage/dlv.md
+++ b/Documentation/usage/dlv.md
@@ -47,4 +47,4 @@ Pass flags to the program you are debugging using `--`, for example:
 * [dlv trace](dlv_trace.md)	 - Compile and begin tracing program.
 * [dlv version](dlv_version.md)	 - Prints version.
 
-###### Auto generated by spf13/cobra on 5-May-2017
+###### Auto generated by spf13/cobra on 20-Jun-2017
diff --git a/Documentation/usage/dlv_attach.md b/Documentation/usage/dlv_attach.md
index d09db1d4..ad5fc366 100644
--- a/Documentation/usage/dlv_attach.md
+++ b/Documentation/usage/dlv_attach.md
@@ -38,4 +38,4 @@ dlv attach pid [executable]
 ### SEE ALSO
 * [dlv](dlv.md)	 - Delve is a debugger for the Go programming language.
 
-###### Auto generated by spf13/cobra on 5-May-2017
+###### Auto generated by spf13/cobra on 20-Jun-2017
diff --git a/Documentation/usage/dlv_connect.md b/Documentation/usage/dlv_connect.md
index 797ae39a..7a9ef256 100644
--- a/Documentation/usage/dlv_connect.md
+++ b/Documentation/usage/dlv_connect.md
@@ -33,4 +33,4 @@ dlv connect addr
 ### SEE ALSO
 * [dlv](dlv.md)	 - Delve is a debugger for the Go programming language.
 
-###### Auto generated by spf13/cobra on 5-May-2017
+###### Auto generated by spf13/cobra on 20-Jun-2017
diff --git a/Documentation/usage/dlv_core.md b/Documentation/usage/dlv_core.md
index bb3813b9..4bfc69a1 100644
--- a/Documentation/usage/dlv_core.md
+++ b/Documentation/usage/dlv_core.md
@@ -37,4 +37,4 @@ dlv core <executable> <core>
 ### SEE ALSO
 * [dlv](dlv.md)	 - Delve is a debugger for the Go programming language.
 
-###### Auto generated by spf13/cobra on 5-May-2017
+###### Auto generated by spf13/cobra on 20-Jun-2017
diff --git a/Documentation/usage/dlv_debug.md b/Documentation/usage/dlv_debug.md
index 3ea72228..c9282afd 100644
--- a/Documentation/usage/dlv_debug.md
+++ b/Documentation/usage/dlv_debug.md
@@ -38,4 +38,4 @@ dlv debug [package]
 ### SEE ALSO
 * [dlv](dlv.md)	 - Delve is a debugger for the Go programming language.
 
-###### Auto generated by spf13/cobra on 5-May-2017
+###### Auto generated by spf13/cobra on 20-Jun-2017
diff --git a/Documentation/usage/dlv_exec.md b/Documentation/usage/dlv_exec.md
index 18096f22..9f67ad79 100644
--- a/Documentation/usage/dlv_exec.md
+++ b/Documentation/usage/dlv_exec.md
@@ -13,7 +13,7 @@ optimizations disabled, it may be difficult to properly debug it. Please
 consider compiling debugging binaries with -gcflags="-N -l".
 
 ```
-dlv exec [./path/to/binary]
+dlv exec <path/to/binary>
 ```
 
 ### Options inherited from parent commands
@@ -38,4 +38,4 @@ dlv exec [./path/to/binary]
 ### SEE ALSO
 * [dlv](dlv.md)	 - Delve is a debugger for the Go programming language.
 
-###### Auto generated by spf13/cobra on 5-May-2017
+###### Auto generated by spf13/cobra on 20-Jun-2017
diff --git a/Documentation/usage/dlv_replay.md b/Documentation/usage/dlv_replay.md
index 3317d945..54093109 100644
--- a/Documentation/usage/dlv_replay.md
+++ b/Documentation/usage/dlv_replay.md
@@ -37,4 +37,4 @@ dlv replay [trace directory]
 ### SEE ALSO
 * [dlv](dlv.md)	 - Delve is a debugger for the Go programming language.
 
-###### Auto generated by spf13/cobra on 5-May-2017
+###### Auto generated by spf13/cobra on 20-Jun-2017
diff --git a/Documentation/usage/dlv_run.md b/Documentation/usage/dlv_run.md
index 57338d1a..f904932b 100644
--- a/Documentation/usage/dlv_run.md
+++ b/Documentation/usage/dlv_run.md
@@ -33,4 +33,4 @@ dlv run
 ### SEE ALSO
 * [dlv](dlv.md)	 - Delve is a debugger for the Go programming language.
 
-###### Auto generated by spf13/cobra on 5-May-2017
+###### Auto generated by spf13/cobra on 20-Jun-2017
diff --git a/Documentation/usage/dlv_test.md b/Documentation/usage/dlv_test.md
index 57391e1d..a3503082 100644
--- a/Documentation/usage/dlv_test.md
+++ b/Documentation/usage/dlv_test.md
@@ -38,4 +38,4 @@ dlv test [package]
 ### SEE ALSO
 * [dlv](dlv.md)	 - Delve is a debugger for the Go programming language.
 
-###### Auto generated by spf13/cobra on 5-May-2017
+###### Auto generated by spf13/cobra on 20-Jun-2017
diff --git a/Documentation/usage/dlv_trace.md b/Documentation/usage/dlv_trace.md
index a68032ed..21e0434a 100644
--- a/Documentation/usage/dlv_trace.md
+++ b/Documentation/usage/dlv_trace.md
@@ -45,4 +45,4 @@ dlv trace [package] regexp
 ### SEE ALSO
 * [dlv](dlv.md)	 - Delve is a debugger for the Go programming language.
 
-###### Auto generated by spf13/cobra on 5-May-2017
+###### Auto generated by spf13/cobra on 20-Jun-2017
diff --git a/Documentation/usage/dlv_version.md b/Documentation/usage/dlv_version.md
index aefd0af8..45bac093 100644
--- a/Documentation/usage/dlv_version.md
+++ b/Documentation/usage/dlv_version.md
@@ -33,4 +33,4 @@ dlv version
 ### SEE ALSO
 * [dlv](dlv.md)	 - Delve is a debugger for the Go programming language.
 
-###### Auto generated by spf13/cobra on 5-May-2017
+###### Auto generated by spf13/cobra on 20-Jun-2017
diff --git a/cmd/dlv/cmds/commands.go b/cmd/dlv/cmds/commands.go
index 908cab12..79a94b11 100644
--- a/cmd/dlv/cmds/commands.go
+++ b/cmd/dlv/cmds/commands.go
@@ -71,7 +71,7 @@ Pass flags to the program you are debugging using ` + "`--`" + `, for example:
 ` + "`dlv exec ./hello -- server --config conf/config.toml`"
 
 // New returns an initialized command tree.
-func New() *cobra.Command {
+func New(docCall bool) *cobra.Command {
 	// Config setup and load.
 	conf = config.LoadConfig()
 	buildFlagsDefault := ""
@@ -153,7 +153,7 @@ session.`,
 
 	// 'exec' subcommand.
 	execCommand := &cobra.Command{
-		Use:   "exec [./path/to/binary]",
+		Use:   "exec <path/to/binary>",
 		Short: "Execute a precompiled binary, and begin a debug session.",
 		Long: `Execute a precompiled binary and begin a debug session.
 
@@ -242,7 +242,7 @@ core dump was taken.`,
 	}
 	RootCommand.AddCommand(versionCommand)
 
-	if path, _ := exec.LookPath("rr"); path != "" {
+	if path, _ := exec.LookPath("rr"); path != "" || docCall {
 		replayCommand := &cobra.Command{
 			Use:   "replay [trace directory]",
 			Short: "Replays a rr trace.",
diff --git a/cmd/dlv/main.go b/cmd/dlv/main.go
index 458084e2..a1c54855 100644
--- a/cmd/dlv/main.go
+++ b/cmd/dlv/main.go
@@ -10,5 +10,5 @@ var Build string
 
 func main() {
 	version.DelveVersion.Build = Build
-	cmds.New().Execute()
+	cmds.New(false).Execute()
 }
diff --git a/scripts/gen-usage-docs.go b/scripts/gen-usage-docs.go
index 7c874ae7..ee969b7c 100644
--- a/scripts/gen-usage-docs.go
+++ b/scripts/gen-usage-docs.go
@@ -8,5 +8,5 @@ import (
 )
 
 func main() {
-	doc.GenMarkdownTree(cmds.New(), "./Documentation/usage")
+	doc.GenMarkdownTree(cmds.New(true), "./Documentation/usage")
 }