Merge commit '0d0d329' into v3-porting

testdata/godoc-v2.x.txt

@@ -135,7 +135,7 @@ var SubcommandHelpTemplate = `NAME:
    {{template "helpNameTemplate" .}}
 
 USAGE:
-   {{if .UsageText}}{{wrap .UsageText 3}}{{else}}{{.HelpName}} command{{if .VisibleFlags}} [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}{{end}}{{if .Description}}
+   {{if .UsageText}}{{wrap .UsageText 3}}{{else}}{{.HelpName}} {{if .VisibleFlags}}command [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}{{end}}{{if .Description}}
 
 DESCRIPTION:
    {{template "descriptionTemplate" .}}{{end}}{{if .VisibleCommands}}
@@ -346,8 +346,8 @@ func (a *App) RunAndExitOnError()
     code in the cli.ExitCoder
 
 func (a *App) RunAsSubcommand(ctx *Context) (err error)
-    RunAsSubcommand invokes the subcommand given the context, parses ctx.Args()
-    to generate command-specific flags
+    This is a stub function to keep public API unchanged from old code No one
+    should really use this. Always use a.Run to execute app
 
 func (a *App) RunContext(ctx context.Context, arguments []string) (err error)
     RunContext is like Run except it takes a Context that will be passed to
@@ -552,10 +552,13 @@ type Command struct {
 	// cli.go uses text/template to render templates. You can
 	// render custom help text by setting this variable.
 	CustomHelpTemplate string
+
 	// Has unexported fields.
 }
     Command is a subcommand for a cli.App.
 
+func (cmd *Command) Command(name string) *Command
+
 func (c *Command) FullName() string
     FullName returns the full name of the command. For subcommands this ensures
     that parent commands are part of the command path
@@ -566,9 +569,11 @@ func (c *Command) HasName(name string) bool
 func (c *Command) Names() []string
     Names returns the names including short names and aliases.
 
-func (c *Command) Run(ctx *Context) (err error)
-    Run invokes the command given the context, parses ctx.Args() to generate
-    command-specific flags
+func (c *Command) Run(cCtx *Context, arguments ...string) (err error)
+
+func (c *Command) VisibleCategories() []CommandCategory
+    VisibleCategories returns a slice of categories and commands that are
+    Hidden=false
 
 func (c *Command) VisibleCommands() []*Command
     VisibleCommands returns a slice of the Commands with Hidden=false