From 9075a83a8d2132a810c3ecd4aad5f44c6c778a22 Mon Sep 17 00:00:00 2001
From: Remko Popma <remkop@yahoo.com>
Date: Tue, 27 Mar 2018 21:49:08 +0900
Subject: [PATCH] Release picocli version 3.0.0-alpha-2

---
 README.md                                     |   17 +-
 RELEASE-NOTES.md                              |    2 +-
 build.gradle                                  |    6 +-
 docs/announcing-picocli-1.0.html              |    2 +-
 docs/apidocs/allclasses-frame.html            |   36 +-
 docs/apidocs/allclasses-noframe.html          |   36 +-
 docs/apidocs/constant-values.html             |   49 +-
 docs/apidocs/deprecated-list.html             |   97 +-
 docs/apidocs/help-doc.html                    |   41 +-
 docs/apidocs/index-all.html                   | 1703 ++++++++--------
 docs/apidocs/index.html                       |   15 +-
 docs/apidocs/overview-frame.html              |    9 +-
 docs/apidocs/overview-summary.html            |   47 +-
 docs/apidocs/overview-tree.html               |  178 +-
 docs/apidocs/picocli/AutoComplete.html        |  127 +-
 .../picocli/CommandLine.AbstractHandler.html  |  214 +-
 ...ommandLine.AbstractParseResultHandler.html |  173 +-
 docs/apidocs/picocli/CommandLine.Command.html |  426 ++--
 .../CommandLine.DefaultExceptionHandler.html  |  217 +-
 ...e.DuplicateOptionAnnotationsException.html |   86 +-
 .../CommandLine.ExecutionException.html       |  137 +-
 .../picocli/CommandLine.Help.Ansi.IStyle.html |  114 +-
 .../picocli/CommandLine.Help.Ansi.Style.html  |  272 ++-
 .../picocli/CommandLine.Help.Ansi.Text.html   |  249 +--
 .../picocli/CommandLine.Help.Ansi.html        |  168 +-
 .../picocli/CommandLine.Help.ColorScheme.html |  268 +--
 .../CommandLine.Help.Column.Overflow.html     |  124 +-
 .../picocli/CommandLine.Help.Column.html      |  117 +-
 .../CommandLine.Help.IOptionRenderer.html     |   94 +-
 .../CommandLine.Help.IParamLabelRenderer.html |  105 +-
 .../CommandLine.Help.IParameterRenderer.html  |   94 +-
 .../picocli/CommandLine.Help.Layout.html      |  304 ++-
 .../CommandLine.Help.TextTable.Cell.html      |  113 +-
 .../picocli/CommandLine.Help.TextTable.html   |  309 ++-
 .../picocli/CommandLine.Help.Visibility.html  |  124 +-
 docs/apidocs/picocli/CommandLine.Help.html    |  815 +++-----
 .../picocli/CommandLine.HelpCommand.html      |  136 +-
 .../CommandLine.IExceptionHandler.html        |  123 +-
 .../CommandLine.IExceptionHandler2.html       |  141 +-
 .../apidocs/picocli/CommandLine.IFactory.html |  101 +-
 ...CommandLine.IHelpCommandInitializable.html |  101 +-
 .../CommandLine.IParseResultHandler.html      |  126 +-
 .../CommandLine.IParseResultHandler2.html     |  127 +-
 .../picocli/CommandLine.ITypeConverter.html   |   98 +-
 .../picocli/CommandLine.IVersionProvider.html |   96 +-
 .../CommandLine.InitializationException.html  |  102 +-
 ...ne.MaxValuesforFieldExceededException.html |   96 +-
 ...CommandLine.MissingParameterException.html |   94 +-
 ...andLine.MissingTypeConverterException.html |   96 +-
 docs/apidocs/picocli/CommandLine.Mixin.html   |   84 +-
 .../picocli/CommandLine.Model.ArgSpec.html    |  246 +--
 .../CommandLine.Model.CommandSpec.html        |  513 ++---
 .../picocli/CommandLine.Model.IBinding.html   |  117 +-
 .../CommandLine.Model.OptionSpec.Builder.html |  220 +-
 .../picocli/CommandLine.Model.OptionSpec.html |  234 +--
 .../picocli/CommandLine.Model.ParserSpec.html |  227 ++-
 ...ine.Model.PositionalParamSpec.Builder.html |  203 +-
 ...CommandLine.Model.PositionalParamSpec.html |  189 +-
 ...ommandLine.Model.UnmatchedArgsBinding.html |  118 +-
 .../CommandLine.Model.UsageMessageSpec.html   |  407 ++--
 docs/apidocs/picocli/CommandLine.Model.html   |   87 +-
 docs/apidocs/picocli/CommandLine.Option.html  |  277 +--
 ...ommandLine.OverwrittenOptionException.html |   94 +-
 .../CommandLine.ParameterException.html       |  155 +-
 ...ommandLine.ParameterIndexGapException.html |   86 +-
 .../picocli/CommandLine.Parameters.html       |  186 +-
 .../picocli/CommandLine.ParentCommand.html    |   61 +-
 .../CommandLine.ParseResult.Builder.html      |  143 +-
 .../picocli/CommandLine.ParseResult.html      |  395 ++--
 .../picocli/CommandLine.PicocliException.html |  102 +-
 docs/apidocs/picocli/CommandLine.Range.html   |  325 ++-
 docs/apidocs/picocli/CommandLine.RunAll.html  |  183 +-
 .../apidocs/picocli/CommandLine.RunFirst.html |  183 +-
 docs/apidocs/picocli/CommandLine.RunLast.html |  190 +-
 .../CommandLine.TypeConversionException.html  |   86 +-
 .../picocli/CommandLine.Unmatched.html        |   66 +-
 ...ommandLine.UnmatchedArgumentException.html |  118 +-
 docs/apidocs/picocli/CommandLine.html         | 1806 +++++++----------
 .../picocli/groovy/PicocliBaseScript.html     |  349 ++--
 .../apidocs/picocli/groovy/PicocliScript.html |   86 +-
 .../PicocliScriptASTTransformation.html       |  117 +-
 .../apidocs/picocli/groovy/package-frame.html |    7 +-
 .../picocli/groovy/package-summary.html       |   55 +-
 docs/apidocs/picocli/groovy/package-tree.html |   47 +-
 docs/apidocs/picocli/package-frame.html       |   34 +-
 docs/apidocs/picocli/package-summary.html     |  125 +-
 docs/apidocs/picocli/package-tree.html        |  172 +-
 docs/apidocs/serialized-form.html             |   47 +-
 docs/apidocs/stylesheet.css                   |  342 ++--
 docs/autocomplete.adoc                        |    4 +-
 docs/autocomplete.html                        |    8 +-
 docs/index.adoc                               |   16 +-
 docs/index.html                               |  326 ++-
 docs/picocli-2.0-do-more-with-less.html       |    2 +-
 ...icocli-2.0-groovy-scripts-on-steroids.html |    2 +-
 docs/picocli-3.0-programmatic-api.html        |    2 +-
 src/main/java/picocli/CommandLine.java        |    2 +-
 src/test/java/picocli/AutoCompleteTest.java   |    2 +-
 src/test/java/picocli/CommandLineTest.java    |    2 +-
 99 files changed, 7157 insertions(+), 10016 deletions(-)

diff --git a/README.md b/README.md
index 2710b2dab..8d60b3a74 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,8 @@ interactively showing users what options and subcommands are available.
 ![Picocli Demo help message with ANSI colors](docs/images/picocli.Demo.png?raw=true)
 
 #### Releases
-* [Releases](https://github.com/remkop/picocli/releases) - latest: 3.0.0-alpha-1
+* [Releases](https://github.com/remkop/picocli/releases) - latest: 3.0.0-alpha-2
+* [Picocli 3.0.0-alpha-1 Release Notes](https://github.com/remkop/picocli/releases/tag/v3.0.0-alpha-1) - note there are some [potential breaking changes](https://github.com/remkop/picocli/releases/tag/v3.0.0-alpha-1#3.0.0-alpha-1-breaking-changes) from prior versions
 * [Picocli 2.0 Release Notes](https://github.com/remkop/picocli/releases/tag/v2.0.0) - note there are some [potential breaking changes](https://github.com/remkop/picocli/releases/tag/v2.0.0#2.0-breaking-changes) from prior versions
 
 #### Documentation
@@ -138,35 +139,35 @@ See the [source code](https://github.com/remkop/picocli/blob/master/src/main/jav
 
 ### Gradle
 ```
-compile 'info.picocli:picocli:3.0.0-alpha-1'
+compile 'info.picocli:picocli:3.0.0-alpha-2'
 ```
 ### Maven
 ```
 <dependency>
   <groupId>info.picocli</groupId>
   <artifactId>picocli</artifactId>
-  <version>3.0.0-alpha-1</version>
+  <version>3.0.0-alpha-2</version>
 </dependency>
 ```
 ### Scala SBT
 ```
-libraryDependencies += "info.picocli" % "picocli" % "3.0.0-alpha-1"
+libraryDependencies += "info.picocli" % "picocli" % "3.0.0-alpha-2"
 ```
 ### Ivy
 ```
-<dependency org="info.picocli" name="picocli" rev="3.0.0-alpha-1" />
+<dependency org="info.picocli" name="picocli" rev="3.0.0-alpha-2" />
 ```
 ### Grape
 ```groovy
 @Grapes(
-    @Grab(group='info.picocli', module='picocli', version='3.0.0-alpha-1')
+    @Grab(group='info.picocli', module='picocli', version='3.0.0-alpha-2')
 )
 ```
 ### Leiningen
 ```
-[info.picocli/picocli "3.0.0-alpha-1"]
+[info.picocli/picocli "3.0.0-alpha-2"]
 ```
 ### Buildr
 ```
-'info.picocli:picocli:jar:3.0.0-alpha-1'
+'info.picocli:picocli:jar:3.0.0-alpha-2'
 ```
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index a2d798a72..36c3daea2 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,6 +1,6 @@
 # picocli Release Notes
 
-# <a name="3.0.0-alpha-2"></a> Picocli 3.0.0-alpha-2 (UNRELEASED)
+# <a name="3.0.0-alpha-2"></a> Picocli 3.0.0-alpha-2
 The picocli community is pleased to announce picocli 3.0.0-alpha-2.
 
 This release includes some bug fixes and small enhancements. See [3.0.0-alpha-1](#3.0.0-alpha-1) for recent functional changes.
diff --git a/build.gradle b/build.gradle
index cff9d17ed..d98966f9a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,11 @@
 group 'info.picocli'
 description 'Annotation-based Java command line parser. Usage help with ANSI styles and colors. Autocomplete. Nested subcommands. Easily included as source to avoid adding a dependency.'
-version '3.0.0-alpha-2-SNAPSHOT'
+version '3.0.0-alpha-2'
 
 // for bumpVersion task
-def oldVersion = '3\\.0\\.0-alpha-1'
+def oldVersion = '3\\.0\\.0-alpha-2-SNAPSHOT'
 def oldRevdate = '2018\\-03\\-21'
-def revDate    = '2018-03-21'
+def revDate    = '2018-03-27'
 
 // for bumpReadmeVersion task
 def previousReleaseVersion = '3.0.0-alpha-1'
diff --git a/docs/announcing-picocli-1.0.html b/docs/announcing-picocli-1.0.html
index 6f2f32df1..f8e8b6871 100644
--- a/docs/announcing-picocli-1.0.html
+++ b/docs/announcing-picocli-1.0.html
@@ -638,7 +638,7 @@ <h2 id="_feedback_welcome">Feedback Welcome</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2017-12-28 22:53:33 +09:00
+Last updated 2017-12-28 22:53:33 JST
 </div>
 </div>
 </body>
diff --git a/docs/apidocs/allclasses-frame.html b/docs/apidocs/allclasses-frame.html
index 8299b69cf..2c2910eae 100644
--- a/docs/apidocs/allclasses-frame.html
+++ b/docs/apidocs/allclasses-frame.html
@@ -2,49 +2,47 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:29 JST 2018 -->
-<title>All Classes (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>All Classes (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
 </head>
 <body>
-<h1 class="bar">All&nbsp;Classes</h1>
+<h1 class="bar">All Classes</h1>
 <div class="indexContainer">
 <ul>
 <li><a href="picocli/AutoComplete.html" title="class in picocli" target="classFrame">AutoComplete</a></li>
 <li><a href="picocli/CommandLine.html" title="class in picocli" target="classFrame">CommandLine</a></li>
 <li><a href="picocli/CommandLine.AbstractHandler.html" title="class in picocli" target="classFrame">CommandLine.AbstractHandler</a></li>
 <li><a href="picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli" target="classFrame">CommandLine.AbstractParseResultHandler</a></li>
-<li><a href="picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli" target="classFrame">CommandLine.AbstractSimpleParseResultHandler</a></li>
 <li><a href="picocli/CommandLine.Command.html" title="annotation in picocli" target="classFrame">CommandLine.Command</a></li>
 <li><a href="picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli" target="classFrame">CommandLine.DefaultExceptionHandler</a></li>
 <li><a href="picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli" target="classFrame">CommandLine.DuplicateOptionAnnotationsException</a></li>
 <li><a href="picocli/CommandLine.ExecutionException.html" title="class in picocli" target="classFrame">CommandLine.ExecutionException</a></li>
 <li><a href="picocli/CommandLine.Help.html" title="class in picocli" target="classFrame">CommandLine.Help</a></li>
 <li><a href="picocli/CommandLine.Help.Ansi.html" title="enum in picocli" target="classFrame">CommandLine.Help.Ansi</a></li>
-<li><a href="picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.Help.Ansi.IStyle</span></a></li>
+<li><a href="picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli" target="classFrame"><i>CommandLine.Help.Ansi.IStyle</i></a></li>
 <li><a href="picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli" target="classFrame">CommandLine.Help.Ansi.Style</a></li>
 <li><a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli" target="classFrame">CommandLine.Help.ColorScheme</a></li>
 <li><a href="picocli/CommandLine.Help.Column.html" title="class in picocli" target="classFrame">CommandLine.Help.Column</a></li>
 <li><a href="picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli" target="classFrame">CommandLine.Help.Column.Overflow</a></li>
-<li><a href="picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.Help.IOptionRenderer</span></a></li>
-<li><a href="picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.Help.IParameterRenderer</span></a></li>
-<li><a href="picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.Help.IParamLabelRenderer</span></a></li>
+<li><a href="picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli" target="classFrame"><i>CommandLine.Help.IOptionRenderer</i></a></li>
+<li><a href="picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli" target="classFrame"><i>CommandLine.Help.IParameterRenderer</i></a></li>
+<li><a href="picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli" target="classFrame"><i>CommandLine.Help.IParamLabelRenderer</i></a></li>
 <li><a href="picocli/CommandLine.Help.Layout.html" title="class in picocli" target="classFrame">CommandLine.Help.Layout</a></li>
 <li><a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli" target="classFrame">CommandLine.Help.TextTable</a></li>
 <li><a href="picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli" target="classFrame">CommandLine.Help.TextTable.Cell</a></li>
 <li><a href="picocli/CommandLine.Help.Visibility.html" title="enum in picocli" target="classFrame">CommandLine.Help.Visibility</a></li>
 <li><a href="picocli/CommandLine.HelpCommand.html" title="class in picocli" target="classFrame">CommandLine.HelpCommand</a></li>
-<li><a href="picocli/CommandLine.IExceptionHandler.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.IExceptionHandler</span></a></li>
-<li><a href="picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.IExceptionHandler2</span></a></li>
-<li><a href="picocli/CommandLine.IFactory.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.IFactory</span></a></li>
-<li><a href="picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.IHelpCommandInitializable</span></a></li>
+<li><a href="picocli/CommandLine.IExceptionHandler.html" title="interface in picocli" target="classFrame"><i>CommandLine.IExceptionHandler</i></a></li>
+<li><a href="picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli" target="classFrame"><i>CommandLine.IExceptionHandler2</i></a></li>
+<li><a href="picocli/CommandLine.IFactory.html" title="interface in picocli" target="classFrame"><i>CommandLine.IFactory</i></a></li>
+<li><a href="picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli" target="classFrame"><i>CommandLine.IHelpCommandInitializable</i></a></li>
 <li><a href="picocli/CommandLine.InitializationException.html" title="class in picocli" target="classFrame">CommandLine.InitializationException</a></li>
-<li><a href="picocli/CommandLine.IParseResultHandler.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.IParseResultHandler</span></a></li>
-<li><a href="picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.IParseResultHandler2</span></a></li>
-<li><a href="picocli/CommandLine.ITypeConverter.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.ITypeConverter</span></a></li>
-<li><a href="picocli/CommandLine.IVersionProvider.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.IVersionProvider</span></a></li>
+<li><a href="picocli/CommandLine.IParseResultHandler.html" title="interface in picocli" target="classFrame"><i>CommandLine.IParseResultHandler</i></a></li>
+<li><a href="picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli" target="classFrame"><i>CommandLine.IParseResultHandler2</i></a></li>
+<li><a href="picocli/CommandLine.ITypeConverter.html" title="interface in picocli" target="classFrame"><i>CommandLine.ITypeConverter</i></a></li>
+<li><a href="picocli/CommandLine.IVersionProvider.html" title="interface in picocli" target="classFrame"><i>CommandLine.IVersionProvider</i></a></li>
 <li><a href="picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli" target="classFrame">CommandLine.MaxValuesforFieldExceededException</a></li>
 <li><a href="picocli/CommandLine.MissingParameterException.html" title="class in picocli" target="classFrame">CommandLine.MissingParameterException</a></li>
 <li><a href="picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli" target="classFrame">CommandLine.MissingTypeConverterException</a></li>
@@ -52,7 +50,7 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="picocli/CommandLine.Model.html" title="class in picocli" target="classFrame">CommandLine.Model</a></li>
 <li><a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli" target="classFrame">CommandLine.Model.ArgSpec</a></li>
 <li><a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli" target="classFrame">CommandLine.Model.CommandSpec</a></li>
-<li><a href="picocli/CommandLine.Model.IBinding.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.Model.IBinding</span></a></li>
+<li><a href="picocli/CommandLine.Model.IBinding.html" title="interface in picocli" target="classFrame"><i>CommandLine.Model.IBinding</i></a></li>
 <li><a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli" target="classFrame">CommandLine.Model.OptionSpec</a></li>
 <li><a href="picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli" target="classFrame">CommandLine.Model.OptionSpec.Builder</a></li>
 <li><a href="picocli/CommandLine.Model.ParserSpec.html" title="class in picocli" target="classFrame">CommandLine.Model.ParserSpec</a></li>
diff --git a/docs/apidocs/allclasses-noframe.html b/docs/apidocs/allclasses-noframe.html
index d414a0519..04afb8b9b 100644
--- a/docs/apidocs/allclasses-noframe.html
+++ b/docs/apidocs/allclasses-noframe.html
@@ -2,49 +2,47 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:29 JST 2018 -->
-<title>All Classes (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>All Classes (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
 </head>
 <body>
-<h1 class="bar">All&nbsp;Classes</h1>
+<h1 class="bar">All Classes</h1>
 <div class="indexContainer">
 <ul>
 <li><a href="picocli/AutoComplete.html" title="class in picocli">AutoComplete</a></li>
 <li><a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></li>
 <li><a href="picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></li>
 <li><a href="picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a></li>
-<li><a href="picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli">CommandLine.AbstractSimpleParseResultHandler</a></li>
 <li><a href="picocli/CommandLine.Command.html" title="annotation in picocli">CommandLine.Command</a></li>
 <li><a href="picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a></li>
 <li><a href="picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli">CommandLine.DuplicateOptionAnnotationsException</a></li>
 <li><a href="picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></li>
 <li><a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></li>
 <li><a href="picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a></li>
-<li><a href="picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli"><span class="interfaceName">CommandLine.Help.Ansi.IStyle</span></a></li>
+<li><a href="picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli"><i>CommandLine.Help.Ansi.IStyle</i></a></li>
 <li><a href="picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></li>
 <li><a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></li>
 <li><a href="picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a></li>
 <li><a href="picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a></li>
-<li><a href="picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli"><span class="interfaceName">CommandLine.Help.IOptionRenderer</span></a></li>
-<li><a href="picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli"><span class="interfaceName">CommandLine.Help.IParameterRenderer</span></a></li>
-<li><a href="picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli"><span class="interfaceName">CommandLine.Help.IParamLabelRenderer</span></a></li>
+<li><a href="picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli"><i>CommandLine.Help.IOptionRenderer</i></a></li>
+<li><a href="picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli"><i>CommandLine.Help.IParameterRenderer</i></a></li>
+<li><a href="picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli"><i>CommandLine.Help.IParamLabelRenderer</i></a></li>
 <li><a href="picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></li>
 <li><a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></li>
 <li><a href="picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli">CommandLine.Help.TextTable.Cell</a></li>
 <li><a href="picocli/CommandLine.Help.Visibility.html" title="enum in picocli">CommandLine.Help.Visibility</a></li>
 <li><a href="picocli/CommandLine.HelpCommand.html" title="class in picocli">CommandLine.HelpCommand</a></li>
-<li><a href="picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><span class="interfaceName">CommandLine.IExceptionHandler</span></a></li>
-<li><a href="picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><span class="interfaceName">CommandLine.IExceptionHandler2</span></a></li>
-<li><a href="picocli/CommandLine.IFactory.html" title="interface in picocli"><span class="interfaceName">CommandLine.IFactory</span></a></li>
-<li><a href="picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli"><span class="interfaceName">CommandLine.IHelpCommandInitializable</span></a></li>
+<li><a href="picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><i>CommandLine.IExceptionHandler</i></a></li>
+<li><a href="picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><i>CommandLine.IExceptionHandler2</i></a></li>
+<li><a href="picocli/CommandLine.IFactory.html" title="interface in picocli"><i>CommandLine.IFactory</i></a></li>
+<li><a href="picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli"><i>CommandLine.IHelpCommandInitializable</i></a></li>
 <li><a href="picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></li>
-<li><a href="picocli/CommandLine.IParseResultHandler.html" title="interface in picocli"><span class="interfaceName">CommandLine.IParseResultHandler</span></a></li>
-<li><a href="picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><span class="interfaceName">CommandLine.IParseResultHandler2</span></a></li>
-<li><a href="picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><span class="interfaceName">CommandLine.ITypeConverter</span></a></li>
-<li><a href="picocli/CommandLine.IVersionProvider.html" title="interface in picocli"><span class="interfaceName">CommandLine.IVersionProvider</span></a></li>
+<li><a href="picocli/CommandLine.IParseResultHandler.html" title="interface in picocli"><i>CommandLine.IParseResultHandler</i></a></li>
+<li><a href="picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><i>CommandLine.IParseResultHandler2</i></a></li>
+<li><a href="picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><i>CommandLine.ITypeConverter</i></a></li>
+<li><a href="picocli/CommandLine.IVersionProvider.html" title="interface in picocli"><i>CommandLine.IVersionProvider</i></a></li>
 <li><a href="picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli">CommandLine.MaxValuesforFieldExceededException</a></li>
 <li><a href="picocli/CommandLine.MissingParameterException.html" title="class in picocli">CommandLine.MissingParameterException</a></li>
 <li><a href="picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli">CommandLine.MissingTypeConverterException</a></li>
@@ -52,7 +50,7 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="picocli/CommandLine.Model.html" title="class in picocli">CommandLine.Model</a></li>
 <li><a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></li>
 <li><a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></li>
-<li><a href="picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><span class="interfaceName">CommandLine.Model.IBinding</span></a></li>
+<li><a href="picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><i>CommandLine.Model.IBinding</i></a></li>
 <li><a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></li>
 <li><a href="picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></li>
 <li><a href="picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></li>
diff --git a/docs/apidocs/constant-values.html b/docs/apidocs/constant-values.html
index c6f34b93b..edb010f9c 100644
--- a/docs/apidocs/constant-values.html
+++ b/docs/apidocs/constant-values.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:29 JST 2018 -->
-<title>Constant Field Values (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>Constant Field Values (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Constant Field Values (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -47,10 +40,10 @@
 </ul>
 <ul class="navList">
 <li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
-<li><a href="constant-values.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="constant-values.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -64,7 +57,7 @@
   //-->
 </script>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -81,7 +74,7 @@ <h2 title="Contents">Contents</h2>
 <h2 title="picocli">picocli.*</h2>
 <ul class="blockList">
 <li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<table border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
 <caption><span>picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -94,13 +87,13 @@ <h2 title="picocli">picocli.*</h2>
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
 <td><code><a href="picocli/CommandLine.html#VERSION">VERSION</a></code></td>
-<td class="colLast"><code>"3.0.0-alpha-1"</code></td>
+<td class="colLast"><code>"3.0.0-alpha-2"</code></td>
 </tr>
 </tbody>
 </table>
 </li>
 <li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<table border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
 <caption><span>picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -126,7 +119,7 @@ <h2 title="picocli">picocli.*</h2>
 </table>
 </li>
 <li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<table border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
 <caption><span>picocli.<a href="picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -151,7 +144,7 @@ <h2 title="picocli">picocli.*</h2>
 <h2 title="picocli.groovy">picocli.groovy.*</h2>
 <ul class="blockList">
 <li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<table border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
 <caption><span>picocli.groovy.<a href="picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -172,11 +165,9 @@ <h2 title="picocli.groovy">picocli.groovy.*</h2>
 </ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -196,10 +187,10 @@ <h2 title="picocli.groovy">picocli.groovy.*</h2>
 </ul>
 <ul class="navList">
 <li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
-<li><a href="constant-values.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="constant-values.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -213,7 +204,7 @@ <h2 title="picocli.groovy">picocli.groovy.*</h2>
   //-->
 </script>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/deprecated-list.html b/docs/apidocs/deprecated-list.html
index 84f8dbedf..e7c1e5597 100644
--- a/docs/apidocs/deprecated-list.html
+++ b/docs/apidocs/deprecated-list.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:29 JST 2018 -->
-<title>Deprecated List (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>Deprecated List (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Deprecated List (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -47,10 +40,10 @@
 </ul>
 <ul class="navList">
 <li><a href="index.html?deprecated-list.html" target="_top">Frames</a></li>
-<li><a href="deprecated-list.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="deprecated-list.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -64,7 +57,7 @@
   //-->
 </script>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -75,7 +68,7 @@ <h2 title="Contents">Contents</h2>
 <li><a href="#interface">Deprecated Interfaces</a></li>
 <li><a href="#method">Deprecated Methods</a></li>
 <li><a href="#constructor">Deprecated Constructors</a></li>
-<li><a href="#annotation.type.member">Deprecated Annotation Type Elements</a></li>
+<li><a href="#annotation_type_member">Deprecated Annotation Type Elements</a></li>
 </ul>
 </div>
 <div class="contentContainer"><a name="interface">
@@ -83,7 +76,7 @@ <h2 title="Contents">Contents</h2>
 </a>
 <ul class="blockList">
 <li class="blockList">
-<table class="deprecatedSummary" border="0" cellpadding="3" cellspacing="0" summary="Deprecated Interfaces table, listing deprecated interfaces, and an explanation">
+<table border="0" cellpadding="3" cellspacing="0" summary="Deprecated Interfaces table, listing deprecated interfaces, and an explanation">
 <caption><span>Deprecated Interfaces</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Interface and Description</th>
@@ -91,12 +84,12 @@ <h2 title="Contents">Contents</h2>
 <tbody>
 <tr class="altColor">
 <td class="colOne"><a href="picocli/CommandLine.IExceptionHandler.html" title="interface in picocli">picocli.CommandLine.IExceptionHandler</a>
-<div class="block"><span class="deprecationComment">Use <a href="picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><code>CommandLine.IExceptionHandler2</code></a> instead.</span></div>
+<div class="block"><i>Use <a href="picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><code>CommandLine.IExceptionHandler2</code></a> instead.</i></div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colOne"><a href="picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">picocli.CommandLine.IParseResultHandler</a>
-<div class="block"><span class="deprecationComment">Use <a href="picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><code>CommandLine.IParseResultHandler2</code></a> instead.</span></div>
+<div class="block"><i>Use <a href="picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><code>CommandLine.IParseResultHandler2</code></a> instead.</i></div>
 </td>
 </tr>
 </tbody>
@@ -108,53 +101,53 @@ <h2 title="Contents">Contents</h2>
 </a>
 <ul class="blockList">
 <li class="blockList">
-<table class="deprecatedSummary" border="0" cellpadding="3" cellspacing="0" summary="Deprecated Methods table, listing deprecated methods, and an explanation">
+<table border="0" cellpadding="3" cellspacing="0" summary="Deprecated Methods table, listing deprecated methods, and an explanation">
 <caption><span>Deprecated Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Method and Description</th>
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a href="picocli/CommandLine.Help.html#addSubcommand-java.lang.String-java.lang.Object-">picocli.CommandLine.Help.addSubcommand(String, Object)</a>&nbsp;</td>
+<td class="colOne"><a href="picocli/CommandLine.Help.html#addSubcommand(java.lang.String,%20java.lang.Object)">picocli.CommandLine.Help.addSubcommand(String, Object)</a>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="picocli/CommandLine.Help.TextTable.html#cellAt-int-int-">picocli.CommandLine.Help.TextTable.cellAt(int, int)</a>
-<div class="block"><span class="deprecationComment">use <a href="picocli/CommandLine.Help.TextTable.html#textAt-int-int-"><code>CommandLine.Help.TextTable.textAt(int, int)</code></a> instead</span></div>
+<td class="colOne"><a href="picocli/CommandLine.Help.TextTable.html#cellAt(int,%20int)">picocli.CommandLine.Help.TextTable.cellAt(int, int)</a>
+<div class="block"><i>use <a href="picocli/CommandLine.Help.TextTable.html#textAt(int,%20int)"><code>CommandLine.Help.TextTable.textAt(int, int)</code></a> instead</i></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="picocli/CommandLine.Range.html#defaultArity-java.lang.Class-">picocli.CommandLine.Range.defaultArity(Class&lt;?&gt;)</a>
-<div class="block"><span class="deprecationComment">use <a href="picocli/CommandLine.Range.html#defaultArity-java.lang.reflect.Field-"><code>CommandLine.Range.defaultArity(Field)</code></a> instead</span></div>
+<td class="colOne"><a href="picocli/CommandLine.Range.html#defaultArity(java.lang.Class)">picocli.CommandLine.Range.defaultArity(Class<?>)</a>
+<div class="block"><i>use <a href="picocli/CommandLine.Range.html#defaultArity(java.lang.reflect.Field)"><code>CommandLine.Range.defaultArity(Field)</code></a> instead</i></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="picocli/CommandLine.Help.html#detailedSynopsis-java.util.Comparator-boolean-">picocli.CommandLine.Help.detailedSynopsis(Comparator&lt;CommandLine.Model.OptionSpec&gt;, boolean)</a>
-<div class="block"><span class="deprecationComment">use <a href="picocli/CommandLine.Help.html#detailedSynopsis-int-java.util.Comparator-boolean-"><code>CommandLine.Help.detailedSynopsis(int, Comparator, boolean)</code></a> instead.</span></div>
+<td class="colOne"><a href="picocli/CommandLine.Help.html#detailedSynopsis(java.util.Comparator,%20boolean)">picocli.CommandLine.Help.detailedSynopsis(Comparator<CommandLine.Model.OptionSpec>, boolean)</a>
+<div class="block"><i>use <a href="picocli/CommandLine.Help.html#detailedSynopsis(int,%20java.util.Comparator,%20boolean)"><code>CommandLine.Help.detailedSynopsis(int, Comparator, boolean)</code></a> instead.</i></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="picocli/CommandLine.Model.OptionSpec.html#help--">picocli.CommandLine.Model.OptionSpec.help()</a>
-<div class="block"><span class="deprecationComment">Use <a href="picocli/CommandLine.Model.OptionSpec.html#usageHelp--"><code>CommandLine.Model.OptionSpec.usageHelp()</code></a> and <a href="picocli/CommandLine.Model.OptionSpec.html#versionHelp--"><code>CommandLine.Model.OptionSpec.versionHelp()</code></a> instead.</span></div>
+<td class="colOne"><a href="picocli/CommandLine.Model.OptionSpec.html#help()">picocli.CommandLine.Model.OptionSpec.help()</a>
+<div class="block"><i>Use <a href="picocli/CommandLine.Model.OptionSpec.html#usageHelp()"><code>CommandLine.Model.OptionSpec.usageHelp()</code></a> and <a href="picocli/CommandLine.Model.OptionSpec.html#versionHelp()"><code>CommandLine.Model.OptionSpec.versionHelp()</code></a> instead.</i></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="picocli/CommandLine.html#parseWithHandler-picocli.CommandLine.IParseResultHandler-java.io.PrintStream-java.lang.String...-">picocli.CommandLine.parseWithHandler(CommandLine.IParseResultHandler, PrintStream, String...)</a>
-<div class="block"><span class="deprecationComment">use <a href="picocli/CommandLine.html#parseWithHandler-picocli.CommandLine.IParseResultHandler2-R-java.lang.String:A-"><code>CommandLine.parseWithHandler(IParseResultHandler2, Object, String[])</code></a> instead</span></div>
+<td class="colOne"><a href="picocli/CommandLine.html#parseWithHandler(picocli.CommandLine.IParseResultHandler,%20java.io.PrintStream,%20java.lang.String...)">picocli.CommandLine.parseWithHandler(CommandLine.IParseResultHandler, PrintStream, String...)</a>
+<div class="block"><i>use <a href="picocli/CommandLine.html#parseWithHandler(picocli.CommandLine.IParseResultHandler2,%20java.lang.String[])"><code>CommandLine.parseWithHandler(IParseResultHandler2,  String[])</code></a> instead</i></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler-java.io.PrintStream-picocli.CommandLine.Help.Ansi-picocli.CommandLine.IExceptionHandler-java.lang.String...-">picocli.CommandLine.parseWithHandlers(CommandLine.IParseResultHandler, PrintStream, CommandLine.Help.Ansi, CommandLine.IExceptionHandler, String...)</a>
-<div class="block"><span class="deprecationComment">use <a href="picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>CommandLine.parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)</code></a> instead</span></div>
+<td class="colOne"><a href="picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20picocli.CommandLine.IExceptionHandler,%20java.lang.String...)">picocli.CommandLine.parseWithHandlers(CommandLine.IParseResultHandler, PrintStream, CommandLine.Help.Ansi, CommandLine.IExceptionHandler, String...)</a>
+<div class="block"><i>use <a href="picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)"><code>CommandLine.parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...)</code></a> instead</i></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="picocli/CommandLine.html#printHelpIfRequested-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">picocli.CommandLine.printHelpIfRequested(List&lt;CommandLine&gt;, PrintStream, CommandLine.Help.Ansi)</a>
-<div class="block"><span class="deprecationComment">use <a href="picocli/CommandLine.html#printHelpIfRequested-java.util.List-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>CommandLine.printHelpIfRequested(List, PrintStream, PrintStream, Help.Ansi)</code></a> instead</span></div>
+<td class="colOne"><a href="picocli/CommandLine.html#printHelpIfRequested(java.util.List,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">picocli.CommandLine.printHelpIfRequested(List<CommandLine>, PrintStream, CommandLine.Help.Ansi)</a>
+<div class="block"><i>use <a href="picocli/CommandLine.html#printHelpIfRequested(java.util.List,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>CommandLine.printHelpIfRequested(List, PrintStream, PrintStream, Help.Ansi)</code></a> instead</i></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="picocli/CommandLine.Help.html#synopsis--">picocli.CommandLine.Help.synopsis()</a>
-<div class="block"><span class="deprecationComment">use <a href="picocli/CommandLine.Help.html#synopsis-int-"><code>CommandLine.Help.synopsis(int)</code></a> instead</span></div>
+<td class="colOne"><a href="picocli/CommandLine.Help.html#synopsis()">picocli.CommandLine.Help.synopsis()</a>
+<div class="block"><i>use <a href="picocli/CommandLine.Help.html#synopsis(int)"><code>CommandLine.Help.synopsis(int)</code></a> instead</i></div>
 </td>
 </tr>
 </tbody>
@@ -166,35 +159,35 @@ <h2 title="Contents">Contents</h2>
 </a>
 <ul class="blockList">
 <li class="blockList">
-<table class="deprecatedSummary" border="0" cellpadding="3" cellspacing="0" summary="Deprecated Constructors table, listing deprecated constructors, and an explanation">
+<table border="0" cellpadding="3" cellspacing="0" summary="Deprecated Constructors table, listing deprecated constructors, and an explanation">
 <caption><span>Deprecated Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a href="picocli/CommandLine.Help.html#Help-java.lang.Object-picocli.CommandLine.Help.ColorScheme-">picocli.CommandLine.Help(Object, CommandLine.Help.ColorScheme)</a>
-<div class="block"><span class="deprecationComment">use <code>picocli.CommandLine.Help#Help(picocli.CommandLine.Model.CommandSpec, picocli.CommandLine.Help.ColorScheme)</code></span></div>
+<td class="colOne"><a href="picocli/CommandLine.Help.html#CommandLine.Help(java.lang.Object,%20picocli.CommandLine.Help.ColorScheme)">picocli.CommandLine.Help(Object, CommandLine.Help.ColorScheme)</a>
+<div class="block"><i>use <code>picocli.CommandLine.Help#Help(picocli.CommandLine.Model.CommandSpec, picocli.CommandLine.Help.ColorScheme)</code></i></div>
 </td>
 </tr>
 </tbody>
 </table>
 </li>
 </ul>
-<a name="annotation.type.member">
+<a name="annotation_type_member">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<table class="deprecatedSummary" border="0" cellpadding="3" cellspacing="0" summary="Deprecated Annotation Type Elements table, listing deprecated annotation type elements, and an explanation">
+<table border="0" cellpadding="3" cellspacing="0" summary="Deprecated Annotation Type Elements table, listing deprecated annotation type elements, and an explanation">
 <caption><span>Deprecated Annotation Type Elements</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Annotation Type Element and Description</th>
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a href="picocli/CommandLine.Option.html#help--">picocli.CommandLine.Option.help</a>
-<div class="block"><span class="deprecationComment">Use <a href="picocli/CommandLine.Option.html#usageHelp--"><code>CommandLine.Option.usageHelp()</code></a> and <a href="picocli/CommandLine.Option.html#versionHelp--"><code>CommandLine.Option.versionHelp()</code></a> instead. See <a href="picocli/CommandLine.html#printHelpIfRequested-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>CommandLine.printHelpIfRequested(List, PrintStream, CommandLine.Help.Ansi)</code></a></span></div>
+<td class="colOne"><a href="picocli/CommandLine.Option.html#help()">picocli.CommandLine.Option.help</a>
+<div class="block"><i>Use <a href="picocli/CommandLine.Option.html#usageHelp()"><code>CommandLine.Option.usageHelp()</code></a> and <a href="picocli/CommandLine.Option.html#versionHelp()"><code>CommandLine.Option.versionHelp()</code></a> instead. See <a href="picocli/CommandLine.html#printHelpIfRequested(java.util.List,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>CommandLine.printHelpIfRequested(List, PrintStream, CommandLine.Help.Ansi)</code></a></i></div>
 </td>
 </tr>
 </tbody>
@@ -203,11 +196,9 @@ <h2 title="Contents">Contents</h2>
 </ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -227,10 +218,10 @@ <h2 title="Contents">Contents</h2>
 </ul>
 <ul class="navList">
 <li><a href="index.html?deprecated-list.html" target="_top">Frames</a></li>
-<li><a href="deprecated-list.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="deprecated-list.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -244,7 +235,7 @@ <h2 title="Contents">Contents</h2>
   //-->
 </script>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/help-doc.html b/docs/apidocs/help-doc.html
index aa6448441..5dec4c9a0 100644
--- a/docs/apidocs/help-doc.html
+++ b/docs/apidocs/help-doc.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:29 JST 2018 -->
-<title>API Help (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>API Help (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="API Help (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -47,10 +40,10 @@
 </ul>
 <ul class="navList">
 <li><a href="index.html?help-doc.html" target="_top">Frames</a></li>
-<li><a href="help-doc.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="help-doc.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -64,7 +57,7 @@
   //-->
 </script>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -172,13 +165,11 @@ <h2>Constant Field Values</h2>
 <p>The <a href="constant-values.html">Constant Field Values</a> page lists the static final fields and their values.</p>
 </li>
 </ul>
-<span class="emphasizedPhrase">This help file applies to API documentation generated using the standard doclet.</span></div>
+<em>This help file applies to API documentation generated using the standard doclet.</em></div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -198,10 +189,10 @@ <h2>Constant Field Values</h2>
 </ul>
 <ul class="navList">
 <li><a href="index.html?help-doc.html" target="_top">Frames</a></li>
-<li><a href="help-doc.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="help-doc.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -215,7 +206,7 @@ <h2>Constant Field Values</h2>
   //-->
 </script>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/index-all.html b/docs/apidocs/index-all.html
index a2c61b151..4986e9891 100644
--- a/docs/apidocs/index-all.html
+++ b/docs/apidocs/index-all.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:29 JST 2018 -->
-<title>Index (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
-<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>Index (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
+<link rel="stylesheet" type="text/css" href="./stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Index (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Index (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,21 +18,19 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
-<li><a href="overview-summary.html">Overview</a></li>
+<li><a href="./overview-summary.html">Overview</a></li>
 <li>Package</li>
 <li>Class</li>
-<li><a href="overview-tree.html">Tree</a></li>
-<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="./overview-tree.html">Tree</a></li>
+<li><a href="./deprecated-list.html">Deprecated</a></li>
 <li class="navBarCell1Rev">Index</li>
-<li><a href="help-doc.html">Help</a></li>
+<li><a href="./help-doc.html">Help</a></li>
 </ul>
 </div>
 <div class="subNav">
@@ -46,11 +39,11 @@
 <li>Next</li>
 </ul>
 <ul class="navList">
-<li><a href="index.html?index-all.html" target="_top">Frames</a></li>
-<li><a href="index-all.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="./index.html?index-all.html" target="_top">Frames</a></li>
+<li><a href="index-all.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="./allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -64,2326 +57,2332 @@
   //-->
 </script>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:J">J</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:U">U</a>&nbsp;<a href="#I:V">V</a>&nbsp;<a href="#I:W">W</a>&nbsp;<a name="I:A">
+<div class="contentContainer"><a href="#_A_">A</a>&nbsp;<a href="#_B_">B</a>&nbsp;<a href="#_C_">C</a>&nbsp;<a href="#_D_">D</a>&nbsp;<a href="#_E_">E</a>&nbsp;<a href="#_F_">F</a>&nbsp;<a href="#_G_">G</a>&nbsp;<a href="#_H_">H</a>&nbsp;<a href="#_I_">I</a>&nbsp;<a href="#_J_">J</a>&nbsp;<a href="#_L_">L</a>&nbsp;<a href="#_M_">M</a>&nbsp;<a href="#_N_">N</a>&nbsp;<a href="#_O_">O</a>&nbsp;<a href="#_P_">P</a>&nbsp;<a href="#_R_">R</a>&nbsp;<a href="#_S_">S</a>&nbsp;<a href="#_T_">T</a>&nbsp;<a href="#_U_">U</a>&nbsp;<a href="#_V_">V</a>&nbsp;<a href="#_W_">W</a>&nbsp;<a name="_A_">
 <!--   -->
 </a>
 <h2 class="title">A</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#abbreviatedSynopsis--">abbreviatedSynopsis()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#abbreviatedSynopsis()">abbreviatedSynopsis()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Generates a generic synopsis like <code>&lt;command name&gt; [OPTIONS] [PARAM1 [PARAM2]...]</code>, omitting parts
  that don't apply to the command (e.g., does not show [OPTIONS] if the command has no options).</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#abbreviateSynopsis--">abbreviateSynopsis()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#abbreviateSynopsis()">abbreviateSynopsis()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Returns whether the synopsis line(s) should show an abbreviated synopsis without detailed option names.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#abbreviateSynopsis-boolean-">abbreviateSynopsis(boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#abbreviateSynopsis(boolean)">abbreviateSynopsis(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Sets whether the synopsis line(s) should show an abbreviated synopsis without detailed option names.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.AbstractHandler.html#AbstractHandler--">AbstractHandler()</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.AbstractParseResultHandler.html#AbstractParseResultHandler--">AbstractParseResultHandler()</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.AbstractSimpleParseResultHandler.html#AbstractSimpleParseResultHandler--">AbstractSimpleParseResultHandler()</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli">CommandLine.AbstractSimpleParseResultHandler</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#add-picocli.CommandLine.Model.ArgSpec-">add(CommandLine.Model.ArgSpec)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#add(picocli.CommandLine.Model.ArgSpec)">add(CommandLine.Model.ArgSpec)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Adds the specified option spec or positional parameter spec to the list of configured arguments to expect.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.Builder.html#add-picocli.CommandLine.Model.ArgSpec-int-">add(CommandLine.Model.ArgSpec, int)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.Builder.html#add(picocli.CommandLine.Model.ArgSpec,%20int)">add(CommandLine.Model.ArgSpec, int)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></dt>
 <dd>
 <div class="block">Adds the specified <code>OptionSpec</code> or <code>PositionalParamSpec</code> to the list of options and parameters
  that were matched on the command line.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#addAllSubcommands-java.util.Map-">addAllSubcommands(Map&lt;String, CommandLine&gt;)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#addAllSubcommands(java.util.Map)">addAllSubcommands(Map&lt;String, CommandLine&gt;)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Registers all specified subcommands with this Help.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.html#addEmptyRow--">addEmptyRow()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.TextTable.html#addEmptyRow()">addEmptyRow()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
 <dd>
-<div class="block">Adds the required <code>char[]</code> slots for a new row to the <a href="picocli/CommandLine.Help.TextTable.html#columnValues"><code>CommandLine.Help.TextTable.columnValues</code></a> field.</div>
+<div class="block">Adds the required <code>char[]</code> slots for a new row to the <a href="./picocli/CommandLine.Help.TextTable.html#columnValues"><code>CommandLine.Help.TextTable.columnValues</code></a> field.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#addMixin-java.lang.String-java.lang.Object-">addMixin(String, Object)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#addMixin(java.lang.String,%20java.lang.Object)">addMixin(String, Object)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Adds the options and positional parameters in the specified mixin to this command.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#addMixin-java.lang.String-picocli.CommandLine.Model.CommandSpec-">addMixin(String, CommandLine.Model.CommandSpec)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#addMixin(java.lang.String,%20picocli.CommandLine.Model.CommandSpec)">addMixin(String, CommandLine.Model.CommandSpec)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Adds the specified mixin <code>CommandSpec</code> object to the map of mixins for this command.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Layout.html#addOption-picocli.CommandLine.Model.OptionSpec-picocli.CommandLine.Help.IParamLabelRenderer-">addOption(CommandLine.Model.OptionSpec, CommandLine.Help.IParamLabelRenderer)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Layout.html#addOption(picocli.CommandLine.Model.OptionSpec,%20picocli.CommandLine.Help.IParamLabelRenderer)">addOption(CommandLine.Model.OptionSpec, CommandLine.Help.IParamLabelRenderer)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
 <dd>
-<div class="block">Delegates to the <a href="picocli/CommandLine.Help.Layout.html#optionRenderer"><code>option renderer</code></a> of this layout to obtain
- text values for the specified <a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>CommandLine.Model.OptionSpec</code></a>, and then calls the <a href="picocli/CommandLine.Help.Layout.html#layout-picocli.CommandLine.Model.ArgSpec-picocli.CommandLine.Help.Ansi.Text:A:A-"><code>CommandLine.Help.Layout.layout(CommandLine.Model.ArgSpec, CommandLine.Help.Ansi.Text[][])</code></a>
+<div class="block">Delegates to the <a href="./picocli/CommandLine.Help.Layout.html#optionRenderer"><code>option renderer</code></a> of this layout to obtain
+ text values for the specified <a href="./picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>CommandLine.Model.OptionSpec</code></a>, and then calls the <a href="./picocli/CommandLine.Help.Layout.html#layout(picocli.CommandLine.Model.ArgSpec,%20picocli.CommandLine.Help.Ansi.Text[][])"><code>CommandLine.Help.Layout.layout(CommandLine.Model.ArgSpec, CommandLine.Help.Ansi.Text[][])</code></a>
  method to write these text values into the correct cells in the TextTable.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#addOption-picocli.CommandLine.Model.OptionSpec-">addOption(CommandLine.Model.OptionSpec)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#addOption(picocli.CommandLine.Model.OptionSpec)">addOption(CommandLine.Model.OptionSpec)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Adds the specified option spec to the list of configured arguments to expect.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.Builder.html#addOption-picocli.CommandLine.Model.OptionSpec-">addOption(CommandLine.Model.OptionSpec)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.Builder.html#addOption(picocli.CommandLine.Model.OptionSpec)">addOption(CommandLine.Model.OptionSpec)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></dt>
 <dd>
 <div class="block">Adds the specified <code>OptionSpec</code> to the list of options that were matched on the command line.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Layout.html#addOptions-java.util.List-picocli.CommandLine.Help.IParamLabelRenderer-">addOptions(List&lt;CommandLine.Model.OptionSpec&gt;, CommandLine.Help.IParamLabelRenderer)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Layout.html#addOptions(java.util.List,%20picocli.CommandLine.Help.IParamLabelRenderer)">addOptions(List&lt;CommandLine.Model.OptionSpec&gt;, CommandLine.Help.IParamLabelRenderer)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
 <dd>
-<div class="block">Calls <a href="picocli/CommandLine.Help.Layout.html#addOption-picocli.CommandLine.Model.OptionSpec-picocli.CommandLine.Help.IParamLabelRenderer-"><code>CommandLine.Help.Layout.addOption(CommandLine.Model.OptionSpec, CommandLine.Help.IParamLabelRenderer)</code></a> for all non-hidden Options in the list.</div>
+<div class="block">Calls <a href="./picocli/CommandLine.Help.Layout.html#addOption(picocli.CommandLine.Model.OptionSpec,%20picocli.CommandLine.Help.IParamLabelRenderer)"><code>CommandLine.Help.Layout.addOption(CommandLine.Model.OptionSpec, CommandLine.Help.IParamLabelRenderer)</code></a> for all non-hidden Options in the list.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#addPositional-picocli.CommandLine.Model.PositionalParamSpec-">addPositional(CommandLine.Model.PositionalParamSpec)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#addPositional(picocli.CommandLine.Model.PositionalParamSpec)">addPositional(CommandLine.Model.PositionalParamSpec)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Adds the specified positional parameter spec to the list of configured arguments to expect.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.Builder.html#addPositionalParam-picocli.CommandLine.Model.PositionalParamSpec-int-">addPositionalParam(CommandLine.Model.PositionalParamSpec, int)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.Builder.html#addPositionalParam(picocli.CommandLine.Model.PositionalParamSpec,%20int)">addPositionalParam(CommandLine.Model.PositionalParamSpec, int)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></dt>
 <dd>
 <div class="block">Adds the specified <code>PositionalParamSpec</code> to the list of parameters that were matched on the command line.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Layout.html#addPositionalParameter-picocli.CommandLine.Model.PositionalParamSpec-picocli.CommandLine.Help.IParamLabelRenderer-">addPositionalParameter(CommandLine.Model.PositionalParamSpec, CommandLine.Help.IParamLabelRenderer)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Layout.html#addPositionalParameter(picocli.CommandLine.Model.PositionalParamSpec,%20picocli.CommandLine.Help.IParamLabelRenderer)">addPositionalParameter(CommandLine.Model.PositionalParamSpec, CommandLine.Help.IParamLabelRenderer)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
 <dd>
-<div class="block">Delegates to the <a href="picocli/CommandLine.Help.Layout.html#parameterRenderer"><code>parameter renderer</code></a> of this layout
- to obtain text values for the specified <a href="picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">positional parameter</a>, and then calls
- <a href="picocli/CommandLine.Help.Layout.html#layout-picocli.CommandLine.Model.ArgSpec-picocli.CommandLine.Help.Ansi.Text:A:A-"><code>CommandLine.Help.Layout.layout(CommandLine.Model.ArgSpec, CommandLine.Help.Ansi.Text[][])</code></a> to write these text values into the correct cells in the TextTable.</div>
+<div class="block">Delegates to the <a href="./picocli/CommandLine.Help.Layout.html#parameterRenderer"><code>parameter renderer</code></a> of this layout
+ to obtain text values for the specified <a href="./picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">positional parameter</a>, and then calls
+ <a href="./picocli/CommandLine.Help.Layout.html#layout(picocli.CommandLine.Model.ArgSpec,%20picocli.CommandLine.Help.Ansi.Text[][])"><code>CommandLine.Help.Layout.layout(CommandLine.Model.ArgSpec, CommandLine.Help.Ansi.Text[][])</code></a> to write these text values into the correct cells in the TextTable.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Layout.html#addPositionalParameters-java.util.List-picocli.CommandLine.Help.IParamLabelRenderer-">addPositionalParameters(List&lt;CommandLine.Model.PositionalParamSpec&gt;, CommandLine.Help.IParamLabelRenderer)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Layout.html#addPositionalParameters(java.util.List,%20picocli.CommandLine.Help.IParamLabelRenderer)">addPositionalParameters(List&lt;CommandLine.Model.PositionalParamSpec&gt;, CommandLine.Help.IParamLabelRenderer)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
 <dd>
-<div class="block">Calls <a href="picocli/CommandLine.Help.Layout.html#addPositionalParameter-picocli.CommandLine.Model.PositionalParamSpec-picocli.CommandLine.Help.IParamLabelRenderer-"><code>CommandLine.Help.Layout.addPositionalParameter(CommandLine.Model.PositionalParamSpec, CommandLine.Help.IParamLabelRenderer)</code></a> for all non-hidden Parameters in the list.</div>
+<div class="block">Calls <a href="./picocli/CommandLine.Help.Layout.html#addPositionalParameter(picocli.CommandLine.Model.PositionalParamSpec,%20picocli.CommandLine.Help.IParamLabelRenderer)"><code>CommandLine.Help.Layout.addPositionalParameter(CommandLine.Model.PositionalParamSpec, CommandLine.Help.IParamLabelRenderer)</code></a> for all non-hidden Parameters in the list.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.html#addRowValues-java.lang.String...-">addRowValues(String...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.TextTable.html#addRowValues(java.lang.String...)">addRowValues(String...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
 <dd>
-<div class="block">Delegates to <a href="picocli/CommandLine.Help.TextTable.html#addRowValues-picocli.CommandLine.Help.Ansi.Text...-"><code>CommandLine.Help.TextTable.addRowValues(CommandLine.Help.Ansi.Text...)</code></a>.</div>
+<div class="block">Delegates to <a href="./picocli/CommandLine.Help.TextTable.html#addRowValues(picocli.CommandLine.Help.Ansi.Text...)"><code>CommandLine.Help.TextTable.addRowValues(CommandLine.Help.Ansi.Text...)</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.html#addRowValues-picocli.CommandLine.Help.Ansi.Text...-">addRowValues(CommandLine.Help.Ansi.Text...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.TextTable.html#addRowValues(picocli.CommandLine.Help.Ansi.Text...)">addRowValues(CommandLine.Help.Ansi.Text...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
 <dd>
-<div class="block">Adds a new <a href="picocli/CommandLine.Help.TextTable.html#addEmptyRow--">empty row</a>, then calls <a href="picocli/CommandLine.Help.TextTable.html#putValue-int-int-picocli.CommandLine.Help.Ansi.Text-"><code>putValue</code></a> for each of the specified values, adding more empty rows
+<div class="block">Adds a new <a href="./picocli/CommandLine.Help.TextTable.html#addEmptyRow()">empty row</a>, then calls <a href="./picocli/CommandLine.Help.TextTable.html#putValue(int,%20int,%20picocli.CommandLine.Help.Ansi.Text)"><code>putValue</code></a> for each of the specified values, adding more empty rows
  if the return value indicates that the value spanned multiple columns or was wrapped to multiple rows.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#addSubcommand-java.lang.String-java.lang.Object-">addSubcommand(String, Object)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#addSubcommand(java.lang.String,%20java.lang.Object)">addSubcommand(String, Object)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Registers a subcommand with the specified name.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#addSubcommand-java.lang.String-java.lang.Object-">addSubcommand(String, Object)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#addSubcommand(java.lang.String,%20java.lang.Object)">addSubcommand(String, Object)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+<div class="block"><span class="strong">Deprecated.</span>&nbsp;</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#addSubcommand-java.lang.String-picocli.CommandLine.Model.CommandSpec-">addSubcommand(String, CommandLine.Model.CommandSpec)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#addSubcommand(java.lang.String,%20picocli.CommandLine.Model.CommandSpec)">addSubcommand(String, CommandLine.Model.CommandSpec)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Adds the specified subcommand with the specified name.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#addSubcommand-java.lang.String-picocli.CommandLine-">addSubcommand(String, CommandLine)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#addSubcommand(java.lang.String,%20picocli.CommandLine)">addSubcommand(String, CommandLine)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Adds the specified subcommand with the specified name.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.Builder.html#addUnmatched-java.lang.String-">addUnmatched(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.Builder.html#addUnmatched(java.lang.String)">addUnmatched(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></dt>
 <dd>
 <div class="block">Adds the specified command line argument to the list of unmatched command line arguments.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.Builder.html#addUnmatched-java.util.Stack-">addUnmatched(Stack&lt;String&gt;)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.Builder.html#addUnmatched(java.util.Stack)">addUnmatched(Stack&lt;String&gt;)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></dt>
 <dd>
 <div class="block">Adds all elements of the specified command line arguments stack to the list of unmatched command line arguments.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#addUnmatchedArgsBinding-picocli.CommandLine.Model.UnmatchedArgsBinding-">addUnmatchedArgsBinding(CommandLine.Model.UnmatchedArgsBinding)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#addUnmatchedArgsBinding(picocli.CommandLine.Model.UnmatchedArgsBinding)">addUnmatchedArgsBinding(CommandLine.Model.UnmatchedArgsBinding)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Adds the specified <code>UnmatchedArgsBinding</code> to the list of model objects to capture unmatched arguments for this command.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.AbstractHandler.html#andExit-int-">andExit(int)</a></span> - Method in class picocli.<a href="picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.AbstractHandler.html#andExit(int)">andExit(int)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
 <dd>
 <div class="block">Indicates that the handler should call <code>System.exit(int)</code> after processing completes and sets the exit code to use as the termination status.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.AbstractHandler.html#ansi--">ansi()</a></span> - Method in class picocli.<a href="picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.AbstractHandler.html#ansi()">ansi()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
 <dd>
 <div class="block">Returns the ANSI style to use.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#ansi--">ansi()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#ansi()">ansi()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns whether ANSI escape codes are enabled or not.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#ansi--">ansi()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.ColorScheme.html#ansi()">ansi()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Text.html#append-java.lang.String-">append(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Text.html#append(java.lang.String)">append(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
 <dd>
 <div class="block">Returns a new <code>Text</code> instance with the specified text appended.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Text.html#append-picocli.CommandLine.Help.Ansi.Text-">append(CommandLine.Help.Ansi.Text)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Text.html#append(picocli.CommandLine.Help.Ansi.Text)">append(CommandLine.Help.Ansi.Text)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
 <dd>
 <div class="block">Returns a new <code>Text</code> instance with the specified text appended.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.html#apply-java.lang.String-java.util.List-">apply(String, List&lt;CommandLine.Help.Ansi.IStyle&gt;)</a></span> - Method in enum picocli.<a href="picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.html#apply(java.lang.String,%20java.util.List)">apply(String, List&lt;CommandLine.Help.Ansi.IStyle&gt;)</a></span> - Method in enum picocli.<a href="./picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a></dt>
 <dd>
 <div class="block">Returns a new Text object where all the specified styles are applied to the full length of the
  specified plain text.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#applySystemProperties--">applySystemProperties()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.ColorScheme.html#applySystemProperties()">applySystemProperties()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>
 <div class="block">Replaces colors and styles in this scheme with ones specified in system properties, and returns this scheme.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ArgSpec.html#arity--">arity()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ArgSpec.html#arity()">arity()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
 <dd>
 <div class="block">Returns how many arguments this option or positional parameter requires.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#asCommandLineList--">asCommandLineList()</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#asCommandLineList()">asCommandLineList()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns this <code>ParseResult</code> as a list of <code>CommandLine</code> objects, one for each matched command/subcommand.</div>
 </dd>
-<dt><a href="picocli/AutoComplete.html" title="class in picocli"><span class="typeNameLink">AutoComplete</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/AutoComplete.html" title="class in picocli"><span class="strong">AutoComplete</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Stand-alone tool that generates bash auto-complete scripts for picocli-based command line applications.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ArgSpec.html#auxiliaryTypes--">auxiliaryTypes()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ArgSpec.html#auxiliaryTypes()">auxiliaryTypes()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
 <dd>
-<div class="block">Returns auxiliary type information used when the <a href="picocli/CommandLine.Model.ArgSpec.html#type--"><code>CommandLine.Model.ArgSpec.type()</code></a> is a generic <code>Collection</code>, <code>Map</code> or an abstract class.</div>
+<div class="block">Returns auxiliary type information used when the <a href="./picocli/CommandLine.Model.ArgSpec.html#type()"><code>CommandLine.Model.ArgSpec.type()</code></a> is a generic <code>Collection</code>, <code>Map</code> or an abstract class.</div>
 </dd>
 </dl>
-<a name="I:B">
+<a name="_B_">
 <!--   -->
 </a>
 <h2 class="title">B</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/AutoComplete.html#bash-java.lang.String-java.io.File-java.io.File-picocli.CommandLine-">bash(String, File, File, CommandLine)</a></span> - Static method in class picocli.<a href="picocli/AutoComplete.html" title="class in picocli">AutoComplete</a></dt>
+<dt><span class="strong"><a href="./picocli/AutoComplete.html#bash(java.lang.String,%20java.io.File,%20java.io.File,%20picocli.CommandLine)">bash(String, File, File, CommandLine)</a></span> - Static method in class picocli.<a href="./picocli/AutoComplete.html" title="class in picocli">AutoComplete</a></dt>
 <dd>
 <div class="block">Generates source code for an autocompletion bash script for the specified picocli-based application,
  and writes this script to the specified <code>out</code> file, and optionally writes an invocation script
  to the specified <code>command</code> file.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/AutoComplete.html#bash-java.lang.String-picocli.CommandLine-">bash(String, CommandLine)</a></span> - Static method in class picocli.<a href="picocli/AutoComplete.html" title="class in picocli">AutoComplete</a></dt>
+<dt><span class="strong"><a href="./picocli/AutoComplete.html#bash(java.lang.String,%20picocli.CommandLine)">bash(String, CommandLine)</a></span> - Static method in class picocli.<a href="./picocli/AutoComplete.html" title="class in picocli">AutoComplete</a></dt>
 <dd>
 <div class="block">Generates and returns the source code for an autocompletion bash script for the specified picocli-based application.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Style.html#bg-java.lang.String-">bg(String)</a></span> - Static method in enum picocli.<a href="picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Style.html#bg(java.lang.String)">bg(String)</a></span> - Static method in enum picocli.<a href="./picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></dt>
 <dd>
 <div class="block">Parses the specified style markup and returns the associated style.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ArgSpec.html#binding--">binding()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ArgSpec.html#binding()">binding()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
 <dd>
-<div class="block">Returns the <a href="picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><code>CommandLine.Model.IBinding</code></a> that is responsible for getting and setting the value of this argument.</div>
+<div class="block">Returns the <a href="./picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><code>CommandLine.Model.IBinding</code></a> that is responsible for getting and setting the value of this argument.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UnmatchedArgsBinding.html#binding--">binding()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UnmatchedArgsBinding.html#binding()">binding()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a></dt>
 <dd>
 <div class="block">Returns the binding responsible for consuming the unmatched arguments.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.OptionSpec.Builder.html#build--">build()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.OptionSpec.Builder.html#build()">build()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></dt>
 <dd>
 <div class="block">Returns a valid <code>OptionSpec</code> instance.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.PositionalParamSpec.Builder.html#build--">build()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli">CommandLine.Model.PositionalParamSpec.Builder</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.PositionalParamSpec.Builder.html#build()">build()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli">CommandLine.Model.PositionalParamSpec.Builder</a></dt>
 <dd>
 <div class="block">Returns a valid <code>PositionalParamSpec</code> instance.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.Builder.html#build--">build()</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.Builder.html#build()">build()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></dt>
 <dd>
 <div class="block">Creates and returns a new <code>ParseResult</code> instance for this builder's configuration.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.OptionSpec.html#builder-java.lang.String-java.lang.String...-">builder(String, String...)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.OptionSpec.html#builder(java.lang.String,%20java.lang.String...)">builder(String, String...)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.OptionSpec.html#builder-java.lang.String:A-">builder(String[])</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.OptionSpec.html#builder(java.lang.String[])">builder(String[])</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.PositionalParamSpec.html#builder--">builder()</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.PositionalParamSpec.html#builder()">builder()</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#builder-picocli.CommandLine.Model.CommandSpec-">builder(CommandLine.Model.CommandSpec)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#builder(picocli.CommandLine.Model.CommandSpec)">builder(CommandLine.Model.CommandSpec)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Creates and returns a new <code>ParseResult.Builder</code> for the specified command spec.</div>
 </dd>
 </dl>
-<a name="I:C">
+<a name="_C_">
 <!--   -->
 </a>
 <h2 class="title">C</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#call-C-java.lang.String...-">call(C, String...)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#call(C,%20java.lang.String...)">call(C, String...)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Delegates to <a href="picocli/CommandLine.html#call-C-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>CommandLine.call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.out</code> for
- requested usage help messages, <code>System.err</code> for diagnostic error messages, and <a href="picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
+<div class="block">Delegates to <a href="./picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>CommandLine.call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.out</code> for
+ requested usage help messages, <code>System.err</code> for diagnostic error messages, and <a href="./picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#call-C-java.io.PrintStream-java.lang.String...-">call(C, PrintStream, String...)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.lang.String...)">call(C, PrintStream, String...)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Delegates to <a href="picocli/CommandLine.html#call-C-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>CommandLine.call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for
- diagnostic error messages and <a href="picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
+<div class="block">Delegates to <a href="./picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>CommandLine.call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for
+ diagnostic error messages and <a href="./picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#call-C-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">call(C, PrintStream, CommandLine.Help.Ansi, String...)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)">call(C, PrintStream, CommandLine.Help.Ansi, String...)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Delegates to <a href="picocli/CommandLine.html#call-C-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>CommandLine.call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for diagnostic error messages.</div>
+<div class="block">Delegates to <a href="./picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>CommandLine.call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for diagnostic error messages.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#call-C-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">call(C, PrintStream, PrintStream, CommandLine.Help.Ansi, String...)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)">call(C, PrintStream, PrintStream, CommandLine.Help.Ansi, String...)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Convenience method to allow command line application authors to avoid some boilerplate code in their application.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.Cell.html#Cell-int-int-">Cell(int, int)</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli">CommandLine.Help.TextTable.Cell</a></dt>
-<dd>
-<div class="block">Constructs a new Cell with the specified coordinates in the table.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.html#cellAt-int-int-">cellAt(int, int)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.TextTable.html#cellAt(int,%20int)">cellAt(int, int)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">use <a href="picocli/CommandLine.Help.TextTable.html#textAt-int-int-"><code>CommandLine.Help.TextTable.textAt(int, int)</code></a> instead</span></div>
+<div class="block"><span class="strong">Deprecated.</span>
+<div class="block"><i>use <a href="./picocli/CommandLine.Help.TextTable.html#textAt(int,%20int)"><code>CommandLine.Help.TextTable.textAt(int, int)</code></a> instead</i></div>
 </div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Text.html#clone--">clone()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Text.html#clone()">clone()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#colorScheme--">colorScheme()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#colorScheme()">colorScheme()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns the <code>ColorScheme</code> model that this Help was constructed with.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#ColorScheme--">ColorScheme()</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
-<dd>
-<div class="block">Constructs a new ColorScheme with <a href="picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#ColorScheme-picocli.CommandLine.Help.Ansi-">ColorScheme(CommandLine.Help.Ansi)</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
-<dd>
-<div class="block">Constructs a new ColorScheme with the specified Ansi enabled mode.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Layout.html#colorScheme">colorScheme</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Column.html#Column-int-int-picocli.CommandLine.Help.Column.Overflow-">Column(int, int, CommandLine.Help.Column.Overflow)</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Layout.html#colorScheme">colorScheme</a></span> - Variable in class picocli.<a href="./picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.Cell.html#column">column</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli">CommandLine.Help.TextTable.Cell</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.TextTable.Cell.html#column">column</a></span> - Variable in class picocli.<a href="./picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli">CommandLine.Help.TextTable.Cell</a></dt>
 <dd>
 <div class="block">Table column index (zero based).</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.html#columns">columns</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.TextTable.html#columns">columns</a></span> - Variable in class picocli.<a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
 <dd>
 <div class="block">The column definitions of this table.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.html#columnValues">columnValues</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.TextTable.html#columnValues">columnValues</a></span> - Variable in class picocli.<a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
 <dd>
 <div class="block">The <code>char[]</code> slots of the <code>TextTable</code> to copy text values into.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/groovy/PicocliBaseScript.html#COMMAND_LINE">COMMAND_LINE</a></span> - Static variable in class picocli.groovy.<a href="picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
+<dt><span class="strong"><a href="./picocli/groovy/PicocliBaseScript.html#COMMAND_LINE">COMMAND_LINE</a></span> - Static variable in class picocli.groovy.<a href="./picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
 <dd>
 <div class="block">Name of the property that holds the CommandLine instance for this script ("commandLine").</div>
 </dd>
-<dt><a href="picocli/CommandLine.html" title="class in picocli"><span class="typeNameLink">CommandLine</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.html" title="class in picocli"><span class="strong">CommandLine</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">
  CommandLine interpreter that uses reflection to initialize an annotated domain object with values obtained from the
  command line arguments.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#CommandLine-java.lang.Object-">CommandLine(Object)</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#CommandLine(java.lang.Object)">CommandLine(Object)</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Constructs a new <code>CommandLine</code> interpreter with the specified object (which may be an annotated user object or a <a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><code>CommandSpec</code></a>) and a default subcommand factory.</div>
+<div class="block">Constructs a new <code>CommandLine</code> interpreter with the specified object (which may be an annotated user object or a <a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><code>CommandSpec</code></a>) and a default subcommand factory.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#CommandLine-java.lang.Object-picocli.CommandLine.IFactory-">CommandLine(Object, CommandLine.IFactory)</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#CommandLine(java.lang.Object,%20picocli.CommandLine.IFactory)">CommandLine(Object, CommandLine.IFactory)</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Constructs a new <code>CommandLine</code> interpreter with the specified object (which may be an annotated user object or a <a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><code>CommandSpec</code></a>) and object factory.</div>
+<div class="block">Constructs a new <code>CommandLine</code> interpreter with the specified object (which may be an annotated user object or a <a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><code>CommandSpec</code></a>) and object factory.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#commandLine--">commandLine()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#commandLine()">commandLine()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Returns the CommandLine constructed with this <code>CommandSpec</code> model.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#commandLine-picocli.CommandLine-">commandLine(CommandLine)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#commandLine(picocli.CommandLine)">commandLine(CommandLine)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Sets the CommandLine constructed with this <code>CommandSpec</code> model.</div>
 </dd>
-<dt><a href="picocli/CommandLine.AbstractHandler.html" title="class in picocli"><span class="typeNameLink">CommandLine.AbstractHandler</span></a>&lt;<a href="picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">R</a>,<a href="picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">T</a> extends <a href="picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a>&lt;<a href="picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">R</a>,<a href="picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">T</a>&gt;&gt; - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.AbstractHandler.html" title="class in picocli"><span class="strong">CommandLine.AbstractHandler</span></a>&lt;<a href="./picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">R</a>,<a href="./picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">T</a> extends <a href="./picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a>&lt;<a href="./picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">R</a>,<a href="./picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">T</a>&gt;&gt; - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
-<div class="block">Abstract superclass for <a href="picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><code>CommandLine.IParseResultHandler2</code></a> and <a href="picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><code>CommandLine.IExceptionHandler2</code></a> implementations.</div>
+<div class="block">Abstract superclass for <a href="./picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><code>CommandLine.IParseResultHandler2</code></a> and <a href="./picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><code>CommandLine.IExceptionHandler2</code></a> implementations.</div>
 </dd>
-<dt><a href="picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli"><span class="typeNameLink">CommandLine.AbstractParseResultHandler</span></a>&lt;<a href="picocli/CommandLine.AbstractParseResultHandler.html" title="type parameter in CommandLine.AbstractParseResultHandler">R</a>&gt; - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.AbstractHandler.html#CommandLine.AbstractHandler()">CommandLine.AbstractHandler()</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli"><span class="strong">CommandLine.AbstractParseResultHandler</span></a>&lt;<a href="./picocli/CommandLine.AbstractParseResultHandler.html" title="type parameter in CommandLine.AbstractParseResultHandler">R</a>&gt; - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Command line parse result handler that returns a value.</div>
 </dd>
-<dt><a href="picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli"><span class="typeNameLink">CommandLine.AbstractSimpleParseResultHandler</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
-<dd>
-<div class="block">Command line parse result handler that does not return a result.</div>
-</dd>
-<dt><a href="picocli/CommandLine.Command.html" title="annotation in picocli"><span class="typeNameLink">CommandLine.Command</span></a> - Annotation Type in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.AbstractParseResultHandler.html#CommandLine.AbstractParseResultHandler()">CommandLine.AbstractParseResultHandler()</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.Command.html" title="annotation in picocli"><span class="strong">CommandLine.Command</span></a> - Annotation Type in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Annotate your class with <code>@Command</code> when you want more control over the format of the generated help
  message.</div>
 </dd>
-<dt><a href="picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><span class="typeNameLink">CommandLine.DefaultExceptionHandler</span></a>&lt;<a href="picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>&gt; - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><span class="strong">CommandLine.DefaultExceptionHandler</span></a>&lt;<a href="./picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>&gt; - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Default exception handler that handles invalid user input by printing the exception message, followed by the usage
  message for the command or subcommand whose input was invalid.</div>
 </dd>
-<dt><a href="picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli"><span class="typeNameLink">CommandLine.DuplicateOptionAnnotationsException</span></a> - Exception in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.DefaultExceptionHandler.html#CommandLine.DefaultExceptionHandler()">CommandLine.DefaultExceptionHandler()</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli"><span class="strong">CommandLine.DuplicateOptionAnnotationsException</span></a> - Exception in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Exception indicating that multiple fields have been annotated with the same Option name.</div>
 </dd>
-<dt><a href="picocli/CommandLine.ExecutionException.html" title="class in picocli"><span class="typeNameLink">CommandLine.ExecutionException</span></a> - Exception in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.DuplicateOptionAnnotationsException.html#CommandLine.DuplicateOptionAnnotationsException(java.lang.String)">CommandLine.DuplicateOptionAnnotationsException(String)</a></span> - Constructor for exception picocli.<a href="./picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli">CommandLine.DuplicateOptionAnnotationsException</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.ExecutionException.html" title="class in picocli"><span class="strong">CommandLine.ExecutionException</span></a> - Exception in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Exception indicating a problem while invoking a command or subcommand.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Help.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ExecutionException.html#CommandLine.ExecutionException(picocli.CommandLine,%20java.lang.String)">CommandLine.ExecutionException(CommandLine, String)</a></span> - Constructor for exception picocli.<a href="./picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.ExecutionException.html#CommandLine.ExecutionException(picocli.CommandLine,%20java.lang.String,%20java.lang.Exception)">CommandLine.ExecutionException(CommandLine, String, Exception)</a></span> - Constructor for exception picocli.<a href="./picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.Help.html" title="class in picocli"><span class="strong">CommandLine.Help</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">A collection of methods and inner classes that provide fine-grained control over the contents and layout of
  the usage help message to display to end users when help is requested or invalid input values were specified.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Help.Ansi.html" title="enum in picocli"><span class="typeNameLink">CommandLine.Help.Ansi</span></a> - Enum in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#CommandLine.Help(java.lang.Object)">CommandLine.Help(Object)</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dd>
+<div class="block">Constructs a new <code>Help</code> instance with a default color scheme, initialized from annotatations
+ on the specified class and superclasses.</div>
+</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#CommandLine.Help(java.lang.Object,%20picocli.CommandLine.Help.Ansi)">CommandLine.Help(Object, CommandLine.Help.Ansi)</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dd>
+<div class="block">Constructs a new <code>Help</code> instance with a default color scheme, initialized from annotatations
+ on the specified class and superclasses.</div>
+</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#CommandLine.Help(java.lang.Object,%20picocli.CommandLine.Help.ColorScheme)">CommandLine.Help(Object, CommandLine.Help.ColorScheme)</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dd>
+<div class="block"><span class="strong">Deprecated.</span>
+<div class="block"><i>use <code>picocli.CommandLine.Help#Help(picocli.CommandLine.Model.CommandSpec, picocli.CommandLine.Help.ColorScheme)</code></i></div>
+</div>
+</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#CommandLine.Help(picocli.CommandLine.Model.CommandSpec,%20picocli.CommandLine.Help.ColorScheme)">CommandLine.Help(CommandLine.Model.CommandSpec, CommandLine.Help.ColorScheme)</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dd>
+<div class="block">Constructs a new <code>Help</code> instance with the specified color scheme, initialized from annotatations
+ on the specified class and superclasses.</div>
+</dd>
+<dt><a href="./picocli/CommandLine.Help.Ansi.html" title="enum in picocli"><span class="strong">CommandLine.Help.Ansi</span></a> - Enum in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Provides methods and inner classes to support using ANSI escape codes in usage help messages.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli"><span class="typeNameLink">CommandLine.Help.Ansi.IStyle</span></a> - Interface in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli"><span class="strong">CommandLine.Help.Ansi.IStyle</span></a> - Interface in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Defines the interface for an ANSI escape sequence.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli"><span class="typeNameLink">CommandLine.Help.Ansi.Style</span></a> - Enum in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli"><span class="strong">CommandLine.Help.Ansi.Style</span></a> - Enum in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">A set of pre-defined ANSI escape code styles and colors, and a set of convenience methods for parsing
  text with embedded markup style names, as well as convenience methods for converting
  styles to strings with embedded escape codes.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help.Ansi.Text</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><span class="strong">CommandLine.Help.Ansi.Text</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Encapsulates rich text with styles and colors.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help.ColorScheme</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Text.html#CommandLine.Help.Ansi.Text(int)">CommandLine.Help.Ansi.Text(int)</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
+<dd>
+<div class="block">Constructs a Text with the specified max length (for use in a TextTable Column).</div>
+</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Text.html#CommandLine.Help.Ansi.Text(java.lang.String)">CommandLine.Help.Ansi.Text(String)</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
+<dd>
+<div class="block">Constructs a Text with the specified String, which may contain markup like
+ <code>@|bg(red),white,underline some text|@</code>.</div>
+</dd>
+<dt><a href="./picocli/CommandLine.Help.ColorScheme.html" title="class in picocli"><span class="strong">CommandLine.Help.ColorScheme</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">All usage help message are generated with a color scheme that assigns certain styles and colors to common
  parts of a usage message: the command name, options, positional parameters and option parameters.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Help.Column.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help.Column</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.ColorScheme.html#CommandLine.Help.ColorScheme()">CommandLine.Help.ColorScheme()</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
+<dd>
+<div class="block">Constructs a new ColorScheme with <a href="./picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
+</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.ColorScheme.html#CommandLine.Help.ColorScheme(picocli.CommandLine.Help.Ansi)">CommandLine.Help.ColorScheme(CommandLine.Help.Ansi)</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
+<dd>
+<div class="block">Constructs a new ColorScheme with the specified Ansi enabled mode.</div>
+</dd>
+<dt><a href="./picocli/CommandLine.Help.Column.html" title="class in picocli"><span class="strong">CommandLine.Help.Column</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Columns define the width, indent (leading number of spaces in a column before the value) and
- <a href="picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">Overflow</a> policy of a column in a <a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">TextTable</a>.</div>
+ <a href="./picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">Overflow</a> policy of a column in a <a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli">TextTable</a>.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli"><span class="typeNameLink">CommandLine.Help.Column.Overflow</span></a> - Enum in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Column.html#CommandLine.Help.Column(int,%20int,%20picocli.CommandLine.Help.Column.Overflow)">CommandLine.Help.Column(int, int, CommandLine.Help.Column.Overflow)</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli"><span class="strong">CommandLine.Help.Column.Overflow</span></a> - Enum in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Policy for handling text that is longer than the column width:
   span multiple columns, wrap to the next row, or simply truncate the portion that doesn't fit.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli"><span class="typeNameLink">CommandLine.Help.IOptionRenderer</span></a> - Interface in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli"><span class="strong">CommandLine.Help.IOptionRenderer</span></a> - Interface in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
-<div class="block">When customizing online help for <a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>Option</code></a> details, a custom <code>IOptionRenderer</code> can be
+<div class="block">When customizing online help for <a href="./picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>Option</code></a> details, a custom <code>IOptionRenderer</code> can be
  used to create textual representation of an Option in a tabular format: one or more rows, each containing
  one or more columns.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli"><span class="typeNameLink">CommandLine.Help.IParameterRenderer</span></a> - Interface in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli"><span class="strong">CommandLine.Help.IParameterRenderer</span></a> - Interface in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
-<div class="block">When customizing online help for <a href="picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">positional parameters</a> details, a custom <code>IParameterRenderer</code>
+<div class="block">When customizing online help for <a href="./picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">positional parameters</a> details, a custom <code>IParameterRenderer</code>
  can be used to create textual representation of a Parameters field in a tabular format: one or more rows,
  each containing one or more columns.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli"><span class="typeNameLink">CommandLine.Help.IParamLabelRenderer</span></a> - Interface in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli"><span class="strong">CommandLine.Help.IParamLabelRenderer</span></a> - Interface in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">When customizing online usage help for an option parameter or a positional parameter, a custom
  <code>IParamLabelRenderer</code> can be used to render the parameter name or label to a String.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Help.Layout.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help.Layout</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.Help.Layout.html" title="class in picocli"><span class="strong">CommandLine.Help.Layout</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Use a Layout to format usage help text for options and parameters in tabular format.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help.TextTable</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Layout.html#CommandLine.Help.Layout(picocli.CommandLine.Help.ColorScheme)">CommandLine.Help.Layout(CommandLine.Help.ColorScheme)</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
+<dd>
+<div class="block">Constructs a Layout with the specified color scheme, a new default TextTable, the
+ <a href="./picocli/CommandLine.Help.html#createDefaultOptionRenderer()">default option renderer</a>, and the
+ <a href="./picocli/CommandLine.Help.html#createDefaultParameterRenderer()">default parameter renderer</a>.</div>
+</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Layout.html#CommandLine.Help.Layout(picocli.CommandLine.Help.ColorScheme,%20picocli.CommandLine.Help.TextTable)">CommandLine.Help.Layout(CommandLine.Help.ColorScheme, CommandLine.Help.TextTable)</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
 <dd>
-<div class="block">Responsible for spacing out <a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><code>CommandLine.Help.Ansi.Text</code></a> values according to the <a href="picocli/CommandLine.Help.Column.html" title="class in picocli"><code>CommandLine.Help.Column</code></a> definitions the table was
+<div class="block">Constructs a Layout with the specified color scheme, the specified TextTable, the
+ <a href="./picocli/CommandLine.Help.html#createDefaultOptionRenderer()">default option renderer</a>, and the
+ <a href="./picocli/CommandLine.Help.html#createDefaultParameterRenderer()">default parameter renderer</a>.</div>
+</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Layout.html#CommandLine.Help.Layout(picocli.CommandLine.Help.ColorScheme,%20picocli.CommandLine.Help.TextTable,%20picocli.CommandLine.Help.IOptionRenderer,%20picocli.CommandLine.Help.IParameterRenderer)">CommandLine.Help.Layout(CommandLine.Help.ColorScheme, CommandLine.Help.TextTable, CommandLine.Help.IOptionRenderer, CommandLine.Help.IParameterRenderer)</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
+<dd>
+<div class="block">Constructs a Layout with the specified color scheme, the specified TextTable, the
+ specified option renderer and the specified parameter renderer.</div>
+</dd>
+<dt><a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli"><span class="strong">CommandLine.Help.TextTable</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
+<dd>
+<div class="block">Responsible for spacing out <a href="./picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><code>CommandLine.Help.Ansi.Text</code></a> values according to the <a href="./picocli/CommandLine.Help.Column.html" title="class in picocli"><code>CommandLine.Help.Column</code></a> definitions the table was
  created with.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help.TextTable.Cell</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.TextTable.html#CommandLine.Help.TextTable(picocli.CommandLine.Help.Ansi)">CommandLine.Help.TextTable(CommandLine.Help.Ansi)</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
+<dd>
+<div class="block">Constructs a TextTable with five columns as follows:
+ 
+ required option/parameter marker (width: 2, indent: 0, TRUNCATE on overflow)
+ short option name (width: 2, indent: 0, TRUNCATE on overflow)
+ comma separator (width: 1, indent: 0, TRUNCATE on overflow)
+ long option name(s) (width: 24, indent: 1, SPAN multiple columns on overflow)
+ description line(s) (width: 51, indent: 1, WRAP to next row on overflow)
+ </div>
+</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.TextTable.html#CommandLine.Help.TextTable(picocli.CommandLine.Help.Ansi,%20int...)">CommandLine.Help.TextTable(CommandLine.Help.Ansi, int...)</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
+<dd>
+<div class="block">Constructs a new TextTable with columns with the specified width, all SPANning  multiple columns on
+ overflow except the last column which WRAPS to the next row.</div>
+</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.TextTable.html#CommandLine.Help.TextTable(picocli.CommandLine.Help.Ansi,%20picocli.CommandLine.Help.Column...)">CommandLine.Help.TextTable(CommandLine.Help.Ansi, CommandLine.Help.Column...)</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
+<dd>
+<div class="block">Constructs a <code>TextTable</code> with the specified columns.</div>
+</dd>
+<dt><a href="./picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli"><span class="strong">CommandLine.Help.TextTable.Cell</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Helper class to index positions in a <code>Help.TextTable</code>.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Help.Visibility.html" title="enum in picocli"><span class="typeNameLink">CommandLine.Help.Visibility</span></a> - Enum in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.TextTable.Cell.html#CommandLine.Help.TextTable.Cell(int,%20int)">CommandLine.Help.TextTable.Cell(int, int)</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli">CommandLine.Help.TextTable.Cell</a></dt>
+<dd>
+<div class="block">Constructs a new Cell with the specified coordinates in the table.</div>
+</dd>
+<dt><a href="./picocli/CommandLine.Help.Visibility.html" title="enum in picocli"><span class="strong">CommandLine.Help.Visibility</span></a> - Enum in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Controls the visibility of certain aspects of the usage help message.</div>
 </dd>
-<dt><a href="picocli/CommandLine.HelpCommand.html" title="class in picocli"><span class="typeNameLink">CommandLine.HelpCommand</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.HelpCommand.html" title="class in picocli"><span class="strong">CommandLine.HelpCommand</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Help command that can be installed as a subcommand on all application commands.</div>
 </dd>
-<dt><a href="picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IExceptionHandler</span></a> - Interface in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.HelpCommand.html#CommandLine.HelpCommand()">CommandLine.HelpCommand()</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.HelpCommand.html" title="class in picocli">CommandLine.HelpCommand</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><span class="strong">CommandLine.IExceptionHandler</span></a> - Interface in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use <a href="picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><code>CommandLine.IExceptionHandler2</code></a> instead.</span></div>
+<div class="block"><span class="strong">Deprecated.</span>
+<div class="block"><i>Use <a href="./picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><code>CommandLine.IExceptionHandler2</code></a> instead.</i></div>
 </div>
 </dd>
-<dt><a href="picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IExceptionHandler2</span></a>&lt;<a href="picocli/CommandLine.IExceptionHandler2.html" title="type parameter in CommandLine.IExceptionHandler2">R</a>&gt; - Interface in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><span class="strong">CommandLine.IExceptionHandler2</span></a>&lt;<a href="./picocli/CommandLine.IExceptionHandler2.html" title="type parameter in CommandLine.IExceptionHandler2">R</a>&gt; - Interface in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Classes implementing this interface know how to handle <code>ParameterExceptions</code> (usually from invalid user input)
  and <code>ExecutionExceptions</code> that occurred while executing the <code>Runnable</code> or <code>Callable</code> command.</div>
 </dd>
-<dt><a href="picocli/CommandLine.IFactory.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IFactory</span></a> - Interface in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.IFactory.html" title="interface in picocli"><span class="strong">CommandLine.IFactory</span></a> - Interface in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Factory for instantiating classes that are registered declaratively with annotation attributes, like
- <a href="picocli/CommandLine.Command.html#subcommands--"><code>CommandLine.Command.subcommands()</code></a>, <a href="picocli/CommandLine.Option.html#converter--"><code>CommandLine.Option.converter()</code></a>, <a href="picocli/CommandLine.Parameters.html#converter--"><code>CommandLine.Parameters.converter()</code></a> and <a href="picocli/CommandLine.Command.html#versionProvider--"><code>CommandLine.Command.versionProvider()</code></a>.</div>
+ <a href="./picocli/CommandLine.Command.html#subcommands()"><code>CommandLine.Command.subcommands()</code></a>, <a href="./picocli/CommandLine.Option.html#converter()"><code>CommandLine.Option.converter()</code></a>, <a href="./picocli/CommandLine.Parameters.html#converter()"><code>CommandLine.Parameters.converter()</code></a> and <a href="./picocli/CommandLine.Command.html#versionProvider()"><code>CommandLine.Command.versionProvider()</code></a>.</div>
 </dd>
-<dt><a href="picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IHelpCommandInitializable</span></a> - Interface in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli"><span class="strong">CommandLine.IHelpCommandInitializable</span></a> - Interface in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Help commands that provide usage help for other commands can implement this interface to be initialized with the information they need.</div>
 </dd>
-<dt><a href="picocli/CommandLine.InitializationException.html" title="class in picocli"><span class="typeNameLink">CommandLine.InitializationException</span></a> - Exception in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.InitializationException.html" title="class in picocli"><span class="strong">CommandLine.InitializationException</span></a> - Exception in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Exception indicating a problem during <code>CommandLine</code> initialization.</div>
 </dd>
-<dt><a href="picocli/CommandLine.IParseResultHandler.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IParseResultHandler</span></a> - Interface in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.InitializationException.html#CommandLine.InitializationException(java.lang.String)">CommandLine.InitializationException(String)</a></span> - Constructor for exception picocli.<a href="./picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.InitializationException.html#CommandLine.InitializationException(java.lang.String,%20java.lang.Exception)">CommandLine.InitializationException(String, Exception)</a></span> - Constructor for exception picocli.<a href="./picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.IParseResultHandler.html" title="interface in picocli"><span class="strong">CommandLine.IParseResultHandler</span></a> - Interface in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use <a href="picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><code>CommandLine.IParseResultHandler2</code></a> instead.</span></div>
+<div class="block"><span class="strong">Deprecated.</span>
+<div class="block"><i>Use <a href="./picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><code>CommandLine.IParseResultHandler2</code></a> instead.</i></div>
 </div>
 </dd>
-<dt><a href="picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IParseResultHandler2</span></a>&lt;<a href="picocli/CommandLine.IParseResultHandler2.html" title="type parameter in CommandLine.IParseResultHandler2">R</a>&gt; - Interface in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><span class="strong">CommandLine.IParseResultHandler2</span></a>&lt;<a href="./picocli/CommandLine.IParseResultHandler2.html" title="type parameter in CommandLine.IParseResultHandler2">R</a>&gt; - Interface in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Represents a function that can process the <code>ParseResult</code> object resulting from successfully
- <a href="picocli/CommandLine.html#parseArgs-java.lang.String...-">parsing</a> the command line arguments.</div>
+ <a href="./picocli/CommandLine.html#parseArgs(java.lang.String...)">parsing</a> the command line arguments.</div>
 </dd>
-<dt><a href="picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><span class="typeNameLink">CommandLine.ITypeConverter</span></a>&lt;<a href="picocli/CommandLine.ITypeConverter.html" title="type parameter in CommandLine.ITypeConverter">K</a>&gt; - Interface in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><span class="strong">CommandLine.ITypeConverter</span></a>&lt;<a href="./picocli/CommandLine.ITypeConverter.html" title="type parameter in CommandLine.ITypeConverter">K</a>&gt; - Interface in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">
  When parsing command line arguments and initializing
- fields annotated with <a href="picocli/CommandLine.Option.html" title="annotation in picocli"><code>@Option</code></a> or <a href="picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>@Parameters</code></a>,
+ fields annotated with <a href="./picocli/CommandLine.Option.html" title="annotation in picocli"><code>@Option</code></a> or <a href="./picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>@Parameters</code></a>,
  String values can be converted to any type for which a <code>ITypeConverter</code> is registered.</div>
 </dd>
-<dt><a href="picocli/CommandLine.IVersionProvider.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IVersionProvider</span></a> - Interface in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.IVersionProvider.html" title="interface in picocli"><span class="strong">CommandLine.IVersionProvider</span></a> - Interface in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Provides version information for a command.</div>
 </dd>
-<dt><a href="picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli"><span class="typeNameLink">CommandLine.MaxValuesforFieldExceededException</span></a> - Exception in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli"><span class="strong">CommandLine.MaxValuesforFieldExceededException</span></a> - Exception in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
-<div class="block">Exception indicating that more values were specified for an option or parameter than its <a href="picocli/CommandLine.Option.html#arity--"><code>arity</code></a> allows.</div>
+<div class="block">Exception indicating that more values were specified for an option or parameter than its <a href="./picocli/CommandLine.Option.html#arity()"><code>arity</code></a> allows.</div>
 </dd>
-<dt><a href="picocli/CommandLine.MissingParameterException.html" title="class in picocli"><span class="typeNameLink">CommandLine.MissingParameterException</span></a> - Exception in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.MaxValuesforFieldExceededException.html#CommandLine.MaxValuesforFieldExceededException(picocli.CommandLine,%20java.lang.String)">CommandLine.MaxValuesforFieldExceededException(CommandLine, String)</a></span> - Constructor for exception picocli.<a href="./picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli">CommandLine.MaxValuesforFieldExceededException</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.MissingParameterException.html" title="class in picocli"><span class="strong">CommandLine.MissingParameterException</span></a> - Exception in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Exception indicating that a required parameter was not specified.</div>
 </dd>
-<dt><a href="picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli"><span class="typeNameLink">CommandLine.MissingTypeConverterException</span></a> - Exception in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.MissingParameterException.html#CommandLine.MissingParameterException(picocli.CommandLine,%20java.lang.String)">CommandLine.MissingParameterException(CommandLine, String)</a></span> - Constructor for exception picocli.<a href="./picocli/CommandLine.MissingParameterException.html" title="class in picocli">CommandLine.MissingParameterException</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli"><span class="strong">CommandLine.MissingTypeConverterException</span></a> - Exception in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
-<div class="block">Exception indicating that an annotated field had a type for which no <a href="picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><code>CommandLine.ITypeConverter</code></a> was
- <a href="picocli/CommandLine.html#registerConverter-java.lang.Class-picocli.CommandLine.ITypeConverter-">registered</a>.</div>
+<div class="block">Exception indicating that an annotated field had a type for which no <a href="./picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><code>CommandLine.ITypeConverter</code></a> was
+ <a href="./picocli/CommandLine.html#registerConverter(java.lang.Class,%20picocli.CommandLine.ITypeConverter)">registered</a>.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Mixin.html" title="annotation in picocli"><span class="typeNameLink">CommandLine.Mixin</span></a> - Annotation Type in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.MissingTypeConverterException.html#CommandLine.MissingTypeConverterException(picocli.CommandLine,%20java.lang.String)">CommandLine.MissingTypeConverterException(CommandLine, String)</a></span> - Constructor for exception picocli.<a href="./picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli">CommandLine.MissingTypeConverterException</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.Mixin.html" title="annotation in picocli"><span class="strong">CommandLine.Mixin</span></a> - Annotation Type in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">
- Fields annotated with <code>@Mixin</code> are "expanded" into the current command: <a href="picocli/CommandLine.Option.html" title="annotation in picocli"><code>@Option</code></a> and
- <a href="picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>@Parameters</code></a> in the mixin class are added to the options and positional parameters of this command.</div>
+ Fields annotated with <code>@Mixin</code> are "expanded" into the current command: <a href="./picocli/CommandLine.Option.html" title="annotation in picocli"><code>@Option</code></a> and
+ <a href="./picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>@Parameters</code></a> in the mixin class are added to the options and positional parameters of this command.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Model.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.Model.html" title="class in picocli"><span class="strong">CommandLine.Model</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">This class provides a namespace for classes and interfaces that model concepts and attributes of command line interfaces in picocli.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.ArgSpec</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.Model.ArgSpec.html" title="class in picocli"><span class="strong">CommandLine.Model.ArgSpec</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
-<div class="block">Models the shared attributes of <a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>CommandLine.Model.OptionSpec</code></a> and <a href="picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli"><code>CommandLine.Model.PositionalParamSpec</code></a>.</div>
+<div class="block">Models the shared attributes of <a href="./picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>CommandLine.Model.OptionSpec</code></a> and <a href="./picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli"><code>CommandLine.Model.PositionalParamSpec</code></a>.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.CommandSpec</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><span class="strong">CommandLine.Model.CommandSpec</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">The <code>CommandSpec</code> class models a command specification, including the options, positional parameters and subcommands
  supported by the command, as well as attributes for the version help message and the usage help message of the command.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><span class="typeNameLink">CommandLine.Model.IBinding</span></a> - Interface in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><span class="strong">CommandLine.Model.IBinding</span></a> - Interface in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Customizable binding for obtaining and modifying the current value of an option or positional parameter.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.OptionSpec</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><span class="strong">CommandLine.Model.OptionSpec</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
-<div class="block">The <code>OptionSpec</code> class models aspects of a <em>named option</em> of a <a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">command</a>, including whether
+<div class="block">The <code>OptionSpec</code> class models aspects of a <em>named option</em> of a <a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">command</a>, including whether
  it is required or optional, the option parameters supported (or required) by the option,
  and attributes for the usage help message describing the option.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.OptionSpec.Builder</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli"><span class="strong">CommandLine.Model.OptionSpec.Builder</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Builder responsible for creating valid <code>OptionSpec</code> objects.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Model.ParserSpec.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.ParserSpec</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.Model.ParserSpec.html" title="class in picocli"><span class="strong">CommandLine.Model.ParserSpec</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Models parser configuration specification.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.PositionalParamSpec</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ParserSpec.html#CommandLine.Model.ParserSpec()">CommandLine.Model.ParserSpec()</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli"><span class="strong">CommandLine.Model.PositionalParamSpec</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
-<div class="block">The <code>PositionalParamSpec</code> class models aspects of a <em>positional parameter</em> of a <a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">command</a>, including whether
+<div class="block">The <code>PositionalParamSpec</code> class models aspects of a <em>positional parameter</em> of a <a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">command</a>, including whether
  it is required or optional, and attributes for the usage help message describing the positional parameter.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.PositionalParamSpec.Builder</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli"><span class="strong">CommandLine.Model.PositionalParamSpec.Builder</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Builder responsible for creating valid <code>PositionalParamSpec</code> objects.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.UnmatchedArgsBinding</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli"><span class="strong">CommandLine.Model.UnmatchedArgsBinding</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">This class allows applications to specify a custom binding that will be invoked for unmatched arguments.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.UsageMessageSpec</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli"><span class="strong">CommandLine.Model.UsageMessageSpec</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Models the usage help message specification.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Option.html" title="annotation in picocli"><span class="typeNameLink">CommandLine.Option</span></a> - Annotation Type in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#CommandLine.Model.UsageMessageSpec()">CommandLine.Model.UsageMessageSpec()</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.Option.html" title="annotation in picocli"><span class="strong">CommandLine.Option</span></a> - Annotation Type in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">
  Annotate fields in your class with <code>@Option</code> and picocli will initialize these fields when matching
  arguments are specified on the command line.</div>
 </dd>
-<dt><a href="picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli"><span class="typeNameLink">CommandLine.OverwrittenOptionException</span></a> - Exception in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli"><span class="strong">CommandLine.OverwrittenOptionException</span></a> - Exception in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Exception indicating that an option for a single-value option field has been specified multiple times on the command line.</div>
 </dd>
-<dt><a href="picocli/CommandLine.ParameterException.html" title="class in picocli"><span class="typeNameLink">CommandLine.ParameterException</span></a> - Exception in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.OverwrittenOptionException.html#CommandLine.OverwrittenOptionException(picocli.CommandLine,%20java.lang.String)">CommandLine.OverwrittenOptionException(CommandLine, String)</a></span> - Constructor for exception picocli.<a href="./picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli">CommandLine.OverwrittenOptionException</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.ParameterException.html" title="class in picocli"><span class="strong">CommandLine.ParameterException</span></a> - Exception in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Exception indicating something went wrong while parsing command line options.</div>
 </dd>
-<dt><a href="picocli/CommandLine.ParameterIndexGapException.html" title="class in picocli"><span class="typeNameLink">CommandLine.ParameterIndexGapException</span></a> - Exception in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParameterException.html#CommandLine.ParameterException(picocli.CommandLine,%20java.lang.String)">CommandLine.ParameterException(CommandLine, String)</a></span> - Constructor for exception picocli.<a href="./picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></dt>
 <dd>
-<div class="block">Exception indicating that there was a gap in the indices of the fields annotated with <a href="picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a>.</div>
+<div class="block">Constructs a new ParameterException with the specified CommandLine and error message.</div>
+</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParameterException.html#CommandLine.ParameterException(picocli.CommandLine,%20java.lang.String,%20java.lang.Exception)">CommandLine.ParameterException(CommandLine, String, Exception)</a></span> - Constructor for exception picocli.<a href="./picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></dt>
+<dd>
+<div class="block">Constructs a new ParameterException with the specified CommandLine and error message.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Parameters.html" title="annotation in picocli"><span class="typeNameLink">CommandLine.Parameters</span></a> - Annotation Type in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.ParameterIndexGapException.html" title="class in picocli"><span class="strong">CommandLine.ParameterIndexGapException</span></a> - Exception in <a href="./picocli/package-summary.html">picocli</a></dt>
+<dd>
+<div class="block">Exception indicating that there was a gap in the indices of the fields annotated with <a href="./picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a>.</div>
+</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParameterIndexGapException.html#CommandLine.ParameterIndexGapException(java.lang.String)">CommandLine.ParameterIndexGapException(String)</a></span> - Constructor for exception picocli.<a href="./picocli/CommandLine.ParameterIndexGapException.html" title="class in picocli">CommandLine.ParameterIndexGapException</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.Parameters.html" title="annotation in picocli"><span class="strong">CommandLine.Parameters</span></a> - Annotation Type in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">
  Fields annotated with <code>@Parameters</code> will be initialized with positional parameters.</div>
 </dd>
-<dt><a href="picocli/CommandLine.ParentCommand.html" title="annotation in picocli"><span class="typeNameLink">CommandLine.ParentCommand</span></a> - Annotation Type in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.ParentCommand.html" title="annotation in picocli"><span class="strong">CommandLine.ParentCommand</span></a> - Annotation Type in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">
  Fields annotated with <code>@ParentCommand</code> will be initialized with the parent command of the current subcommand.</div>
 </dd>
-<dt><a href="picocli/CommandLine.ParseResult.html" title="class in picocli"><span class="typeNameLink">CommandLine.ParseResult</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.ParseResult.html" title="class in picocli"><span class="strong">CommandLine.ParseResult</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Encapsulates the result of parsing an array of command line arguments.</div>
 </dd>
-<dt><a href="picocli/CommandLine.ParseResult.Builder.html" title="class in picocli"><span class="typeNameLink">CommandLine.ParseResult.Builder</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.ParseResult.Builder.html" title="class in picocli"><span class="strong">CommandLine.ParseResult.Builder</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Builds immutable <code>ParseResult</code> instances.</div>
 </dd>
-<dt><a href="picocli/CommandLine.PicocliException.html" title="class in picocli"><span class="typeNameLink">CommandLine.PicocliException</span></a> - Exception in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.PicocliException.html" title="class in picocli"><span class="strong">CommandLine.PicocliException</span></a> - Exception in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Base class of all exceptions thrown by <code>picocli.CommandLine</code>.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Range.html" title="class in picocli"><span class="typeNameLink">CommandLine.Range</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.PicocliException.html#CommandLine.PicocliException(java.lang.String)">CommandLine.PicocliException(String)</a></span> - Constructor for exception picocli.<a href="./picocli/CommandLine.PicocliException.html" title="class in picocli">CommandLine.PicocliException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.PicocliException.html#CommandLine.PicocliException(java.lang.String,%20java.lang.Exception)">CommandLine.PicocliException(String, Exception)</a></span> - Constructor for exception picocli.<a href="./picocli/CommandLine.PicocliException.html" title="class in picocli">CommandLine.PicocliException</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.Range.html" title="class in picocli"><span class="strong">CommandLine.Range</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Describes the number of parameters required and accepted by an option or a positional parameter.</div>
 </dd>
-<dt><a href="picocli/CommandLine.RunAll.html" title="class in picocli"><span class="typeNameLink">CommandLine.RunAll</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Range.html#CommandLine.Range(int,%20int,%20boolean,%20boolean,%20java.lang.String)">CommandLine.Range(int, int, boolean, boolean, String)</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
+<dd>
+<div class="block">Constructs a new Range object with the specified parameters.</div>
+</dd>
+<dt><a href="./picocli/CommandLine.RunAll.html" title="class in picocli"><span class="strong">CommandLine.RunAll</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Command line parse result handler that prints help if requested, and otherwise executes the top-level command and
  all subcommands as <code>Runnable</code> or <code>Callable</code>.</div>
 </dd>
-<dt><a href="picocli/CommandLine.RunFirst.html" title="class in picocli"><span class="typeNameLink">CommandLine.RunFirst</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.RunAll.html#CommandLine.RunAll()">CommandLine.RunAll()</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.RunAll.html" title="class in picocli">CommandLine.RunAll</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.RunFirst.html" title="class in picocli"><span class="strong">CommandLine.RunFirst</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Command line parse result handler that prints help if requested, and otherwise executes the top-level
  <code>Runnable</code> or <code>Callable</code> command.</div>
 </dd>
-<dt><a href="picocli/CommandLine.RunLast.html" title="class in picocli"><span class="typeNameLink">CommandLine.RunLast</span></a> - Class in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.RunFirst.html#CommandLine.RunFirst()">CommandLine.RunFirst()</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.RunFirst.html" title="class in picocli">CommandLine.RunFirst</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.RunLast.html" title="class in picocli"><span class="strong">CommandLine.RunLast</span></a> - Class in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Command line parse result handler that prints help if requested, and otherwise executes the most specific
  <code>Runnable</code> or <code>Callable</code> subcommand.</div>
 </dd>
-<dt><a href="picocli/CommandLine.TypeConversionException.html" title="class in picocli"><span class="typeNameLink">CommandLine.TypeConversionException</span></a> - Exception in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.RunLast.html#CommandLine.RunLast()">CommandLine.RunLast()</a></span> - Constructor for class picocli.<a href="./picocli/CommandLine.RunLast.html" title="class in picocli">CommandLine.RunLast</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.TypeConversionException.html" title="class in picocli"><span class="strong">CommandLine.TypeConversionException</span></a> - Exception in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
-<div class="block">Exception thrown by <a href="picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><code>CommandLine.ITypeConverter</code></a> implementations to indicate a String could not be converted.</div>
+<div class="block">Exception thrown by <a href="./picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><code>CommandLine.ITypeConverter</code></a> implementations to indicate a String could not be converted.</div>
 </dd>
-<dt><a href="picocli/CommandLine.Unmatched.html" title="annotation in picocli"><span class="typeNameLink">CommandLine.Unmatched</span></a> - Annotation Type in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.TypeConversionException.html#CommandLine.TypeConversionException(java.lang.String)">CommandLine.TypeConversionException(String)</a></span> - Constructor for exception picocli.<a href="./picocli/CommandLine.TypeConversionException.html" title="class in picocli">CommandLine.TypeConversionException</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./picocli/CommandLine.Unmatched.html" title="annotation in picocli"><span class="strong">CommandLine.Unmatched</span></a> - Annotation Type in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Fields annotated with <code>@Unmatched</code> will be initialized with the list of unmatched command line arguments, if any.</div>
 </dd>
-<dt><a href="picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli"><span class="typeNameLink">CommandLine.UnmatchedArgumentException</span></a> - Exception in <a href="picocli/package-summary.html">picocli</a></dt>
+<dt><a href="./picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli"><span class="strong">CommandLine.UnmatchedArgumentException</span></a> - Exception in <a href="./picocli/package-summary.html">picocli</a></dt>
 <dd>
 <div class="block">Exception indicating that a command line argument could not be mapped to any of the fields annotated with
- <a href="picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a>.</div>
+ <a href="./picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="./picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#commandList--">commandList()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.UnmatchedArgumentException.html#CommandLine.UnmatchedArgumentException(picocli.CommandLine,%20java.lang.String)">CommandLine.UnmatchedArgumentException(CommandLine, String)</a></span> - Constructor for exception picocli.<a href="./picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli">CommandLine.UnmatchedArgumentException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.UnmatchedArgumentException.html#CommandLine.UnmatchedArgumentException(picocli.CommandLine,%20java.util.Stack)">CommandLine.UnmatchedArgumentException(CommandLine, Stack&lt;String&gt;)</a></span> - Constructor for exception picocli.<a href="./picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli">CommandLine.UnmatchedArgumentException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.UnmatchedArgumentException.html#CommandLine.UnmatchedArgumentException(picocli.CommandLine,%20java.util.List)">CommandLine.UnmatchedArgumentException(CommandLine, List&lt;String&gt;)</a></span> - Constructor for exception picocli.<a href="./picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli">CommandLine.UnmatchedArgumentException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#commandList()">commandList()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns a 2-column list with command names and the first line of their header or (if absent) description.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#commandListHeading-java.lang.Object...-">commandListHeading(Object...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#commandListHeading(java.lang.Object...)">commandListHeading(Object...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns the text displayed before the command list; an empty string if there are no commands,
  otherwise the result of <code>String.format(commandListHeading, params)</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#commandListHeading--">commandListHeading()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#commandListHeading()">commandListHeading()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Returns the optional heading preceding the subcommand list.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#commandListHeading-java.lang.String-">commandListHeading(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#commandListHeading(java.lang.String)">commandListHeading(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Sets the optional heading preceding the subcommand list.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#commands-picocli.CommandLine.Help.Ansi.IStyle...-">commands(CommandLine.Help.Ansi.IStyle...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.ColorScheme.html#commands(picocli.CommandLine.Help.Ansi.IStyle...)">commands(CommandLine.Help.Ansi.IStyle...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>
 <div class="block">Adds the specified styles to the registered styles for commands in this color scheme and returns this color scheme.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#commandSpec--">commandSpec()</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#commandSpec()">commandSpec()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns the <code>CommandSpec</code> for the matched command.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#commandStyles">commandStyles</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.ColorScheme.html#commandStyles">commandStyles</a></span> - Variable in class picocli.<a href="./picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#commandText-java.lang.String-">commandText(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.ColorScheme.html#commandText(java.lang.String)">commandText(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>
 <div class="block">Returns a Text with all command styles applied to the specified command string.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Range.html#compareTo-picocli.CommandLine.Range-">compareTo(CommandLine.Range)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Range.html#compareTo(picocli.CommandLine.Range)">compareTo(CommandLine.Range)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Range.html#contains-int-">contains(int)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Range.html#contains(int)">contains(int)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
 <dd>
 <div class="block">Returns <code>true</code> if this Range includes the specified value, <code>false</code> otherwise.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ITypeConverter.html#convert-java.lang.String-">convert(String)</a></span> - Method in interface picocli.<a href="picocli/CommandLine.ITypeConverter.html" title="interface in picocli">CommandLine.ITypeConverter</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ITypeConverter.html#convert(java.lang.String)">convert(String)</a></span> - Method in interface picocli.<a href="./picocli/CommandLine.ITypeConverter.html" title="interface in picocli">CommandLine.ITypeConverter</a></dt>
 <dd>
 <div class="block">Converts the specified command line argument value to some domain object.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ArgSpec.html#converters--">converters()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ArgSpec.html#converters()">converters()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
 <dd>
-<div class="block">Returns one or more <a href="picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><code>type converters</code></a> to use to convert the command line
+<div class="block">Returns one or more <a href="./picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><code>type converters</code></a> to use to convert the command line
  argument into a strongly typed value (or key-value pair for map fields).</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.IFactory.html#create-java.lang.Class-">create(Class&lt;K&gt;)</a></span> - Method in interface picocli.<a href="picocli/CommandLine.IFactory.html" title="interface in picocli">CommandLine.IFactory</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.IFactory.html#create(java.lang.Class)">create(Class&lt;K&gt;)</a></span> - Method in interface picocli.<a href="./picocli/CommandLine.IFactory.html" title="interface in picocli">CommandLine.IFactory</a></dt>
 <dd>
 <div class="block">Creates and returns an instance of the specified class.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#create--">create()</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#create()">create()</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Creates and returns a new <code>CommandSpec</code> without any associated user object.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/groovy/PicocliBaseScript.html#createCommandLine--">createCommandLine()</a></span> - Method in class picocli.groovy.<a href="picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
+<dt><span class="strong"><a href="./picocli/groovy/PicocliBaseScript.html#createCommandLine()">createCommandLine()</a></span> - Method in class picocli.groovy.<a href="./picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
 <dd>
 <div class="block">Create and returns a new CommandLine instance.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#createDefaultLayout--">createDefaultLayout()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#createDefaultLayout()">createDefaultLayout()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns a <code>Layout</code> instance configured with the user preferences captured in this Help instance.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#createDefaultOptionRenderer--">createDefaultOptionRenderer()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#createDefaultOptionRenderer()">createDefaultOptionRenderer()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
-<div class="block">Returns a new default OptionRenderer which converts <a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>Options</code></a> to five columns of text to match
-  the default <a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">TextTable</a> column layout.</div>
+<div class="block">Returns a new default OptionRenderer which converts <a href="./picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>Options</code></a> to five columns of text to match
+  the default <a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli">TextTable</a> column layout.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#createDefaultParameterRenderer--">createDefaultParameterRenderer()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#createDefaultParameterRenderer()">createDefaultParameterRenderer()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
-<div class="block">Returns a new default ParameterRenderer which converts <a href="picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">positional parameters</a> to four columns of
- text to match the default <a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">TextTable</a> column layout.</div>
+<div class="block">Returns a new default ParameterRenderer which converts <a href="./picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">positional parameters</a> to four columns of
+ text to match the default <a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli">TextTable</a> column layout.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#createDefaultParamLabelRenderer--">createDefaultParamLabelRenderer()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#createDefaultParamLabelRenderer()">createDefaultParamLabelRenderer()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns a new default value renderer that separates option parameters from their option name
  with the specified separator string, surrounds optional parameters with <code>'['</code> and <code>']'</code>
  characters and uses ellipses ("...") to indicate that any number of a parameter are allowed.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#createMinimalOptionRenderer--">createMinimalOptionRenderer()</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#createMinimalOptionRenderer()">createMinimalOptionRenderer()</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
-<div class="block">Returns a new minimal OptionRenderer which converts <a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>Options</code></a> to a single row with two columns
+<div class="block">Returns a new minimal OptionRenderer which converts <a href="./picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>Options</code></a> to a single row with two columns
  of text: an option name and a description.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#createMinimalParameterRenderer--">createMinimalParameterRenderer()</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#createMinimalParameterRenderer()">createMinimalParameterRenderer()</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
-<div class="block">Returns a new minimal ParameterRenderer which converts <a href="picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">positional parameters</a>
+<div class="block">Returns a new minimal ParameterRenderer which converts <a href="./picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">positional parameters</a>
  to a single row with two columns of text: an option name and a description.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#createMinimalParamLabelRenderer--">createMinimalParamLabelRenderer()</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#createMinimalParamLabelRenderer()">createMinimalParamLabelRenderer()</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns a value renderer that returns the <code>paramLabel</code> if defined or the field name otherwise.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#createShortOptionArityAndNameComparator--">createShortOptionArityAndNameComparator()</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#createShortOptionArityAndNameComparator()">createShortOptionArityAndNameComparator()</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
-<div class="block">Sorts <a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>OptionSpecs</code></a> by their option <a href="picocli/CommandLine.Range.html#max">max arity</a> first, by
- <a href="picocli/CommandLine.Range.html#min">min arity</a> next, and by <a href="picocli/CommandLine.Help.html#createShortOptionNameComparator--">option name</a> last.</div>
+<div class="block">Sorts <a href="./picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>OptionSpecs</code></a> by their option <a href="./picocli/CommandLine.Range.html#max">max arity</a> first, by
+ <a href="./picocli/CommandLine.Range.html#min">min arity</a> next, and by <a href="./picocli/CommandLine.Help.html#createShortOptionNameComparator()">option name</a> last.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#createShortOptionNameComparator--">createShortOptionNameComparator()</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#createShortOptionNameComparator()">createShortOptionNameComparator()</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
-<div class="block">Sorts <a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>OptionSpecs</code></a> by their option name in case-insensitive alphabetic order.</div>
+<div class="block">Sorts <a href="./picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>OptionSpecs</code></a> by their option name in case-insensitive alphabetic order.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.IStyle.html#CSI">CSI</a></span> - Static variable in interface picocli.<a href="picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.IStyle.html#CSI">CSI</a></span> - Static variable in interface picocli.<a href="./picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></dt>
 <dd>
 <div class="block">The Control Sequence Introducer (CSI) escape sequence "\u001b[".</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#customSynopsis-java.lang.Object...-">customSynopsis(Object...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#customSynopsis(java.lang.Object...)">customSynopsis(Object...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns command custom synopsis as a string.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#customSynopsis--">customSynopsis()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#customSynopsis()">customSynopsis()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Returns the optional custom synopsis lines to use instead of the auto-generated synopsis.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#customSynopsis-java.lang.String...-">customSynopsis(String...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#customSynopsis(java.lang.String...)">customSynopsis(String...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Sets the optional custom synopsis lines to use instead of the auto-generated synopsis.</div>
 </dd>
 </dl>
-<a name="I:D">
+<a name="_D_">
 <!--   -->
 </a>
 <h2 class="title">D</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#DEFAULT_COMMAND_NAME">DEFAULT_COMMAND_NAME</a></span> - Static variable in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#DEFAULT_COMMAND_NAME">DEFAULT_COMMAND_NAME</a></span> - Static variable in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
-<div class="block">Constant String holding the default program name, value defined in <a href="picocli/CommandLine.Model.CommandSpec.html#DEFAULT_COMMAND_NAME"><code>CommandLine.Model.CommandSpec.DEFAULT_COMMAND_NAME</code></a>.</div>
+<div class="block">Constant String holding the default program name, value defined in <a href="./picocli/CommandLine.Model.CommandSpec.html#DEFAULT_COMMAND_NAME"><code>CommandLine.Model.CommandSpec.DEFAULT_COMMAND_NAME</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#DEFAULT_SEPARATOR">DEFAULT_SEPARATOR</a></span> - Static variable in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#DEFAULT_SEPARATOR">DEFAULT_SEPARATOR</a></span> - Static variable in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
-<div class="block">Constant String holding the default string that separates options from option parameters, value defined in <a href="picocli/CommandLine.Model.ParserSpec.html#DEFAULT_SEPARATOR"><code>CommandLine.Model.ParserSpec.DEFAULT_SEPARATOR</code></a>.</div>
+<div class="block">Constant String holding the default string that separates options from option parameters, value defined in <a href="./picocli/CommandLine.Model.ParserSpec.html#DEFAULT_SEPARATOR"><code>CommandLine.Model.ParserSpec.DEFAULT_SEPARATOR</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Range.html#defaultArity-java.lang.reflect.Field-">defaultArity(Field)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Range.html#defaultArity(java.lang.reflect.Field)">defaultArity(Field)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
 <dd>
-<div class="block">Returns the default arity <code>Range</code>: for <a href="picocli/CommandLine.Option.html" title="annotation in picocli"><code>options</code></a> this is 0 for booleans and 1 for
- other types, for <a href="picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>parameters</code></a> booleans have arity 0, arrays or Collections have
+<div class="block">Returns the default arity <code>Range</code>: for <a href="./picocli/CommandLine.Option.html" title="annotation in picocli"><code>options</code></a> this is 0 for booleans and 1 for
+ other types, for <a href="./picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>parameters</code></a> booleans have arity 0, arrays or Collections have
  arity "0..*", and other types have arity 1.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Range.html#defaultArity-java.lang.Class-">defaultArity(Class&lt;?&gt;)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Range.html#defaultArity(java.lang.Class)">defaultArity(Class&lt;?&gt;)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">use <a href="picocli/CommandLine.Range.html#defaultArity-java.lang.reflect.Field-"><code>CommandLine.Range.defaultArity(Field)</code></a> instead</span></div>
+<div class="block"><span class="strong">Deprecated.</span>
+<div class="block"><i>use <a href="./picocli/CommandLine.Range.html#defaultArity(java.lang.reflect.Field)"><code>CommandLine.Range.defaultArity(Field)</code></a> instead</i></div>
 </div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#defaultColorScheme-picocli.CommandLine.Help.Ansi-">defaultColorScheme(CommandLine.Help.Ansi)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#defaultColorScheme(picocli.CommandLine.Help.Ansi)">defaultColorScheme(CommandLine.Help.Ansi)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
-<div class="block">Creates and returns a new <a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli"><code>CommandLine.Help.ColorScheme</code></a> initialized with picocli default values: commands are bold,
+<div class="block">Creates and returns a new <a href="./picocli/CommandLine.Help.ColorScheme.html" title="class in picocli"><code>CommandLine.Help.ColorScheme</code></a> initialized with picocli default values: commands are bold,
   options and parameters use a yellow foreground, and option parameters use italic.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.DefaultExceptionHandler.html#DefaultExceptionHandler--">DefaultExceptionHandler()</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ArgSpec.html#defaultValue--">defaultValue()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#defaultExceptionHandler()">defaultExceptionHandler()</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dd>
+<div class="block">Convenience method that returns <code>new DefaultExceptionHandler&lt;List&lt;Object&gt;&gt;()</code>.</div>
+</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ArgSpec.html#defaultValue()">defaultValue()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
 <dd>
 <div class="block">Returns the default value of this option or positional parameter.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#description-java.lang.Object...-">description(Object...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#description(java.lang.Object...)">description(Object...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns command description text as a string.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ArgSpec.html#description--">description()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ArgSpec.html#description()">description()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
 <dd>
 <div class="block">Returns the description of this option, used when generating the usage documentation.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#description--">description()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#description()">description()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Returns the optional text lines to use as the description of the help message, displayed between the synopsis and the
  options list.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#description-java.lang.String...-">description(String...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#description(java.lang.String...)">description(String...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Sets the optional text lines to use as the description of the help message, displayed between the synopsis and the
  options list.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#descriptionHeading-java.lang.Object...-">descriptionHeading(Object...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#descriptionHeading(java.lang.Object...)">descriptionHeading(Object...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns the text displayed before the description text; an empty string if there is no description,
  otherwise the result of <code>String.format(descriptionHeading, params)</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#descriptionHeading--">descriptionHeading()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#descriptionHeading()">descriptionHeading()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Returns the optional heading preceding the description section.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#descriptionHeading-java.lang.String-">descriptionHeading(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#descriptionHeading(java.lang.String)">descriptionHeading(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Sets the heading preceding the description section.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#detailedSynopsis-java.util.Comparator-boolean-">detailedSynopsis(Comparator&lt;CommandLine.Model.OptionSpec&gt;, boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#detailedSynopsis(java.util.Comparator,%20boolean)">detailedSynopsis(Comparator&lt;CommandLine.Model.OptionSpec&gt;, boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">use <a href="picocli/CommandLine.Help.html#detailedSynopsis-int-java.util.Comparator-boolean-"><code>CommandLine.Help.detailedSynopsis(int, Comparator, boolean)</code></a> instead.</span></div>
+<div class="block"><span class="strong">Deprecated.</span>
+<div class="block"><i>use <a href="./picocli/CommandLine.Help.html#detailedSynopsis(int,%20java.util.Comparator,%20boolean)"><code>CommandLine.Help.detailedSynopsis(int, Comparator, boolean)</code></a> instead.</i></div>
 </div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#detailedSynopsis-int-java.util.Comparator-boolean-">detailedSynopsis(int, Comparator&lt;CommandLine.Model.OptionSpec&gt;, boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#detailedSynopsis(int,%20java.util.Comparator,%20boolean)">detailedSynopsis(int, Comparator&lt;CommandLine.Model.OptionSpec&gt;, boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Generates a detailed synopsis message showing all options and parameters.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.DuplicateOptionAnnotationsException.html#DuplicateOptionAnnotationsException-java.lang.String-">DuplicateOptionAnnotationsException(String)</a></span> - Constructor for exception picocli.<a href="picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli">CommandLine.DuplicateOptionAnnotationsException</a></dt>
-<dd>&nbsp;</dd>
 </dl>
-<a name="I:E">
+<a name="_E_">
 <!--   -->
 </a>
 <h2 class="title">E</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.html#enabled--">enabled()</a></span> - Method in enum picocli.<a href="picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.html#enabled()">enabled()</a></span> - Method in enum picocli.<a href="./picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a></dt>
 <dd>
 <div class="block">Returns <code>true</code> if ANSI escape codes should be emitted, <code>false</code> otherwise.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Text.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Text.html#equals(java.lang.Object)">equals(Object)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ArgSpec.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ArgSpec.html#equals(java.lang.Object)">equals(Object)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.OptionSpec.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.OptionSpec.html#equals(java.lang.Object)">equals(Object)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.PositionalParamSpec.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.PositionalParamSpec.html#equals(java.lang.Object)">equals(Object)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Range.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Range.html#equals(java.lang.Object)">equals(Object)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.AbstractHandler.html#err--">err()</a></span> - Method in class picocli.<a href="picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.AbstractHandler.html#err()">err()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
 <dd>
 <div class="block">Returns the stream to print diagnostic messages to.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ExecutionException.html#ExecutionException-picocli.CommandLine-java.lang.String-">ExecutionException(CommandLine, String)</a></span> - Constructor for exception picocli.<a href="picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ExecutionException.html#ExecutionException-picocli.CommandLine-java.lang.String-java.lang.Exception-">ExecutionException(CommandLine, String, Exception)</a></span> - Constructor for exception picocli.<a href="picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.AbstractHandler.html#exitCode--">exitCode()</a></span> - Method in class picocli.<a href="picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.AbstractHandler.html#exitCode()">exitCode()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
 <dd>
 <div class="block">Returns the exit code to use as the termination status, or <code>null</code> (the default) if the handler should
  not call <code>System.exit(int)</code> after processing completes.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ParserSpec.html#expandAtFiles--">expandAtFiles()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ParserSpec.html#expandAtFiles()">expandAtFiles()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ParserSpec.html#expandAtFiles-boolean-">expandAtFiles(boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ParserSpec.html#expandAtFiles(boolean)">expandAtFiles(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
 <dd>&nbsp;</dd>
 </dl>
-<a name="I:F">
+<a name="_F_">
 <!--   -->
 </a>
 <h2 class="title">F</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Style.html#fg-java.lang.String-">fg(String)</a></span> - Static method in enum picocli.<a href="picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Style.html#fg(java.lang.String)">fg(String)</a></span> - Static method in enum picocli.<a href="./picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></dt>
 <dd>
 <div class="block">Parses the specified style markup and returns the associated style.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#footer-java.lang.Object...-">footer(Object...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#footer(java.lang.Object...)">footer(Object...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns command footer text as a string.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#footer--">footer()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#footer()">footer()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Returns the optional footer text lines displayed at the bottom of the help message.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#footer-java.lang.String...-">footer(String...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#footer(java.lang.String...)">footer(String...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Sets the optional footer text lines displayed at the bottom of the help message.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#footerHeading-java.lang.Object...-">footerHeading(Object...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#footerHeading(java.lang.Object...)">footerHeading(Object...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns the text displayed before the footer text; the result of <code>String.format(footerHeading, params)</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#footerHeading--">footerHeading()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#footerHeading()">footerHeading()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Returns the optional heading preceding the footer section.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#footerHeading-java.lang.String-">footerHeading(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#footerHeading(java.lang.String)">footerHeading(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Sets the optional heading preceding the footer section.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#forAnnotatedObject-java.lang.Object-">forAnnotatedObject(Object)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#forAnnotatedObject(java.lang.Object)">forAnnotatedObject(Object)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Creates and returns a new <code>CommandSpec</code> initialized from the specified associated user object.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#forAnnotatedObject-java.lang.Object-picocli.CommandLine.IFactory-">forAnnotatedObject(Object, CommandLine.IFactory)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#forAnnotatedObject(java.lang.Object,%20picocli.CommandLine.IFactory)">forAnnotatedObject(Object, CommandLine.IFactory)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Creates and returns a new <code>CommandSpec</code> initialized from the specified associated user object.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UnmatchedArgsBinding.html#forStringArraySupplier-picocli.CommandLine.Model.IBinding-">forStringArraySupplier(CommandLine.Model.IBinding)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UnmatchedArgsBinding.html#forStringArraySupplier(picocli.CommandLine.Model.IBinding)">forStringArraySupplier(CommandLine.Model.IBinding)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a></dt>
 <dd>
 <div class="block">Creates a <code>UnmatchedArgsBinding</code> for a binding that produces and consumes <code>String[]</code> objects.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UnmatchedArgsBinding.html#forStringConsumer-picocli.CommandLine.Model.IBinding-">forStringConsumer(CommandLine.Model.IBinding)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UnmatchedArgsBinding.html#forStringConsumer(picocli.CommandLine.Model.IBinding)">forStringConsumer(CommandLine.Model.IBinding)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a></dt>
 <dd>
 <div class="block">Creates a <code>UnmatchedArgsBinding</code> for a binding that consumes <code>String</code> objects.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UnmatchedArgsBinding.html#forStringListSupplier-picocli.CommandLine.Model.IBinding-">forStringListSupplier(CommandLine.Model.IBinding)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UnmatchedArgsBinding.html#forStringListSupplier(picocli.CommandLine.Model.IBinding)">forStringListSupplier(CommandLine.Model.IBinding)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a></dt>
 <dd>
 <div class="block">Creates a <code>UnmatchedArgsBinding</code> for a binding that produces and consumes <code>List&lt;String&gt;</code> objects.</div>
 </dd>
 </dl>
-<a name="I:G">
+<a name="_G_">
 <!--   -->
 </a>
 <h2 class="title">G</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.IBinding.html#get--">get()</a></span> - Method in interface picocli.<a href="picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.IBinding.html#get()">get()</a></span> - Method in interface picocli.<a href="./picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a></dt>
 <dd>
 <div class="block">Returns the current value of the binding.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#getCommand--">getCommand()</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#getCommand()">getCommand()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Returns the annotated user object that this <code>CommandLine</code> instance was constructed with.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ExecutionException.html#getCommandLine--">getCommandLine()</a></span> - Method in exception picocli.<a href="picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ExecutionException.html#getCommandLine()">getCommandLine()</a></span> - Method in exception picocli.<a href="./picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></dt>
 <dd>
 <div class="block">Returns the <code>CommandLine</code> object for the (sub)command that could not be invoked.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParameterException.html#getCommandLine--">getCommandLine()</a></span> - Method in exception picocli.<a href="picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParameterException.html#getCommandLine()">getCommandLine()</a></span> - Method in exception picocli.<a href="./picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></dt>
 <dd>
 <div class="block">Returns the <code>CommandLine</code> object for the (sub)command whose input could not be parsed.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#getCommandName--">getCommandName()</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#getCommandName()">getCommandName()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Returns the command name (also called program name) displayed in the usage help synopsis.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#getCommandSpec--">getCommandSpec()</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#getCommandSpec()">getCommandSpec()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Returns the <code>CommandSpec</code> model that this <code>CommandLine</code> was constructed with.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#getMixins--">getMixins()</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#getMixins()">getMixins()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Returns a map of user objects whose options and positional parameters were added to ("mixed in" with) this command.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/groovy/PicocliBaseScript.html#getOrCreateCommandLine--">getOrCreateCommandLine()</a></span> - Method in class picocli.groovy.<a href="picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
+<dt><span class="strong"><a href="./picocli/groovy/PicocliBaseScript.html#getOrCreateCommandLine()">getOrCreateCommandLine()</a></span> - Method in class picocli.groovy.<a href="./picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
 <dd>
 <div class="block">Return the CommandLine for this script.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#getParent--">getParent()</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#getParent()">getParent()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Returns the command that this is a subcommand of, or <code>null</code> if this is a top-level command.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#getParseResult--">getParseResult()</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#getParseResult()">getParseResult()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/groovy/PicocliBaseScript.html#getScriptArguments--">getScriptArguments()</a></span> - Method in class picocli.groovy.<a href="picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
+<dt><span class="strong"><a href="./picocli/groovy/PicocliBaseScript.html#getScriptArguments()">getScriptArguments()</a></span> - Method in class picocli.groovy.<a href="./picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
 <dd>
 <div class="block">Return the script arguments as an array of strings.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#getSeparator--">getSeparator()</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#getSeparator()">getSeparator()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Returns the String that separates option names from option values when parsing command line options.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Text.html#getStyledChars-int-int-picocli.CommandLine.Help.Ansi.Text-int-">getStyledChars(int, int, CommandLine.Help.Ansi.Text, int)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Text.html#getStyledChars(int,%20int,%20picocli.CommandLine.Help.Ansi.Text,%20int)">getStyledChars(int, int, CommandLine.Help.Ansi.Text, int)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
 <dd>
 <div class="block">Copies the specified substring of this Text into the specified destination, preserving the markup.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#getSubcommands--">getSubcommands()</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#getSubcommands()">getSubcommands()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Returns a map with the subcommands <a href="picocli/CommandLine.html#addSubcommand-java.lang.String-java.lang.Object-">registered</a> on this instance.</div>
+<div class="block">Returns a map with the subcommands <a href="./picocli/CommandLine.html#addSubcommand(java.lang.String,%20java.lang.Object)">registered</a> on this instance.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#getUnmatchedArguments--">getUnmatchedArguments()</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#getUnmatchedArguments()">getUnmatchedArguments()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Returns the list of unmatched command line arguments, if any.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.IVersionProvider.html#getVersion--">getVersion()</a></span> - Method in interface picocli.<a href="picocli/CommandLine.IVersionProvider.html" title="interface in picocli">CommandLine.IVersionProvider</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.IVersionProvider.html#getVersion()">getVersion()</a></span> - Method in interface picocli.<a href="./picocli/CommandLine.IVersionProvider.html" title="interface in picocli">CommandLine.IVersionProvider</a></dt>
 <dd>
 <div class="block">Returns version information for a command.</div>
 </dd>
 </dl>
-<a name="I:H">
+<a name="_H_">
 <!--   -->
 </a>
 <h2 class="title">H</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.AbstractParseResultHandler.html#handle-picocli.CommandLine.ParseResult-R-">handle(CommandLine.ParseResult, R)</a></span> - Method in class picocli.<a href="picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.AbstractParseResultHandler.html#handle(picocli.CommandLine.ParseResult)">handle(CommandLine.ParseResult)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a></dt>
 <dd>
 <div class="block">Processes the specified <code>ParseResult</code> and returns the result as a list of objects.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.AbstractSimpleParseResultHandler.html#handle-picocli.CommandLine.ParseResult-">handle(CommandLine.ParseResult)</a></span> - Method in class picocli.<a href="picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli">CommandLine.AbstractSimpleParseResultHandler</a></dt>
-<dd>
-<div class="block">Processes the specified <code>ParseResult</code>.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.RunAll.html#handle-picocli.CommandLine.ParseResult-java.util.List-">handle(CommandLine.ParseResult, List&lt;Object&gt;)</a></span> - Method in class picocli.<a href="picocli/CommandLine.RunAll.html" title="class in picocli">CommandLine.RunAll</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.RunAll.html#handle(picocli.CommandLine.ParseResult)">handle(CommandLine.ParseResult)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.RunAll.html" title="class in picocli">CommandLine.RunAll</a></dt>
 <dd>
 <div class="block">Executes the top-level command and all subcommands as <code>Runnable</code> or <code>Callable</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.RunFirst.html#handle-picocli.CommandLine.ParseResult-java.util.List-">handle(CommandLine.ParseResult, List&lt;Object&gt;)</a></span> - Method in class picocli.<a href="picocli/CommandLine.RunFirst.html" title="class in picocli">CommandLine.RunFirst</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.RunFirst.html#handle(picocli.CommandLine.ParseResult)">handle(CommandLine.ParseResult)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.RunFirst.html" title="class in picocli">CommandLine.RunFirst</a></dt>
 <dd>
 <div class="block">Executes the top-level <code>Runnable</code> or <code>Callable</code> subcommand.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.RunLast.html#handle-picocli.CommandLine.ParseResult-java.util.List-">handle(CommandLine.ParseResult, List&lt;Object&gt;)</a></span> - Method in class picocli.<a href="picocli/CommandLine.RunLast.html" title="class in picocli">CommandLine.RunLast</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.RunLast.html#handle(picocli.CommandLine.ParseResult)">handle(CommandLine.ParseResult)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.RunLast.html" title="class in picocli">CommandLine.RunLast</a></dt>
 <dd>
 <div class="block">Executes the most specific <code>Runnable</code> or <code>Callable</code> subcommand.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.DefaultExceptionHandler.html#handleException-picocli.CommandLine.ParameterException-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">handleException(CommandLine.ParameterException, PrintStream, CommandLine.Help.Ansi, String...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.DefaultExceptionHandler.html#handleException(picocli.CommandLine.ParameterException,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)">handleException(CommandLine.ParameterException, PrintStream, CommandLine.Help.Ansi, String...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.IExceptionHandler.html#handleException-picocli.CommandLine.ParameterException-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">handleException(CommandLine.ParameterException, PrintStream, CommandLine.Help.Ansi, String...)</a></span> - Method in interface picocli.<a href="picocli/CommandLine.IExceptionHandler.html" title="interface in picocli">CommandLine.IExceptionHandler</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.IExceptionHandler.html#handleException(picocli.CommandLine.ParameterException,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)">handleException(CommandLine.ParameterException, PrintStream, CommandLine.Help.Ansi, String...)</a></span> - Method in interface picocli.<a href="./picocli/CommandLine.IExceptionHandler.html" title="interface in picocli">CommandLine.IExceptionHandler</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
-<div class="block">Handles a <code>ParameterException</code> that occurred while <a href="picocli/CommandLine.html#parse-java.lang.String...-">parsing</a> the command
+<div class="block"><span class="strong">Deprecated.</span></div>
+<div class="block">Handles a <code>ParameterException</code> that occurred while <a href="./picocli/CommandLine.html#parse(java.lang.String...)">parsing</a> the command
  line arguments and optionally returns a list of results.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.DefaultExceptionHandler.html#handleExecutionException-picocli.CommandLine.ExecutionException-R-picocli.CommandLine.ParseResult-">handleExecutionException(CommandLine.ExecutionException, R, CommandLine.ParseResult)</a></span> - Method in class picocli.<a href="picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.DefaultExceptionHandler.html#handleExecutionException(picocli.CommandLine.ExecutionException,%20picocli.CommandLine.ParseResult)">handleExecutionException(CommandLine.ExecutionException, CommandLine.ParseResult)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a></dt>
 <dd>
 <div class="block">This implementation always simply rethrows the specified exception.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.IExceptionHandler2.html#handleExecutionException-picocli.CommandLine.ExecutionException-R-picocli.CommandLine.ParseResult-">handleExecutionException(CommandLine.ExecutionException, R, CommandLine.ParseResult)</a></span> - Method in interface picocli.<a href="picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.IExceptionHandler2.html#handleExecutionException(picocli.CommandLine.ExecutionException,%20picocli.CommandLine.ParseResult)">handleExecutionException(CommandLine.ExecutionException, CommandLine.ParseResult)</a></span> - Method in interface picocli.<a href="./picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a></dt>
 <dd>
 <div class="block">Handles a <code>ExecutionException</code> that occurred while executing the <code>Runnable</code> or
  <code>Callable</code> command and optionally returns a list of results.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/groovy/PicocliBaseScript.html#handleExecutionException-picocli.CommandLine-java.lang.String:A-java.lang.Exception-">handleExecutionException(CommandLine, String[], Exception)</a></span> - Method in class picocli.groovy.<a href="picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
+<dt><span class="strong"><a href="./picocli/groovy/PicocliBaseScript.html#handleExecutionException(picocli.CommandLine,%20java.lang.String[],%20java.lang.Exception)">handleExecutionException(CommandLine, String[], Exception)</a></span> - Method in class picocli.groovy.<a href="./picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
 <dd>
-<div class="block">If an Exception occurs during <a href="picocli/groovy/PicocliBaseScript.html#runRunnableSubcommand-java.util.List-"><code>PicocliBaseScript.runRunnableSubcommand(List)</code></a>, or <a href="picocli/groovy/PicocliBaseScript.html#runScriptBody--"><code>PicocliBaseScript.runScriptBody()</code></a>
+<div class="block">If an Exception occurs during <a href="./picocli/groovy/PicocliBaseScript.html#runRunnableSubcommand(java.util.List)"><code>PicocliBaseScript.runRunnableSubcommand(List)</code></a>, or <a href="./picocli/groovy/PicocliBaseScript.html#runScriptBody()"><code>PicocliBaseScript.runScriptBody()</code></a>
  then this gets called to report the problem.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/groovy/PicocliBaseScript.html#handleParameterException-picocli.CommandLine.ParameterException-java.lang.String:A-">handleParameterException(CommandLine.ParameterException, String[])</a></span> - Method in class picocli.groovy.<a href="picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
+<dt><span class="strong"><a href="./picocli/groovy/PicocliBaseScript.html#handleParameterException(picocli.CommandLine.ParameterException,%20java.lang.String[])">handleParameterException(CommandLine.ParameterException, String[])</a></span> - Method in class picocli.groovy.<a href="./picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
 <dd>
-<div class="block">If a ParameterException occurs during <a href="picocli/groovy/PicocliBaseScript.html#parseScriptArguments-picocli.CommandLine-java.lang.String:A-"><code>PicocliBaseScript.parseScriptArguments(CommandLine, String[])</code></a>
+<div class="block">If a ParameterException occurs during <a href="./picocli/groovy/PicocliBaseScript.html#parseScriptArguments(picocli.CommandLine,%20java.lang.String[])"><code>PicocliBaseScript.parseScriptArguments(CommandLine, String[])</code></a>
  then this method gets called to report the problem.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.DefaultExceptionHandler.html#handleParseException-picocli.CommandLine.ParameterException-R-java.lang.String:A-">handleParseException(CommandLine.ParameterException, R, String[])</a></span> - Method in class picocli.<a href="picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.DefaultExceptionHandler.html#handleParseException(picocli.CommandLine.ParameterException,%20java.lang.String[])">handleParseException(CommandLine.ParameterException, String[])</a></span> - Method in class picocli.<a href="./picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a></dt>
 <dd>
 <div class="block">Prints the message of the specified exception, followed by the usage message for the command or subcommand
- whose input was invalid, to the stream returned by <a href="picocli/CommandLine.AbstractHandler.html#err--"><code>CommandLine.AbstractHandler.err()</code></a>.</div>
+ whose input was invalid, to the stream returned by <a href="./picocli/CommandLine.AbstractHandler.html#err()"><code>CommandLine.AbstractHandler.err()</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.IExceptionHandler2.html#handleParseException-picocli.CommandLine.ParameterException-R-java.lang.String:A-">handleParseException(CommandLine.ParameterException, R, String[])</a></span> - Method in interface picocli.<a href="picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.IExceptionHandler2.html#handleParseException(picocli.CommandLine.ParameterException,%20java.lang.String[])">handleParseException(CommandLine.ParameterException, String[])</a></span> - Method in interface picocli.<a href="./picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a></dt>
 <dd>
-<div class="block">Handles a <code>ParameterException</code> that occurred while <a href="picocli/CommandLine.html#parseArgs-java.lang.String...-">parsing</a> the command
+<div class="block">Handles a <code>ParameterException</code> that occurred while <a href="./picocli/CommandLine.html#parseArgs(java.lang.String...)">parsing</a> the command
  line arguments and optionally returns a list of results.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.AbstractParseResultHandler.html#handleParseResult-picocli.CommandLine.ParseResult-R-">handleParseResult(CommandLine.ParseResult, R)</a></span> - Method in class picocli.<a href="picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.AbstractParseResultHandler.html#handleParseResult(picocli.CommandLine.ParseResult)">handleParseResult(CommandLine.ParseResult)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a></dt>
 <dd>
-<div class="block">Prints help if requested, and otherwise calls <a href="picocli/CommandLine.AbstractParseResultHandler.html#handle-picocli.CommandLine.ParseResult-R-"><code>CommandLine.AbstractParseResultHandler.handle(CommandLine.ParseResult, Object)</code></a>.</div>
+<div class="block">Prints help if requested, and otherwise calls <a href="./picocli/CommandLine.AbstractParseResultHandler.html#handle(picocli.CommandLine.ParseResult)"><code>CommandLine.AbstractParseResultHandler.handle(CommandLine.ParseResult)</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.AbstractSimpleParseResultHandler.html#handleParseResult-picocli.CommandLine.ParseResult-java.lang.Void-">handleParseResult(CommandLine.ParseResult, Void)</a></span> - Method in class picocli.<a href="picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli">CommandLine.AbstractSimpleParseResultHandler</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.IParseResultHandler.html#handleParseResult(java.util.List,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">handleParseResult(List&lt;CommandLine&gt;, PrintStream, CommandLine.Help.Ansi)</a></span> - Method in interface picocli.<a href="./picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a></dt>
 <dd>
-<div class="block">Prints help if requested, and otherwise calls <a href="picocli/CommandLine.AbstractSimpleParseResultHandler.html#handle-picocli.CommandLine.ParseResult-"><code>CommandLine.AbstractSimpleParseResultHandler.handle(CommandLine.ParseResult)</code></a>.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.IParseResultHandler.html#handleParseResult-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">handleParseResult(List&lt;CommandLine&gt;, PrintStream, CommandLine.Help.Ansi)</a></span> - Method in interface picocli.<a href="picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block"><span class="strong">Deprecated.</span></div>
 <div class="block">Processes a List of <code>CommandLine</code> objects resulting from successfully
- <a href="picocli/CommandLine.html#parse-java.lang.String...-">parsing</a> the command line arguments and optionally returns a list of results.</div>
+ <a href="./picocli/CommandLine.html#parse(java.lang.String...)">parsing</a> the command line arguments and optionally returns a list of results.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.IParseResultHandler2.html#handleParseResult-picocli.CommandLine.ParseResult-R-">handleParseResult(CommandLine.ParseResult, R)</a></span> - Method in interface picocli.<a href="picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.IParseResultHandler2.html#handleParseResult(picocli.CommandLine.ParseResult)">handleParseResult(CommandLine.ParseResult)</a></span> - Method in interface picocli.<a href="./picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a></dt>
 <dd>
 <div class="block">Processes the <code>ParseResult</code> object resulting from successfully
- <a href="picocli/CommandLine.html#parseArgs-java.lang.String...-">parsing</a> the command line arguments and returns a return value.</div>
+ <a href="./picocli/CommandLine.html#parseArgs(java.lang.String...)">parsing</a> the command line arguments and returns a return value.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.RunAll.html#handleParseResult-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">handleParseResult(List&lt;CommandLine&gt;, PrintStream, CommandLine.Help.Ansi)</a></span> - Method in class picocli.<a href="picocli/CommandLine.RunAll.html" title="class in picocli">CommandLine.RunAll</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.RunAll.html#handleParseResult(java.util.List,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">handleParseResult(List&lt;CommandLine&gt;, PrintStream, CommandLine.Help.Ansi)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.RunAll.html" title="class in picocli">CommandLine.RunAll</a></dt>
 <dd>
 <div class="block">Prints help if requested, and otherwise executes the top-level command and all subcommands as <code>Runnable</code>
  or <code>Callable</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.RunFirst.html#handleParseResult-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">handleParseResult(List&lt;CommandLine&gt;, PrintStream, CommandLine.Help.Ansi)</a></span> - Method in class picocli.<a href="picocli/CommandLine.RunFirst.html" title="class in picocli">CommandLine.RunFirst</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.RunFirst.html#handleParseResult(java.util.List,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">handleParseResult(List&lt;CommandLine&gt;, PrintStream, CommandLine.Help.Ansi)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.RunFirst.html" title="class in picocli">CommandLine.RunFirst</a></dt>
 <dd>
 <div class="block">Prints help if requested, and otherwise executes the top-level <code>Runnable</code> or <code>Callable</code> command.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.RunLast.html#handleParseResult-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">handleParseResult(List&lt;CommandLine&gt;, PrintStream, CommandLine.Help.Ansi)</a></span> - Method in class picocli.<a href="picocli/CommandLine.RunLast.html" title="class in picocli">CommandLine.RunLast</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.RunLast.html#handleParseResult(java.util.List,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">handleParseResult(List&lt;CommandLine&gt;, PrintStream, CommandLine.Help.Ansi)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.RunLast.html" title="class in picocli">CommandLine.RunLast</a></dt>
 <dd>
 <div class="block">Prints help if requested, and otherwise executes the most specific <code>Runnable</code> or <code>Callable</code> subcommand.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.AbstractHandler.html#hasExitCode--">hasExitCode()</a></span> - Method in class picocli.<a href="picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.AbstractHandler.html#hasExitCode()">hasExitCode()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
 <dd>
-<div class="block">Returns <code>true</code> if an exit code was set with <a href="picocli/CommandLine.AbstractHandler.html#andExit-int-"><code>CommandLine.AbstractHandler.andExit(int)</code></a>, or <code>false</code> (the default) if
+<div class="block">Returns <code>true</code> if an exit code was set with <a href="./picocli/CommandLine.AbstractHandler.html#andExit(int)"><code>CommandLine.AbstractHandler.andExit(int)</code></a>, or <code>false</code> (the default) if
  the handler should not call <code>System.exit(int)</code> after processing completes.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Text.html#hashCode--">hashCode()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Text.html#hashCode()">hashCode()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ArgSpec.html#hashCode--">hashCode()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ArgSpec.html#hashCode()">hashCode()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.OptionSpec.html#hashCode--">hashCode()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.OptionSpec.html#hashCode()">hashCode()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.PositionalParamSpec.html#hashCode--">hashCode()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.PositionalParamSpec.html#hashCode()">hashCode()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Range.html#hashCode--">hashCode()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Range.html#hashCode()">hashCode()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#hasOption-char-">hasOption(char)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#hasOption(char)">hasOption(char)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns whether an option whose aliases include the specified short name was matched on the command line.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#hasOption-java.lang.String-">hasOption(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#hasOption(java.lang.String)">hasOption(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns whether an option whose aliases include the specified name was matched on the command line.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#hasOption-picocli.CommandLine.Model.OptionSpec-">hasOption(CommandLine.Model.OptionSpec)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#hasOption(picocli.CommandLine.Model.OptionSpec)">hasOption(CommandLine.Model.OptionSpec)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns whether the specified option was matched on the command line.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#hasPositional-int-">hasPositional(int)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#hasPositional(int)">hasPositional(int)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns whether a positional parameter was matched at the specified position.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#hasPositional-picocli.CommandLine.Model.PositionalParamSpec-">hasPositional(CommandLine.Model.PositionalParamSpec)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#hasPositional(picocli.CommandLine.Model.PositionalParamSpec)">hasPositional(CommandLine.Model.PositionalParamSpec)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns whether the specified positional parameter was matched on the command line.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#hasSubcommand--">hasSubcommand()</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#hasSubcommand()">hasSubcommand()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns <code>true</code> if a subcommand was matched on the command line, <code>false</code> otherwise.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#header-java.lang.Object...-">header(Object...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#header(java.lang.Object...)">header(Object...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns the command header text as a string.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#header--">header()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#header()">header()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Returns the optional header lines displayed at the top of the help message.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#header-java.lang.String...-">header(String...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#header(java.lang.String...)">header(String...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Sets the optional header lines displayed at the top of the help message.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#headerHeading-java.lang.Object...-">headerHeading(Object...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#headerHeading(java.lang.Object...)">headerHeading(Object...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns the text displayed before the header text; the result of <code>String.format(headerHeading, params)</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#headerHeading--">headerHeading()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#headerHeading()">headerHeading()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Returns the optional heading preceding the header section.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#headerHeading-java.lang.String-">headerHeading(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#headerHeading(java.lang.String)">headerHeading(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Sets the heading preceding the header section.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#Help-java.lang.Object-">Help(Object)</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
-<dd>
-<div class="block">Constructs a new <code>Help</code> instance with a default color scheme, initialized from annotatations
- on the specified class and superclasses.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#Help-java.lang.Object-picocli.CommandLine.Help.Ansi-">Help(Object, CommandLine.Help.Ansi)</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
-<dd>
-<div class="block">Constructs a new <code>Help</code> instance with a default color scheme, initialized from annotatations
- on the specified class and superclasses.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#Help-java.lang.Object-picocli.CommandLine.Help.ColorScheme-">Help(Object, CommandLine.Help.ColorScheme)</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">use <code>picocli.CommandLine.Help#Help(picocli.CommandLine.Model.CommandSpec, picocli.CommandLine.Help.ColorScheme)</code></span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#Help-picocli.CommandLine.Model.CommandSpec-picocli.CommandLine.Help.ColorScheme-">Help(CommandLine.Model.CommandSpec, CommandLine.Help.ColorScheme)</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
-<dd>
-<div class="block">Constructs a new <code>Help</code> instance with the specified color scheme, initialized from annotatations
- on the specified class and superclasses.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.OptionSpec.Builder.html#help-boolean-">help(boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.OptionSpec.Builder.html#help(boolean)">help(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></dt>
 <dd>
 <div class="block">Sets whether this option disables validation of the other arguments, and returns this builder.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.OptionSpec.html#help--">help()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.OptionSpec.html#help()">help()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use <a href="picocli/CommandLine.Model.OptionSpec.html#usageHelp--"><code>CommandLine.Model.OptionSpec.usageHelp()</code></a> and <a href="picocli/CommandLine.Model.OptionSpec.html#versionHelp--"><code>CommandLine.Model.OptionSpec.versionHelp()</code></a> instead.</span></div>
+<div class="block"><span class="strong">Deprecated.</span>
+<div class="block"><i>Use <a href="./picocli/CommandLine.Model.OptionSpec.html#usageHelp()"><code>CommandLine.Model.OptionSpec.usageHelp()</code></a> and <a href="./picocli/CommandLine.Model.OptionSpec.html#versionHelp()"><code>CommandLine.Model.OptionSpec.versionHelp()</code></a> instead.</i></div>
 </div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.HelpCommand.html#HelpCommand--">HelpCommand()</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.HelpCommand.html" title="class in picocli">CommandLine.HelpCommand</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#helpCommand--">helpCommand()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#helpCommand()">helpCommand()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Returns whether this subcommand is a help command, and required options and positional
  parameters of the parent command should not be validated.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#helpCommand-boolean-">helpCommand(boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#helpCommand(boolean)">helpCommand(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Sets whether this is a help command and required parameter checking should be suspended.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ArgSpec.html#hidden--">hidden()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ArgSpec.html#hidden()">hidden()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
 <dd>
 <div class="block">Returns whether this option should be excluded from the usage message.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#hidden--">hidden()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#hidden()">hidden()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Returns whether this command should be hidden from the usage help message of the parent command.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#hidden-boolean-">hidden(boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#hidden(boolean)">hidden(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Set the hidden flag on this command to control whether to show or hide it in the help usage text of the parent command.</div>
 </dd>
 </dl>
-<a name="I:I">
+<a name="_I_">
 <!--   -->
 </a>
 <h2 class="title">I</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Column.html#indent">indent</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Column.html#indent">indent</a></span> - Variable in class picocli.<a href="./picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a></dt>
 <dd>
 <div class="block">Indent (number of empty spaces at the start of the column preceding the text value)</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.html#indentWrappedLines">indentWrappedLines</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.TextTable.html#indentWrappedLines">indentWrappedLines</a></span> - Variable in class picocli.<a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
 <dd>
 <div class="block">By default, indent wrapped lines by 2 spaces.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.PositionalParamSpec.Builder.html#index-java.lang.String-">index(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli">CommandLine.Model.PositionalParamSpec.Builder</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.PositionalParamSpec.Builder.html#index(java.lang.String)">index(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli">CommandLine.Model.PositionalParamSpec.Builder</a></dt>
 <dd>
 <div class="block">Sets the index or range specifying which of the command line arguments should be assigned to this positional parameter, and returns this builder.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.PositionalParamSpec.Builder.html#index-picocli.CommandLine.Range-">index(CommandLine.Range)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli">CommandLine.Model.PositionalParamSpec.Builder</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.PositionalParamSpec.Builder.html#index(picocli.CommandLine.Range)">index(CommandLine.Range)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli">CommandLine.Model.PositionalParamSpec.Builder</a></dt>
 <dd>
 <div class="block">Sets the index or range specifying which of the command line arguments should be assigned to this positional parameter, and returns this builder.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.PositionalParamSpec.html#index--">index()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.PositionalParamSpec.html#index()">index()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a></dt>
 <dd>
 <div class="block">Returns an index or range specifying which of the command line arguments should be assigned to this positional parameter.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.HelpCommand.html#init-picocli.CommandLine-picocli.CommandLine.Help.Ansi-java.io.PrintStream-java.io.PrintStream-">init(CommandLine, CommandLine.Help.Ansi, PrintStream, PrintStream)</a></span> - Method in class picocli.<a href="picocli/CommandLine.HelpCommand.html" title="class in picocli">CommandLine.HelpCommand</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.HelpCommand.html#init(picocli.CommandLine,%20picocli.CommandLine.Help.Ansi,%20java.io.PrintStream,%20java.io.PrintStream)">init(CommandLine, CommandLine.Help.Ansi, PrintStream, PrintStream)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.HelpCommand.html" title="class in picocli">CommandLine.HelpCommand</a></dt>
 <dd>
 <div class="block">Initializes this object with the information needed to implement a help command that provides usage help for other commands.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.IHelpCommandInitializable.html#init-picocli.CommandLine-picocli.CommandLine.Help.Ansi-java.io.PrintStream-java.io.PrintStream-">init(CommandLine, CommandLine.Help.Ansi, PrintStream, PrintStream)</a></span> - Method in interface picocli.<a href="picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli">CommandLine.IHelpCommandInitializable</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.IHelpCommandInitializable.html#init(picocli.CommandLine,%20picocli.CommandLine.Help.Ansi,%20java.io.PrintStream,%20java.io.PrintStream)">init(CommandLine, CommandLine.Help.Ansi, PrintStream, PrintStream)</a></span> - Method in interface picocli.<a href="./picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli">CommandLine.IHelpCommandInitializable</a></dt>
 <dd>
 <div class="block">Initializes this object with the information needed to implement a help command that provides usage help for other commands.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.InitializationException.html#InitializationException-java.lang.String-">InitializationException(String)</a></span> - Constructor for exception picocli.<a href="picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.InitializationException.html#InitializationException-java.lang.String-java.lang.Exception-">InitializationException(String, Exception)</a></span> - Constructor for exception picocli.<a href="picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#isExpandAtFiles--">isExpandAtFiles()</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#isExpandAtFiles()">isExpandAtFiles()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Returns whether arguments starting with <code>'@'</code> should be treated as the path to an argument file and its
  contents should be expanded into separate arguments for each line in the specified file.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ArgSpec.html#isOption--">isOption()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ArgSpec.html#isOption()">isOption()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
 <dd>
 <div class="block">Returns <code>true</code> if this argument is a named option, <code>false</code> otherwise.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.OptionSpec.html#isOption--">isOption()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.OptionSpec.html#isOption()">isOption()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.PositionalParamSpec.html#isOption--">isOption()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.PositionalParamSpec.html#isOption()">isOption()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#isOverwrittenOptionsAllowed--">isOverwrittenOptionsAllowed()</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#isOverwrittenOptionsAllowed()">isOverwrittenOptionsAllowed()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Returns whether options for single-value fields can be specified multiple times on the command line.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ArgSpec.html#isPositional--">isPositional()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ArgSpec.html#isPositional()">isPositional()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
 <dd>
 <div class="block">Returns <code>true</code> if this argument is a positional parameter, <code>false</code> otherwise.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.OptionSpec.html#isPositional--">isPositional()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.OptionSpec.html#isPositional()">isPositional()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.PositionalParamSpec.html#isPositional--">isPositional()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.PositionalParamSpec.html#isPositional()">isPositional()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#isStopAtPositional--">isStopAtPositional()</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#isPosixClusteredShortOptionsAllowed()">isPosixClusteredShortOptionsAllowed()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dd>
+<div class="block">Returns whether the parser accepts clustered short options.</div>
+</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#isStopAtPositional()">isStopAtPositional()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Returns whether the parser interprets the first positional parameter as "end of options" so the remaining
  arguments are all treated as positional parameters.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#isStopAtUnmatched--">isStopAtUnmatched()</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#isStopAtUnmatched()">isStopAtUnmatched()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Returns whether the parser should stop interpreting options and positional parameters as soon as it encounters an
  unmatched option.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#isUnmatchedArgumentsAllowed--">isUnmatchedArgumentsAllowed()</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#isUnmatchedArgumentsAllowed()">isUnmatchedArgumentsAllowed()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Returns whether the end user may specify arguments on the command line that are not matched to any option or parameter fields.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#isUsageHelpRequested--">isUsageHelpRequested()</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#isUsageHelpRequested()">isUsageHelpRequested()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Returns <code>true</code> if an option annotated with <a href="picocli/CommandLine.Option.html#usageHelp--"><code>CommandLine.Option.usageHelp()</code></a> was specified on the command line.</div>
+<div class="block">Returns <code>true</code> if an option annotated with <a href="./picocli/CommandLine.Option.html#usageHelp()"><code>CommandLine.Option.usageHelp()</code></a> was specified on the command line.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#isUsageHelpRequested--">isUsageHelpRequested()</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#isUsageHelpRequested()">isUsageHelpRequested()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
-<div class="block">Returns <code>true</code> if one of the options that was matched on the command line is a <a href="picocli/CommandLine.Model.OptionSpec.html#usageHelp--"><code>usageHelp</code></a> option.</div>
+<div class="block">Returns <code>true</code> if one of the options that was matched on the command line is a <a href="./picocli/CommandLine.Model.OptionSpec.html#usageHelp()"><code>usageHelp</code></a> option.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Range.html#isVariable">isVariable</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Range.html#isVariable">isVariable</a></span> - Variable in class picocli.<a href="./picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#isVersionHelpRequested--">isVersionHelpRequested()</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#isVersionHelpRequested()">isVersionHelpRequested()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Returns <code>true</code> if an option annotated with <a href="picocli/CommandLine.Option.html#versionHelp--"><code>CommandLine.Option.versionHelp()</code></a> was specified on the command line.</div>
+<div class="block">Returns <code>true</code> if an option annotated with <a href="./picocli/CommandLine.Option.html#versionHelp()"><code>CommandLine.Option.versionHelp()</code></a> was specified on the command line.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#isVersionHelpRequested--">isVersionHelpRequested()</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#isVersionHelpRequested()">isVersionHelpRequested()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
-<div class="block">Returns <code>true</code> if one of the options that was matched on the command line is a <a href="picocli/CommandLine.Model.OptionSpec.html#versionHelp--"><code>versionHelp</code></a> option.</div>
+<div class="block">Returns <code>true</code> if one of the options that was matched on the command line is a <a href="./picocli/CommandLine.Model.OptionSpec.html#versionHelp()"><code>versionHelp</code></a> option.</div>
 </dd>
 </dl>
-<a name="I:J">
+<a name="_J_">
 <!--   -->
 </a>
 <h2 class="title">J</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#join-picocli.CommandLine.Help.Ansi-java.lang.String:A-java.lang.StringBuilder-java.lang.Object...-">join(CommandLine.Help.Ansi, String[], StringBuilder, Object...)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#join(picocli.CommandLine.Help.Ansi,%20java.lang.String[],%20java.lang.StringBuilder,%20java.lang.Object...)">join(CommandLine.Help.Ansi, String[], StringBuilder, Object...)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Formats each of the specified values and appends it to the specified StringBuilder.</div>
 </dd>
 </dl>
-<a name="I:L">
+<a name="_L_">
 <!--   -->
 </a>
 <h2 class="title">L</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Layout.html#Layout-picocli.CommandLine.Help.ColorScheme-">Layout(CommandLine.Help.ColorScheme)</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
-<dd>
-<div class="block">Constructs a Layout with the specified color scheme, a new default TextTable, the
- <a href="picocli/CommandLine.Help.html#createDefaultOptionRenderer--">default option renderer</a>, and the
- <a href="picocli/CommandLine.Help.html#createDefaultParameterRenderer--">default parameter renderer</a>.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Layout.html#Layout-picocli.CommandLine.Help.ColorScheme-picocli.CommandLine.Help.TextTable-">Layout(CommandLine.Help.ColorScheme, CommandLine.Help.TextTable)</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
-<dd>
-<div class="block">Constructs a Layout with the specified color scheme, the specified TextTable, the
- <a href="picocli/CommandLine.Help.html#createDefaultOptionRenderer--">default option renderer</a>, and the
- <a href="picocli/CommandLine.Help.html#createDefaultParameterRenderer--">default parameter renderer</a>.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Layout.html#Layout-picocli.CommandLine.Help.ColorScheme-picocli.CommandLine.Help.TextTable-picocli.CommandLine.Help.IOptionRenderer-picocli.CommandLine.Help.IParameterRenderer-">Layout(CommandLine.Help.ColorScheme, CommandLine.Help.TextTable, CommandLine.Help.IOptionRenderer, CommandLine.Help.IParameterRenderer)</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Layout.html#layout(picocli.CommandLine.Model.ArgSpec,%20picocli.CommandLine.Help.Ansi.Text[][])">layout(CommandLine.Model.ArgSpec, CommandLine.Help.Ansi.Text[][])</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
 <dd>
-<div class="block">Constructs a Layout with the specified color scheme, the specified TextTable, the
- specified option renderer and the specified parameter renderer.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Layout.html#layout-picocli.CommandLine.Model.ArgSpec-picocli.CommandLine.Help.Ansi.Text:A:A-">layout(CommandLine.Model.ArgSpec, CommandLine.Help.Ansi.Text[][])</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
-<dd>
-<div class="block">Copies the specified text values into the correct cells in the <a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli"><code>CommandLine.Help.TextTable</code></a>.</div>
+<div class="block">Copies the specified text values into the correct cells in the <a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli"><code>CommandLine.Help.TextTable</code></a>.</div>
 </dd>
 </dl>
-<a name="I:M">
+<a name="_M_">
 <!--   -->
 </a>
 <h2 class="title">M</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/AutoComplete.html#main-java.lang.String...-">main(String...)</a></span> - Static method in class picocli.<a href="picocli/AutoComplete.html" title="class in picocli">AutoComplete</a></dt>
+<dt><span class="strong"><a href="./picocli/AutoComplete.html#main(java.lang.String...)">main(String...)</a></span> - Static method in class picocli.<a href="./picocli/AutoComplete.html" title="class in picocli">AutoComplete</a></dt>
 <dd>
 <div class="block">Generates a bash completion script for the specified command class.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Range.html#max">max</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Range.html#max">max</a></span> - Variable in class picocli.<a href="./picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
 <dd>
 <div class="block">Maximum accepted number of parameters for an option or positional parameter.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Range.html#max-int-">max(int)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Range.html#max(int)">max(int)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
 <dd>
 <div class="block">Returns a new Range object with the <code>max</code> value replaced by the specified value.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.MaxValuesforFieldExceededException.html#MaxValuesforFieldExceededException-picocli.CommandLine-java.lang.String-">MaxValuesforFieldExceededException(CommandLine, String)</a></span> - Constructor for exception picocli.<a href="picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli">CommandLine.MaxValuesforFieldExceededException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Range.html#min">min</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Range.html#min">min</a></span> - Variable in class picocli.<a href="./picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
 <dd>
 <div class="block">Required number of parameters for an option or positional parameter.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Range.html#min-int-">min(int)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Range.html#min(int)">min(int)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
 <dd>
 <div class="block">Returns a new Range object with the <code>min</code> value replaced by the specified value.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.MissingParameterException.html#MissingParameterException-picocli.CommandLine-java.lang.String-">MissingParameterException(CommandLine, String)</a></span> - Constructor for exception picocli.<a href="picocli/CommandLine.MissingParameterException.html" title="class in picocli">CommandLine.MissingParameterException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.MissingTypeConverterException.html#MissingTypeConverterException-picocli.CommandLine-java.lang.String-">MissingTypeConverterException(CommandLine, String)</a></span> - Constructor for exception picocli.<a href="picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli">CommandLine.MissingTypeConverterException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#mixins--">mixins()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#mixins()">mixins()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Returns a map of the mixin names to mixin <code>CommandSpec</code> objects configured for this command.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#mixinStandardHelpOptions--">mixinStandardHelpOptions()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#mixinStandardHelpOptions()">mixinStandardHelpOptions()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Returns <code>true</code> if the standard help options have been mixed in with this command, <code>false</code> otherwise.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#mixinStandardHelpOptions-boolean-">mixinStandardHelpOptions(boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#mixinStandardHelpOptions(boolean)">mixinStandardHelpOptions(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Sets whether the standard help options should be mixed in with this command.</div>
 </dd>
 </dl>
-<a name="I:N">
+<a name="_N_">
 <!--   -->
 </a>
 <h2 class="title">N</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#name--">name()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#name()">name()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Returns the String to use as the program name in the synopsis line of the help message.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#name-java.lang.String-">name(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#name(java.lang.String)">name(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Sets the String to use as the program name in the synopsis line of the help message.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.OptionSpec.Builder.html#names-java.lang.String...-">names(String...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.OptionSpec.Builder.html#names(java.lang.String...)">names(String...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></dt>
 <dd>
 <div class="block">Replaces the option names with the specified values.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.OptionSpec.html#names--">names()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.OptionSpec.html#names()">names()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
 <dd>
 <div class="block">Returns one or more option names.</div>
 </dd>
 </dl>
-<a name="I:O">
+<a name="_O_">
 <!--   -->
 </a>
 <h2 class="title">O</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.IStyle.html#off--">off()</a></span> - Method in interface picocli.<a href="picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.IStyle.html#off()">off()</a></span> - Method in interface picocli.<a href="./picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></dt>
 <dd>
 <div class="block">Returns the ANSI escape code for turning this style off.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Style.html#off--">off()</a></span> - Method in enum picocli.<a href="picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Style.html#off()">off()</a></span> - Method in enum picocli.<a href="./picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Style.html#off-picocli.CommandLine.Help.Ansi.IStyle...-">off(CommandLine.Help.Ansi.IStyle...)</a></span> - Static method in enum picocli.<a href="picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Style.html#off(picocli.CommandLine.Help.Ansi.IStyle...)">off(CommandLine.Help.Ansi.IStyle...)</a></span> - Static method in enum picocli.<a href="./picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></dt>
 <dd>
 <div class="block">Returns the concatenated ANSI escape codes for turning all specified styles off.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.IStyle.html#on--">on()</a></span> - Method in interface picocli.<a href="picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.IStyle.html#on()">on()</a></span> - Method in interface picocli.<a href="./picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></dt>
 <dd>
 <div class="block">Returns the ANSI escape code for turning this style on.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Style.html#on--">on()</a></span> - Method in enum picocli.<a href="picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Style.html#on()">on()</a></span> - Method in enum picocli.<a href="./picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Style.html#on-picocli.CommandLine.Help.Ansi.IStyle...-">on(CommandLine.Help.Ansi.IStyle...)</a></span> - Static method in enum picocli.<a href="picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Style.html#on(picocli.CommandLine.Help.Ansi.IStyle...)">on(CommandLine.Help.Ansi.IStyle...)</a></span> - Static method in enum picocli.<a href="./picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></dt>
 <dd>
 <div class="block">Returns the concatenated ANSI escape codes for turning all specified styles on.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#option-char-">option(char)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#option(char)">option(char)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns the option with the specified short name, or <code>null</code> if no option with that name was matched on the command one.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#option-java.lang.String-">option(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#option(java.lang.String)">option(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns the option with the specified name, or <code>null</code> if no option with that name was matched on the command one.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Range.html#optionArity-java.lang.reflect.Field-">optionArity(Field)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Range.html#optionArity(java.lang.reflect.Field)">optionArity(Field)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
 <dd>
-<div class="block">Returns a new <code>Range</code> based on the <a href="picocli/CommandLine.Option.html#arity--"><code>CommandLine.Option.arity()</code></a> annotation on the specified field,
+<div class="block">Returns a new <code>Range</code> based on the <a href="./picocli/CommandLine.Option.html#arity()"><code>CommandLine.Option.arity()</code></a> annotation on the specified field,
  or the field type's default arity if no arity was specified.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#optionList--">optionList()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#optionList()">optionList()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
-<div class="block">Returns a description of the <a href="picocli/CommandLine.Option.html" title="annotation in picocli">options</a> supported by the application.</div>
+<div class="block">Returns a description of the <a href="./picocli/CommandLine.Option.html" title="annotation in picocli">options</a> supported by the application.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#optionList-picocli.CommandLine.Help.Layout-java.util.Comparator-picocli.CommandLine.Help.IParamLabelRenderer-">optionList(CommandLine.Help.Layout, Comparator&lt;CommandLine.Model.OptionSpec&gt;, CommandLine.Help.IParamLabelRenderer)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#optionList(picocli.CommandLine.Help.Layout,%20java.util.Comparator,%20picocli.CommandLine.Help.IParamLabelRenderer)">optionList(CommandLine.Help.Layout, Comparator&lt;CommandLine.Model.OptionSpec&gt;, CommandLine.Help.IParamLabelRenderer)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Sorts all <code>Options</code> with the specified <code>comparator</code> (if the comparator is non-<code>null</code>),
- then <a href="picocli/CommandLine.Help.Layout.html#addOption-picocli.CommandLine.Model.OptionSpec-picocli.CommandLine.Help.IParamLabelRenderer-">adds</a> all non-hidden options to the
+ then <a href="./picocli/CommandLine.Help.Layout.html#addOption(picocli.CommandLine.Model.OptionSpec,%20picocli.CommandLine.Help.IParamLabelRenderer)">adds</a> all non-hidden options to the
  specified TextTable and returns the result of TextTable.toString().</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#optionListHeading-java.lang.Object...-">optionListHeading(Object...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#optionListHeading(java.lang.Object...)">optionListHeading(Object...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns the text displayed before the option list; an empty string if there are no options,
  otherwise the result of <code>String.format(optionListHeading, params)</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#optionListHeading--">optionListHeading()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#optionListHeading()">optionListHeading()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Returns the optional heading preceding the options list.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#optionListHeading-java.lang.String-">optionListHeading(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#optionListHeading(java.lang.String)">optionListHeading(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Sets the heading preceding the options list.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#optionParams-picocli.CommandLine.Help.Ansi.IStyle...-">optionParams(CommandLine.Help.Ansi.IStyle...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.ColorScheme.html#optionParams(picocli.CommandLine.Help.Ansi.IStyle...)">optionParams(CommandLine.Help.Ansi.IStyle...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>
 <div class="block">Adds the specified styles to the registered styles for option parameters in this color scheme and returns this color scheme.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#optionParamStyles">optionParamStyles</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.ColorScheme.html#optionParamStyles">optionParamStyles</a></span> - Variable in class picocli.<a href="./picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#optionParamText-java.lang.String-">optionParamText(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.ColorScheme.html#optionParamText(java.lang.String)">optionParamText(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>
 <div class="block">Returns a Text with all optionParam styles applied to the specified optionParam string.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Layout.html#optionRenderer">optionRenderer</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Layout.html#optionRenderer">optionRenderer</a></span> - Variable in class picocli.<a href="./picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#options-picocli.CommandLine.Help.Ansi.IStyle...-">options(CommandLine.Help.Ansi.IStyle...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.ColorScheme.html#options(picocli.CommandLine.Help.Ansi.IStyle...)">options(CommandLine.Help.Ansi.IStyle...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>
 <div class="block">Adds the specified styles to the registered styles for options in this color scheme and returns this color scheme.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#options--">options()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#options()">options()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Returns the list of options configured for this command.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#options--">options()</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#options()">options()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns a list of matched options, in the order they were found on the command line.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#optionsMap--">optionsMap()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#optionsMap()">optionsMap()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Returns a map of the option names to option spec objects configured for this command.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#optionStyles">optionStyles</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.ColorScheme.html#optionStyles">optionStyles</a></span> - Variable in class picocli.<a href="./picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#optionText-java.lang.String-">optionText(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.ColorScheme.html#optionText(java.lang.String)">optionText(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>
 <div class="block">Returns a Text with all option styles applied to the specified option string.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#optionValue-char-T-">optionValue(char, T)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#optionValue(char,%20T)">optionValue(char, T)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
-<div class="block">Returns the command line argument value of the option with the specified name, converted to the <a href="picocli/CommandLine.Model.ArgSpec.html#type--">type</a> of the option, or the specified default value if no option with the specified name was matched.</div>
+<div class="block">Returns the command line argument value of the option with the specified name, converted to the <a href="./picocli/CommandLine.Model.ArgSpec.html#type()">type</a> of the option, or the specified default value if no option with the specified name was matched.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#optionValue-java.lang.String-T-">optionValue(String, T)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#optionValue(java.lang.String,%20T)">optionValue(String, T)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
-<div class="block">Returns the command line argument value of the option with the specified name, converted to the <a href="picocli/CommandLine.Model.ArgSpec.html#type--">type</a> of the option, or the specified default value if no option with the specified name was matched.</div>
+<div class="block">Returns the command line argument value of the option with the specified name, converted to the <a href="./picocli/CommandLine.Model.ArgSpec.html#type()">type</a> of the option, or the specified default value if no option with the specified name was matched.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#optionValue-picocli.CommandLine.Model.OptionSpec-T-">optionValue(CommandLine.Model.OptionSpec, T)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#optionValue(picocli.CommandLine.Model.OptionSpec,%20T)">optionValue(CommandLine.Model.OptionSpec, T)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
-<div class="block">Returns the command line argument value of the specified option, converted to the <a href="picocli/CommandLine.Model.ArgSpec.html#type--">type</a> of the option, or the specified default value if the specified option is <code>null</code>.</div>
+<div class="block">Returns the command line argument value of the specified option, converted to the <a href="./picocli/CommandLine.Model.ArgSpec.html#type()">type</a> of the option, or the specified default value if the specified option is <code>null</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.Builder.html#originalArgs-java.lang.String:A-">originalArgs(String[])</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.Builder.html#originalArgs(java.lang.String[])">originalArgs(String[])</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></dt>
 <dd>
 <div class="block">Sets the specified command line arguments that were parsed.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#originalArgs--">originalArgs()</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#originalArgs()">originalArgs()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns the command line arguments that were parsed.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.AbstractHandler.html#out--">out()</a></span> - Method in class picocli.<a href="picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.AbstractHandler.html#out()">out()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
 <dd>
 <div class="block">Returns the stream to print command output to.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Column.html#overflow">overflow</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Column.html#overflow">overflow</a></span> - Variable in class picocli.<a href="./picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a></dt>
 <dd>
 <div class="block">Policy that determines how to handle values larger than the column width.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.OverwrittenOptionException.html#OverwrittenOptionException-picocli.CommandLine-java.lang.String-">OverwrittenOptionException(CommandLine, String)</a></span> - Constructor for exception picocli.<a href="picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli">CommandLine.OverwrittenOptionException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ParserSpec.html#overwrittenOptionsAllowed--">overwrittenOptionsAllowed()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ParserSpec.html#overwrittenOptionsAllowed()">overwrittenOptionsAllowed()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ParserSpec.html#overwrittenOptionsAllowed-boolean-">overwrittenOptionsAllowed(boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ParserSpec.html#overwrittenOptionsAllowed(boolean)">overwrittenOptionsAllowed(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
 <dd>&nbsp;</dd>
 </dl>
-<a name="I:P">
+<a name="_P_">
 <!--   -->
 </a>
 <h2 class="title">P</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Range.html#parameterArity-java.lang.reflect.Field-">parameterArity(Field)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Range.html#parameterArity(java.lang.reflect.Field)">parameterArity(Field)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
 <dd>
-<div class="block">Returns a new <code>Range</code> based on the <a href="picocli/CommandLine.Parameters.html#arity--"><code>CommandLine.Parameters.arity()</code></a> annotation on the specified field,
+<div class="block">Returns a new <code>Range</code> based on the <a href="./picocli/CommandLine.Parameters.html#arity()"><code>CommandLine.Parameters.arity()</code></a> annotation on the specified field,
  or the field type's default arity if no arity was specified.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParameterException.html#ParameterException-picocli.CommandLine-java.lang.String-">ParameterException(CommandLine, String)</a></span> - Constructor for exception picocli.<a href="picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Range.html#parameterIndex(java.lang.reflect.Field)">parameterIndex(Field)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
 <dd>
-<div class="block">Constructs a new ParameterException with the specified CommandLine and error message.</div>
+<div class="block">Returns a new <code>Range</code> based on the <a href="./picocli/CommandLine.Parameters.html#index()"><code>CommandLine.Parameters.index()</code></a> annotation on the specified field.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParameterException.html#ParameterException-picocli.CommandLine-java.lang.String-java.lang.Exception-">ParameterException(CommandLine, String, Exception)</a></span> - Constructor for exception picocli.<a href="picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></dt>
-<dd>
-<div class="block">Constructs a new ParameterException with the specified CommandLine and error message.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Range.html#parameterIndex-java.lang.reflect.Field-">parameterIndex(Field)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
-<dd>
-<div class="block">Returns a new <code>Range</code> based on the <a href="picocli/CommandLine.Parameters.html#index--"><code>CommandLine.Parameters.index()</code></a> annotation on the specified field.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParameterIndexGapException.html#ParameterIndexGapException-java.lang.String-">ParameterIndexGapException(String)</a></span> - Constructor for exception picocli.<a href="picocli/CommandLine.ParameterIndexGapException.html" title="class in picocli">CommandLine.ParameterIndexGapException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#parameterLabelRenderer--">parameterLabelRenderer()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#parameterLabelRenderer()">parameterLabelRenderer()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Option and positional parameter value label renderer used for the synopsis line(s) and the option list.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#parameterList--">parameterList()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#parameterList()">parameterList()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns the section of the usage help message that lists the parameters with their descriptions.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#parameterList-picocli.CommandLine.Help.Layout-picocli.CommandLine.Help.IParamLabelRenderer-">parameterList(CommandLine.Help.Layout, CommandLine.Help.IParamLabelRenderer)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#parameterList(picocli.CommandLine.Help.Layout,%20picocli.CommandLine.Help.IParamLabelRenderer)">parameterList(CommandLine.Help.Layout, CommandLine.Help.IParamLabelRenderer)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns the section of the usage help message that lists the parameters with their descriptions.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#parameterListHeading-java.lang.Object...-">parameterListHeading(Object...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#parameterListHeading(java.lang.Object...)">parameterListHeading(Object...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns the text displayed before the positional parameter list; an empty string if there are no positional
  parameters, otherwise the result of <code>String.format(parameterListHeading, params)</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#parameterListHeading--">parameterListHeading()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#parameterListHeading()">parameterListHeading()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Returns the optional heading preceding the parameter list.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#parameterListHeading-java.lang.String-">parameterListHeading(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#parameterListHeading(java.lang.String)">parameterListHeading(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Sets the optional heading preceding the parameter list.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Layout.html#parameterRenderer">parameterRenderer</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Layout.html#parameterRenderer">parameterRenderer</a></span> - Variable in class picocli.<a href="./picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#parameters-picocli.CommandLine.Help.Ansi.IStyle...-">parameters(CommandLine.Help.Ansi.IStyle...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.ColorScheme.html#parameters(picocli.CommandLine.Help.Ansi.IStyle...)">parameters(CommandLine.Help.Ansi.IStyle...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>
 <div class="block">Adds the specified styles to the registered styles for positional parameters in this color scheme and returns this color scheme.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#parameterStyles">parameterStyles</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.ColorScheme.html#parameterStyles">parameterStyles</a></span> - Variable in class picocli.<a href="./picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#parameterText-java.lang.String-">parameterText(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.ColorScheme.html#parameterText(java.lang.String)">parameterText(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>
 <div class="block">Returns a Text with all parameter styles applied to the specified parameter string.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ArgSpec.html#paramLabel--">paramLabel()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ArgSpec.html#paramLabel()">paramLabel()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
 <dd>
 <div class="block">Returns the name of the option or positional parameter used in the usage help message.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#parent--">parent()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#parent()">parent()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Returns the parent command of this subcommand, or <code>null</code> if this is a top-level command.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#parent-picocli.CommandLine.Model.CommandSpec-">parent(CommandLine.Model.CommandSpec)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#parent(picocli.CommandLine.Model.CommandSpec)">parent(CommandLine.Model.CommandSpec)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Sets the parent command of this subcommand.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Style.html#parse-java.lang.String-">parse(String)</a></span> - Static method in enum picocli.<a href="picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Style.html#parse(java.lang.String)">parse(String)</a></span> - Static method in enum picocli.<a href="./picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></dt>
 <dd>
 <div class="block">Parses the specified comma-separated sequence of style descriptors and returns the associated
   styles.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#parse-java.lang.String...-">parse(String...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#parse(java.lang.String...)">parse(String...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Parses the specified command line arguments and returns a list of <code>CommandLine</code> objects representing the
  top-level command and any subcommands (if any) that were recognized and initialized during the parsing process.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#parseArgs-java.lang.String...-">parseArgs(String...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#parseArgs(java.lang.String...)">parseArgs(String...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Parses the specified command line arguments and returns a list of <code>ParseResult</code> with the options, positional
  parameters, and subcommands (if any) that were recognized and initialized during the parsing process.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#parser--">parser()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#parser()">parser()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Returns the parser specification for this command.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ParserSpec.html#ParserSpec--">ParserSpec()</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/groovy/PicocliBaseScript.html#parseScriptArguments-picocli.CommandLine-java.lang.String:A-">parseScriptArguments(CommandLine, String[])</a></span> - Method in class picocli.groovy.<a href="picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
+<dt><span class="strong"><a href="./picocli/groovy/PicocliBaseScript.html#parseScriptArguments(picocli.CommandLine,%20java.lang.String[])">parseScriptArguments(CommandLine, String[])</a></span> - Method in class picocli.groovy.<a href="./picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
 <dd>
-<div class="block">Returns the result of calling <a href="picocli/CommandLine.html#parse-java.lang.String...-"><code>CommandLine.parse(String...)</code></a> with the given arguments.</div>
+<div class="block">Returns the result of calling <a href="./picocli/CommandLine.html#parse(java.lang.String...)"><code>CommandLine.parse(String...)</code></a> with the given arguments.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#parseWithHandler-picocli.CommandLine.IParseResultHandler-java.io.PrintStream-java.lang.String...-">parseWithHandler(CommandLine.IParseResultHandler, PrintStream, String...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#parseWithHandler(picocli.CommandLine.IParseResultHandler,%20java.io.PrintStream,%20java.lang.String...)">parseWithHandler(CommandLine.IParseResultHandler, PrintStream, String...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">use <a href="picocli/CommandLine.html#parseWithHandler-picocli.CommandLine.IParseResultHandler2-R-java.lang.String:A-"><code>CommandLine.parseWithHandler(IParseResultHandler2, Object, String[])</code></a> instead</span></div>
+<div class="block"><span class="strong">Deprecated.</span>
+<div class="block"><i>use <a href="./picocli/CommandLine.html#parseWithHandler(picocli.CommandLine.IParseResultHandler2,%20java.lang.String[])"><code>CommandLine.parseWithHandler(IParseResultHandler2,  String[])</code></a> instead</i></div>
 </div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#parseWithHandler-picocli.CommandLine.IParseResultHandler2-R-java.lang.String:A-">parseWithHandler(CommandLine.IParseResultHandler2&lt;R&gt;, R, String[])</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#parseWithHandler(picocli.CommandLine.IParseResultHandler2,%20java.lang.String[])">parseWithHandler(CommandLine.IParseResultHandler2&lt;R&gt;, String[])</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Returns the result of calling <a href="picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>CommandLine.parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)</code></a> with
- a new <a href="picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><code>CommandLine.DefaultExceptionHandler</code></a> in addition to the specified parse result handler and the specified command line arguments.</div>
+<div class="block">Returns the result of calling <a href="./picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)"><code>CommandLine.parseWithHandlers(IParseResultHandler2,  IExceptionHandler2, String...)</code></a> with
+ a new <a href="./picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><code>CommandLine.DefaultExceptionHandler</code></a> in addition to the specified parse result handler and the specified command line arguments.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler-java.io.PrintStream-picocli.CommandLine.Help.Ansi-picocli.CommandLine.IExceptionHandler-java.lang.String...-">parseWithHandlers(CommandLine.IParseResultHandler, PrintStream, CommandLine.Help.Ansi, CommandLine.IExceptionHandler, String...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20picocli.CommandLine.IExceptionHandler,%20java.lang.String...)">parseWithHandlers(CommandLine.IParseResultHandler, PrintStream, CommandLine.Help.Ansi, CommandLine.IExceptionHandler, String...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">use <a href="picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>CommandLine.parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)</code></a> instead</span></div>
+<div class="block"><span class="strong">Deprecated.</span>
+<div class="block"><i>use <a href="./picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)"><code>CommandLine.parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...)</code></a> instead</i></div>
 </div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-">parseWithHandlers(CommandLine.IParseResultHandler2&lt;R&gt;, R, CommandLine.IExceptionHandler2&lt;R&gt;, String...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
-<dd>
-<div class="block">Tries to <a href="picocli/CommandLine.html#parseArgs-java.lang.String...-">parse</a> the specified command line arguments, and if successful, delegates
- the processing of the resulting <code>ParseResult</code> object to the specified <a href="picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">handler</a>.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#parseWithSimpleHandler-picocli.CommandLine.AbstractSimpleParseResultHandler-java.lang.String...-">parseWithSimpleHandler(CommandLine.AbstractSimpleParseResultHandler, String...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
-<dd>
-<div class="block">Calls <a href="picocli/CommandLine.html#parseWithSimpleHandlers-picocli.CommandLine.AbstractSimpleParseResultHandler-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>CommandLine.parseWithSimpleHandlers(AbstractSimpleParseResultHandler, IExceptionHandler2, String...)</code></a> with
- a new <a href="picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><code>CommandLine.DefaultExceptionHandler</code></a> in addition to the specified parse result handler and the specified command line arguments.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#parseWithSimpleHandlers-picocli.CommandLine.AbstractSimpleParseResultHandler-picocli.CommandLine.IExceptionHandler2-java.lang.String...-">parseWithSimpleHandlers(CommandLine.AbstractSimpleParseResultHandler, CommandLine.IExceptionHandler2&lt;Void&gt;, String...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)">parseWithHandlers(CommandLine.IParseResultHandler2&lt;R&gt;, CommandLine.IExceptionHandler2&lt;R&gt;, String...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Tries to <a href="picocli/CommandLine.html#parseArgs-java.lang.String...-">parse</a> the specified command line arguments, and if successful, delegates
- the processing of the resulting <code>ParseResult</code> object to the specified <a href="picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli">handler</a>.</div>
+<div class="block">Tries to <a href="./picocli/CommandLine.html#parseArgs(java.lang.String...)">parse</a> the specified command line arguments, and if successful, delegates
+ the processing of the resulting <code>ParseResult</code> object to the specified <a href="./picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">handler</a>.</div>
 </dd>
-<dt><a href="picocli/package-summary.html">picocli</a> - package picocli</dt>
+<dt><a href="./picocli/package-summary.html">picocli</a> - package picocli</dt>
 <dd>
-<div class="block">Provides classes and interfaces for the main picocli <a href="picocli/CommandLine.html" title="class in picocli">command line parsing</a> and
- <a href="picocli/AutoComplete.html" title="class in picocli"><code>autocompletion</code></a> functionality.</div>
+<div class="block">Provides classes and interfaces for the main picocli <a href="./picocli/CommandLine.html" title="class in picocli">command line parsing</a> and
+ <a href="./picocli/AutoComplete.html" title="class in picocli"><code>autocompletion</code></a> functionality.</div>
 </dd>
-<dt><a href="picocli/groovy/package-summary.html">picocli.groovy</a> - package picocli.groovy</dt>
+<dt><a href="./picocli/groovy/package-summary.html">picocli.groovy</a> - package picocli.groovy</dt>
 <dd>
 <div class="block">Provides classes and annotations to give Groovy scripts convenient access to picocli functionality.</div>
 </dd>
-<dt><a href="picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy"><span class="typeNameLink">PicocliBaseScript</span></a> - Class in <a href="picocli/groovy/package-summary.html">picocli.groovy</a></dt>
+<dt><a href="./picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy"><span class="strong">PicocliBaseScript</span></a> - Class in <a href="./picocli/groovy/package-summary.html">picocli.groovy</a></dt>
 <dd>
 <div class="block">
  Base script class that provides picocli declarative (annotation-based) command line argument processing for Groovy scripts.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/groovy/PicocliBaseScript.html#PicocliBaseScript--">PicocliBaseScript()</a></span> - Constructor for class picocli.groovy.<a href="picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.PicocliException.html#PicocliException-java.lang.String-">PicocliException(String)</a></span> - Constructor for exception picocli.<a href="picocli/CommandLine.PicocliException.html" title="class in picocli">CommandLine.PicocliException</a></dt>
+<dt><span class="strong"><a href="./picocli/groovy/PicocliBaseScript.html#PicocliBaseScript()">PicocliBaseScript()</a></span> - Constructor for class picocli.groovy.<a href="./picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.PicocliException.html#PicocliException-java.lang.String-java.lang.Exception-">PicocliException(String, Exception)</a></span> - Constructor for exception picocli.<a href="picocli/CommandLine.PicocliException.html" title="class in picocli">CommandLine.PicocliException</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="picocli/groovy/PicocliScript.html" title="annotation in picocli.groovy"><span class="typeNameLink">PicocliScript</span></a> - Annotation Type in <a href="picocli/groovy/package-summary.html">picocli.groovy</a></dt>
+<dt><a href="./picocli/groovy/PicocliScript.html" title="annotation in picocli.groovy"><span class="strong">PicocliScript</span></a> - Annotation Type in <a href="./picocli/groovy/package-summary.html">picocli.groovy</a></dt>
 <dd>
 <div class="block">
  Annotation to give Groovy scripts convenient access to picocli functionality.</div>
 </dd>
-<dt><a href="picocli/groovy/PicocliScriptASTTransformation.html" title="class in picocli.groovy"><span class="typeNameLink">PicocliScriptASTTransformation</span></a> - Class in <a href="picocli/groovy/package-summary.html">picocli.groovy</a></dt>
+<dt><a href="./picocli/groovy/PicocliScriptASTTransformation.html" title="class in picocli.groovy"><span class="strong">PicocliScriptASTTransformation</span></a> - Class in <a href="./picocli/groovy/package-summary.html">picocli.groovy</a></dt>
 <dd>
-<div class="block">Ensures that Groovy scripts annotated with <a href="picocli/groovy/PicocliScript.html" title="annotation in picocli.groovy"><code>PicocliScript</code></a> are transformed into a class that
- extends <a href="picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy"><code>PicocliBaseScript</code></a>.</div>
+<div class="block">Ensures that Groovy scripts annotated with <a href="./picocli/groovy/PicocliScript.html" title="annotation in picocli.groovy"><code>PicocliScript</code></a> are transformed into a class that
+ extends <a href="./picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy"><code>PicocliBaseScript</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/groovy/PicocliScriptASTTransformation.html#PicocliScriptASTTransformation--">PicocliScriptASTTransformation()</a></span> - Constructor for class picocli.groovy.<a href="picocli/groovy/PicocliScriptASTTransformation.html" title="class in picocli.groovy">PicocliScriptASTTransformation</a></dt>
+<dt><span class="strong"><a href="./picocli/groovy/PicocliScriptASTTransformation.html#PicocliScriptASTTransformation()">PicocliScriptASTTransformation()</a></span> - Constructor for class picocli.groovy.<a href="./picocli/groovy/PicocliScriptASTTransformation.html" title="class in picocli.groovy">PicocliScriptASTTransformation</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Text.html#plainString--">plainString()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Text.html#plainString()">plainString()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
 <dd>
 <div class="block">Returns the plain text without any formatting.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#populateCommand-T-java.lang.String...-">populateCommand(T, String...)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#populateCommand(T,%20java.lang.String...)">populateCommand(T, String...)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">
  Convenience method that initializes the specified annotated object from the specified command line arguments.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#positional-int-">positional(int)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#positional(int)">positional(int)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns the <code>PositionalParamSpec</code> that was matched at the specified position, or <code>null</code> if no positional parameters were matched at that position.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#positionalParameters--">positionalParameters()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#positionalParameters()">positionalParameters()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Returns the list of positional parameters configured for this command.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#positionalParams--">positionalParams()</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#positionalParams()">positionalParams()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns a list of matched positional parameters.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#positionalValue-int-T-">positionalValue(int, T)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#positionalValue(int,%20T)">positionalValue(int, T)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
-<div class="block">Returns the command line argument value of the positional parameter at the specified position, converted to the <a href="picocli/CommandLine.Model.ArgSpec.html#type--">type</a> of the positional parameter, or the specified default value if no positional parameter was matched at that position.</div>
+<div class="block">Returns the command line argument value of the positional parameter at the specified position, converted to the <a href="./picocli/CommandLine.Model.ArgSpec.html#type()">type</a> of the positional parameter, or the specified default value if no positional parameter was matched at that position.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#positionalValue-picocli.CommandLine.Model.PositionalParamSpec-T-">positionalValue(CommandLine.Model.PositionalParamSpec, T)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#positionalValue(picocli.CommandLine.Model.PositionalParamSpec,%20T)">positionalValue(CommandLine.Model.PositionalParamSpec, T)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
-<div class="block">Returns the command line argument value of the specified positional parameter, converted to the <a href="picocli/CommandLine.Model.ArgSpec.html#type--">type</a> of the positional parameter, or the specified default value if the specified positional parameter is <code>null</code>.</div>
+<div class="block">Returns the command line argument value of the specified positional parameter, converted to the <a href="./picocli/CommandLine.Model.ArgSpec.html#type()">type</a> of the positional parameter, or the specified default value if the specified positional parameter is <code>null</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#posixOptionsMap--">posixOptionsMap()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ParserSpec.html#posixClusteredShortOptionsAllowed()">posixClusteredShortOptionsAllowed()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ParserSpec.html#posixClusteredShortOptionsAllowed(boolean)">posixClusteredShortOptionsAllowed(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#posixOptionsMap()">posixOptionsMap()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Returns a map of the short (single character) option names to option spec objects configured for this command.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/groovy/PicocliBaseScript.html#printErrorMessage-java.lang.String-">printErrorMessage(String)</a></span> - Method in class picocli.groovy.<a href="picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
+<dt><span class="strong"><a href="./picocli/groovy/PicocliBaseScript.html#printErrorMessage(java.lang.String)">printErrorMessage(String)</a></span> - Method in class picocli.groovy.<a href="./picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
 <dd>
 <div class="block">Error messages that arise from command line processing call this.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#printHelpIfRequested-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">printHelpIfRequested(List&lt;CommandLine&gt;, PrintStream, CommandLine.Help.Ansi)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#printHelpIfRequested(java.util.List,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">printHelpIfRequested(List&lt;CommandLine&gt;, PrintStream, CommandLine.Help.Ansi)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">use <a href="picocli/CommandLine.html#printHelpIfRequested-java.util.List-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>CommandLine.printHelpIfRequested(List, PrintStream, PrintStream, Help.Ansi)</code></a> instead</span></div>
+<div class="block"><span class="strong">Deprecated.</span>
+<div class="block"><i>use <a href="./picocli/CommandLine.html#printHelpIfRequested(java.util.List,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>CommandLine.printHelpIfRequested(List, PrintStream, PrintStream, Help.Ansi)</code></a> instead</i></div>
 </div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#printHelpIfRequested-picocli.CommandLine.ParseResult-">printHelpIfRequested(CommandLine.ParseResult)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#printHelpIfRequested(picocli.CommandLine.ParseResult)">printHelpIfRequested(CommandLine.ParseResult)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Delegates to <a href="picocli/CommandLine.html#printHelpIfRequested-java.util.List-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>CommandLine.printHelpIfRequested(List, PrintStream, PrintStream, Help.Ansi)</code></a> with
+<div class="block">Delegates to <a href="./picocli/CommandLine.html#printHelpIfRequested(java.util.List,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>CommandLine.printHelpIfRequested(List, PrintStream, PrintStream, Help.Ansi)</code></a> with
  <code>parseResult.asCommandLineList(), System.out, System.err, Help.Ansi.AUTO</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#printHelpIfRequested-java.util.List-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">printHelpIfRequested(List&lt;CommandLine&gt;, PrintStream, PrintStream, CommandLine.Help.Ansi)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#printHelpIfRequested(java.util.List,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">printHelpIfRequested(List&lt;CommandLine&gt;, PrintStream, PrintStream, CommandLine.Help.Ansi)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Helper method that may be useful when processing the list of <code>CommandLine</code> objects that result from successfully
- <a href="picocli/CommandLine.html#parse-java.lang.String...-">parsing</a> command line arguments.</div>
+ <a href="./picocli/CommandLine.html#parse(java.lang.String...)">parsing</a> command line arguments.</div>
+</dd>
+<dt><span class="strong"><a href="./picocli/groovy/PicocliBaseScript.html#printHelpMessage(picocli.CommandLine)">printHelpMessage(CommandLine)</a></span> - Method in class picocli.groovy.<a href="./picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
+<dd>
+<div class="block">If an &#064;Option whose <code>usageHelp</code> attribute is annotated as true appears in the arguments.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/groovy/PicocliBaseScript.html#printHelpMessage-picocli.CommandLine-">printHelpMessage(CommandLine)</a></span> - Method in class picocli.groovy.<a href="picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
+<dt><span class="strong"><a href="./picocli/groovy/PicocliBaseScript.html#printHelpMessage(picocli.CommandLine,%20java.io.PrintStream)">printHelpMessage(CommandLine, PrintStream)</a></span> - Method in class picocli.groovy.<a href="./picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
 <dd>
 <div class="block">If an &#064;Option whose <code>usageHelp</code> attribute is annotated as true appears in the arguments.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#printVersionHelp-java.io.PrintStream-">printVersionHelp(PrintStream)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#printVersionHelp(java.io.PrintStream)">printVersionHelp(PrintStream)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Delegates to <a href="picocli/CommandLine.html#printVersionHelp-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>CommandLine.printVersionHelp(PrintStream, Help.Ansi)</code></a> with the <a href="picocli/CommandLine.Help.Ansi.html#AUTO">platform default</a>.</div>
+<div class="block">Delegates to <a href="./picocli/CommandLine.html#printVersionHelp(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>CommandLine.printVersionHelp(PrintStream, Help.Ansi)</code></a> with the <a href="./picocli/CommandLine.Help.Ansi.html#AUTO">platform default</a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#printVersionHelp-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">printVersionHelp(PrintStream, CommandLine.Help.Ansi)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#printVersionHelp(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">printVersionHelp(PrintStream, CommandLine.Help.Ansi)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Prints version information from the <a href="picocli/CommandLine.Command.html#version--"><code>CommandLine.Command.version()</code></a> annotation to the specified <code>PrintStream</code>.</div>
+<div class="block">Prints version information from the <a href="./picocli/CommandLine.Command.html#version()"><code>CommandLine.Command.version()</code></a> annotation to the specified <code>PrintStream</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#printVersionHelp-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.Object...-">printVersionHelp(PrintStream, CommandLine.Help.Ansi, Object...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#printVersionHelp(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.Object...)">printVersionHelp(PrintStream, CommandLine.Help.Ansi, Object...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Prints version information from the <a href="picocli/CommandLine.Command.html#version--"><code>CommandLine.Command.version()</code></a> annotation to the specified <code>PrintStream</code>.</div>
+<div class="block">Prints version information from the <a href="./picocli/CommandLine.Command.html#version()"><code>CommandLine.Command.version()</code></a> annotation to the specified <code>PrintStream</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/groovy/PicocliBaseScript.html#printVersionHelpMessage-picocli.CommandLine-">printVersionHelpMessage(CommandLine)</a></span> - Method in class picocli.groovy.<a href="picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
+<dt><span class="strong"><a href="./picocli/groovy/PicocliBaseScript.html#printVersionHelpMessage(picocli.CommandLine)">printVersionHelpMessage(CommandLine)</a></span> - Method in class picocli.groovy.<a href="./picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
 <dd>
 <div class="block">If an &#064;Option whose <code>versionHelp</code> attribute is annotated as true appears in the arguments.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.html#putValue-int-int-picocli.CommandLine.Help.Ansi.Text-">putValue(int, int, CommandLine.Help.Ansi.Text)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.TextTable.html#putValue(int,%20int,%20picocli.CommandLine.Help.Ansi.Text)">putValue(int, int, CommandLine.Help.Ansi.Text)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
 <dd>
 <div class="block">Writes the specified value into the cell at the specified row and column and returns the last row and
  column written to.</div>
 </dd>
 </dl>
-<a name="I:R">
+<a name="_R_">
 <!--   -->
 </a>
 <h2 class="title">R</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Range.html#Range-int-int-boolean-boolean-java.lang.String-">Range(int, int, boolean, boolean, String)</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
-<dd>
-<div class="block">Constructs a new Range object with the specified parameters.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#rawOptionValue-char-">rawOptionValue(char)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#rawOptionValue(char)">rawOptionValue(char)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns the command line argument String value of the option with the specified name, or <code>null</code> if no option with the specified name was matched.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#rawOptionValue-java.lang.String-">rawOptionValue(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#rawOptionValue(java.lang.String)">rawOptionValue(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns the command line argument String value of the option with the specified name, or <code>null</code> if no option with the specified name was matched.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#rawOptionValue-picocli.CommandLine.Model.OptionSpec-">rawOptionValue(CommandLine.Model.OptionSpec)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#rawOptionValue(picocli.CommandLine.Model.OptionSpec)">rawOptionValue(CommandLine.Model.OptionSpec)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns the command line argument String value of the specified option, or <code>null</code> if the specified option is <code>null</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#rawOptionValue-char-java.lang.String-">rawOptionValue(char, String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#rawOptionValue(char,%20java.lang.String)">rawOptionValue(char, String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns the command line argument String value of the option with the specified name, or the specified default value if no option with the specified name was matched.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#rawOptionValue-java.lang.String-java.lang.String-">rawOptionValue(String, String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#rawOptionValue(java.lang.String,%20java.lang.String)">rawOptionValue(String, String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns the command line argument String value of the option with the specified name, or the specified default value if no option with the specified name was matched.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#rawOptionValue-picocli.CommandLine.Model.OptionSpec-java.lang.String-">rawOptionValue(CommandLine.Model.OptionSpec, String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#rawOptionValue(picocli.CommandLine.Model.OptionSpec,%20java.lang.String)">rawOptionValue(CommandLine.Model.OptionSpec, String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns the command line argument String value of the specified option, or the specified default value if the specified option is <code>null</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#rawOptionValues-char-">rawOptionValues(char)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#rawOptionValues(char)">rawOptionValues(char)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns all command line argument String values matched for the option with the specified name, or an empty list if no option with the specified name was matched.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#rawOptionValues-java.lang.String-">rawOptionValues(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#rawOptionValues(java.lang.String)">rawOptionValues(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns all command line argument String values matched for the option with the specified name, or an empty list if no option with the specified name was matched.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#rawOptionValues-picocli.CommandLine.Model.OptionSpec-">rawOptionValues(CommandLine.Model.OptionSpec)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#rawOptionValues(picocli.CommandLine.Model.OptionSpec)">rawOptionValues(CommandLine.Model.OptionSpec)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns all command line argument String values matched for the specified option, or an empty list if the specified option is <code>null</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#rawPositionalValue-int-">rawPositionalValue(int)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#rawPositionalValue(int)">rawPositionalValue(int)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns the command line argument String value of the positional parameter at the specified position, or <code>null</code> if no positional parameter was matched at that position.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#rawPositionalValue-int-java.lang.String-">rawPositionalValue(int, String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#rawPositionalValue(int,%20java.lang.String)">rawPositionalValue(int, String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns the command line argument String value of the positional parameter at the specified position, or the specified default value if no positional parameter was matched at that position.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ArgSpec.html#rawStringValues--">rawStringValues()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ArgSpec.html#rawStringValues()">rawStringValues()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
 <dd>
 <div class="block">Returns the command line arguments matched by this option or positional parameter spec.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#registerConverter-java.lang.Class-picocli.CommandLine.ITypeConverter-">registerConverter(Class&lt;K&gt;, CommandLine.ITypeConverter&lt;K&gt;)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#registerConverter(java.lang.Class,%20picocli.CommandLine.ITypeConverter)">registerConverter(Class&lt;K&gt;, CommandLine.ITypeConverter&lt;K&gt;)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Registers the specified type converter for the specified class.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.IOptionRenderer.html#render-picocli.CommandLine.Model.OptionSpec-picocli.CommandLine.Help.IParamLabelRenderer-picocli.CommandLine.Help.ColorScheme-">render(CommandLine.Model.OptionSpec, CommandLine.Help.IParamLabelRenderer, CommandLine.Help.ColorScheme)</a></span> - Method in interface picocli.<a href="picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.IOptionRenderer.html#render(picocli.CommandLine.Model.OptionSpec,%20picocli.CommandLine.Help.IParamLabelRenderer,%20picocli.CommandLine.Help.ColorScheme)">render(CommandLine.Model.OptionSpec, CommandLine.Help.IParamLabelRenderer, CommandLine.Help.ColorScheme)</a></span> - Method in interface picocli.<a href="./picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a></dt>
 <dd>
 <div class="block">Returns a text representation of the specified option and its parameter(s) if any.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.IParameterRenderer.html#render-picocli.CommandLine.Model.PositionalParamSpec-picocli.CommandLine.Help.IParamLabelRenderer-picocli.CommandLine.Help.ColorScheme-">render(CommandLine.Model.PositionalParamSpec, CommandLine.Help.IParamLabelRenderer, CommandLine.Help.ColorScheme)</a></span> - Method in interface picocli.<a href="picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.IParameterRenderer.html#render(picocli.CommandLine.Model.PositionalParamSpec,%20picocli.CommandLine.Help.IParamLabelRenderer,%20picocli.CommandLine.Help.ColorScheme)">render(CommandLine.Model.PositionalParamSpec, CommandLine.Help.IParamLabelRenderer, CommandLine.Help.ColorScheme)</a></span> - Method in interface picocli.<a href="./picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a></dt>
 <dd>
 <div class="block">Returns a text representation of the specified positional parameter.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.IParamLabelRenderer.html#renderParameterLabel-picocli.CommandLine.Model.ArgSpec-picocli.CommandLine.Help.Ansi-java.util.List-">renderParameterLabel(CommandLine.Model.ArgSpec, CommandLine.Help.Ansi, List&lt;CommandLine.Help.Ansi.IStyle&gt;)</a></span> - Method in interface picocli.<a href="picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.IParamLabelRenderer.html#renderParameterLabel(picocli.CommandLine.Model.ArgSpec,%20picocli.CommandLine.Help.Ansi,%20java.util.List)">renderParameterLabel(CommandLine.Model.ArgSpec, CommandLine.Help.Ansi, List&lt;CommandLine.Help.Ansi.IStyle&gt;)</a></span> - Method in interface picocli.<a href="./picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a></dt>
 <dd>
 <div class="block">Returns a text rendering of the option parameter or positional parameter; returns an empty string
  <code>""</code> if the option is a boolean and does not take a parameter.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ArgSpec.html#required--">required()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ArgSpec.html#required()">required()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
 <dd>
 <div class="block">Returns whether this is a required option or positional parameter.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#requiredArgs--">requiredArgs()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#requiredArgs()">requiredArgs()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Returns the list of required options and positional parameters configured for this command.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#requiredOptionMarker--">requiredOptionMarker()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#requiredOptionMarker()">requiredOptionMarker()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Returns the character used to prefix required options in the options list.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#requiredOptionMarker-char-">requiredOptionMarker(char)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#requiredOptionMarker(char)">requiredOptionMarker(char)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Sets the character used to prefix required options in the options list.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.AbstractHandler.html#returnResultOrExit-R-">returnResultOrExit(R)</a></span> - Method in class picocli.<a href="picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.AbstractHandler.html#returnResultOrExit(R)">returnResultOrExit(R)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
 <dd>
 <div class="block">Convenience method for subclasses that returns the specified result object if no exit code was set,
- or otherwise, if an exit code <a href="picocli/CommandLine.AbstractHandler.html#andExit-int-">was set</a>, calls <code>System.exit</code> with the configured
+ or otherwise, if an exit code <a href="./picocli/CommandLine.AbstractHandler.html#andExit(int)">was set</a>, calls <code>System.exit</code> with the configured
  exit code to terminate the currently running Java virtual machine.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.Cell.html#row">row</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli">CommandLine.Help.TextTable.Cell</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.TextTable.Cell.html#row">row</a></span> - Variable in class picocli.<a href="./picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli">CommandLine.Help.TextTable.Cell</a></dt>
 <dd>
 <div class="block">Table row index (zero based).</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.html#rowCount--">rowCount()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.TextTable.html#rowCount()">rowCount()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
 <dd>
 <div class="block">Returns the current number of rows of this <code>TextTable</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.HelpCommand.html#run--">run()</a></span> - Method in class picocli.<a href="picocli/CommandLine.HelpCommand.html" title="class in picocli">CommandLine.HelpCommand</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.HelpCommand.html#run()">run()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.HelpCommand.html" title="class in picocli">CommandLine.HelpCommand</a></dt>
 <dd>
-<div class="block">Invokes <a href="picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>usage</code></a> for the specified command, or for the parent command.</div>
+<div class="block">Invokes <a href="./picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>usage</code></a> for the specified command, or for the parent command.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#run-R-java.lang.String...-">run(R, String...)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#run(R,%20java.lang.String...)">run(R, String...)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Delegates to <a href="picocli/CommandLine.html#run-R-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>CommandLine.run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.out</code> for
- requested usage help messages, <code>System.err</code> for diagnostic error messages, and <a href="picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
+<div class="block">Delegates to <a href="./picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>CommandLine.run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.out</code> for
+ requested usage help messages, <code>System.err</code> for diagnostic error messages, and <a href="./picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#run-R-java.io.PrintStream-java.lang.String...-">run(R, PrintStream, String...)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.lang.String...)">run(R, PrintStream, String...)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Delegates to <a href="picocli/CommandLine.html#run-R-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>CommandLine.run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for diagnostic error messages and <a href="picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
+<div class="block">Delegates to <a href="./picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>CommandLine.run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for diagnostic error messages and <a href="./picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#run-R-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">run(R, PrintStream, CommandLine.Help.Ansi, String...)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)">run(R, PrintStream, CommandLine.Help.Ansi, String...)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Delegates to <a href="picocli/CommandLine.html#run-R-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>CommandLine.run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for diagnostic error messages.</div>
+<div class="block">Delegates to <a href="./picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>CommandLine.run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for diagnostic error messages.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#run-R-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">run(R, PrintStream, PrintStream, CommandLine.Help.Ansi, String...)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)">run(R, PrintStream, PrintStream, CommandLine.Help.Ansi, String...)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Convenience method to allow command line application authors to avoid some boilerplate code in their application.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/groovy/PicocliBaseScript.html#run--">run()</a></span> - Method in class picocli.groovy.<a href="picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
+<dt><span class="strong"><a href="./picocli/groovy/PicocliBaseScript.html#run()">run()</a></span> - Method in class picocli.groovy.<a href="./picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
 <dd>
 <div class="block">
  Parses the command line and initializes <code>@Field</code> variables
  annotated with <code>@Option</code> or <code>@Parameters</code> before executing the script body.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.RunAll.html#RunAll--">RunAll()</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.RunAll.html" title="class in picocli">CommandLine.RunAll</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.RunFirst.html#RunFirst--">RunFirst()</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.RunFirst.html" title="class in picocli">CommandLine.RunFirst</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.RunLast.html#RunLast--">RunLast()</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.RunLast.html" title="class in picocli">CommandLine.RunLast</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/groovy/PicocliBaseScript.html#runRunnableSubcommand-java.util.List-">runRunnableSubcommand(List&lt;CommandLine&gt;)</a></span> - Method in class picocli.groovy.<a href="picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
+<dt><span class="strong"><a href="./picocli/groovy/PicocliBaseScript.html#runRunnableSubcommand(java.util.List)">runRunnableSubcommand(List&lt;CommandLine&gt;)</a></span> - Method in class picocli.groovy.<a href="./picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
 <dd>
 <div class="block">If the most specific subcommand (the last <code>CommandLine</code> object in the list) implements Runnable or Callable,
  then run it.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/groovy/PicocliBaseScript.html#runScriptBody--">runScriptBody()</a></span> - Method in class picocli.groovy.<a href="picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
+<dt><span class="strong"><a href="./picocli/groovy/PicocliBaseScript.html#runScriptBody()">runScriptBody()</a></span> - Method in class picocli.groovy.<a href="./picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy">PicocliBaseScript</a></dt>
 <dd>
 <div class="block">The script body.</div>
 </dd>
 </dl>
-<a name="I:S">
+<a name="_S_">
 <!--   -->
 </a>
 <h2 class="title">S</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.AbstractHandler.html#self--">self()</a></span> - Method in class picocli.<a href="picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.AbstractHandler.html#self()">self()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
 <dd>
 <div class="block">Returns <code>this</code> to allow method chaining when calling the setters for a fluent API.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.AbstractSimpleParseResultHandler.html#self--">self()</a></span> - Method in class picocli.<a href="picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli">CommandLine.AbstractSimpleParseResultHandler</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.DefaultExceptionHandler.html#self()">self()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.DefaultExceptionHandler.html#self--">self()</a></span> - Method in class picocli.<a href="picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.OptionSpec.Builder.html#self--">self()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.OptionSpec.Builder.html#self()">self()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></dt>
 <dd>
 <div class="block">Returns this builder.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.PositionalParamSpec.Builder.html#self--">self()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli">CommandLine.Model.PositionalParamSpec.Builder</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.PositionalParamSpec.Builder.html#self()">self()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli">CommandLine.Model.PositionalParamSpec.Builder</a></dt>
 <dd>
 <div class="block">Returns this builder.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.RunAll.html#self--">self()</a></span> - Method in class picocli.<a href="picocli/CommandLine.RunAll.html" title="class in picocli">CommandLine.RunAll</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.RunAll.html#self()">self()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.RunAll.html" title="class in picocli">CommandLine.RunAll</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.RunFirst.html#self--">self()</a></span> - Method in class picocli.<a href="picocli/CommandLine.RunFirst.html" title="class in picocli">CommandLine.RunFirst</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.RunFirst.html#self()">self()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.RunFirst.html" title="class in picocli">CommandLine.RunFirst</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.RunLast.html#self--">self()</a></span> - Method in class picocli.<a href="picocli/CommandLine.RunLast.html" title="class in picocli">CommandLine.RunLast</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.RunLast.html#self()">self()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.RunLast.html" title="class in picocli">CommandLine.RunLast</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.IParamLabelRenderer.html#separator--">separator()</a></span> - Method in interface picocli.<a href="picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.IParamLabelRenderer.html#separator()">separator()</a></span> - Method in interface picocli.<a href="./picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a></dt>
 <dd>
 <div class="block">Returns the separator between option name and param label.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ParserSpec.html#separator--">separator()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ParserSpec.html#separator()">separator()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
 <dd>
 <div class="block">Returns the String to use as the separator between options and option parameters.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ParserSpec.html#separator-java.lang.String-">separator(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ParserSpec.html#separator(java.lang.String)">separator(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
 <dd>
 <div class="block">Sets the String to use as the separator between options and option parameters.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.IBinding.html#set-T-">set(T)</a></span> - Method in interface picocli.<a href="picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.IBinding.html#set(T)">set(T)</a></span> - Method in interface picocli.<a href="./picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a></dt>
 <dd>
 <div class="block">Sets the new value of the binding.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#setCommandName-java.lang.String-">setCommandName(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#setCommandName(java.lang.String)">setCommandName(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Sets the command name (also called program name) displayed in the usage help synopsis to the specified value.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#setExpandAtFiles-boolean-">setExpandAtFiles(boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#setExpandAtFiles(boolean)">setExpandAtFiles(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Sets whether arguments starting with <code>'@'</code> should be treated as the path to an argument file and its
  contents should be expanded into separate arguments for each line in the specified file.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#setOverwrittenOptionsAllowed-boolean-">setOverwrittenOptionsAllowed(boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#setOverwrittenOptionsAllowed(boolean)">setOverwrittenOptionsAllowed(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dd>
+<div class="block">Sets whether options for single-value fields can be specified multiple times on the command line without a <a href="./picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli"><code>CommandLine.OverwrittenOptionException</code></a> being thrown.</div>
+</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#setPosixClusteredShortOptionsAllowed(boolean)">setPosixClusteredShortOptionsAllowed(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Sets whether options for single-value fields can be specified multiple times on the command line without a <a href="picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli"><code>CommandLine.OverwrittenOptionException</code></a> being thrown.</div>
+<div class="block">Sets whether short options like <code>-x -v -f SomeFile</code> can be clustered together like <code>-xvfSomeFile</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#setSeparator-java.lang.String-">setSeparator(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#setSeparator(java.lang.String)">setSeparator(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Sets the String the parser uses to separate option names from option values to the specified value.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#setStopAtPositional-boolean-">setStopAtPositional(boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#setStopAtPositional(boolean)">setStopAtPositional(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Sets whether the parser interprets the first positional parameter as "end of options" so the remaining
  arguments are all treated as positional parameters.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#setStopAtUnmatched-boolean-">setStopAtUnmatched(boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#setStopAtUnmatched(boolean)">setStopAtUnmatched(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Sets whether the parser should stop interpreting options and positional parameters as soon as it encounters an
  unmatched option.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#setUnmatchedArgumentsAllowed-boolean-">setUnmatchedArgumentsAllowed(boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#setUnmatchedArgumentsAllowed(boolean)">setUnmatchedArgumentsAllowed(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Sets whether the end user may specify unmatched arguments on the command line without a <a href="picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli"><code>CommandLine.UnmatchedArgumentException</code></a> being thrown.</div>
+<div class="block">Sets whether the end user may specify unmatched arguments on the command line without a <a href="./picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli"><code>CommandLine.UnmatchedArgumentException</code></a> being thrown.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#shortestFirst--">shortestFirst()</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#shortestFirst()">shortestFirst()</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Sorts short strings before longer strings.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ArgSpec.html#showDefaultValue--">showDefaultValue()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ArgSpec.html#showDefaultValue()">showDefaultValue()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
 <dd>
 <div class="block">Returns whether this option or positional parameter's default value should be shown in the usage help.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#showDefaultValues--">showDefaultValues()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#showDefaultValues()">showDefaultValues()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Returns whether the options list in the usage help message should show default values for all non-boolean options.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#showDefaultValues-boolean-">showDefaultValues(boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#showDefaultValues(boolean)">showDefaultValues(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Sets whether the options list in the usage help message should show default values for all non-boolean options.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#sortOptions--">sortOptions()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#sortOptions()">sortOptions()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Returns whether the options list in the usage help message should be sorted alphabetically.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#sortOptions-boolean-">sortOptions(boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#sortOptions(boolean)">sortOptions(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Sets whether the options list in the usage help message should be sorted alphabetically.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Text.html#splitLines--">splitLines()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Text.html#splitLines()">splitLines()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ArgSpec.html#splitRegex--">splitRegex()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ArgSpec.html#splitRegex()">splitRegex()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
 <dd>
 <div class="block">Returns a regular expression to split option parameter values or <code>""</code> if the value should not be split.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ParserSpec.html#stopAtPositional--">stopAtPositional()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ParserSpec.html#stopAtPositional()">stopAtPositional()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ParserSpec.html#stopAtPositional-boolean-">stopAtPositional(boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ParserSpec.html#stopAtPositional(boolean)">stopAtPositional(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ParserSpec.html#stopAtUnmatched--">stopAtUnmatched()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ParserSpec.html#stopAtUnmatched()">stopAtUnmatched()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ParserSpec.html#stopAtUnmatched-boolean-">stopAtUnmatched(boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ParserSpec.html#stopAtUnmatched(boolean)">stopAtUnmatched(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.Builder.html#subcommand-picocli.CommandLine.ParseResult-">subcommand(CommandLine.ParseResult)</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.Builder.html#subcommand(picocli.CommandLine.ParseResult)">subcommand(CommandLine.ParseResult)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></dt>
 <dd>
 <div class="block">Sets the specified <code>ParseResult</code> for a subcommand that was matched on the command line.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#subcommand--">subcommand()</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#subcommand()">subcommand()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns the <code>ParseResult</code> for the subcommand of this command that was matched on the command line, or <code>null</code> if no subcommand was matched.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#subcommands--">subcommands()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#subcommands()">subcommands()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Returns a read-only view of the subcommand map.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Text.html#substring-int-">substring(int)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Text.html#substring(int)">substring(int)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
 <dd>
 <div class="block">Returns a new <code>Text</code> instance that is a substring of this Text.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Text.html#substring-int-int-">substring(int, int)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Text.html#substring(int,%20int)">substring(int, int)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
 <dd>
 <div class="block">Returns a new <code>Text</code> instance that is a substring of this Text.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#synopsis--">synopsis()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#synopsis()">synopsis()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">use <a href="picocli/CommandLine.Help.html#synopsis-int-"><code>CommandLine.Help.synopsis(int)</code></a> instead</span></div>
+<div class="block"><span class="strong">Deprecated.</span>
+<div class="block"><i>use <a href="./picocli/CommandLine.Help.html#synopsis(int)"><code>CommandLine.Help.synopsis(int)</code></a> instead</i></div>
 </div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#synopsis-int-">synopsis(int)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#synopsis(int)">synopsis(int)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns a synopsis for the command, reserving the specified space for the synopsis heading.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#synopsisHeading-java.lang.Object...-">synopsisHeading(Object...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#synopsisHeading(java.lang.Object...)">synopsisHeading(Object...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns the text displayed before the synopsis text; the result of <code>String.format(synopsisHeading, params)</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#synopsisHeading--">synopsisHeading()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#synopsisHeading()">synopsisHeading()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Returns the optional heading preceding the synopsis.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#synopsisHeading-java.lang.String-">synopsisHeading(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.UsageMessageSpec.html#synopsisHeading(java.lang.String)">synopsisHeading(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
 <dd>
 <div class="block">Sets the optional heading preceding the synopsis.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#synopsisHeadingLength--">synopsisHeadingLength()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.html#synopsisHeadingLength()">synopsisHeadingLength()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
 <div class="block">Returns the number of characters the synopsis heading will take on the same line as the synopsis.</div>
 </dd>
 </dl>
-<a name="I:T">
+<a name="_T_">
 <!--   -->
 </a>
 <h2 class="title">T</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Layout.html#table">table</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Layout.html#table">table</a></span> - Variable in class picocli.<a href="./picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Text.html#Text-int-">Text(int)</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
-<dd>
-<div class="block">Constructs a Text with the specified max length (for use in a TextTable Column).</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Text.html#Text-java.lang.String-">Text(String)</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
-<dd>
-<div class="block">Constructs a Text with the specified String, which may contain markup like
- <code>@|bg(red),white,underline some text|@</code>.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.html#textAt-int-int-">textAt(int, int)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.TextTable.html#textAt(int,%20int)">textAt(int, int)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
 <dd>
 <div class="block">Returns the <code>Text</code> slot at the specified row and column to write a text value into.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.html#TextTable-picocli.CommandLine.Help.Ansi-">TextTable(CommandLine.Help.Ansi)</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
-<dd>
-<div class="block">Constructs a TextTable with five columns as follows:
- 
- required option/parameter marker (width: 2, indent: 0, TRUNCATE on overflow)
- short option name (width: 2, indent: 0, TRUNCATE on overflow)
- comma separator (width: 1, indent: 0, TRUNCATE on overflow)
- long option name(s) (width: 24, indent: 1, SPAN multiple columns on overflow)
- description line(s) (width: 51, indent: 1, WRAP to next row on overflow)
- </div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.html#TextTable-picocli.CommandLine.Help.Ansi-int...-">TextTable(CommandLine.Help.Ansi, int...)</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
-<dd>
-<div class="block">Constructs a new TextTable with columns with the specified width, all SPANning  multiple columns on
- overflow except the last column which WRAPS to the next row.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.html#TextTable-picocli.CommandLine.Help.Ansi-picocli.CommandLine.Help.Column...-">TextTable(CommandLine.Help.Ansi, CommandLine.Help.Column...)</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
-<dd>
-<div class="block">Constructs a <code>TextTable</code> with the specified columns.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.OptionSpec.html#toBuilder--">toBuilder()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.OptionSpec.html#toBuilder()">toBuilder()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
 <dd>
 <div class="block">Returns a new Builder initialized with the attributes from this <code>OptionSpec</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.PositionalParamSpec.html#toBuilder--">toBuilder()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.PositionalParamSpec.html#toBuilder()">toBuilder()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a></dt>
 <dd>
 <div class="block">Returns a new Builder initialized with the attributes from this <code>PositionalParamSpec</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Text.html#toString--">toString()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Text.html#toString()">toString()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
 <dd>
 <div class="block">Returns a String representation of the text with ANSI escape codes embedded, unless ANSI is
- <a href="picocli/CommandLine.Help.Ansi.html#enabled--">CommandLine.Help.Ansi.enabled()</a> not enabled}, in which case the plain text is returned.</div>
+ <a href="./picocli/CommandLine.Help.Ansi.html#enabled()">CommandLine.Help.Ansi.enabled()</a> not enabled}, in which case the plain text is returned.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Layout.html#toString--">toString()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Layout.html#toString()">toString()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
 <dd>
 <div class="block">Returns the section of the usage help message accumulated in the TextTable owned by this layout.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.html#toString-java.lang.StringBuilder-">toString(StringBuilder)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.TextTable.html#toString(java.lang.StringBuilder)">toString(StringBuilder)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
 <dd>
 <div class="block">Copies the text representation that we built up from the options into the specified StringBuilder.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.html#toString--">toString()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.TextTable.html#toString()">toString()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ArgSpec.html#toString--">toString()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ArgSpec.html#toString()">toString()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
 <dd>
 <div class="block">Returns a string respresentation of this option or positional parameter.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#toString--">toString()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#toString()">toString()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Returns a string representation of this command, used in error messages and trace messages.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Range.html#toString--">toString()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ParserSpec.html#toString()">toString()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ArgSpec.html#type--">type()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Range.html#toString()">toString()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ArgSpec.html#type()">type()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></dt>
 <dd>
-<div class="block">Returns the type to convert the option or positional parameter to before <a href="picocli/CommandLine.Model.ArgSpec.html#setValue-java.lang.Object-">setting</a> the value.</div>
+<div class="block">Returns the type to convert the option or positional parameter to before <a href="./picocli/CommandLine.Model.ArgSpec.html#setValue(java.lang.Object)">setting</a> the value.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.TypeConversionException.html#TypeConversionException-java.lang.String-">TypeConversionException(String)</a></span> - Constructor for exception picocli.<a href="picocli/CommandLine.TypeConversionException.html" title="class in picocli">CommandLine.TypeConversionException</a></dt>
-<dd>&nbsp;</dd>
 </dl>
-<a name="I:U">
+<a name="_U_">
 <!--   -->
 </a>
 <h2 class="title">U</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.ParseResult.html#unmatched--">unmatched()</a></span> - Method in class picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.ParseResult.html#unmatched()">unmatched()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></dt>
 <dd>
 <div class="block">Returns a list of command line arguments that did not match any options or positional parameters.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#unmatchedArgsBindings--">unmatchedArgsBindings()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#unmatchedArgsBindings()">unmatchedArgsBindings()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
-<div class="block">Returns the list of <a href="picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli"><code>UnmatchedArgumentsBindings</code></a> configured for this command;
+<div class="block">Returns the list of <a href="./picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli"><code>UnmatchedArgumentsBindings</code></a> configured for this command;
  each <code>UnmatchedArgsBinding</code> captures the arguments that could not be matched to any options or positional parameters.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.UnmatchedArgumentException.html#UnmatchedArgumentException-picocli.CommandLine-java.lang.String-">UnmatchedArgumentException(CommandLine, String)</a></span> - Constructor for exception picocli.<a href="picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli">CommandLine.UnmatchedArgumentException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.UnmatchedArgumentException.html#UnmatchedArgumentException-picocli.CommandLine-java.util.Stack-">UnmatchedArgumentException(CommandLine, Stack&lt;String&gt;)</a></span> - Constructor for exception picocli.<a href="picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli">CommandLine.UnmatchedArgumentException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.UnmatchedArgumentException.html#UnmatchedArgumentException-picocli.CommandLine-java.util.List-">UnmatchedArgumentException(CommandLine, List&lt;String&gt;)</a></span> - Constructor for exception picocli.<a href="picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli">CommandLine.UnmatchedArgumentException</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ParserSpec.html#unmatchedArgumentsAllowed()">unmatchedArgumentsAllowed()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ParserSpec.html#unmatchedArgumentsAllowed--">unmatchedArgumentsAllowed()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.ParserSpec.html#unmatchedArgumentsAllowed(boolean)">unmatchedArgumentsAllowed(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.ParserSpec.html#unmatchedArgumentsAllowed-boolean-">unmatchedArgumentsAllowed(boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#usage-java.lang.Object-java.io.PrintStream-">usage(Object, PrintStream)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#usage(java.lang.Object,%20java.io.PrintStream)">usage(Object, PrintStream)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Equivalent to <code>new CommandLine(command).usage(out)</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#usage-java.lang.Object-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">usage(Object, PrintStream, CommandLine.Help.Ansi)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#usage(java.lang.Object,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">usage(Object, PrintStream, CommandLine.Help.Ansi)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Equivalent to <code>new CommandLine(command).usage(out, ansi)</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#usage-java.lang.Object-java.io.PrintStream-picocli.CommandLine.Help.ColorScheme-">usage(Object, PrintStream, CommandLine.Help.ColorScheme)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#usage(java.lang.Object,%20java.io.PrintStream,%20picocli.CommandLine.Help.ColorScheme)">usage(Object, PrintStream, CommandLine.Help.ColorScheme)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Equivalent to <code>new CommandLine(command).usage(out, colorScheme)</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#usage-java.io.PrintStream-">usage(PrintStream)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#usage(java.io.PrintStream)">usage(PrintStream)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dd>
+<div class="block">Delegates to <a href="./picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>CommandLine.usage(PrintStream, Help.Ansi)</code></a> with the <a href="./picocli/CommandLine.Help.Ansi.html#AUTO">platform default</a>.</div>
+</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#usage(java.io.PrintWriter)">usage(PrintWriter)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Delegates to <a href="picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>CommandLine.usage(PrintStream, Help.Ansi)</code></a> with the <a href="picocli/CommandLine.Help.Ansi.html#AUTO">platform default</a>.</div>
+<div class="block">Delegates to <a href="./picocli/CommandLine.html#usage(java.io.PrintWriter,%20picocli.CommandLine.Help.Ansi)"><code>CommandLine.usage(PrintWriter, Help.Ansi)</code></a> with the <a href="./picocli/CommandLine.Help.Ansi.html#AUTO">platform default</a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">usage(PrintStream, CommandLine.Help.Ansi)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">usage(PrintStream, CommandLine.Help.Ansi)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Delegates to <a href="picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.ColorScheme-"><code>CommandLine.usage(PrintStream, Help.ColorScheme)</code></a> with the <a href="picocli/CommandLine.Help.html#defaultColorScheme-picocli.CommandLine.Help.Ansi-">default color scheme</a>.</div>
+<div class="block">Delegates to <a href="./picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.ColorScheme)"><code>CommandLine.usage(PrintStream, Help.ColorScheme)</code></a> with the <a href="./picocli/CommandLine.Help.html#defaultColorScheme(picocli.CommandLine.Help.Ansi)">default color scheme</a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.ColorScheme-">usage(PrintStream, CommandLine.Help.ColorScheme)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#usage(java.io.PrintWriter,%20picocli.CommandLine.Help.Ansi)">usage(PrintWriter, CommandLine.Help.Ansi)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dd>
+<div class="block">Similar to <a href="./picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>CommandLine.usage(PrintStream, Help.Ansi)</code></a> but with the specified <code>PrintWriter</code> instead of a <code>PrintStream</code>.</div>
+</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.ColorScheme)">usage(PrintStream, CommandLine.Help.ColorScheme)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
 <div class="block">Prints a usage help message for the annotated command class to the specified <code>PrintStream</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.OptionSpec.Builder.html#usageHelp-boolean-">usageHelp(boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#usage(java.io.PrintWriter,%20picocli.CommandLine.Help.ColorScheme)">usage(PrintWriter, CommandLine.Help.ColorScheme)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dd>
+<div class="block">Similar to <a href="./picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.ColorScheme)"><code>CommandLine.usage(PrintStream, Help.ColorScheme)</code></a>, but with the specified <code>PrintWriter</code> instead of a <code>PrintStream</code>.</div>
+</dd>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.OptionSpec.Builder.html#usageHelp(boolean)">usageHelp(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></dt>
 <dd>
 <div class="block">Sets whether this option allows the user to request usage help, and returns this builder.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.OptionSpec.html#usageHelp--">usageHelp()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.OptionSpec.html#usageHelp()">usageHelp()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
 <dd>
 <div class="block">Returns whether this option allows the user to request usage help.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#usageMessage--">usageMessage()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#usageMessage()">usageMessage()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Returns the usage help message specification for this command.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.UsageMessageSpec.html#UsageMessageSpec--">UsageMessageSpec()</a></span> - Constructor for class picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.AbstractHandler.html#useAnsi-picocli.CommandLine.Help.Ansi-">useAnsi(CommandLine.Help.Ansi)</a></span> - Method in class picocli.<a href="picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.AbstractHandler.html#useAnsi(picocli.CommandLine.Help.Ansi)">useAnsi(CommandLine.Help.Ansi)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
 <dd>
 <div class="block">Sets the ANSI style to use.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.AbstractHandler.html#useErr-java.io.PrintStream-">useErr(PrintStream)</a></span> - Method in class picocli.<a href="picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.AbstractHandler.html#useErr(java.io.PrintStream)">useErr(PrintStream)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
 <dd>
 <div class="block">Sets the stream to print diagnostic messages to.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.AbstractHandler.html#useOut-java.io.PrintStream-">useOut(PrintStream)</a></span> - Method in class picocli.<a href="picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.AbstractHandler.html#useOut(java.io.PrintStream)">useOut(PrintStream)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></dt>
 <dd>
 <div class="block">Sets the stream to print command output to.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#userObject--">userObject()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#userObject()">userObject()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Returns the user object associated with this command.</div>
 </dd>
 </dl>
-<a name="I:V">
+<a name="_V_">
 <!--   -->
 </a>
 <h2 class="title">V</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Style.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum picocli.<a href="picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Style.html#valueOf(java.lang.String)">valueOf(String)</a></span> - Static method in enum picocli.<a href="./picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></dt>
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum picocli.<a href="picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.html#valueOf(java.lang.String)">valueOf(String)</a></span> - Static method in enum picocli.<a href="./picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a></dt>
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Column.Overflow.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum picocli.<a href="picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Column.Overflow.html#valueOf(java.lang.String)">valueOf(String)</a></span> - Static method in enum picocli.<a href="./picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a></dt>
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Visibility.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum picocli.<a href="picocli/CommandLine.Help.Visibility.html" title="enum in picocli">CommandLine.Help.Visibility</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Visibility.html#valueOf(java.lang.String)">valueOf(String)</a></span> - Static method in enum picocli.<a href="./picocli/CommandLine.Help.Visibility.html" title="enum in picocli">CommandLine.Help.Visibility</a></dt>
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Range.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Range.html#valueOf(java.lang.String)">valueOf(String)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></dt>
 <dd>
 <div class="block">Leniently parses the specified String as an <code>Range</code> value and return the result.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Style.html#values--">values()</a></span> - Static method in enum picocli.<a href="picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.Style.html#values()">values()</a></span> - Static method in enum picocli.<a href="./picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></dt>
 <dd>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.html#values--">values()</a></span> - Static method in enum picocli.<a href="picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Ansi.html#values()">values()</a></span> - Static method in enum picocli.<a href="./picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a></dt>
 <dd>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Column.Overflow.html#values--">values()</a></span> - Static method in enum picocli.<a href="picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Column.Overflow.html#values()">values()</a></span> - Static method in enum picocli.<a href="./picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a></dt>
 <dd>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Visibility.html#values--">values()</a></span> - Static method in enum picocli.<a href="picocli/CommandLine.Help.Visibility.html" title="enum in picocli">CommandLine.Help.Visibility</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Visibility.html#values()">values()</a></span> - Static method in enum picocli.<a href="./picocli/CommandLine.Help.Visibility.html" title="enum in picocli">CommandLine.Help.Visibility</a></dt>
 <dd>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#version--">version()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#version()">version()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Returns version information for this command, to print to the console when the user specifies an
- <a href="picocli/CommandLine.Model.OptionSpec.html#versionHelp--">option</a> to request version help.</div>
+ <a href="./picocli/CommandLine.Model.OptionSpec.html#versionHelp()">option</a> to request version help.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#version-java.lang.String...-">version(String...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#version(java.lang.String...)">version(String...)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Sets version information literals for this command, to print to the console when the user specifies an
- <a href="picocli/CommandLine.Model.OptionSpec.html#versionHelp--">option</a> to request version help.</div>
+ <a href="./picocli/CommandLine.Model.OptionSpec.html#versionHelp()">option</a> to request version help.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.html#VERSION">VERSION</a></span> - Static variable in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.html#VERSION">VERSION</a></span> - Static variable in class picocli.<a href="./picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">This is picocli version "3.0.0-alpha-1".</div>
+<div class="block">This is picocli version "3.0.0-alpha-2".</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.OptionSpec.Builder.html#versionHelp-boolean-">versionHelp(boolean)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.OptionSpec.Builder.html#versionHelp(boolean)">versionHelp(boolean)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></dt>
 <dd>
 <div class="block">Sets whether this option allows the user to request version information, and returns this builder.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.OptionSpec.html#versionHelp--">versionHelp()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.OptionSpec.html#versionHelp()">versionHelp()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></dt>
 <dd>
 <div class="block">Returns whether this option allows the user to request version information.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#versionProvider--">versionProvider()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#versionProvider()">versionProvider()</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
-<div class="block">Returns the version provider for this command, to generate the <a href="picocli/CommandLine.Model.CommandSpec.html#version--"><code>CommandLine.Model.CommandSpec.version()</code></a> strings.</div>
+<div class="block">Returns the version provider for this command, to generate the <a href="./picocli/CommandLine.Model.CommandSpec.html#version()"><code>CommandLine.Model.CommandSpec.version()</code></a> strings.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#versionProvider-picocli.CommandLine.IVersionProvider-">versionProvider(CommandLine.IVersionProvider)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#versionProvider(picocli.CommandLine.IVersionProvider)">versionProvider(CommandLine.IVersionProvider)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
-<div class="block">Sets version provider for this command, to generate the <a href="picocli/CommandLine.Model.CommandSpec.html#version--"><code>CommandLine.Model.CommandSpec.version()</code></a> strings.</div>
+<div class="block">Sets version provider for this command, to generate the <a href="./picocli/CommandLine.Model.CommandSpec.html#version()"><code>CommandLine.Model.CommandSpec.version()</code></a> strings.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/groovy/PicocliScriptASTTransformation.html#visit-org.codehaus.groovy.ast.ASTNode:A-org.codehaus.groovy.control.SourceUnit-">visit(ASTNode[], SourceUnit)</a></span> - Method in class picocli.groovy.<a href="picocli/groovy/PicocliScriptASTTransformation.html" title="class in picocli.groovy">PicocliScriptASTTransformation</a></dt>
+<dt><span class="strong"><a href="./picocli/groovy/PicocliScriptASTTransformation.html#visit(org.codehaus.groovy.ast.ASTNode[],%20org.codehaus.groovy.control.SourceUnit)">visit(ASTNode[], SourceUnit)</a></span> - Method in class picocli.groovy.<a href="./picocli/groovy/PicocliScriptASTTransformation.html" title="class in picocli.groovy">PicocliScriptASTTransformation</a></dt>
 <dd>&nbsp;</dd>
 </dl>
-<a name="I:W">
+<a name="_W_">
 <!--   -->
 </a>
 <h2 class="title">W</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Column.html#width">width</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Help.Column.html#width">width</a></span> - Variable in class picocli.<a href="./picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a></dt>
 <dd>
 <div class="block">Column width in characters</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#withToString-java.lang.String-">withToString(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#withToString(java.lang.String)">withToString(String)</a></span> - Method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Sets the string representation of this command, used in error messages and trace messages.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="picocli/CommandLine.Model.CommandSpec.html#wrapWithoutInspection-java.lang.Object-">wrapWithoutInspection(Object)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
+<dt><span class="strong"><a href="./picocli/CommandLine.Model.CommandSpec.html#wrapWithoutInspection(java.lang.Object)">wrapWithoutInspection(Object)</a></span> - Static method in class picocli.<a href="./picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></dt>
 <dd>
 <div class="block">Creates and returns a new <code>CommandSpec</code> with the specified associated user object.</div>
 </dd>
 </dl>
-<a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:J">J</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:U">U</a>&nbsp;<a href="#I:V">V</a>&nbsp;<a href="#I:W">W</a>&nbsp;</div>
+<a href="#_A_">A</a>&nbsp;<a href="#_B_">B</a>&nbsp;<a href="#_C_">C</a>&nbsp;<a href="#_D_">D</a>&nbsp;<a href="#_E_">E</a>&nbsp;<a href="#_F_">F</a>&nbsp;<a href="#_G_">G</a>&nbsp;<a href="#_H_">H</a>&nbsp;<a href="#_I_">I</a>&nbsp;<a href="#_J_">J</a>&nbsp;<a href="#_L_">L</a>&nbsp;<a href="#_M_">M</a>&nbsp;<a href="#_N_">N</a>&nbsp;<a href="#_O_">O</a>&nbsp;<a href="#_P_">P</a>&nbsp;<a href="#_R_">R</a>&nbsp;<a href="#_S_">S</a>&nbsp;<a href="#_T_">T</a>&nbsp;<a href="#_U_">U</a>&nbsp;<a href="#_V_">V</a>&nbsp;<a href="#_W_">W</a>&nbsp;</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
-<li><a href="overview-summary.html">Overview</a></li>
+<li><a href="./overview-summary.html">Overview</a></li>
 <li>Package</li>
 <li>Class</li>
-<li><a href="overview-tree.html">Tree</a></li>
-<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="./overview-tree.html">Tree</a></li>
+<li><a href="./deprecated-list.html">Deprecated</a></li>
 <li class="navBarCell1Rev">Index</li>
-<li><a href="help-doc.html">Help</a></li>
+<li><a href="./help-doc.html">Help</a></li>
 </ul>
 </div>
 <div class="subNav">
@@ -2392,11 +2391,11 @@ <h2 class="title">W</h2>
 <li>Next</li>
 </ul>
 <ul class="navList">
-<li><a href="index.html?index-all.html" target="_top">Frames</a></li>
-<li><a href="index-all.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="./index.html?index-all.html" target="_top">Frames</a></li>
+<li><a href="index-all.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="./allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -2410,7 +2409,7 @@ <h2 class="title">W</h2>
   //-->
 </script>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/index.html b/docs/apidocs/index.html
index 762fef084..a578b3233 100644
--- a/docs/apidocs/index.html
+++ b/docs/apidocs/index.html
@@ -2,15 +2,14 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:29 JST 2018 -->
-<title>picocli 3.0.0-alpha-1 API</title>
+<!-- Generated by javadoc on Tue Mar 27 21:44:03 JST 2018 -->
+<title>picocli 3.0.0-alpha-2 API</title>
 <script type="text/javascript">
-    tmpTargetPage = "" + window.location.search;
-    if (tmpTargetPage != "" && tmpTargetPage != "undefined")
-        tmpTargetPage = tmpTargetPage.substring(1);
-    if (tmpTargetPage.indexOf(":") != -1 || (tmpTargetPage != "" && !validURL(tmpTargetPage)))
-        tmpTargetPage = "undefined";
-    targetPage = tmpTargetPage;
+    targetPage = "" + window.location.search;
+    if (targetPage != "" && targetPage != "undefined")
+        targetPage = targetPage.substring(1);
+    if (targetPage.indexOf(":") != -1 || (targetPage != "" && !validURL(targetPage)))
+        targetPage = "undefined";
     function validURL(url) {
         try {
             url = decodeURIComponent(url);
diff --git a/docs/apidocs/overview-frame.html b/docs/apidocs/overview-frame.html
index cf52aa3d3..66873588d 100644
--- a/docs/apidocs/overview-frame.html
+++ b/docs/apidocs/overview-frame.html
@@ -2,14 +2,13 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>Overview List (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>Overview List (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
 </head>
 <body>
-<div class="indexHeader"><span><a href="allclasses-frame.html" target="packageFrame">All&nbsp;Classes</a></span></div>
+<div class="indexHeader"><a href="allclasses-frame.html" target="packageFrame">All Classes</a></div>
 <div class="indexContainer">
 <h2 title="Packages">Packages</h2>
 <ul title="Packages">
diff --git a/docs/apidocs/overview-summary.html b/docs/apidocs/overview-summary.html
index f767bdaa0..9d08fd2d2 100644
--- a/docs/apidocs/overview-summary.html
+++ b/docs/apidocs/overview-summary.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:29 JST 2018 -->
-<title>Overview (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>Overview (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Overview (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Overview (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -47,10 +40,10 @@
 </ul>
 <ul class="navList">
 <li><a href="index.html?overview-summary.html" target="_top">Frames</a></li>
-<li><a href="overview-summary.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="overview-summary.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -64,19 +57,19 @@
   //-->
 </script>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title">picocli 3.0.0-alpha-1 API</h1>
+<h1 class="title">picocli 3.0.0-alpha-2 API</h1>
 </div>
 <div class="header">
 <div class="subTitle">
 <div class="block">
     Picocli is a one-file framework for creating Java command line applications with almost zero code.</div>
 </div>
-<p>See: <a href="#overview.description">Description</a></p>
+<p>See: <a href="#overview_description">Description</a></p>
 </div>
 <div class="contentContainer">
 <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Packages table, listing packages, and an explanation">
@@ -102,9 +95,10 @@ <h1 class="title">picocli 3.0.0-alpha-1 API</h1>
 </tbody>
 </table>
 </div>
-<div class="contentContainer"><a name="overview.description">
+<div class="footer"><a name="overview_description">
 <!--   -->
 </a>
+<div class="subTitle">
 <div class="block"><p>
     Picocli is a one-file framework for creating Java command line applications with almost zero code.
     It supports a variety of command line syntax styles including POSIX, GNU, MS-DOS and more.
@@ -154,12 +148,11 @@ <h1 class="title">picocli 3.0.0-alpha-1 API</h1>
 }
 </pre></div>
 </div>
+</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -179,10 +172,10 @@ <h1 class="title">picocli 3.0.0-alpha-1 API</h1>
 </ul>
 <ul class="navList">
 <li><a href="index.html?overview-summary.html" target="_top">Frames</a></li>
-<li><a href="overview-summary.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="overview-summary.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -196,7 +189,7 @@ <h1 class="title">picocli 3.0.0-alpha-1 API</h1>
   //-->
 </script>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/overview-tree.html b/docs/apidocs/overview-tree.html
index 65cfea876..a06e63613 100644
--- a/docs/apidocs/overview-tree.html
+++ b/docs/apidocs/overview-tree.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:29 JST 2018 -->
-<title>Class Hierarchy (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>Class Hierarchy (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Class Hierarchy (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Class Hierarchy (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -47,10 +40,10 @@
 </ul>
 <ul class="navList">
 <li><a href="index.html?overview-tree.html" target="_top">Frames</a></li>
-<li><a href="overview-tree.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="overview-tree.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -64,13 +57,13 @@
   //-->
 </script>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
 <h1 class="title">Hierarchy For All Packages</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<span class="strong">Package Hierarchies:</span>
 <ul class="horizontal">
 <li><a href="picocli/package-tree.html">picocli</a>, </li>
 <li><a href="picocli/groovy/package-tree.html">picocli.groovy</a></li>
@@ -83,53 +76,52 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li type="circle">org.codehaus.groovy.transform.AbstractASTTransformation (implements org.codehaus.groovy.transform.ASTTransformation, groovyjarjarasm.asm.Opcodes)
 <ul>
-<li type="circle">picocli.groovy.<a href="picocli/groovy/PicocliScriptASTTransformation.html" title="class in picocli.groovy"><span class="typeNameLink">PicocliScriptASTTransformation</span></a></li>
+<li type="circle">picocli.groovy.<a href="picocli/groovy/PicocliScriptASTTransformation.html" title="class in picocli.groovy"><span class="strong">PicocliScriptASTTransformation</span></a></li>
 </ul>
 </li>
-<li type="circle">picocli.<a href="picocli/AutoComplete.html" title="class in picocli"><span class="typeNameLink">AutoComplete</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.html" title="class in picocli"><span class="typeNameLink">CommandLine</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.AbstractHandler.html" title="class in picocli"><span class="typeNameLink">CommandLine.AbstractHandler</span></a>&lt;R,T&gt;
+<li type="circle">picocli.<a href="picocli/AutoComplete.html" title="class in picocli"><span class="strong">AutoComplete</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.html" title="class in picocli"><span class="strong">CommandLine</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.AbstractHandler.html" title="class in picocli"><span class="strong">CommandLine.AbstractHandler</span></a>&lt;R,T&gt;
 <ul>
-<li type="circle">picocli.<a href="picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli"><span class="typeNameLink">CommandLine.AbstractParseResultHandler</span></a>&lt;R&gt; (implements picocli.<a href="picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a>&lt;R&gt;)
+<li type="circle">picocli.<a href="picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli"><span class="strong">CommandLine.AbstractParseResultHandler</span></a>&lt;R&gt; (implements picocli.<a href="picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a>&lt;R&gt;)
 <ul>
-<li type="circle">picocli.<a href="picocli/CommandLine.RunAll.html" title="class in picocli"><span class="typeNameLink">CommandLine.RunAll</span></a> (implements picocli.<a href="picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a>)</li>
-<li type="circle">picocli.<a href="picocli/CommandLine.RunFirst.html" title="class in picocli"><span class="typeNameLink">CommandLine.RunFirst</span></a> (implements picocli.<a href="picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a>)</li>
-<li type="circle">picocli.<a href="picocli/CommandLine.RunLast.html" title="class in picocli"><span class="typeNameLink">CommandLine.RunLast</span></a> (implements picocli.<a href="picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a>)</li>
+<li type="circle">picocli.<a href="picocli/CommandLine.RunAll.html" title="class in picocli"><span class="strong">CommandLine.RunAll</span></a> (implements picocli.<a href="picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a>)</li>
+<li type="circle">picocli.<a href="picocli/CommandLine.RunFirst.html" title="class in picocli"><span class="strong">CommandLine.RunFirst</span></a> (implements picocli.<a href="picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a>)</li>
+<li type="circle">picocli.<a href="picocli/CommandLine.RunLast.html" title="class in picocli"><span class="strong">CommandLine.RunLast</span></a> (implements picocli.<a href="picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a>)</li>
 </ul>
 </li>
-<li type="circle">picocli.<a href="picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli"><span class="typeNameLink">CommandLine.AbstractSimpleParseResultHandler</span></a> (implements picocli.<a href="picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a>&lt;R&gt;)</li>
-<li type="circle">picocli.<a href="picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><span class="typeNameLink">CommandLine.DefaultExceptionHandler</span></a>&lt;R&gt; (implements picocli.<a href="picocli/CommandLine.IExceptionHandler.html" title="interface in picocli">CommandLine.IExceptionHandler</a>, picocli.<a href="picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a>&lt;R&gt;)</li>
+<li type="circle">picocli.<a href="picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><span class="strong">CommandLine.DefaultExceptionHandler</span></a>&lt;R&gt; (implements picocli.<a href="picocli/CommandLine.IExceptionHandler.html" title="interface in picocli">CommandLine.IExceptionHandler</a>, picocli.<a href="picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a>&lt;R&gt;)</li>
 </ul>
 </li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help.Ansi.Text</span></a> (implements java.lang.Cloneable)</li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help.ColorScheme</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Help.Column.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help.Column</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Help.Layout.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help.Layout</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help.TextTable</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help.TextTable.Cell</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.HelpCommand.html" title="class in picocli"><span class="typeNameLink">CommandLine.HelpCommand</span></a> (implements picocli.<a href="picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli">CommandLine.IHelpCommandInitializable</a>, java.lang.Runnable)</li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Model.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.ArgSpec</span></a>
-<ul>
-<li type="circle">picocli.<a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.OptionSpec</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.PositionalParamSpec</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli"><span class="strong">CommandLine.Help</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><span class="strong">CommandLine.Help.Ansi.Text</span></a> (implements java.lang.Cloneable)</li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli"><span class="strong">CommandLine.Help.ColorScheme</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Help.Column.html" title="class in picocli"><span class="strong">CommandLine.Help.Column</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Help.Layout.html" title="class in picocli"><span class="strong">CommandLine.Help.Layout</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli"><span class="strong">CommandLine.Help.TextTable</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli"><span class="strong">CommandLine.Help.TextTable.Cell</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.HelpCommand.html" title="class in picocli"><span class="strong">CommandLine.HelpCommand</span></a> (implements picocli.<a href="picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli">CommandLine.IHelpCommandInitializable</a>, java.lang.Runnable)</li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Model.html" title="class in picocli"><span class="strong">CommandLine.Model</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Model.ArgSpec.html" title="class in picocli"><span class="strong">CommandLine.Model.ArgSpec</span></a>
+<ul>
+<li type="circle">picocli.<a href="picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><span class="strong">CommandLine.Model.OptionSpec</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli"><span class="strong">CommandLine.Model.PositionalParamSpec</span></a></li>
 </ul>
 </li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.CommandSpec</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.OptionSpec.Builder</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Model.ParserSpec.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.ParserSpec</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.PositionalParamSpec.Builder</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.UnmatchedArgsBinding</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.UsageMessageSpec</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli"><span class="typeNameLink">CommandLine.ParseResult</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.ParseResult.Builder.html" title="class in picocli"><span class="typeNameLink">CommandLine.ParseResult.Builder</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Range.html" title="class in picocli"><span class="typeNameLink">CommandLine.Range</span></a> (implements java.lang.Comparable&lt;T&gt;)</li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><span class="strong">CommandLine.Model.CommandSpec</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli"><span class="strong">CommandLine.Model.OptionSpec.Builder</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Model.ParserSpec.html" title="class in picocli"><span class="strong">CommandLine.Model.ParserSpec</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli"><span class="strong">CommandLine.Model.PositionalParamSpec.Builder</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli"><span class="strong">CommandLine.Model.UnmatchedArgsBinding</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli"><span class="strong">CommandLine.Model.UsageMessageSpec</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.ParseResult.html" title="class in picocli"><span class="strong">CommandLine.ParseResult</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.ParseResult.Builder.html" title="class in picocli"><span class="strong">CommandLine.ParseResult.Builder</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Range.html" title="class in picocli"><span class="strong">CommandLine.Range</span></a> (implements java.lang.Comparable&lt;T&gt;)</li>
 <li type="circle">groovy.lang.GroovyObjectSupport (implements groovy.lang.GroovyObject)
 <ul>
 <li type="circle">groovy.lang.Script
 <ul>
-<li type="circle">picocli.groovy.<a href="picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy"><span class="typeNameLink">PicocliBaseScript</span></a></li>
+<li type="circle">picocli.groovy.<a href="picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy"><span class="strong">PicocliBaseScript</span></a></li>
 </ul>
 </li>
 </ul>
@@ -140,25 +132,25 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li type="circle">java.lang.RuntimeException
 <ul>
-<li type="circle">picocli.<a href="picocli/CommandLine.PicocliException.html" title="class in picocli"><span class="typeNameLink">CommandLine.PicocliException</span></a>
+<li type="circle">picocli.<a href="picocli/CommandLine.PicocliException.html" title="class in picocli"><span class="strong">CommandLine.PicocliException</span></a>
 <ul>
-<li type="circle">picocli.<a href="picocli/CommandLine.ExecutionException.html" title="class in picocli"><span class="typeNameLink">CommandLine.ExecutionException</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.InitializationException.html" title="class in picocli"><span class="typeNameLink">CommandLine.InitializationException</span></a>
+<li type="circle">picocli.<a href="picocli/CommandLine.ExecutionException.html" title="class in picocli"><span class="strong">CommandLine.ExecutionException</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.InitializationException.html" title="class in picocli"><span class="strong">CommandLine.InitializationException</span></a>
 <ul>
-<li type="circle">picocli.<a href="picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli"><span class="typeNameLink">CommandLine.DuplicateOptionAnnotationsException</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.ParameterIndexGapException.html" title="class in picocli"><span class="typeNameLink">CommandLine.ParameterIndexGapException</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli"><span class="strong">CommandLine.DuplicateOptionAnnotationsException</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.ParameterIndexGapException.html" title="class in picocli"><span class="strong">CommandLine.ParameterIndexGapException</span></a></li>
 </ul>
 </li>
-<li type="circle">picocli.<a href="picocli/CommandLine.ParameterException.html" title="class in picocli"><span class="typeNameLink">CommandLine.ParameterException</span></a>
+<li type="circle">picocli.<a href="picocli/CommandLine.ParameterException.html" title="class in picocli"><span class="strong">CommandLine.ParameterException</span></a>
 <ul>
-<li type="circle">picocli.<a href="picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli"><span class="typeNameLink">CommandLine.MaxValuesforFieldExceededException</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.MissingParameterException.html" title="class in picocli"><span class="typeNameLink">CommandLine.MissingParameterException</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli"><span class="typeNameLink">CommandLine.MissingTypeConverterException</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli"><span class="typeNameLink">CommandLine.OverwrittenOptionException</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli"><span class="typeNameLink">CommandLine.UnmatchedArgumentException</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli"><span class="strong">CommandLine.MaxValuesforFieldExceededException</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.MissingParameterException.html" title="class in picocli"><span class="strong">CommandLine.MissingParameterException</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli"><span class="strong">CommandLine.MissingTypeConverterException</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli"><span class="strong">CommandLine.OverwrittenOptionException</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli"><span class="strong">CommandLine.UnmatchedArgumentException</span></a></li>
 </ul>
 </li>
-<li type="circle">picocli.<a href="picocli/CommandLine.TypeConversionException.html" title="class in picocli"><span class="typeNameLink">CommandLine.TypeConversionException</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.TypeConversionException.html" title="class in picocli"><span class="strong">CommandLine.TypeConversionException</span></a></li>
 </ul>
 </li>
 </ul>
@@ -172,29 +164,29 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 </ul>
 <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
-<li type="circle">picocli.<a href="picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli"><span class="typeNameLink">CommandLine.Help.Ansi.IStyle</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli"><span class="typeNameLink">CommandLine.Help.IOptionRenderer</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli"><span class="typeNameLink">CommandLine.Help.IParameterRenderer</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli"><span class="typeNameLink">CommandLine.Help.IParamLabelRenderer</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IExceptionHandler</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IExceptionHandler2</span></a>&lt;R&gt;</li>
-<li type="circle">picocli.<a href="picocli/CommandLine.IFactory.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IFactory</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IHelpCommandInitializable</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.IParseResultHandler.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IParseResultHandler</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IParseResultHandler2</span></a>&lt;R&gt;</li>
-<li type="circle">picocli.<a href="picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><span class="typeNameLink">CommandLine.ITypeConverter</span></a>&lt;K&gt;</li>
-<li type="circle">picocli.<a href="picocli/CommandLine.IVersionProvider.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IVersionProvider</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><span class="typeNameLink">CommandLine.Model.IBinding</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli"><span class="strong">CommandLine.Help.Ansi.IStyle</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli"><span class="strong">CommandLine.Help.IOptionRenderer</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli"><span class="strong">CommandLine.Help.IParameterRenderer</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli"><span class="strong">CommandLine.Help.IParamLabelRenderer</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><span class="strong">CommandLine.IExceptionHandler</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><span class="strong">CommandLine.IExceptionHandler2</span></a>&lt;R&gt;</li>
+<li type="circle">picocli.<a href="picocli/CommandLine.IFactory.html" title="interface in picocli"><span class="strong">CommandLine.IFactory</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli"><span class="strong">CommandLine.IHelpCommandInitializable</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.IParseResultHandler.html" title="interface in picocli"><span class="strong">CommandLine.IParseResultHandler</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><span class="strong">CommandLine.IParseResultHandler2</span></a>&lt;R&gt;</li>
+<li type="circle">picocli.<a href="picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><span class="strong">CommandLine.ITypeConverter</span></a>&lt;K&gt;</li>
+<li type="circle">picocli.<a href="picocli/CommandLine.IVersionProvider.html" title="interface in picocli"><span class="strong">CommandLine.IVersionProvider</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><span class="strong">CommandLine.Model.IBinding</span></a></li>
 </ul>
 <h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>
 <ul>
-<li type="circle">picocli.<a href="picocli/CommandLine.Option.html" title="annotation in picocli"><span class="typeNameLink">CommandLine.Option</span></a> (implements java.lang.annotation.Annotation)</li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Parameters.html" title="annotation in picocli"><span class="typeNameLink">CommandLine.Parameters</span></a> (implements java.lang.annotation.Annotation)</li>
-<li type="circle">picocli.<a href="picocli/CommandLine.ParentCommand.html" title="annotation in picocli"><span class="typeNameLink">CommandLine.ParentCommand</span></a> (implements java.lang.annotation.Annotation)</li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Unmatched.html" title="annotation in picocli"><span class="typeNameLink">CommandLine.Unmatched</span></a> (implements java.lang.annotation.Annotation)</li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Mixin.html" title="annotation in picocli"><span class="typeNameLink">CommandLine.Mixin</span></a> (implements java.lang.annotation.Annotation)</li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Command.html" title="annotation in picocli"><span class="typeNameLink">CommandLine.Command</span></a> (implements java.lang.annotation.Annotation)</li>
-<li type="circle">picocli.groovy.<a href="picocli/groovy/PicocliScript.html" title="annotation in picocli.groovy"><span class="typeNameLink">PicocliScript</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Option.html" title="annotation in picocli"><span class="strong">CommandLine.Option</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Parameters.html" title="annotation in picocli"><span class="strong">CommandLine.Parameters</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">picocli.<a href="picocli/CommandLine.ParentCommand.html" title="annotation in picocli"><span class="strong">CommandLine.ParentCommand</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Unmatched.html" title="annotation in picocli"><span class="strong">CommandLine.Unmatched</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Mixin.html" title="annotation in picocli"><span class="strong">CommandLine.Mixin</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Command.html" title="annotation in picocli"><span class="strong">CommandLine.Command</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">picocli.groovy.<a href="picocli/groovy/PicocliScript.html" title="annotation in picocli.groovy"><span class="strong">PicocliScript</span></a> (implements java.lang.annotation.Annotation)</li>
 </ul>
 <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
 <ul>
@@ -202,10 +194,10 @@ <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
 <ul>
 <li type="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
 <ul>
-<li type="circle">picocli.<a href="picocli/CommandLine.Help.Visibility.html" title="enum in picocli"><span class="typeNameLink">CommandLine.Help.Visibility</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli"><span class="typeNameLink">CommandLine.Help.Column.Overflow</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Help.Ansi.html" title="enum in picocli"><span class="typeNameLink">CommandLine.Help.Ansi</span></a></li>
-<li type="circle">picocli.<a href="picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli"><span class="typeNameLink">CommandLine.Help.Ansi.Style</span></a> (implements picocli.<a href="picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>)</li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Help.Visibility.html" title="enum in picocli"><span class="strong">CommandLine.Help.Visibility</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli"><span class="strong">CommandLine.Help.Column.Overflow</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Help.Ansi.html" title="enum in picocli"><span class="strong">CommandLine.Help.Ansi</span></a></li>
+<li type="circle">picocli.<a href="picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli"><span class="strong">CommandLine.Help.Ansi.Style</span></a> (implements picocli.<a href="picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>)</li>
 </ul>
 </li>
 </ul>
@@ -213,11 +205,9 @@ <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
 </ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -237,10 +227,10 @@ <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
 </ul>
 <ul class="navList">
 <li><a href="index.html?overview-tree.html" target="_top">Frames</a></li>
-<li><a href="overview-tree.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="overview-tree.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -254,7 +244,7 @@ <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
   //-->
 </script>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/AutoComplete.html b/docs/apidocs/picocli/AutoComplete.html
index 663c228d5..c4454a1c7 100644
--- a/docs/apidocs/picocli/AutoComplete.html
+++ b/docs/apidocs/picocli/AutoComplete.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:27 JST 2018 -->
-<title>AutoComplete (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:02 JST 2018 -->
+<title>AutoComplete (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AutoComplete (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="AutoComplete (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":9,"i1":9,"i2":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../picocli/CommandLine.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li>Prev Class</li>
+<li><a href="../picocli/CommandLine.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/AutoComplete.html" target="_top">Frames</a></li>
-<li><a href="AutoComplete.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="AutoComplete.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -76,16 +63,16 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -108,7 +95,7 @@ <h2 title="Class AutoComplete" class="title">Class AutoComplete</h2>
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">AutoComplete</span>
+<pre>public class <span class="strong">AutoComplete</span>
 extends java.lang.Object</pre>
 <div class="block">Stand-alone tool that generates bash auto-complete scripts for picocli-based command line applications.</div>
 </li>
@@ -119,26 +106,26 @@ <h2 title="Class AutoComplete" class="title">Class AutoComplete</h2>
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/AutoComplete.html#bash-java.lang.String-picocli.CommandLine-">bash</a></span>(java.lang.String&nbsp;scriptName,
+<td class="colLast"><code><strong><a href="../picocli/AutoComplete.html#bash(java.lang.String,%20picocli.CommandLine)">bash</a></strong>(java.lang.String&nbsp;scriptName,
     <a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine)</code>
 <div class="block">Generates and returns the source code for an autocompletion bash script for the specified picocli-based application.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/AutoComplete.html#bash-java.lang.String-java.io.File-java.io.File-picocli.CommandLine-">bash</a></span>(java.lang.String&nbsp;scriptName,
+<td class="colLast"><code><strong><a href="../picocli/AutoComplete.html#bash(java.lang.String,%20java.io.File,%20java.io.File,%20picocli.CommandLine)">bash</a></strong>(java.lang.String&nbsp;scriptName,
     java.io.File&nbsp;out,
     java.io.File&nbsp;command,
     <a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine)</code>
@@ -147,15 +134,15 @@ <h3>Method Summary</h3>
  to the specified <code>command</code> file.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/AutoComplete.html#main-java.lang.String...-">main</a></span>(java.lang.String...&nbsp;args)</code>
+<td class="colLast"><code><strong><a href="../picocli/AutoComplete.html#main(java.lang.String...)">main</a></strong>(java.lang.String...&nbsp;args)</code>
 <div class="block">Generates a bash completion script for the specified command class.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -171,11 +158,11 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="main-java.lang.String...-">
+<a name="main(java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -183,55 +170,41 @@ <h3>Method Detail</h3>
 <h4>main</h4>
 <pre>public static&nbsp;void&nbsp;main(java.lang.String...&nbsp;args)</pre>
 <div class="block">Generates a bash completion script for the specified command class.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>args</code> - command line options. Specify at least the <code>commandLineFQCN</code> mandatory parameter, which is
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>args</code> - command line options. Specify at least the <code>commandLineFQCN</code> mandatory parameter, which is
       the fully qualified class name of the annotated <code>@Command</code> class to generate a completion script for.
-      Other parameters are optional. Specify <code>-h</code> to see details on the available options.</dd>
-</dl>
+      Other parameters are optional. Specify <code>-h</code> to see details on the available options.</dd></dl>
 </li>
 </ul>
-<a name="bash-java.lang.String-java.io.File-java.io.File-picocli.CommandLine-">
+<a name="bash(java.lang.String, java.io.File, java.io.File, picocli.CommandLine)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>bash</h4>
 <pre>public static&nbsp;void&nbsp;bash(java.lang.String&nbsp;scriptName,
-                        java.io.File&nbsp;out,
-                        java.io.File&nbsp;command,
-                        <a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine)
+        java.io.File&nbsp;out,
+        java.io.File&nbsp;command,
+        <a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine)
                  throws java.io.IOException</pre>
 <div class="block">Generates source code for an autocompletion bash script for the specified picocli-based application,
  and writes this script to the specified <code>out</code> file, and optionally writes an invocation script
  to the specified <code>command</code> file.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>scriptName</code> - the name of the command to generate a bash autocompletion script for</dd>
-<dd><code>commandLine</code> - the <code>CommandLine</code> instance for the command line application</dd>
-<dd><code>out</code> - the file to write the autocompletion bash script source code to</dd>
-<dd><code>command</code> - the file to write a helper script to that invokes the command, or <code>null</code> if no helper script file should be written</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code> - if a problem occurred writing to the specified files</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>scriptName</code> - the name of the command to generate a bash autocompletion script for</dd><dd><code>commandLine</code> - the <code>CommandLine</code> instance for the command line application</dd><dd><code>out</code> - the file to write the autocompletion bash script source code to</dd><dd><code>command</code> - the file to write a helper script to that invokes the command, or <code>null</code> if no helper script file should be written</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code>java.io.IOException</code> - if a problem occurred writing to the specified files</dd></dl>
 </li>
 </ul>
-<a name="bash-java.lang.String-picocli.CommandLine-">
+<a name="bash(java.lang.String, picocli.CommandLine)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>bash</h4>
 <pre>public static&nbsp;java.lang.String&nbsp;bash(java.lang.String&nbsp;scriptName,
-                                    <a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine)</pre>
+                    <a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine)</pre>
 <div class="block">Generates and returns the source code for an autocompletion bash script for the specified picocli-based application.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>scriptName</code> - the name of the command to generate a bash autocompletion script for</dd>
-<dd><code>commandLine</code> - the <code>CommandLine</code> instance for the command line application</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>source code for an autocompletion bash script</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>scriptName</code> - the name of the command to generate a bash autocompletion script for</dd><dd><code>commandLine</code> - the <code>CommandLine</code> instance for the command line application</dd>
+<dt><span class="strong">Returns:</span></dt><dd>source code for an autocompletion bash script</dd></dl>
 </li>
 </ul>
 </li>
@@ -242,11 +215,9 @@ <h4>bash</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -261,15 +232,15 @@ <h4>bash</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../picocli/CommandLine.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li>Prev Class</li>
+<li><a href="../picocli/CommandLine.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/AutoComplete.html" target="_top">Frames</a></li>
-<li><a href="AutoComplete.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="AutoComplete.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -289,16 +260,16 @@ <h4>bash</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.AbstractHandler.html b/docs/apidocs/picocli/CommandLine.AbstractHandler.html
index bf76bdd20..2809ece7e 100644
--- a/docs/apidocs/picocli/CommandLine.AbstractHandler.html
+++ b/docs/apidocs/picocli/CommandLine.AbstractHandler.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.AbstractHandler (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:02 JST 2018 -->
+<title>CommandLine.AbstractHandler (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.AbstractHandler (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.AbstractHandler (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":6,"i8":10,"i9":10,"i10":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.AbstractHandler.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.AbstractHandler.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.AbstractHandler.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -75,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -106,14 +93,10 @@ <h2 title="Class CommandLine.AbstractHandler" class="title">Class CommandLine.Ab
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>R</code> - the return type of this handler</dd>
-<dd><code>T</code> - The type of the handler subclass; for fluent API method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Type Parameters:</span></dt><dd><code>R</code> - the return type of this handler</dd><dd><code>T</code> - The type of the handler subclass; for fluent API method chaining</dd></dl>
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>, <a href="../picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli">CommandLine.AbstractSimpleParseResultHandler</a>, <a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a></dd>
+<dd><a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>, <a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a></dd>
 </dl>
 <dl>
 <dt>Enclosing class:</dt>
@@ -121,23 +104,20 @@ <h2 title="Class CommandLine.AbstractHandler" class="title">Class CommandLine.Ab
 </dl>
 <hr>
 <br>
-<pre>public abstract static class <span class="typeNameLabel">CommandLine.AbstractHandler&lt;R,T extends CommandLine.AbstractHandler&lt;R,T&gt;&gt;</span>
+<pre>public abstract static class <span class="strong">CommandLine.AbstractHandler&lt;R,T extends CommandLine.AbstractHandler&lt;R,T&gt;&gt;</span>
 extends java.lang.Object</pre>
 <div class="block">Abstract superclass for <a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><code>CommandLine.IParseResultHandler2</code></a> and <a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><code>CommandLine.IExceptionHandler2</code></a> implementations.
  <p>Note that <code>AbstractHandler</code> is a generic type. This, along with the abstract <code>self</code> method,
  allows method chaining to work properly in subclasses, without the need for casts. An example subclass can look like this:</p>
- <pre><code>
- class MyResultHandler extends AbstractHandler&lt;MyReturnType, MyResultHandler&gt; implements IParseResultHandler2&lt;MyReturnType&gt; {
+ <pre><code>class MyResultHandler extends AbstractHandler&lt;MyReturnType, MyResultHandler&gt; implements IParseResultHandler2&lt;MyReturnType&gt; {
 
      public MyReturnType handleParseResult(ParseResult parseResult, MyReturnType prototypeReturnValue) { ... }
 
      protected MyResultHandler self() { return this; }
  }
  </code></pre></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -146,106 +126,106 @@ <h2 title="Class CommandLine.AbstractHandler" class="title">Class CommandLine.Ab
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.AbstractHandler.html#AbstractHandler--">AbstractHandler</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.AbstractHandler.html#CommandLine.AbstractHandler()">CommandLine.AbstractHandler</a></strong>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">T</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.AbstractHandler.html#andExit-int-">andExit</a></span>(int&nbsp;exitCode)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.AbstractHandler.html#andExit(int)">andExit</a></strong>(int&nbsp;exitCode)</code>
 <div class="block">Indicates that the handler should call <code>System.exit(int)</code> after processing completes and sets the exit code to use as the termination status.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.AbstractHandler.html#ansi--">ansi</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.AbstractHandler.html#ansi()">ansi</a></strong>()</code>
 <div class="block">Returns the ANSI style to use.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.io.PrintStream</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.AbstractHandler.html#err--">err</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.AbstractHandler.html#err()">err</a></strong>()</code>
 <div class="block">Returns the stream to print diagnostic messages to.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.Integer</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.AbstractHandler.html#exitCode--">exitCode</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.AbstractHandler.html#exitCode()">exitCode</a></strong>()</code>
 <div class="block">Returns the exit code to use as the termination status, or <code>null</code> (the default) if the handler should
  not call <code>System.exit(int)</code> after processing completes.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.AbstractHandler.html#hasExitCode--">hasExitCode</a></span>()</code>
-<div class="block">Returns <code>true</code> if an exit code was set with <a href="../picocli/CommandLine.AbstractHandler.html#andExit-int-"><code>andExit(int)</code></a>, or <code>false</code> (the default) if
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.AbstractHandler.html#hasExitCode()">hasExitCode</a></strong>()</code>
+<div class="block">Returns <code>true</code> if an exit code was set with <a href="../picocli/CommandLine.AbstractHandler.html#andExit(int)"><code>andExit(int)</code></a>, or <code>false</code> (the default) if
  the handler should not call <code>System.exit(int)</code> after processing completes.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.io.PrintStream</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.AbstractHandler.html#out--">out</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.AbstractHandler.html#out()">out</a></strong>()</code>
 <div class="block">Returns the stream to print command output to.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected <a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">R</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.AbstractHandler.html#returnResultOrExit-R-">returnResultOrExit</a></span>(<a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">R</a>&nbsp;result)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.AbstractHandler.html#returnResultOrExit(R)">returnResultOrExit</a></strong>(<a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">R</a>&nbsp;result)</code>
 <div class="block">Convenience method for subclasses that returns the specified result object if no exit code was set,
- or otherwise, if an exit code <a href="../picocli/CommandLine.AbstractHandler.html#andExit-int-">was set</a>, calls <code>System.exit</code> with the configured
+ or otherwise, if an exit code <a href="../picocli/CommandLine.AbstractHandler.html#andExit(int)">was set</a>, calls <code>System.exit</code> with the configured
  exit code to terminate the currently running Java virtual machine.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>protected abstract <a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">T</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.AbstractHandler.html#self--">self</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.AbstractHandler.html#self()">self</a></strong>()</code>
 <div class="block">Returns <code>this</code> to allow method chaining when calling the setters for a fluent API.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">T</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.AbstractHandler.html#useAnsi-picocli.CommandLine.Help.Ansi-">useAnsi</a></span>(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.AbstractHandler.html#useAnsi(picocli.CommandLine.Help.Ansi)">useAnsi</a></strong>(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
 <div class="block">Sets the ANSI style to use.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">T</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.AbstractHandler.html#useErr-java.io.PrintStream-">useErr</a></span>(java.io.PrintStream&nbsp;err)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.AbstractHandler.html#useErr(java.io.PrintStream)">useErr</a></strong>(java.io.PrintStream&nbsp;err)</code>
 <div class="block">Sets the stream to print diagnostic messages to.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">T</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.AbstractHandler.html#useOut-java.io.PrintStream-">useOut</a></span>(java.io.PrintStream&nbsp;out)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.AbstractHandler.html#useOut(java.io.PrintStream)">useOut</a></strong>(java.io.PrintStream&nbsp;out)</code>
 <div class="block">Sets the stream to print command output to.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -261,64 +241,64 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="AbstractHandler--">
+<a name="CommandLine.AbstractHandler()">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>AbstractHandler</h4>
-<pre>public&nbsp;AbstractHandler()</pre>
+<h4>CommandLine.AbstractHandler</h4>
+<pre>public&nbsp;CommandLine.AbstractHandler()</pre>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="out--">
+<a name="out()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>out</h4>
 <pre>public&nbsp;java.io.PrintStream&nbsp;out()</pre>
-<div class="block">Returns the stream to print command output to. Defaults to <code>System.out</code>, unless <a href="../picocli/CommandLine.AbstractHandler.html#useOut-java.io.PrintStream-"><code>useOut(PrintStream)</code></a>
+<div class="block">Returns the stream to print command output to. Defaults to <code>System.out</code>, unless <a href="../picocli/CommandLine.AbstractHandler.html#useOut(java.io.PrintStream)"><code>useOut(PrintStream)</code></a>
  was called with a different stream.
  <p><code>IParseResultHandler2</code> implementations should use this stream.
  By <a href="http://www.gnu.org/prep/standards/html_node/_002d_002dhelp.html">convention</a>, when the user requests
  help with a <code>--help</code> or similar option, the usage help message is printed to the standard output stream so that it can be easily searched and paged.</p></div>
 </li>
 </ul>
-<a name="err--">
+<a name="err()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>err</h4>
 <pre>public&nbsp;java.io.PrintStream&nbsp;err()</pre>
-<div class="block">Returns the stream to print diagnostic messages to. Defaults to <code>System.err</code>, unless <a href="../picocli/CommandLine.AbstractHandler.html#useErr-java.io.PrintStream-"><code>useErr(PrintStream)</code></a>
+<div class="block">Returns the stream to print diagnostic messages to. Defaults to <code>System.err</code>, unless <a href="../picocli/CommandLine.AbstractHandler.html#useErr(java.io.PrintStream)"><code>useErr(PrintStream)</code></a>
  was called with a different stream. <p><code>IExceptionHandler2</code> implementations should use this stream to print error
  messages (which may include a usage help message) when an unexpected error occurs.</p></div>
 </li>
 </ul>
-<a name="ansi--">
+<a name="ansi()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>ansi</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi()</pre>
-<div class="block">Returns the ANSI style to use. Defaults to <code>Help.Ansi.AUTO</code>, unless <a href="../picocli/CommandLine.AbstractHandler.html#useAnsi-picocli.CommandLine.Help.Ansi-"><code>useAnsi(CommandLine.Help.Ansi)</code></a> was called with a different setting.</div>
+<div class="block">Returns the ANSI style to use. Defaults to <code>Help.Ansi.AUTO</code>, unless <a href="../picocli/CommandLine.AbstractHandler.html#useAnsi(picocli.CommandLine.Help.Ansi)"><code>useAnsi(CommandLine.Help.Ansi)</code></a> was called with a different setting.</div>
 </li>
 </ul>
-<a name="exitCode--">
+<a name="exitCode()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -327,26 +307,23 @@ <h4>exitCode</h4>
 <pre>public&nbsp;java.lang.Integer&nbsp;exitCode()</pre>
 <div class="block">Returns the exit code to use as the termination status, or <code>null</code> (the default) if the handler should
  not call <code>System.exit(int)</code> after processing completes.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.AbstractHandler.html#andExit-int-"><code>andExit(int)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.AbstractHandler.html#andExit(int)"><code>andExit(int)</code></a></dd></dl>
 </li>
 </ul>
-<a name="hasExitCode--">
+<a name="hasExitCode()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>hasExitCode</h4>
 <pre>public&nbsp;boolean&nbsp;hasExitCode()</pre>
-<div class="block">Returns <code>true</code> if an exit code was set with <a href="../picocli/CommandLine.AbstractHandler.html#andExit-int-"><code>andExit(int)</code></a>, or <code>false</code> (the default) if
+<div class="block">Returns <code>true</code> if an exit code was set with <a href="../picocli/CommandLine.AbstractHandler.html#andExit(int)"><code>andExit(int)</code></a>, or <code>false</code> (the default) if
  the handler should not call <code>System.exit(int)</code> after processing completes.</div>
 </li>
 </ul>
-<a name="returnResultOrExit-java.lang.Object-">
+<a name="returnResultOrExit(java.lang.Object)">
 <!--   -->
-</a><a name="returnResultOrExit-R-">
+</a><a name="returnResultOrExit(R)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -354,11 +331,11 @@ <h4>hasExitCode</h4>
 <h4>returnResultOrExit</h4>
 <pre>protected&nbsp;<a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">R</a>&nbsp;returnResultOrExit(<a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">R</a>&nbsp;result)</pre>
 <div class="block">Convenience method for subclasses that returns the specified result object if no exit code was set,
- or otherwise, if an exit code <a href="../picocli/CommandLine.AbstractHandler.html#andExit-int-">was set</a>, calls <code>System.exit</code> with the configured
+ or otherwise, if an exit code <a href="../picocli/CommandLine.AbstractHandler.html#andExit(int)">was set</a>, calls <code>System.exit</code> with the configured
  exit code to terminate the currently running Java virtual machine.</div>
 </li>
 </ul>
-<a name="self--">
+<a name="self()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -368,7 +345,7 @@ <h4>self</h4>
 <div class="block">Returns <code>this</code> to allow method chaining when calling the setters for a fluent API.</div>
 </li>
 </ul>
-<a name="useOut-java.io.PrintStream-">
+<a name="useOut(java.io.PrintStream)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -376,13 +353,10 @@ <h4>self</h4>
 <h4>useOut</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">T</a>&nbsp;useOut(java.io.PrintStream&nbsp;out)</pre>
 <div class="block">Sets the stream to print command output to. For use by <code>IParseResultHandler2</code> implementations.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.AbstractHandler.html#out--"><code>out()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.AbstractHandler.html#out()"><code>out()</code></a></dd></dl>
 </li>
 </ul>
-<a name="useErr-java.io.PrintStream-">
+<a name="useErr(java.io.PrintStream)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -390,13 +364,10 @@ <h4>useOut</h4>
 <h4>useErr</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">T</a>&nbsp;useErr(java.io.PrintStream&nbsp;err)</pre>
 <div class="block">Sets the stream to print diagnostic messages to. For use by <code>IExceptionHandler2</code> implementations.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.AbstractHandler.html#err--"><code>err()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.AbstractHandler.html#err()"><code>err()</code></a></dd></dl>
 </li>
 </ul>
-<a name="useAnsi-picocli.CommandLine.Help.Ansi-">
+<a name="useAnsi(picocli.CommandLine.Help.Ansi)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -404,13 +375,10 @@ <h4>useErr</h4>
 <h4>useAnsi</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">T</a>&nbsp;useAnsi(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
 <div class="block">Sets the ANSI style to use.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.AbstractHandler.html#ansi--"><code>ansi()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.AbstractHandler.html#ansi()"><code>ansi()</code></a></dd></dl>
 </li>
 </ul>
-<a name="andExit-int-">
+<a name="andExit(int)">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -428,11 +396,9 @@ <h4>andExit</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -447,15 +413,15 @@ <h4>andExit</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.AbstractHandler.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.AbstractHandler.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.AbstractHandler.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -474,17 +440,17 @@ <h4>andExit</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.AbstractParseResultHandler.html b/docs/apidocs/picocli/CommandLine.AbstractParseResultHandler.html
index e49592786..767d4c9dd 100644
--- a/docs/apidocs/picocli/CommandLine.AbstractParseResultHandler.html
+++ b/docs/apidocs/picocli/CommandLine.AbstractParseResultHandler.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.AbstractParseResultHandler (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:02 JST 2018 -->
+<title>CommandLine.AbstractParseResultHandler (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.AbstractParseResultHandler (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.AbstractParseResultHandler (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":6,"i1":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.AbstractParseResultHandler.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.AbstractParseResultHandler.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.AbstractParseResultHandler.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -75,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -125,25 +112,22 @@ <h2 title="Class CommandLine.AbstractParseResultHandler" class="title">Class Com
 </dl>
 <hr>
 <br>
-<pre>public abstract static class <span class="typeNameLabel">CommandLine.AbstractParseResultHandler&lt;R&gt;</span>
+<pre>public abstract static class <span class="strong">CommandLine.AbstractParseResultHandler&lt;R&gt;</span>
 extends <a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a>&lt;R,<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>&lt;R&gt;&gt;
 implements <a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a>&lt;R&gt;</pre>
 <div class="block">Command line parse result handler that returns a value. This handler prints help if requested, and otherwise calls
- <a href="../picocli/CommandLine.AbstractParseResultHandler.html#handle-picocli.CommandLine.ParseResult-R-"><code>handle(CommandLine.ParseResult, Object)</code></a> with the parse result. Facilitates implementation of the <a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><code>CommandLine.IParseResultHandler2</code></a> interface.
+ <a href="../picocli/CommandLine.AbstractParseResultHandler.html#handle(picocli.CommandLine.ParseResult)"><code>handle(CommandLine.ParseResult)</code></a> with the parse result. Facilitates implementation of the <a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><code>CommandLine.IParseResultHandler2</code></a> interface.
  <p>Note that <code>AbstractParseResultHandler</code> is a generic type. This, along with the abstract <code>self</code> method,
  allows method chaining to work properly in subclasses, without the need for casts. An example subclass can look like this:</p>
- <pre><code>
- class MyResultHandler extends AbstractParseResultHandler&lt;MyReturnType&gt; {
+ <pre><code>class MyResultHandler extends AbstractParseResultHandler&lt;MyReturnType&gt; {
 
      protected MyReturnType handle(ParseResult parseResult, MyReturnType prototypeReturnValue) throws ExecutionException { ... }
 
      protected MyResultHandler self() { return this; }
  }
  </code></pre></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -152,57 +136,55 @@ <h2 title="Class CommandLine.AbstractParseResultHandler" class="title">Class Com
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.AbstractParseResultHandler.html#AbstractParseResultHandler--">AbstractParseResultHandler</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.AbstractParseResultHandler.html#CommandLine.AbstractParseResultHandler()">CommandLine.AbstractParseResultHandler</a></strong>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected abstract <a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="type parameter in CommandLine.AbstractParseResultHandler">R</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.AbstractParseResultHandler.html#handle-picocli.CommandLine.ParseResult-R-">handle</a></span>(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult,
-      <a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="type parameter in CommandLine.AbstractParseResultHandler">R</a>&nbsp;prototypeReturnValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.AbstractParseResultHandler.html#handle(picocli.CommandLine.ParseResult)">handle</a></strong>(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)</code>
 <div class="block">Processes the specified <code>ParseResult</code> and returns the result as a list of objects.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="type parameter in CommandLine.AbstractParseResultHandler">R</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.AbstractParseResultHandler.html#handleParseResult-picocli.CommandLine.ParseResult-R-">handleParseResult</a></span>(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult,
-                 <a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="type parameter in CommandLine.AbstractParseResultHandler">R</a>&nbsp;prototypeReturnValue)</code>
-<div class="block">Prints help if requested, and otherwise calls <a href="../picocli/CommandLine.AbstractParseResultHandler.html#handle-picocli.CommandLine.ParseResult-R-"><code>handle(CommandLine.ParseResult, Object)</code></a>.</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.AbstractParseResultHandler.html#handleParseResult(picocli.CommandLine.ParseResult)">handleParseResult</a></strong>(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)</code>
+<div class="block">Prints help if requested, and otherwise calls <a href="../picocli/CommandLine.AbstractParseResultHandler.html#handle(picocli.CommandLine.ParseResult)"><code>handle(CommandLine.ParseResult)</code></a>.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.picocli.CommandLine.AbstractHandler">
+<li class="blockList"><a name="methods_inherited_from_class_picocli.CommandLine.AbstractHandler">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;picocli.<a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></h3>
-<code><a href="../picocli/CommandLine.AbstractHandler.html#andExit-int-">andExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#ansi--">ansi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#err--">err</a>, <a href="../picocli/CommandLine.AbstractHandler.html#exitCode--">exitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#hasExitCode--">hasExitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#out--">out</a>, <a href="../picocli/CommandLine.AbstractHandler.html#returnResultOrExit-R-">returnResultOrExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#self--">self</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useAnsi-picocli.CommandLine.Help.Ansi-">useAnsi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useErr-java.io.PrintStream-">useErr</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useOut-java.io.PrintStream-">useOut</a></code></li>
+<code><a href="../picocli/CommandLine.AbstractHandler.html#andExit(int)">andExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#ansi()">ansi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#err()">err</a>, <a href="../picocli/CommandLine.AbstractHandler.html#exitCode()">exitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#hasExitCode()">hasExitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#out()">out</a>, <a href="../picocli/CommandLine.AbstractHandler.html#returnResultOrExit(R)">returnResultOrExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#self()">self</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useAnsi(picocli.CommandLine.Help.Ansi)">useAnsi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useErr(java.io.PrintStream)">useErr</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useOut(java.io.PrintStream)">useOut</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -218,84 +200,65 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="AbstractParseResultHandler--">
+<a name="CommandLine.AbstractParseResultHandler()">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>AbstractParseResultHandler</h4>
-<pre>public&nbsp;AbstractParseResultHandler()</pre>
+<h4>CommandLine.AbstractParseResultHandler</h4>
+<pre>public&nbsp;CommandLine.AbstractParseResultHandler()</pre>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="handleParseResult-picocli.CommandLine.ParseResult-java.lang.Object-">
-<!--   -->
-</a><a name="handleParseResult-picocli.CommandLine.ParseResult-R-">
+<a name="handleParseResult(picocli.CommandLine.ParseResult)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>handleParseResult</h4>
-<pre>public&nbsp;<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="type parameter in CommandLine.AbstractParseResultHandler">R</a>&nbsp;handleParseResult(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult,
-                           <a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="type parameter in CommandLine.AbstractParseResultHandler">R</a>&nbsp;prototypeReturnValue)
+<pre>public&nbsp;<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="type parameter in CommandLine.AbstractParseResultHandler">R</a>&nbsp;handleParseResult(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)
                     throws <a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></pre>
-<div class="block">Prints help if requested, and otherwise calls <a href="../picocli/CommandLine.AbstractParseResultHandler.html#handle-picocli.CommandLine.ParseResult-R-"><code>handle(CommandLine.ParseResult, Object)</code></a>.
- Finally, either a list of result objects is returned, or the JVM is terminated if an exit code <a href="../picocli/CommandLine.AbstractHandler.html#andExit-int-">was set</a>.</div>
+<div class="block">Prints help if requested, and otherwise calls <a href="../picocli/CommandLine.AbstractParseResultHandler.html#handle(picocli.CommandLine.ParseResult)"><code>handle(CommandLine.ParseResult)</code></a>.
+ Finally, either a list of result objects is returned, or the JVM is terminated if an exit code <a href="../picocli/CommandLine.AbstractHandler.html#andExit(int)">was set</a>.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.IParseResultHandler2.html#handleParseResult-picocli.CommandLine.ParseResult-R-">handleParseResult</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a>&lt;<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="type parameter in CommandLine.AbstractParseResultHandler">R</a>&gt;</code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>parseResult</code> - the <code>ParseResult</code> that resulted from successfully parsing the command line arguments</dd>
-<dd><code>prototypeReturnValue</code> - prototype return value, may be returned as is when the user requested help for example,
-                               or may be used to collect results from multiple subcommands, or may be used by the
-                               handler for internal processing and a completely different object is returned</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the result of processing parse results, may be the specified prototype or some other object</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.IParseResultHandler2.html#handleParseResult(picocli.CommandLine.ParseResult)">handleParseResult</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a>&lt;<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="type parameter in CommandLine.AbstractParseResultHandler">R</a>&gt;</code></dd>
+<dt><span class="strong">Parameters:</span></dt><dd><code>parseResult</code> - the <code>ParseResult</code> that resulted from successfully parsing the command line arguments</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the result of processing parse results, may be the specified prototype or some other object</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></code> - if the <a href="../picocli/CommandLine.HelpCommand.html" title="class in picocli"><code>HelpCommand</code></a> was invoked for an unknown subcommand. Any <code>ParameterExceptions</code>
       thrown from this method are treated as if this exception was thrown during parsing and passed to the <a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><code>CommandLine.IExceptionHandler2</code></a></dd>
 <dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if a problem occurred while processing the parse results; client code can use
-      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine--"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd>
-</dl>
+      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine()"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd></dl>
 </li>
 </ul>
-<a name="handle-picocli.CommandLine.ParseResult-java.lang.Object-">
-<!--   -->
-</a><a name="handle-picocli.CommandLine.ParseResult-R-">
+<a name="handle(picocli.CommandLine.ParseResult)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>handle</h4>
-<pre>protected abstract&nbsp;<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="type parameter in CommandLine.AbstractParseResultHandler">R</a>&nbsp;handle(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult,
-                            <a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="type parameter in CommandLine.AbstractParseResultHandler">R</a>&nbsp;prototypeReturnValue)
+<pre>protected abstract&nbsp;<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="type parameter in CommandLine.AbstractParseResultHandler">R</a>&nbsp;handle(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)
                      throws <a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></pre>
 <div class="block">Processes the specified <code>ParseResult</code> and returns the result as a list of objects.
  Implementations are responsible for catching any exceptions thrown in the <code>handle</code> method, and
  rethrowing an <code>ExecutionException</code> that details the problem and captures the offending <code>CommandLine</code> object.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>parseResult</code> - the <code>ParseResult</code> that resulted from successfully parsing the command line arguments</dd>
-<dd><code>prototypeReturnValue</code> - prototype return value, may be returned as is when the user requested help for example,
-                               or may be used to collect results from multiple subcommands, or may be used by the
-                               handler for internal processing and a completely different object is returned</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the result of processing parse results, may be the specified prototype or some other object</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>parseResult</code> - the <code>ParseResult</code> that resulted from successfully parsing the command line arguments</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the result of processing parse results, may be the specified prototype or some other object</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if a problem occurred while processing the parse results; client code can use
-      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine--"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd>
-</dl>
+      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine()"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd></dl>
 </li>
 </ul>
 </li>
@@ -306,11 +269,9 @@ <h4>handle</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -325,15 +286,15 @@ <h4>handle</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.AbstractParseResultHandler.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.AbstractParseResultHandler.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.AbstractParseResultHandler.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -352,17 +313,17 @@ <h4>handle</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Command.html b/docs/apidocs/picocli/CommandLine.Command.html
index 95931a3eb..5d6282315 100644
--- a/docs/apidocs/picocli/CommandLine.Command.html
+++ b/docs/apidocs/picocli/CommandLine.Command.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Command (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:02 JST 2018 -->
+<title>CommandLine.Command (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Command (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Command (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Command.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Command.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Command.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -67,17 +60,15 @@
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
 <li>Required&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
+<li><a href="#annotation_type_optional_element_summary">Optional</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
+<li><a href="#annotation_type_element_detail">Element</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -93,8 +84,8 @@ <h2 title="Annotation Type CommandLine.Command" class="title">Annotation Type Co
 <hr>
 <br>
 <pre>@Retention(value=RUNTIME)
- @Target(value={TYPE,LOCAL_VARIABLE,PACKAGE})
-public static @interface <span class="memberNameLabel">CommandLine.Command</span></pre>
+@Target(value={TYPE,LOCAL_VARIABLE,PACKAGE})
+public static @interface <span class="strong">CommandLine.Command</span></pre>
 <div class="block"><p>Annotate your class with <code>@Command</code> when you want more control over the format of the generated help
  message.
  </p><pre>
@@ -130,11 +121,11 @@ <h2 title="Annotation Type CommandLine.Command" class="title">Annotation Type Co
 <li class="blockList">
 <!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="annotation.type.optional.element.summary">
+<li class="blockList"><a name="annotation_type_optional_element_summary">
 <!--   -->
 </a>
 <h3>Optional Element Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
 <caption><span>Optional Elements</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -142,143 +133,143 @@ <h3>Optional Element Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#abbreviateSynopsis--">abbreviateSynopsis</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#abbreviateSynopsis()">abbreviateSynopsis</a></strong></code>
 <div class="block">Specify <code>true</code> to generate an abbreviated synopsis like <code>"&lt;main&gt; [OPTIONS] [PARAMETERS...]"</code>.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#commandListHeading--">commandListHeading</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#commandListHeading()">commandListHeading</a></strong></code>
 <div class="block">Set the heading preceding the subcommands list.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.String[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#customSynopsis--">customSynopsis</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#customSynopsis()">customSynopsis</a></strong></code>
 <div class="block">Specify one or more custom synopsis lines to display instead of an auto-generated synopsis.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>java.lang.String[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#description--">description</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#description()">description</a></strong></code>
 <div class="block">Optional text to display between the synopsis line(s) and the list of options.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#descriptionHeading--">descriptionHeading</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#descriptionHeading()">descriptionHeading</a></strong></code>
 <div class="block">Set the heading preceding the description section.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>java.lang.String[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#footer--">footer</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#footer()">footer</a></strong></code>
 <div class="block">Optional text to display after the list of options.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#footerHeading--">footerHeading</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#footerHeading()">footerHeading</a></strong></code>
 <div class="block">Set the heading preceding the footer section.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>java.lang.String[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#header--">header</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#header()">header</a></strong></code>
 <div class="block">Optional summary description of the command, shown before the synopsis.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#headerHeading--">headerHeading</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#headerHeading()">headerHeading</a></strong></code>
 <div class="block">Set the heading preceding the header section.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#helpCommand--">helpCommand</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#helpCommand()">helpCommand</a></strong></code>
 <div class="block">Set this attribute to <code>true</code> if this subcommand is a help command, and required options and positional
  parameters of the parent command should not be validated.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#hidden--">hidden</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#hidden()">hidden</a></strong></code>
 <div class="block">Set <code>hidden=true</code> if this command should not be included in the list of commands in the usage help of the parent command.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#mixinStandardHelpOptions--">mixinStandardHelpOptions</a></span></code>
-<div class="block">Adds the standard <code>-h</code> and <code>--help</code> <a href="../picocli/CommandLine.Option.html#usageHelp--">usageHelp</a> options and <code>-V</code>
- and <code>--version</code> <a href="../picocli/CommandLine.Option.html#versionHelp--">versionHelp</a> options to the options of this command.</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#mixinStandardHelpOptions()">mixinStandardHelpOptions</a></strong></code>
+<div class="block">Adds the standard <code>-h</code> and <code>--help</code> <a href="../picocli/CommandLine.Option.html#usageHelp()">usageHelp</a> options and <code>-V</code>
+ and <code>--version</code> <a href="../picocli/CommandLine.Option.html#versionHelp()">versionHelp</a> options to the options of this command.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#name--">name</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#name()">name</a></strong></code>
 <div class="block">Program name to show in the synopsis.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#optionListHeading--">optionListHeading</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#optionListHeading()">optionListHeading</a></strong></code>
 <div class="block">Set the heading preceding the options list.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#parameterListHeading--">parameterListHeading</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#parameterListHeading()">parameterListHeading</a></strong></code>
 <div class="block">Set the heading preceding the parameters list.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>char</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#requiredOptionMarker--">requiredOptionMarker</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#requiredOptionMarker()">requiredOptionMarker</a></strong></code>
 <div class="block">Prefix required options with this character in the options list.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#separator--">separator</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#separator()">separator</a></strong></code>
 <div class="block">String that separates options from option parameters.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#showDefaultValues--">showDefaultValues</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#showDefaultValues()">showDefaultValues</a></strong></code>
 <div class="block">Specify <code>true</code> to show default values in the description column of the options list (except for
  boolean options).</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#sortOptions--">sortOptions</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#sortOptions()">sortOptions</a></strong></code>
 <div class="block">Specify <code>false</code> to show Options in declaration order.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>java.lang.Class&lt;?&gt;[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#subcommands--">subcommands</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#subcommands()">subcommands</a></strong></code>
 <div class="block">A list of classes to instantiate and register as subcommands.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#synopsisHeading--">synopsisHeading</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#synopsisHeading()">synopsisHeading</a></strong></code>
 <div class="block">Set the heading preceding the synopsis text.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>java.lang.String[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#version--">version</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#version()">version</a></strong></code>
 <div class="block">Version information for this command, to print to the console when the user specifies an
- <a href="../picocli/CommandLine.Option.html#versionHelp--">option</a> to request version help.</div>
+ <a href="../picocli/CommandLine.Option.html#versionHelp()">option</a> to request version help.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.Class&lt;? extends <a href="../picocli/CommandLine.IVersionProvider.html" title="interface in picocli">CommandLine.IVersionProvider</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html#versionProvider--">versionProvider</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html#versionProvider()">versionProvider</a></strong></code>
 <div class="block">Class that can provide version information dynamically at runtime.</div>
 </td>
 </tr>
@@ -293,11 +284,11 @@ <h3>Optional Element Summary</h3>
 <li class="blockList">
 <!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="annotation.type.element.detail">
+<li class="blockList"><a name="annotation_type_element_detail">
 <!--   -->
 </a>
 <h3>Element Detail</h3>
-<a name="name--">
+<a name="name()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -305,25 +296,17 @@ <h3>Element Detail</h3>
 <h4>name</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;name</pre>
 <div class="block">Program name to show in the synopsis. If omitted, <code>"&lt;main class&gt;"</code> is used.
- For <a href="../picocli/CommandLine.Command.html#subcommands--">declaratively added</a> subcommands, this attribute is also used
+ For <a href="../picocli/CommandLine.Command.html#subcommands()">declaratively added</a> subcommands, this attribute is also used
  by the parser to recognize subcommands in the command line arguments.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the program name to show in the synopsis</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Model.CommandSpec.html#name--"><code>CommandLine.Model.CommandSpec.name()</code></a>, 
-<a href="../picocli/CommandLine.Help.html#commandName--"><code>CommandLine.Help.commandName()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the program name to show in the synopsis</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Model.CommandSpec.html#name()"><code>CommandLine.Model.CommandSpec.name()</code></a>, 
+<a href="../picocli/CommandLine.Help.html#commandName()"><code>CommandLine.Help.commandName()</code></a></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>"&lt;main class&gt;"</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="subcommands--">
+<a name="subcommands()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -331,7 +314,7 @@ <h4>name</h4>
 <h4>subcommands</h4>
 <pre>public abstract&nbsp;java.lang.Class&lt;?&gt;[]&nbsp;subcommands</pre>
 <div class="block">A list of classes to instantiate and register as subcommands. When registering subcommands declaratively
- like this, you don't need to call the <a href="../picocli/CommandLine.html#addSubcommand-java.lang.String-java.lang.Object-"><code>CommandLine.addSubcommand(String, Object)</code></a> method. For example, this:
+ like this, you don't need to call the <a href="../picocli/CommandLine.html#addSubcommand(java.lang.String,%20java.lang.Object)"><code>CommandLine.addSubcommand(String, Object)</code></a> method. For example, this:
  <pre>
  &#064;Command(subcommands = {
          GitStatus.class,
@@ -351,25 +334,17 @@ <h4>subcommands</h4>
          .addSubcommand("commit",   new GitCommit())
          .addSubcommand("branch",   new GitBranch());
  </pre></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the declaratively registered subcommands of this command, or an empty array if none</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>0.9.8</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#addSubcommand-java.lang.String-java.lang.Object-"><code>CommandLine.addSubcommand(String, Object)</code></a>, 
-<a href="../picocli/CommandLine.HelpCommand.html" title="class in picocli"><code>CommandLine.HelpCommand</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the declaratively registered subcommands of this command, or an empty array if none</dd><dt><span class="strong">Since:</span></dt>
+  <dd>0.9.8</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#addSubcommand(java.lang.String,%20java.lang.Object)"><code>CommandLine.addSubcommand(String, Object)</code></a>, 
+<a href="../picocli/CommandLine.HelpCommand.html" title="class in picocli"><code>CommandLine.HelpCommand</code></a></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>{}</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="separator--">
+<a name="separator()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -377,22 +352,14 @@ <h4>subcommands</h4>
 <h4>separator</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;separator</pre>
 <div class="block">String that separates options from option parameters. Default is <code>"="</code>. Spaces are also accepted.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the string that separates options from option parameters, used both when parsing and when generating usage help</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#setSeparator-java.lang.String-"><code>CommandLine.setSeparator(String)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the string that separates options from option parameters, used both when parsing and when generating usage help</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#setSeparator(java.lang.String)"><code>CommandLine.setSeparator(String)</code></a></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>"="</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="version--">
+<a name="version()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -400,25 +367,17 @@ <h4>separator</h4>
 <h4>version</h4>
 <pre>public abstract&nbsp;java.lang.String[]&nbsp;version</pre>
 <div class="block">Version information for this command, to print to the console when the user specifies an
- <a href="../picocli/CommandLine.Option.html#versionHelp--">option</a> to request version help. This is not part of the usage help message.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a string or an array of strings with version information about this command (each string in the array is displayed on a separate line).</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>0.9.8</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#printVersionHelp-java.io.PrintStream-"><code>CommandLine.printVersionHelp(PrintStream)</code></a></dd>
-</dl>
+ <a href="../picocli/CommandLine.Option.html#versionHelp()">option</a> to request version help. This is not part of the usage help message.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a string or an array of strings with version information about this command (each string in the array is displayed on a separate line).</dd><dt><span class="strong">Since:</span></dt>
+  <dd>0.9.8</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#printVersionHelp(java.io.PrintStream)"><code>CommandLine.printVersionHelp(PrintStream)</code></a></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>{}</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="versionProvider--">
+<a name="versionProvider()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -427,49 +386,35 @@ <h4>versionProvider</h4>
 <pre>public abstract&nbsp;java.lang.Class&lt;? extends <a href="../picocli/CommandLine.IVersionProvider.html" title="interface in picocli">CommandLine.IVersionProvider</a>&gt;&nbsp;versionProvider</pre>
 <div class="block">Class that can provide version information dynamically at runtime. An implementation may return version
  information obtained from the JAR manifest, a properties file or some other source.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a Class that can provide version information dynamically at runtime</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.2</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a Class that can provide version information dynamically at runtime</dd><dt><span class="strong">Since:</span></dt>
+  <dd>2.2</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>picocli.CommandLine.NoVersionProvider.class</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="mixinStandardHelpOptions--">
+<a name="mixinStandardHelpOptions()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>mixinStandardHelpOptions</h4>
 <pre>public abstract&nbsp;boolean&nbsp;mixinStandardHelpOptions</pre>
-<div class="block">Adds the standard <code>-h</code> and <code>--help</code> <a href="../picocli/CommandLine.Option.html#usageHelp--">usageHelp</a> options and <code>-V</code>
- and <code>--version</code> <a href="../picocli/CommandLine.Option.html#versionHelp--">versionHelp</a> options to the options of this command.
+<div class="block">Adds the standard <code>-h</code> and <code>--help</code> <a href="../picocli/CommandLine.Option.html#usageHelp()">usageHelp</a> options and <code>-V</code>
+ and <code>--version</code> <a href="../picocli/CommandLine.Option.html#versionHelp()">versionHelp</a> options to the options of this command.
  <p>
- Note that if no <a href="../picocli/CommandLine.Command.html#version--"><code>version()</code></a> or <a href="../picocli/CommandLine.Command.html#versionProvider--"><code>versionProvider()</code></a> is specified, the <code>--version</code> option will not print anything.
+ Note that if no <a href="../picocli/CommandLine.Command.html#version()"><code>version()</code></a> or <a href="../picocli/CommandLine.Command.html#versionProvider()"><code>versionProvider()</code></a> is specified, the <code>--version</code> option will not print anything.
  </p></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>whether the auto-help mixin should be added to this command</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>whether the auto-help mixin should be added to this command</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>false</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="helpCommand--">
+<a name="helpCommand()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -479,24 +424,17 @@ <h4>helpCommand</h4>
 <div class="block">Set this attribute to <code>true</code> if this subcommand is a help command, and required options and positional
  parameters of the parent command should not be validated. If a subcommand marked as <code>helpCommand</code> is
  specified on the command line, picocli will not validate the parent arguments (so no "missing required
- option" errors) and the <a href="../picocli/CommandLine.html#printHelpIfRequested-java.util.List-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>CommandLine.printHelpIfRequested(List, PrintStream, PrintStream, Help.Ansi)</code></a> method will return <code>true</code>.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd><code>true</code> if this subcommand is a help command and picocli should not check for missing required
-      options and positional parameters on the parent command</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+ option" errors) and the <a href="../picocli/CommandLine.html#printHelpIfRequested(java.util.List,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>CommandLine.printHelpIfRequested(List, PrintStream, PrintStream, Help.Ansi)</code></a> method will return <code>true</code>.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd><code>true</code> if this subcommand is a help command and picocli should not check for missing required
+      options and positional parameters on the parent command</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>false</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="headerHeading--">
+<a name="headerHeading()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -504,23 +442,15 @@ <h4>helpCommand</h4>
 <h4>headerHeading</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;headerHeading</pre>
 <div class="block">Set the heading preceding the header section. May contain embedded format specifiers.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the heading preceding the header section</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#headerHeading--"><code>CommandLine.Model.UsageMessageSpec.headerHeading()</code></a>, 
-<a href="../picocli/CommandLine.Help.html#headerHeading-java.lang.Object...-"><code>CommandLine.Help.headerHeading(Object...)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the heading preceding the header section</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#headerHeading()"><code>CommandLine.Model.UsageMessageSpec.headerHeading()</code></a>, 
+<a href="../picocli/CommandLine.Help.html#headerHeading(java.lang.Object...)"><code>CommandLine.Help.headerHeading(Object...)</code></a></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>""</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="header--">
+<a name="header()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -528,23 +458,15 @@ <h4>headerHeading</h4>
 <h4>header</h4>
 <pre>public abstract&nbsp;java.lang.String[]&nbsp;header</pre>
 <div class="block">Optional summary description of the command, shown before the synopsis.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>summary description of the command</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#header--"><code>CommandLine.Model.UsageMessageSpec.header()</code></a>, 
-<a href="../picocli/CommandLine.Help.html#header-java.lang.Object...-"><code>CommandLine.Help.header(Object...)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>summary description of the command</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#header()"><code>CommandLine.Model.UsageMessageSpec.header()</code></a>, 
+<a href="../picocli/CommandLine.Help.html#header(java.lang.Object...)"><code>CommandLine.Help.header(Object...)</code></a></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>{}</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="synopsisHeading--">
+<a name="synopsisHeading()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -554,22 +476,14 @@ <h4>synopsisHeading</h4>
 <div class="block">Set the heading preceding the synopsis text. May contain embedded
  format specifiers. The default heading is <code>"Usage: "</code> (without a line
  break between the heading and the synopsis text).</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the heading preceding the synopsis text</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Help.html#synopsisHeading-java.lang.Object...-"><code>CommandLine.Help.synopsisHeading(Object...)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the heading preceding the synopsis text</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Help.html#synopsisHeading(java.lang.Object...)"><code>CommandLine.Help.synopsisHeading(Object...)</code></a></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>"Usage: "</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="abbreviateSynopsis--">
+<a name="abbreviateSynopsis()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -578,23 +492,15 @@ <h4>abbreviateSynopsis</h4>
 <pre>public abstract&nbsp;boolean&nbsp;abbreviateSynopsis</pre>
 <div class="block">Specify <code>true</code> to generate an abbreviated synopsis like <code>"&lt;main&gt; [OPTIONS] [PARAMETERS...]"</code>.
  By default, a detailed synopsis with individual option names and parameters is generated.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>whether the synopsis should be abbreviated</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Help.html#abbreviatedSynopsis--"><code>CommandLine.Help.abbreviatedSynopsis()</code></a>, 
-<a href="../picocli/CommandLine.Help.html#detailedSynopsis-java.util.Comparator-boolean-"><code>CommandLine.Help.detailedSynopsis(Comparator, boolean)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>whether the synopsis should be abbreviated</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Help.html#abbreviatedSynopsis()"><code>CommandLine.Help.abbreviatedSynopsis()</code></a>, 
+<a href="../picocli/CommandLine.Help.html#detailedSynopsis(java.util.Comparator,%20boolean)"><code>CommandLine.Help.detailedSynopsis(Comparator, boolean)</code></a></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>false</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="customSynopsis--">
+<a name="customSynopsis()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -602,22 +508,14 @@ <h4>abbreviateSynopsis</h4>
 <h4>customSynopsis</h4>
 <pre>public abstract&nbsp;java.lang.String[]&nbsp;customSynopsis</pre>
 <div class="block">Specify one or more custom synopsis lines to display instead of an auto-generated synopsis.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>custom synopsis text to replace the auto-generated synopsis</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Help.html#customSynopsis-java.lang.Object...-"><code>CommandLine.Help.customSynopsis(Object...)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>custom synopsis text to replace the auto-generated synopsis</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Help.html#customSynopsis(java.lang.Object...)"><code>CommandLine.Help.customSynopsis(Object...)</code></a></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>{}</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="descriptionHeading--">
+<a name="descriptionHeading()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -625,22 +523,14 @@ <h4>customSynopsis</h4>
 <h4>descriptionHeading</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;descriptionHeading</pre>
 <div class="block">Set the heading preceding the description section. May contain embedded format specifiers.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the heading preceding the description section</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Help.html#descriptionHeading-java.lang.Object...-"><code>CommandLine.Help.descriptionHeading(Object...)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the heading preceding the description section</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Help.html#descriptionHeading(java.lang.Object...)"><code>CommandLine.Help.descriptionHeading(Object...)</code></a></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>""</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="description--">
+<a name="description()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -648,22 +538,14 @@ <h4>descriptionHeading</h4>
 <h4>description</h4>
 <pre>public abstract&nbsp;java.lang.String[]&nbsp;description</pre>
 <div class="block">Optional text to display between the synopsis line(s) and the list of options.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>description of this command</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Help.html#description-java.lang.Object...-"><code>CommandLine.Help.description(Object...)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>description of this command</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Help.html#description(java.lang.Object...)"><code>CommandLine.Help.description(Object...)</code></a></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>{}</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="parameterListHeading--">
+<a name="parameterListHeading()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -671,22 +553,14 @@ <h4>description</h4>
 <h4>parameterListHeading</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;parameterListHeading</pre>
 <div class="block">Set the heading preceding the parameters list. May contain embedded format specifiers.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the heading preceding the parameters list</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Help.html#parameterListHeading-java.lang.Object...-"><code>CommandLine.Help.parameterListHeading(Object...)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the heading preceding the parameters list</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Help.html#parameterListHeading(java.lang.Object...)"><code>CommandLine.Help.parameterListHeading(Object...)</code></a></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>""</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="optionListHeading--">
+<a name="optionListHeading()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -694,22 +568,14 @@ <h4>parameterListHeading</h4>
 <h4>optionListHeading</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;optionListHeading</pre>
 <div class="block">Set the heading preceding the options list. May contain embedded format specifiers.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the heading preceding the options list</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Help.html#optionListHeading-java.lang.Object...-"><code>CommandLine.Help.optionListHeading(Object...)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the heading preceding the options list</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Help.html#optionListHeading(java.lang.Object...)"><code>CommandLine.Help.optionListHeading(Object...)</code></a></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>""</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="sortOptions--">
+<a name="sortOptions()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -717,20 +583,14 @@ <h4>optionListHeading</h4>
 <h4>sortOptions</h4>
 <pre>public abstract&nbsp;boolean&nbsp;sortOptions</pre>
 <div class="block">Specify <code>false</code> to show Options in declaration order. The default is to sort alphabetically.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>whether options should be shown in alphabetic order.</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>whether options should be shown in alphabetic order.</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>true</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="requiredOptionMarker--">
+<a name="requiredOptionMarker()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -739,20 +599,14 @@ <h4>requiredOptionMarker</h4>
 <pre>public abstract&nbsp;char&nbsp;requiredOptionMarker</pre>
 <div class="block">Prefix required options with this character in the options list. The default is no marker: the synopsis
  indicates which options and parameters are required.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the character to show in the options list to mark required options</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the character to show in the options list to mark required options</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>32</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="showDefaultValues--">
+<a name="showDefaultValues()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -761,20 +615,14 @@ <h4>showDefaultValues</h4>
 <pre>public abstract&nbsp;boolean&nbsp;showDefaultValues</pre>
 <div class="block">Specify <code>true</code> to show default values in the description column of the options list (except for
  boolean options). False by default.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>whether the default values for options and parameters should be shown in the description column</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>whether the default values for options and parameters should be shown in the description column</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>false</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="commandListHeading--">
+<a name="commandListHeading()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -783,22 +631,14 @@ <h4>commandListHeading</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;commandListHeading</pre>
 <div class="block">Set the heading preceding the subcommands list. May contain embedded format specifiers.
  The default heading is <code>"Commands:%n"</code> (with a line break at the end).</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the heading preceding the subcommands list</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Help.html#commandListHeading-java.lang.Object...-"><code>CommandLine.Help.commandListHeading(Object...)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the heading preceding the subcommands list</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Help.html#commandListHeading(java.lang.Object...)"><code>CommandLine.Help.commandListHeading(Object...)</code></a></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>"Commands:%n"</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="footerHeading--">
+<a name="footerHeading()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -806,22 +646,14 @@ <h4>commandListHeading</h4>
 <h4>footerHeading</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;footerHeading</pre>
 <div class="block">Set the heading preceding the footer section. May contain embedded format specifiers.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the heading preceding the footer section</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Help.html#footerHeading-java.lang.Object...-"><code>CommandLine.Help.footerHeading(Object...)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the heading preceding the footer section</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Help.html#footerHeading(java.lang.Object...)"><code>CommandLine.Help.footerHeading(Object...)</code></a></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>""</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="footer--">
+<a name="footer()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -829,22 +661,14 @@ <h4>footerHeading</h4>
 <h4>footer</h4>
 <pre>public abstract&nbsp;java.lang.String[]&nbsp;footer</pre>
 <div class="block">Optional text to display after the list of options.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>text to display after the list of options</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Help.html#footer-java.lang.Object...-"><code>CommandLine.Help.footer(Object...)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>text to display after the list of options</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Help.html#footer(java.lang.Object...)"><code>CommandLine.Help.footer(Object...)</code></a></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>{}</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="hidden--">
+<a name="hidden()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -852,12 +676,8 @@ <h4>footer</h4>
 <h4>hidden</h4>
 <pre>public abstract&nbsp;boolean&nbsp;hidden</pre>
 <div class="block">Set <code>hidden=true</code> if this command should not be included in the list of commands in the usage help of the parent command.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>whether this command should be excluded from the usage message</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>whether this command should be excluded from the usage message</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>false</dd>
@@ -872,11 +692,9 @@ <h4>hidden</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -891,15 +709,15 @@ <h4>hidden</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Command.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Command.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Command.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -916,17 +734,15 @@ <h4>hidden</h4>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
 <li>Required&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
+<li><a href="#annotation_type_optional_element_summary">Optional</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
+<li><a href="#annotation_type_element_detail">Element</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.DefaultExceptionHandler.html b/docs/apidocs/picocli/CommandLine.DefaultExceptionHandler.html
index f6425862a..4ff92b6b6 100644
--- a/docs/apidocs/picocli/CommandLine.DefaultExceptionHandler.html
+++ b/docs/apidocs/picocli/CommandLine.DefaultExceptionHandler.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.DefaultExceptionHandler (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:02 JST 2018 -->
+<title>CommandLine.DefaultExceptionHandler (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.DefaultExceptionHandler (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.DefaultExceptionHandler (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.DefaultExceptionHandler.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.DefaultExceptionHandler.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.DefaultExceptionHandler.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -75,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -121,7 +108,7 @@ <h2 title="Class CommandLine.DefaultExceptionHandler" class="title">Class Comman
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.DefaultExceptionHandler&lt;R&gt;</span>
+<pre>public static class <span class="strong">CommandLine.DefaultExceptionHandler&lt;R&gt;</span>
 extends <a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a>&lt;R,<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a>&lt;R&gt;&gt;
 implements <a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli">CommandLine.IExceptionHandler</a>, <a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a>&lt;R&gt;</pre>
 <div class="block">Default exception handler that handles invalid user input by printing the exception message, followed by the usage
@@ -133,10 +120,8 @@ <h2 title="Class CommandLine.DefaultExceptionHandler" class="title">Class Comman
      if (hasExitCode()) System.exit(exitCode()); else return prototypeReturnValue;
  </pre>
  <p><code>ExecutionExceptions</code> that occurred while executing the <code>Runnable</code> or <code>Callable</code> command are simply rethrown and not handled.</p></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -145,76 +130,74 @@ <h2 title="Class CommandLine.DefaultExceptionHandler" class="title">Class Comman
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.DefaultExceptionHandler.html#DefaultExceptionHandler--">DefaultExceptionHandler</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.DefaultExceptionHandler.html#CommandLine.DefaultExceptionHandler()">CommandLine.DefaultExceptionHandler</a></strong>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.util.List&lt;java.lang.Object&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.DefaultExceptionHandler.html#handleException-picocli.CommandLine.ParameterException-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">handleException</a></span>(<a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a>&nbsp;ex,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.DefaultExceptionHandler.html#handleException(picocli.CommandLine.ParameterException,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)">handleException</a></strong>(<a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a>&nbsp;ex,
                java.io.PrintStream&nbsp;out,
                <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
                java.lang.String...&nbsp;args)</code>
-<div class="block">Handles a <code>ParameterException</code> that occurred while <a href="../picocli/CommandLine.html#parse-java.lang.String...-">parsing</a> the command
+<div class="block">Handles a <code>ParameterException</code> that occurred while <a href="../picocli/CommandLine.html#parse(java.lang.String...)">parsing</a> the command
  line arguments and optionally returns a list of results.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.DefaultExceptionHandler.html#handleExecutionException-picocli.CommandLine.ExecutionException-R-picocli.CommandLine.ParseResult-">handleExecutionException</a></span>(<a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a>&nbsp;ex,
-                        <a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>&nbsp;prototypeReturnValue,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.DefaultExceptionHandler.html#handleExecutionException(picocli.CommandLine.ExecutionException,%20picocli.CommandLine.ParseResult)">handleExecutionException</a></strong>(<a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a>&nbsp;ex,
                         <a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)</code>
 <div class="block">This implementation always simply rethrows the specified exception.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.DefaultExceptionHandler.html#handleParseException-picocli.CommandLine.ParameterException-R-java.lang.String:A-">handleParseException</a></span>(<a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a>&nbsp;ex,
-                    <a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>&nbsp;prototypeReturnValue,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.DefaultExceptionHandler.html#handleParseException(picocli.CommandLine.ParameterException,%20java.lang.String[])">handleParseException</a></strong>(<a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a>&nbsp;ex,
                     java.lang.String[]&nbsp;args)</code>
 <div class="block">Prints the message of the specified exception, followed by the usage message for the command or subcommand
- whose input was invalid, to the stream returned by <a href="../picocli/CommandLine.AbstractHandler.html#err--"><code>CommandLine.AbstractHandler.err()</code></a>.</div>
+ whose input was invalid, to the stream returned by <a href="../picocli/CommandLine.AbstractHandler.html#err()"><code>CommandLine.AbstractHandler.err()</code></a>.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>protected <a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a>&lt;<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.DefaultExceptionHandler.html#self--">self</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.DefaultExceptionHandler.html#self()">self</a></strong>()</code>
 <div class="block">Returns <code>this</code> to allow method chaining when calling the setters for a fluent API.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.picocli.CommandLine.AbstractHandler">
+<li class="blockList"><a name="methods_inherited_from_class_picocli.CommandLine.AbstractHandler">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;picocli.<a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></h3>
-<code><a href="../picocli/CommandLine.AbstractHandler.html#andExit-int-">andExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#ansi--">ansi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#err--">err</a>, <a href="../picocli/CommandLine.AbstractHandler.html#exitCode--">exitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#hasExitCode--">hasExitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#out--">out</a>, <a href="../picocli/CommandLine.AbstractHandler.html#returnResultOrExit-R-">returnResultOrExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useAnsi-picocli.CommandLine.Help.Ansi-">useAnsi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useErr-java.io.PrintStream-">useErr</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useOut-java.io.PrintStream-">useOut</a></code></li>
+<code><a href="../picocli/CommandLine.AbstractHandler.html#andExit(int)">andExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#ansi()">ansi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#err()">err</a>, <a href="../picocli/CommandLine.AbstractHandler.html#exitCode()">exitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#hasExitCode()">hasExitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#out()">out</a>, <a href="../picocli/CommandLine.AbstractHandler.html#returnResultOrExit(R)">returnResultOrExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useAnsi(picocli.CommandLine.Help.Ansi)">useAnsi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useErr(java.io.PrintStream)">useErr</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useOut(java.io.PrintStream)">useOut</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -230,122 +213,98 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="DefaultExceptionHandler--">
+<a name="CommandLine.DefaultExceptionHandler()">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>DefaultExceptionHandler</h4>
-<pre>public&nbsp;DefaultExceptionHandler()</pre>
+<h4>CommandLine.DefaultExceptionHandler</h4>
+<pre>public&nbsp;CommandLine.DefaultExceptionHandler()</pre>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="handleException-picocli.CommandLine.ParameterException-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">
+<a name="handleException(picocli.CommandLine.ParameterException, java.io.PrintStream, picocli.CommandLine.Help.Ansi, java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>handleException</h4>
 <pre>public&nbsp;java.util.List&lt;java.lang.Object&gt;&nbsp;handleException(<a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a>&nbsp;ex,
-                                                        java.io.PrintStream&nbsp;out,
-                                                        <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
-                                                        java.lang.String...&nbsp;args)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../picocli/CommandLine.IExceptionHandler.html#handleException-picocli.CommandLine.ParameterException-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">CommandLine.IExceptionHandler</a></code></span></div>
-<div class="block">Handles a <code>ParameterException</code> that occurred while <a href="../picocli/CommandLine.html#parse-java.lang.String...-">parsing</a> the command
+                                               java.io.PrintStream&nbsp;out,
+                                               <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
+                                               java.lang.String...&nbsp;args)</pre>
+<div class="block"><strong>Description copied from interface:&nbsp;<code><a href="../picocli/CommandLine.IExceptionHandler.html#handleException(picocli.CommandLine.ParameterException,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)">CommandLine.IExceptionHandler</a></code></strong></div>
+<div class="block">Handles a <code>ParameterException</code> that occurred while <a href="../picocli/CommandLine.html#parse(java.lang.String...)">parsing</a> the command
  line arguments and optionally returns a list of results.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.IExceptionHandler.html#handleException-picocli.CommandLine.ParameterException-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">handleException</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli">CommandLine.IExceptionHandler</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ex</code> - the ParameterException describing the problem that occurred while parsing the command line arguments,
-           and the CommandLine representing the command or subcommand whose input was invalid</dd>
-<dd><code>out</code> - the <code>PrintStream</code> to print help to if requested</dd>
-<dd><code>ansi</code> - for printing help messages using ANSI styles and colors</dd>
-<dd><code>args</code> - the command line arguments that could not be parsed</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a list of results, or an empty list if there are no results</dd>
-</dl>
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.IExceptionHandler.html#handleException(picocli.CommandLine.ParameterException,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)">handleException</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli">CommandLine.IExceptionHandler</a></code></dd>
+<dt><span class="strong">Parameters:</span></dt><dd><code>ex</code> - the ParameterException describing the problem that occurred while parsing the command line arguments,
+           and the CommandLine representing the command or subcommand whose input was invalid</dd><dd><code>out</code> - the <code>PrintStream</code> to print help to if requested</dd><dd><code>ansi</code> - for printing help messages using ANSI styles and colors</dd><dd><code>args</code> - the command line arguments that could not be parsed</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a list of results, or an empty list if there are no results</dd></dl>
 </li>
 </ul>
-<a name="handleParseException-picocli.CommandLine.ParameterException-java.lang.Object-java.lang.String:A-">
-<!--   -->
-</a><a name="handleParseException-picocli.CommandLine.ParameterException-R-java.lang.String:A-">
+<a name="handleParseException(picocli.CommandLine.ParameterException, java.lang.String[])">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>handleParseException</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>&nbsp;handleParseException(<a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a>&nbsp;ex,
-                              <a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>&nbsp;prototypeReturnValue,
-                              java.lang.String[]&nbsp;args)</pre>
+                     java.lang.String[]&nbsp;args)</pre>
 <div class="block">Prints the message of the specified exception, followed by the usage message for the command or subcommand
- whose input was invalid, to the stream returned by <a href="../picocli/CommandLine.AbstractHandler.html#err--"><code>CommandLine.AbstractHandler.err()</code></a>.</div>
+ whose input was invalid, to the stream returned by <a href="../picocli/CommandLine.AbstractHandler.html#err()"><code>CommandLine.AbstractHandler.err()</code></a>.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.IExceptionHandler2.html#handleParseException-picocli.CommandLine.ParameterException-R-java.lang.String:A-">handleParseException</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a>&lt;<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>&gt;</code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ex</code> - the ParameterException describing the problem that occurred while parsing the command line arguments,
-           and the CommandLine representing the command or subcommand whose input was invalid</dd>
-<dd><code>prototypeReturnValue</code> - prototype return value, returned as is unless an exit code is set</dd>
-<dd><code>args</code> - the command line arguments that could not be parsed</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the empty list</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.IExceptionHandler2.html#handleParseException(picocli.CommandLine.ParameterException,%20java.lang.String[])">handleParseException</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a>&lt;<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>&gt;</code></dd>
+<dt><span class="strong">Parameters:</span></dt><dd><code>ex</code> - the ParameterException describing the problem that occurred while parsing the command line arguments,
+           and the CommandLine representing the command or subcommand whose input was invalid</dd><dd><code>args</code> - the command line arguments that could not be parsed</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the empty list</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="handleExecutionException-picocli.CommandLine.ExecutionException-java.lang.Object-picocli.CommandLine.ParseResult-">
-<!--   -->
-</a><a name="handleExecutionException-picocli.CommandLine.ExecutionException-R-picocli.CommandLine.ParseResult-">
+<a name="handleExecutionException(picocli.CommandLine.ExecutionException, picocli.CommandLine.ParseResult)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>handleExecutionException</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>&nbsp;handleExecutionException(<a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a>&nbsp;ex,
-                                  <a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>&nbsp;prototypeReturnValue,
-                                  <a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)</pre>
+                         <a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)</pre>
 <div class="block">This implementation always simply rethrows the specified exception.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.IExceptionHandler2.html#handleExecutionException-picocli.CommandLine.ExecutionException-R-picocli.CommandLine.ParseResult-">handleExecutionException</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a>&lt;<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>&gt;</code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ex</code> - the ExecutionException describing the problem that occurred while executing the <code>Runnable</code> or <code>Callable</code> command</dd>
-<dd><code>prototypeReturnValue</code> - ignored</dd>
-<dd><code>parseResult</code> - the result of parsing the command line arguments</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>nothing: this method always rethrows the specified exception</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - always rethrows the specified exception</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.IExceptionHandler2.html#handleExecutionException(picocli.CommandLine.ExecutionException,%20picocli.CommandLine.ParseResult)">handleExecutionException</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a>&lt;<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>&gt;</code></dd>
+<dt><span class="strong">Parameters:</span></dt><dd><code>ex</code> - the ExecutionException describing the problem that occurred while executing the <code>Runnable</code> or <code>Callable</code> command</dd><dd><code>parseResult</code> - the result of parsing the command line arguments</dd>
+<dt><span class="strong">Returns:</span></dt><dd>nothing: this method always rethrows the specified exception</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - always rethrows the specified exception</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="self--">
+<a name="self()">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>self</h4>
 <pre>protected&nbsp;<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a>&lt;<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>&gt;&nbsp;self()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../picocli/CommandLine.AbstractHandler.html#self--">CommandLine.AbstractHandler</a></code></span></div>
+<div class="block"><strong>Description copied from class:&nbsp;<code><a href="../picocli/CommandLine.AbstractHandler.html#self()">CommandLine.AbstractHandler</a></code></strong></div>
 <div class="block">Returns <code>this</code> to allow method chaining when calling the setters for a fluent API.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.AbstractHandler.html#self--">self</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a>&lt;<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>,<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a>&lt;<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>&gt;&gt;</code></dd>
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.AbstractHandler.html#self()">self</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a>&lt;<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>,<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a>&lt;<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>&gt;&gt;</code></dd>
 </dl>
 </li>
 </ul>
@@ -357,11 +316,9 @@ <h4>self</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -376,15 +333,15 @@ <h4>self</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.DefaultExceptionHandler.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.DefaultExceptionHandler.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.DefaultExceptionHandler.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -403,17 +360,17 @@ <h4>self</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.DuplicateOptionAnnotationsException.html b/docs/apidocs/picocli/CommandLine.DuplicateOptionAnnotationsException.html
index c88eb118a..8a6ca08bf 100644
--- a/docs/apidocs/picocli/CommandLine.DuplicateOptionAnnotationsException.html
+++ b/docs/apidocs/picocli/CommandLine.DuplicateOptionAnnotationsException.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.DuplicateOptionAnnotationsException (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:02 JST 2018 -->
+<title>CommandLine.DuplicateOptionAnnotationsException (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.DuplicateOptionAnnotationsException (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.DuplicateOptionAnnotationsException (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.DuplicateOptionAnnotationsException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.DuplicateOptionAnnotationsException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.DuplicateOptionAnnotationsException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -69,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Throwable">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -135,13 +128,10 @@ <h2 title="Class CommandLine.DuplicateOptionAnnotationsException" class="title">
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.DuplicateOptionAnnotationsException</span>
+<pre>public static class <span class="strong">CommandLine.DuplicateOptionAnnotationsException</span>
 extends <a href="../picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></pre>
 <div class="block">Exception indicating that multiple fields have been annotated with the same Option name.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../serialized-form.html#picocli.CommandLine.DuplicateOptionAnnotationsException">Serialized Form</a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../serialized-form.html#picocli.CommandLine.DuplicateOptionAnnotationsException">Serialized Form</a></dd></dl>
 </li>
 </ul>
 </div>
@@ -150,36 +140,36 @@ <h2 title="Class CommandLine.DuplicateOptionAnnotationsException" class="title">
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.DuplicateOptionAnnotationsException.html#DuplicateOptionAnnotationsException-java.lang.String-">DuplicateOptionAnnotationsException</a></span>(java.lang.String&nbsp;msg)</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.DuplicateOptionAnnotationsException.html#CommandLine.DuplicateOptionAnnotationsException(java.lang.String)">CommandLine.DuplicateOptionAnnotationsException</a></strong>(java.lang.String&nbsp;msg)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Throwable">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
 <code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -195,17 +185,17 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="DuplicateOptionAnnotationsException-java.lang.String-">
+<a name="CommandLine.DuplicateOptionAnnotationsException(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>DuplicateOptionAnnotationsException</h4>
-<pre>public&nbsp;DuplicateOptionAnnotationsException(java.lang.String&nbsp;msg)</pre>
+<h4>CommandLine.DuplicateOptionAnnotationsException</h4>
+<pre>public&nbsp;CommandLine.DuplicateOptionAnnotationsException(java.lang.String&nbsp;msg)</pre>
 </li>
 </ul>
 </li>
@@ -216,11 +206,9 @@ <h4>DuplicateOptionAnnotationsException</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -235,15 +223,15 @@ <h4>DuplicateOptionAnnotationsException</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.DuplicateOptionAnnotationsException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.DuplicateOptionAnnotationsException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.DuplicateOptionAnnotationsException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -262,17 +250,17 @@ <h4>DuplicateOptionAnnotationsException</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Throwable">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.ExecutionException.html b/docs/apidocs/picocli/CommandLine.ExecutionException.html
index d0adf732e..e84ab640b 100644
--- a/docs/apidocs/picocli/CommandLine.ExecutionException.html
+++ b/docs/apidocs/picocli/CommandLine.ExecutionException.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.ExecutionException (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:02 JST 2018 -->
+<title>CommandLine.ExecutionException (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.ExecutionException (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.ExecutionException (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.ExecutionException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.ExecutionException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.ExecutionException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -75,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -136,15 +123,12 @@ <h2 title="Class CommandLine.ExecutionException" class="title">Class CommandLine
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.ExecutionException</span>
+<pre>public static class <span class="strong">CommandLine.ExecutionException</span>
 extends <a href="../picocli/CommandLine.PicocliException.html" title="class in picocli">CommandLine.PicocliException</a></pre>
 <div class="block">Exception indicating a problem while invoking a command or subcommand.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../serialized-form.html#picocli.CommandLine.ExecutionException">Serialized Form</a></dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../serialized-form.html#picocli.CommandLine.ExecutionException">Serialized Form</a></dd></dl>
 </li>
 </ul>
 </div>
@@ -153,55 +137,55 @@ <h2 title="Class CommandLine.ExecutionException" class="title">Class CommandLine
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ExecutionException.html#ExecutionException-picocli.CommandLine-java.lang.String-">ExecutionException</a></span>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                  java.lang.String&nbsp;msg)</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.ExecutionException.html#CommandLine.ExecutionException(picocli.CommandLine,%20java.lang.String)">CommandLine.ExecutionException</a></strong>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                              java.lang.String&nbsp;msg)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ExecutionException.html#ExecutionException-picocli.CommandLine-java.lang.String-java.lang.Exception-">ExecutionException</a></span>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                  java.lang.String&nbsp;msg,
-                  java.lang.Exception&nbsp;ex)</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.ExecutionException.html#CommandLine.ExecutionException(picocli.CommandLine,%20java.lang.String,%20java.lang.Exception)">CommandLine.ExecutionException</a></strong>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                              java.lang.String&nbsp;msg,
+                              java.lang.Exception&nbsp;ex)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ExecutionException.html#getCommandLine--">getCommandLine</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ExecutionException.html#getCommandLine()">getCommandLine</a></strong>()</code>
 <div class="block">Returns the <code>CommandLine</code> object for the (sub)command that could not be invoked.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Throwable">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
 <code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -217,40 +201,40 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ExecutionException-picocli.CommandLine-java.lang.String-">
+<a name="CommandLine.ExecutionException(picocli.CommandLine, java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>ExecutionException</h4>
-<pre>public&nbsp;ExecutionException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                          java.lang.String&nbsp;msg)</pre>
+<h4>CommandLine.ExecutionException</h4>
+<pre>public&nbsp;CommandLine.ExecutionException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                              java.lang.String&nbsp;msg)</pre>
 </li>
 </ul>
-<a name="ExecutionException-picocli.CommandLine-java.lang.String-java.lang.Exception-">
+<a name="CommandLine.ExecutionException(picocli.CommandLine, java.lang.String, java.lang.Exception)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ExecutionException</h4>
-<pre>public&nbsp;ExecutionException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                          java.lang.String&nbsp;msg,
-                          java.lang.Exception&nbsp;ex)</pre>
+<h4>CommandLine.ExecutionException</h4>
+<pre>public&nbsp;CommandLine.ExecutionException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                              java.lang.String&nbsp;msg,
+                              java.lang.Exception&nbsp;ex)</pre>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="getCommandLine--">
+<a name="getCommandLine()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -258,10 +242,7 @@ <h3>Method Detail</h3>
 <h4>getCommandLine</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;getCommandLine()</pre>
 <div class="block">Returns the <code>CommandLine</code> object for the (sub)command that could not be invoked.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the <code>CommandLine</code> object for the (sub)command where invocation failed.</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the <code>CommandLine</code> object for the (sub)command where invocation failed.</dd></dl>
 </li>
 </ul>
 </li>
@@ -272,11 +253,9 @@ <h4>getCommandLine</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -291,15 +270,15 @@ <h4>getCommandLine</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.ExecutionException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.ExecutionException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.ExecutionException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -318,17 +297,17 @@ <h4>getCommandLine</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Help.Ansi.IStyle.html b/docs/apidocs/picocli/CommandLine.Help.Ansi.IStyle.html
index 3b4f6efdc..b607e6e1d 100644
--- a/docs/apidocs/picocli/CommandLine.Help.Ansi.IStyle.html
+++ b/docs/apidocs/picocli/CommandLine.Help.Ansi.IStyle.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Help.Ansi.IStyle (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Help.Ansi.IStyle (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.Ansi.IStyle (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Help.Ansi.IStyle (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.Ansi.IStyle.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Ansi.IStyle.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.Ansi.IStyle.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -74,18 +61,18 @@
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -108,7 +95,7 @@ <h2 title="Interface CommandLine.Help.Ansi.IStyle" class="title">Interface Comma
 </dl>
 <hr>
 <br>
-<pre>public static interface <span class="typeNameLabel">CommandLine.Help.Ansi.IStyle</span></pre>
+<pre>public static interface <span class="strong">CommandLine.Help.Ansi.IStyle</span></pre>
 <div class="block">Defines the interface for an ANSI escape sequence.</div>
 </li>
 </ul>
@@ -118,11 +105,11 @@ <h2 title="Interface CommandLine.Help.Ansi.IStyle" class="title">Interface Comma
 <li class="blockList">
 <!-- =========== FIELD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.summary">
+<li class="blockList"><a name="field_summary">
 <!--   -->
 </a>
 <h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
 <caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -130,7 +117,7 @@ <h3>Field Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.IStyle.html#CSI">CSI</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.IStyle.html#CSI">CSI</a></strong></code>
 <div class="block">The Control Sequence Introducer (CSI) escape sequence "\u001b[".</div>
 </td>
 </tr>
@@ -139,25 +126,25 @@ <h3>Field Summary</h3>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.IStyle.html#off--">off</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.IStyle.html#off()">off</a></strong>()</code>
 <div class="block">Returns the ANSI escape code for turning this style off.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.IStyle.html#on--">on</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.IStyle.html#on()">on</a></strong>()</code>
 <div class="block">Returns the ANSI escape code for turning this style on.</div>
 </td>
 </tr>
@@ -172,7 +159,7 @@ <h3>Method Summary</h3>
 <li class="blockList">
 <!-- ============ FIELD DETAIL =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.detail">
+<li class="blockList"><a name="field_detail">
 <!--   -->
 </a>
 <h3>Field Detail</h3>
@@ -184,21 +171,18 @@ <h3>Field Detail</h3>
 <h4>CSI</h4>
 <pre>static final&nbsp;java.lang.String CSI</pre>
 <div class="block">The Control Sequence Introducer (CSI) escape sequence "\u001b[".</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#picocli.CommandLine.Help.Ansi.IStyle.CSI">Constant Field Values</a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../constant-values.html#picocli.CommandLine.Help.Ansi.IStyle.CSI">Constant Field Values</a></dd></dl>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="on--">
+<a name="on()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -206,13 +190,10 @@ <h3>Method Detail</h3>
 <h4>on</h4>
 <pre>java.lang.String&nbsp;on()</pre>
 <div class="block">Returns the ANSI escape code for turning this style on.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the ANSI escape code for turning this style on</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the ANSI escape code for turning this style on</dd></dl>
 </li>
 </ul>
-<a name="off--">
+<a name="off()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -220,10 +201,7 @@ <h4>on</h4>
 <h4>off</h4>
 <pre>java.lang.String&nbsp;off()</pre>
 <div class="block">Returns the ANSI escape code for turning this style off.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the ANSI escape code for turning this style off</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the ANSI escape code for turning this style off</dd></dl>
 </li>
 </ul>
 </li>
@@ -234,11 +212,9 @@ <h4>off</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -253,15 +229,15 @@ <h4>off</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.Ansi.IStyle.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Ansi.IStyle.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.Ansi.IStyle.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -279,18 +255,18 @@ <h4>off</h4>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Help.Ansi.Style.html b/docs/apidocs/picocli/CommandLine.Help.Ansi.Style.html
index a6df8a1e9..45e5b577e 100644
--- a/docs/apidocs/picocli/CommandLine.Help.Ansi.Style.html
+++ b/docs/apidocs/picocli/CommandLine.Help.Ansi.Style.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Help.Ansi.Style (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Help.Ansi.Style (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.Ansi.Style (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Help.Ansi.Style (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":9,"i1":9,"i2":10,"i3":9,"i4":10,"i5":9,"i6":9,"i7":9,"i8":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.Ansi.Style.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Ansi.Style.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.Ansi.Style.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -74,18 +61,18 @@
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li><a href="#enum_constant_summary">Enum Constants</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li><a href="#enum_constant_detail">Enum Constants</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -121,7 +108,7 @@ <h2 title="Enum CommandLine.Help.Ansi.Style" class="title">Enum CommandLine.Help
 </dl>
 <hr>
 <br>
-<pre>public static enum <span class="typeNameLabel">CommandLine.Help.Ansi.Style</span>
+<pre>public static enum <span class="strong">CommandLine.Help.Ansi.Style</span>
 extends java.lang.Enum&lt;<a href="../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a>&gt;
 implements <a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></pre>
 <div class="block">A set of pre-defined ANSI escape code styles and colors, and a set of convenience methods for parsing
@@ -135,95 +122,95 @@ <h2 title="Enum CommandLine.Help.Ansi.Style" class="title">Enum CommandLine.Help
 <li class="blockList">
 <!-- =========== ENUM CONSTANT SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="enum.constant.summary">
+<li class="blockList"><a name="enum_constant_summary">
 <!--   -->
 </a>
 <h3>Enum Constant Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
 <caption><span>Enum Constants</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Enum Constant and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#bg_black">bg_black</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#bg_black">bg_black</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#bg_blue">bg_blue</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#bg_blue">bg_blue</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#bg_cyan">bg_cyan</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#bg_cyan">bg_cyan</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#bg_green">bg_green</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#bg_green">bg_green</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#bg_magenta">bg_magenta</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#bg_magenta">bg_magenta</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#bg_red">bg_red</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#bg_red">bg_red</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#bg_white">bg_white</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#bg_white">bg_white</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#bg_yellow">bg_yellow</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#bg_yellow">bg_yellow</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#blink">blink</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#blink">blink</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#bold">bold</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#bold">bold</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#faint">faint</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#faint">faint</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#fg_black">fg_black</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#fg_black">fg_black</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#fg_blue">fg_blue</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#fg_blue">fg_blue</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#fg_cyan">fg_cyan</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#fg_cyan">fg_cyan</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#fg_green">fg_green</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#fg_green">fg_green</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#fg_magenta">fg_magenta</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#fg_magenta">fg_magenta</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#fg_red">fg_red</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#fg_red">fg_red</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#fg_white">fg_white</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#fg_white">fg_white</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#fg_yellow">fg_yellow</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#fg_yellow">fg_yellow</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#italic">italic</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#italic">italic</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#reset">reset</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#reset">reset</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#reverse">reverse</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#reverse">reverse</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#underline">underline</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#underline">underline</a></strong></code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- =========== FIELD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.summary">
+<li class="blockList"><a name="field_summary">
 <!--   -->
 </a>
 <h3>Field Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="fields.inherited.from.class.picocli.CommandLine.Help.Ansi.IStyle">
+<li class="blockList"><a name="fields_inherited_from_class_picocli.CommandLine.Help.Ansi.IStyle">
 <!--   -->
 </a>
 <h3>Fields inherited from interface&nbsp;picocli.<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></h3>
@@ -233,82 +220,82 @@ <h3>Fields inherited from interface&nbsp;picocli.<a href="../picocli/CommandLine
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#bg-java.lang.String-">bg</a></span>(java.lang.String&nbsp;str)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#bg(java.lang.String)">bg</a></strong>(java.lang.String&nbsp;str)</code>
 <div class="block">Parses the specified style markup and returns the associated style.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#fg-java.lang.String-">fg</a></span>(java.lang.String&nbsp;str)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#fg(java.lang.String)">fg</a></strong>(java.lang.String&nbsp;str)</code>
 <div class="block">Parses the specified style markup and returns the associated style.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#off--">off</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#off()">off</a></strong>()</code>
 <div class="block">Returns the ANSI escape code for turning this style off.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#off-picocli.CommandLine.Help.Ansi.IStyle...-">off</a></span>(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#off(picocli.CommandLine.Help.Ansi.IStyle...)">off</a></strong>(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
 <div class="block">Returns the concatenated ANSI escape codes for turning all specified styles off.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#on--">on</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#on()">on</a></strong>()</code>
 <div class="block">Returns the ANSI escape code for turning this style on.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#on-picocli.CommandLine.Help.Ansi.IStyle...-">on</a></span>(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#on(picocli.CommandLine.Help.Ansi.IStyle...)">on</a></strong>(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
 <div class="block">Returns the concatenated ANSI escape codes for turning all specified styles on.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#parse-java.lang.String-">parse</a></span>(java.lang.String&nbsp;commaSeparatedCodes)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#parse(java.lang.String)">parse</a></strong>(java.lang.String&nbsp;commaSeparatedCodes)</code>
 <div class="block">Parses the specified comma-separated sequence of style descriptors and returns the associated
   styles.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;name)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#valueOf(java.lang.String)">valueOf</a></strong>(java.lang.String&nbsp;name)</code>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html#values--">values</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html#values()">values</a></strong>()</code>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Enum">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Enum">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Enum</h3>
 <code>clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -324,7 +311,7 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ ENUM CONSTANT DETAIL =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="enum.constant.detail">
+<li class="blockList"><a name="enum_constant_detail">
 <!--   -->
 </a>
 <h3>Enum Constant Detail</h3>
@@ -539,11 +526,11 @@ <h4>bg_white</h4>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="values--">
+<a name="values()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -557,13 +544,10 @@ <h4>values</h4>
 for (CommandLine.Help.Ansi.Style c : CommandLine.Help.Ansi.Style.values())
 &nbsp;   System.out.println(c);
 </pre></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an array containing the constants of this enum type, in the order they are declared</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>an array containing the constants of this enum type, in the order they are declared</dd></dl>
 </li>
 </ul>
-<a name="valueOf-java.lang.String-">
+<a name="valueOf(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -574,52 +558,44 @@ <h4>valueOf</h4>
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 
 not permitted.)</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - the name of the enum constant to be returned.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the enum constant with the specified name</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>name</code> - the name of the enum constant to be returned.</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the enum constant with the specified name</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code>java.lang.IllegalArgumentException</code> - if this enum type has no constant with the specified name</dd>
-<dd><code>java.lang.NullPointerException</code> - if the argument is null</dd>
-</dl>
+<dd><code>java.lang.NullPointerException</code> - if the argument is null</dd></dl>
 </li>
 </ul>
-<a name="on--">
+<a name="on()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>on</h4>
 <pre>public&nbsp;java.lang.String&nbsp;on()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../picocli/CommandLine.Help.Ansi.IStyle.html#on--">CommandLine.Help.Ansi.IStyle</a></code></span></div>
+<div class="block"><strong>Description copied from interface:&nbsp;<code><a href="../picocli/CommandLine.Help.Ansi.IStyle.html#on()">CommandLine.Help.Ansi.IStyle</a></code></strong></div>
 <div class="block">Returns the ANSI escape code for turning this style on.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.Help.Ansi.IStyle.html#on--">on</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></code></dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the ANSI escape code for turning this style on</dd>
-</dl>
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.Help.Ansi.IStyle.html#on()">on</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></code></dd>
+<dt><span class="strong">Returns:</span></dt><dd>the ANSI escape code for turning this style on</dd></dl>
 </li>
 </ul>
-<a name="off--">
+<a name="off()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>off</h4>
 <pre>public&nbsp;java.lang.String&nbsp;off()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../picocli/CommandLine.Help.Ansi.IStyle.html#off--">CommandLine.Help.Ansi.IStyle</a></code></span></div>
+<div class="block"><strong>Description copied from interface:&nbsp;<code><a href="../picocli/CommandLine.Help.Ansi.IStyle.html#off()">CommandLine.Help.Ansi.IStyle</a></code></strong></div>
 <div class="block">Returns the ANSI escape code for turning this style off.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.Help.Ansi.IStyle.html#off--">off</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></code></dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the ANSI escape code for turning this style off</dd>
-</dl>
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.Help.Ansi.IStyle.html#off()">off</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></code></dd>
+<dt><span class="strong">Returns:</span></dt><dd>the ANSI escape code for turning this style off</dd></dl>
 </li>
 </ul>
-<a name="on-picocli.CommandLine.Help.Ansi.IStyle...-">
+<a name="on(picocli.CommandLine.Help.Ansi.IStyle...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -627,15 +603,11 @@ <h4>off</h4>
 <h4>on</h4>
 <pre>public static&nbsp;java.lang.String&nbsp;on(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</pre>
 <div class="block">Returns the concatenated ANSI escape codes for turning all specified styles on.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>styles</code> - the styles to generate ANSI escape codes for</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the concatenated ANSI escape codes for turning all specified styles on</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>styles</code> - the styles to generate ANSI escape codes for</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the concatenated ANSI escape codes for turning all specified styles on</dd></dl>
 </li>
 </ul>
-<a name="off-picocli.CommandLine.Help.Ansi.IStyle...-">
+<a name="off(picocli.CommandLine.Help.Ansi.IStyle...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -643,15 +615,11 @@ <h4>on</h4>
 <h4>off</h4>
 <pre>public static&nbsp;java.lang.String&nbsp;off(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</pre>
 <div class="block">Returns the concatenated ANSI escape codes for turning all specified styles off.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>styles</code> - the styles to generate ANSI escape codes for</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the concatenated ANSI escape codes for turning all specified styles off</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>styles</code> - the styles to generate ANSI escape codes for</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the concatenated ANSI escape codes for turning all specified styles off</dd></dl>
 </li>
 </ul>
-<a name="fg-java.lang.String-">
+<a name="fg(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -661,16 +629,12 @@ <h4>fg</h4>
 <div class="block">Parses the specified style markup and returns the associated style.
   The markup may be one of the Style enum value names, or it may be one of the Style enum value
   names when <code>"fg_"</code> is prepended, or it may be one of the indexed colors in the 256 color palette.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>str</code> - the case-insensitive style markup to convert, e.g. <code>"blue"</code> or <code>"fg_blue"</code>,
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>str</code> - the case-insensitive style markup to convert, e.g. <code>"blue"</code> or <code>"fg_blue"</code>,
           or <code>"46"</code> (indexed color) or <code>"0;5;0"</code> (RGB components of an indexed color)</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the IStyle for the specified converter</dd>
-</dl>
+<dt><span class="strong">Returns:</span></dt><dd>the IStyle for the specified converter</dd></dl>
 </li>
 </ul>
-<a name="bg-java.lang.String-">
+<a name="bg(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -680,16 +644,12 @@ <h4>bg</h4>
 <div class="block">Parses the specified style markup and returns the associated style.
   The markup may be one of the Style enum value names, or it may be one of the Style enum value
   names when <code>"bg_"</code> is prepended, or it may be one of the indexed colors in the 256 color palette.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>str</code> - the case-insensitive style markup to convert, e.g. <code>"blue"</code> or <code>"bg_blue"</code>,
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>str</code> - the case-insensitive style markup to convert, e.g. <code>"blue"</code> or <code>"bg_blue"</code>,
           or <code>"46"</code> (indexed color) or <code>"0;5;0"</code> (RGB components of an indexed color)</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the IStyle for the specified converter</dd>
-</dl>
+<dt><span class="strong">Returns:</span></dt><dd>the IStyle for the specified converter</dd></dl>
 </li>
 </ul>
-<a name="parse-java.lang.String-">
+<a name="parse(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -698,13 +658,9 @@ <h4>parse</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>[]&nbsp;parse(java.lang.String&nbsp;commaSeparatedCodes)</pre>
 <div class="block">Parses the specified comma-separated sequence of style descriptors and returns the associated
   styles. For each markup, strings starting with <code>"bg("</code> are delegated to
-  <a href="../picocli/CommandLine.Help.Ansi.Style.html#bg-java.lang.String-"><code>bg(String)</code></a>, others are delegated to <a href="../picocli/CommandLine.Help.Ansi.Style.html#bg-java.lang.String-"><code>bg(String)</code></a>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>commaSeparatedCodes</code> - one or more descriptors, e.g. <code>"bg(blue),underline,red"</code></dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an array with all styles for the specified descriptors</dd>
-</dl>
+  <a href="../picocli/CommandLine.Help.Ansi.Style.html#bg(java.lang.String)"><code>bg(String)</code></a>, others are delegated to <a href="../picocli/CommandLine.Help.Ansi.Style.html#bg(java.lang.String)"><code>bg(String)</code></a>.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>commaSeparatedCodes</code> - one or more descriptors, e.g. <code>"bg(blue),underline,red"</code></dd>
+<dt><span class="strong">Returns:</span></dt><dd>an array with all styles for the specified descriptors</dd></dl>
 </li>
 </ul>
 </li>
@@ -715,11 +671,9 @@ <h4>parse</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -734,15 +688,15 @@ <h4>parse</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.Ansi.Style.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Ansi.Style.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.Ansi.Style.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -760,18 +714,18 @@ <h4>parse</h4>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li><a href="#enum_constant_summary">Enum Constants</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li><a href="#enum_constant_detail">Enum Constants</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Help.Ansi.Text.html b/docs/apidocs/picocli/CommandLine.Help.Ansi.Text.html
index 8afc19a15..9f5fccaa4 100644
--- a/docs/apidocs/picocli/CommandLine.Help.Ansi.Text.html
+++ b/docs/apidocs/picocli/CommandLine.Help.Ansi.Text.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Help.Ansi.Text (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Help.Ansi.Text (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.Ansi.Text (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Help.Ansi.Text (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.Ansi.Text.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Ansi.Text.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.Ansi.Text.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -75,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -116,7 +103,7 @@ <h2 title="Class CommandLine.Help.Ansi.Text" class="title">Class CommandLine.Hel
 </dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">CommandLine.Help.Ansi.Text</span>
+<pre>public class <span class="strong">CommandLine.Help.Ansi.Text</span>
 extends java.lang.Object
 implements java.lang.Cloneable</pre>
 <div class="block">Encapsulates rich text with styles and colors. Text objects may be constructed with Strings containing
@@ -133,22 +120,22 @@ <h2 title="Class CommandLine.Help.Ansi.Text" class="title">Class CommandLine.Hel
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Text.html#Text-int-">Text</a></span>(int&nbsp;maxLength)</code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Text.html#CommandLine.Help.Ansi.Text(int)">CommandLine.Help.Ansi.Text</a></strong>(int&nbsp;maxLength)</code>
 <div class="block">Constructs a Text with the specified max length (for use in a TextTable Column).</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Text.html#Text-java.lang.String-">Text</a></span>(java.lang.String&nbsp;input)</code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Text.html#CommandLine.Help.Ansi.Text(java.lang.String)">CommandLine.Help.Ansi.Text</a></strong>(java.lang.String&nbsp;input)</code>
 <div class="block">Constructs a Text with the specified String, which may contain markup like
  <code>@|bg(red),white,underline some text|@</code>.</div>
 </td>
@@ -158,82 +145,82 @@ <h3>Constructor Summary</h3>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Text.html#append-picocli.CommandLine.Help.Ansi.Text-">append</a></span>(<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;other)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Text.html#append(picocli.CommandLine.Help.Ansi.Text)">append</a></strong>(<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;other)</code>
 <div class="block">Returns a new <code>Text</code> instance with the specified text appended.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Text.html#append-java.lang.String-">append</a></span>(java.lang.String&nbsp;string)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Text.html#append(java.lang.String)">append</a></strong>(java.lang.String&nbsp;string)</code>
 <div class="block">Returns a new <code>Text</code> instance with the specified text appended.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.Object</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Text.html#clone--">clone</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Text.html#clone()">clone</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Text.html#equals-java.lang.Object-">equals</a></span>(java.lang.Object&nbsp;obj)</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Text.html#equals(java.lang.Object)">equals</a></strong>(java.lang.Object&nbsp;obj)</code>&nbsp;</td>
 </tr>
-<tr id="i4" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Text.html#getStyledChars-int-int-picocli.CommandLine.Help.Ansi.Text-int-">getStyledChars</a></span>(int&nbsp;from,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Text.html#getStyledChars(int,%20int,%20picocli.CommandLine.Help.Ansi.Text,%20int)">getStyledChars</a></strong>(int&nbsp;from,
               int&nbsp;length,
               <a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;destination,
               int&nbsp;offset)</code>
 <div class="block">Copies the specified substring of this Text into the specified destination, preserving the markup.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Text.html#hashCode--">hashCode</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Text.html#hashCode()">hashCode</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr id="i6" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Text.html#plainString--">plainString</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Text.html#plainString()">plainString</a></strong>()</code>
 <div class="block">Returns the plain text without any formatting.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Text.html#splitLines--">splitLines</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Text.html#splitLines()">splitLines</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr id="i8" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Text.html#substring-int-">substring</a></span>(int&nbsp;start)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Text.html#substring(int)">substring</a></strong>(int&nbsp;start)</code>
 <div class="block">Returns a new <code>Text</code> instance that is a substring of this Text.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Text.html#substring-int-int-">substring</a></span>(int&nbsp;start,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Text.html#substring(int,%20int)">substring</a></strong>(int&nbsp;start,
          int&nbsp;end)</code>
 <div class="block">Returns a new <code>Text</code> instance that is a substring of this Text.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Text.html#toString--">toString</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Text.html#toString()">toString</a></strong>()</code>
 <div class="block">Returns a String representation of the text with ANSI escape codes embedded, unless ANSI is
- <a href="../picocli/CommandLine.Help.Ansi.html#enabled--">CommandLine.Help.Ansi.enabled()</a> not enabled}, in which case the plain text is returned.</div>
+ <a href="../picocli/CommandLine.Help.Ansi.html#enabled()">CommandLine.Help.Ansi.enabled()</a> not enabled}, in which case the plain text is returned.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -249,48 +236,42 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="Text-int-">
+<a name="CommandLine.Help.Ansi.Text(int)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>Text</h4>
-<pre>public&nbsp;Text(int&nbsp;maxLength)</pre>
+<h4>CommandLine.Help.Ansi.Text</h4>
+<pre>public&nbsp;CommandLine.Help.Ansi.Text(int&nbsp;maxLength)</pre>
 <div class="block">Constructs a Text with the specified max length (for use in a TextTable Column).</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>maxLength</code> - max length of this text</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>maxLength</code> - max length of this text</dd></dl>
 </li>
 </ul>
-<a name="Text-java.lang.String-">
+<a name="CommandLine.Help.Ansi.Text(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>Text</h4>
-<pre>public&nbsp;Text(java.lang.String&nbsp;input)</pre>
+<h4>CommandLine.Help.Ansi.Text</h4>
+<pre>public&nbsp;CommandLine.Help.Ansi.Text(java.lang.String&nbsp;input)</pre>
 <div class="block">Constructs a Text with the specified String, which may contain markup like
  <code>@|bg(red),white,underline some text|@</code>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>input</code> - the string with markup to parse</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>input</code> - the string with markup to parse</dd></dl>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="clone--">
+<a name="clone()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -298,12 +279,12 @@ <h3>Method Detail</h3>
 <h4>clone</h4>
 <pre>public&nbsp;java.lang.Object&nbsp;clone()</pre>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dt><strong>Overrides:</strong></dt>
 <dd><code>clone</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
 </dl>
 </li>
 </ul>
-<a name="splitLines--">
+<a name="splitLines()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -312,7 +293,7 @@ <h4>splitLines</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>[]&nbsp;splitLines()</pre>
 </li>
 </ul>
-<a name="substring-int-">
+<a name="substring(int)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -320,33 +301,24 @@ <h4>splitLines</h4>
 <h4>substring</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;substring(int&nbsp;start)</pre>
 <div class="block">Returns a new <code>Text</code> instance that is a substring of this Text. Does not modify this instance!</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>start</code> - index in the plain text where to start the substring</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new Text instance that is a substring of this Text</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>start</code> - index in the plain text where to start the substring</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a new Text instance that is a substring of this Text</dd></dl>
 </li>
 </ul>
-<a name="substring-int-int-">
+<a name="substring(int, int)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>substring</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;substring(int&nbsp;start,
-                                            int&nbsp;end)</pre>
+                                   int&nbsp;end)</pre>
 <div class="block">Returns a new <code>Text</code> instance that is a substring of this Text. Does not modify this instance!</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>start</code> - index in the plain text where to start the substring</dd>
-<dd><code>end</code> - index in the plain text where to end the substring</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new Text instance that is a substring of this Text</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>start</code> - index in the plain text where to start the substring</dd><dd><code>end</code> - index in the plain text where to end the substring</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a new Text instance that is a substring of this Text</dd></dl>
 </li>
 </ul>
-<a name="append-java.lang.String-">
+<a name="append(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -354,15 +326,11 @@ <h4>substring</h4>
 <h4>append</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;append(java.lang.String&nbsp;string)</pre>
 <div class="block">Returns a new <code>Text</code> instance with the specified text appended. Does not modify this instance!</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>string</code> - the text to append</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new Text instance</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>string</code> - the text to append</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a new Text instance</dd></dl>
 </li>
 </ul>
-<a name="append-picocli.CommandLine.Help.Ansi.Text-">
+<a name="append(picocli.CommandLine.Help.Ansi.Text)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -370,35 +338,25 @@ <h4>append</h4>
 <h4>append</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;append(<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;other)</pre>
 <div class="block">Returns a new <code>Text</code> instance with the specified text appended. Does not modify this instance!</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>other</code> - the text to append</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new Text instance</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>other</code> - the text to append</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a new Text instance</dd></dl>
 </li>
 </ul>
-<a name="getStyledChars-int-int-picocli.CommandLine.Help.Ansi.Text-int-">
+<a name="getStyledChars(int, int, picocli.CommandLine.Help.Ansi.Text, int)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getStyledChars</h4>
 <pre>public&nbsp;void&nbsp;getStyledChars(int&nbsp;from,
-                           int&nbsp;length,
-                           <a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;destination,
-                           int&nbsp;offset)</pre>
+                  int&nbsp;length,
+                  <a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;destination,
+                  int&nbsp;offset)</pre>
 <div class="block">Copies the specified substring of this Text into the specified destination, preserving the markup.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>from</code> - start of the substring</dd>
-<dd><code>length</code> - length of the substring</dd>
-<dd><code>destination</code> - destination Text to modify</dd>
-<dd><code>offset</code> - indentation (padding)</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>from</code> - start of the substring</dd><dd><code>length</code> - length of the substring</dd><dd><code>destination</code> - destination Text to modify</dd><dd><code>offset</code> - indentation (padding)</dd></dl>
 </li>
 </ul>
-<a name="plainString--">
+<a name="plainString()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -406,13 +364,10 @@ <h4>getStyledChars</h4>
 <h4>plainString</h4>
 <pre>public&nbsp;java.lang.String&nbsp;plainString()</pre>
 <div class="block">Returns the plain text without any formatting.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the plain text without any formatting</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the plain text without any formatting</dd></dl>
 </li>
 </ul>
-<a name="equals-java.lang.Object-">
+<a name="equals(java.lang.Object)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -420,12 +375,12 @@ <h4>plainString</h4>
 <h4>equals</h4>
 <pre>public&nbsp;boolean&nbsp;equals(java.lang.Object&nbsp;obj)</pre>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dt><strong>Overrides:</strong></dt>
 <dd><code>equals</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
 </dl>
 </li>
 </ul>
-<a name="hashCode--">
+<a name="hashCode()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -433,12 +388,12 @@ <h4>equals</h4>
 <h4>hashCode</h4>
 <pre>public&nbsp;int&nbsp;hashCode()</pre>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dt><strong>Overrides:</strong></dt>
 <dd><code>hashCode</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
 </dl>
 </li>
 </ul>
-<a name="toString--">
+<a name="toString()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -446,13 +401,11 @@ <h4>hashCode</h4>
 <h4>toString</h4>
 <pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
 <div class="block">Returns a String representation of the text with ANSI escape codes embedded, unless ANSI is
- <a href="../picocli/CommandLine.Help.Ansi.html#enabled--">CommandLine.Help.Ansi.enabled()</a> not enabled}, in which case the plain text is returned.</div>
+ <a href="../picocli/CommandLine.Help.Ansi.html#enabled()">CommandLine.Help.Ansi.enabled()</a> not enabled}, in which case the plain text is returned.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dt><strong>Overrides:</strong></dt>
 <dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a String representation of the text with ANSI escape codes embedded (if enabled)</dd>
-</dl>
+<dt><span class="strong">Returns:</span></dt><dd>a String representation of the text with ANSI escape codes embedded (if enabled)</dd></dl>
 </li>
 </ul>
 </li>
@@ -463,11 +416,9 @@ <h4>toString</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -482,15 +433,15 @@ <h4>toString</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.Ansi.Text.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Ansi.Text.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.Ansi.Text.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -509,17 +460,17 @@ <h4>toString</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Help.Ansi.html b/docs/apidocs/picocli/CommandLine.Help.Ansi.html
index 2771bae04..a0571af04 100644
--- a/docs/apidocs/picocli/CommandLine.Help.Ansi.html
+++ b/docs/apidocs/picocli/CommandLine.Help.Ansi.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Help.Ansi (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Help.Ansi (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.Ansi (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Help.Ansi (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":9,"i3":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.Ansi.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Ansi.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.Ansi.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -73,19 +60,19 @@
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li><a href="#nested_class_summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#enum_constant_summary">Enum Constants</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li><a href="#enum_constant_detail">Enum Constants</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -121,7 +108,7 @@ <h2 title="Enum CommandLine.Help.Ansi" class="title">Enum CommandLine.Help.Ansi<
 </dl>
 <hr>
 <br>
-<pre>public static enum <span class="typeNameLabel">CommandLine.Help.Ansi</span>
+<pre>public static enum <span class="strong">CommandLine.Help.Ansi</span>
 extends java.lang.Enum&lt;<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&gt;</pre>
 <div class="block">Provides methods and inner classes to support using ANSI escape codes in usage help messages.</div>
 </li>
@@ -132,11 +119,11 @@ <h2 title="Enum CommandLine.Help.Ansi" class="title">Enum CommandLine.Help.Ansi<
 <li class="blockList">
 <!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="nested.class.summary">
+<li class="blockList"><a name="nested_class_summary">
 <!--   -->
 </a>
 <h3>Nested Class Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
 <caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -144,13 +131,13 @@ <h3>Nested Class Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></strong></code>
 <div class="block">Defines the interface for an ANSI escape sequence.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></strong></code>
 <div class="block">A set of pre-defined ANSI escape code styles and colors, and a set of convenience methods for parsing
  text with embedded markup style names, as well as convenience methods for converting
  styles to strings with embedded escape codes.</div>
@@ -158,7 +145,7 @@ <h3>Nested Class Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></strong></code>
 <div class="block">Encapsulates rich text with styles and colors.</div>
 </td>
 </tr>
@@ -167,28 +154,28 @@ <h3>Nested Class Summary</h3>
 </ul>
 <!-- =========== ENUM CONSTANT SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="enum.constant.summary">
+<li class="blockList"><a name="enum_constant_summary">
 <!--   -->
 </a>
 <h3>Enum Constant Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
 <caption><span>Enum Constants</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Enum Constant and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.html#AUTO">AUTO</a></span></code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.html#AUTO">AUTO</a></strong></code>
 <div class="block">Only emit ANSI escape codes if the platform supports it and system property <code>"picocli.ansi"</code>
  is not set to any value other than <code>"true"</code> (case insensitive).</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.html#OFF">OFF</a></span></code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.html#OFF">OFF</a></strong></code>
 <div class="block">Forced OFF: never emit ANSI escape code regardless of the platform.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.html#ON">ON</a></span></code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Ansi.html#ON">ON</a></strong></code>
 <div class="block">Forced ON: always emit ANSI escape code regardless of the platform.</div>
 </td>
 </tr>
@@ -197,53 +184,53 @@ <h3>Enum Constant Summary</h3>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.html#apply-java.lang.String-java.util.List-">apply</a></span>(java.lang.String&nbsp;plainText,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.html#apply(java.lang.String,%20java.util.List)">apply</a></strong>(java.lang.String&nbsp;plainText,
      java.util.List&lt;<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&gt;&nbsp;styles)</code>
 <div class="block">Returns a new Text object where all the specified styles are applied to the full length of the
  specified plain text.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.html#enabled--">enabled</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.html#enabled()">enabled</a></strong>()</code>
 <div class="block">Returns <code>true</code> if ANSI escape codes should be emitted, <code>false</code> otherwise.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;name)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.html#valueOf(java.lang.String)">valueOf</a></strong>(java.lang.String&nbsp;name)</code>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.html#values--">values</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.html#values()">values</a></strong>()</code>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Enum">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Enum">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Enum</h3>
 <code>clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -259,7 +246,7 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ ENUM CONSTANT DETAIL =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="enum.constant.detail">
+<li class="blockList"><a name="enum_constant_detail">
 <!--   -->
 </a>
 <h3>Enum Constant Detail</h3>
@@ -298,11 +285,11 @@ <h4>OFF</h4>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="values--">
+<a name="values()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -316,13 +303,10 @@ <h4>values</h4>
 for (CommandLine.Help.Ansi c : CommandLine.Help.Ansi.values())
 &nbsp;   System.out.println(c);
 </pre></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an array containing the constants of this enum type, in the order they are declared</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>an array containing the constants of this enum type, in the order they are declared</dd></dl>
 </li>
 </ul>
-<a name="valueOf-java.lang.String-">
+<a name="valueOf(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -333,18 +317,14 @@ <h4>valueOf</h4>
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 
 not permitted.)</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - the name of the enum constant to be returned.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the enum constant with the specified name</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>name</code> - the name of the enum constant to be returned.</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the enum constant with the specified name</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code>java.lang.IllegalArgumentException</code> - if this enum type has no constant with the specified name</dd>
-<dd><code>java.lang.NullPointerException</code> - if the argument is null</dd>
-</dl>
+<dd><code>java.lang.NullPointerException</code> - if the argument is null</dd></dl>
 </li>
 </ul>
-<a name="enabled--">
+<a name="enabled()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -352,30 +332,22 @@ <h4>valueOf</h4>
 <h4>enabled</h4>
 <pre>public&nbsp;boolean&nbsp;enabled()</pre>
 <div class="block">Returns <code>true</code> if ANSI escape codes should be emitted, <code>false</code> otherwise.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>ON: <code>true</code>, OFF: <code>false</code>, AUTO: if system property <code>"picocli.ansi"</code> is
-      defined then return its boolean value, otherwise return whether the platform supports ANSI escape codes</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>ON: <code>true</code>, OFF: <code>false</code>, AUTO: if system property <code>"picocli.ansi"</code> is
+      defined then return its boolean value, otherwise return whether the platform supports ANSI escape codes</dd></dl>
 </li>
 </ul>
-<a name="apply-java.lang.String-java.util.List-">
+<a name="apply(java.lang.String, java.util.List)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>apply</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;apply(java.lang.String&nbsp;plainText,
-                                        java.util.List&lt;<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&gt;&nbsp;styles)</pre>
+                               java.util.List&lt;<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&gt;&nbsp;styles)</pre>
 <div class="block">Returns a new Text object where all the specified styles are applied to the full length of the
  specified plain text.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>plainText</code> - the string to apply all styles to. Must not contain markup!</dd>
-<dd><code>styles</code> - the styles to apply to the full plain text</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new Text object</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>plainText</code> - the string to apply all styles to. Must not contain markup!</dd><dd><code>styles</code> - the styles to apply to the full plain text</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a new Text object</dd></dl>
 </li>
 </ul>
 </li>
@@ -386,11 +358,9 @@ <h4>apply</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -405,15 +375,15 @@ <h4>apply</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.Ansi.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Ansi.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.Ansi.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -430,19 +400,19 @@ <h4>apply</h4>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li><a href="#nested_class_summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#enum_constant_summary">Enum Constants</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li><a href="#enum_constant_detail">Enum Constants</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Help.ColorScheme.html b/docs/apidocs/picocli/CommandLine.Help.ColorScheme.html
index 7c80c58b1..128f94266 100644
--- a/docs/apidocs/picocli/CommandLine.Help.ColorScheme.html
+++ b/docs/apidocs/picocli/CommandLine.Help.ColorScheme.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Help.ColorScheme (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Help.ColorScheme (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.ColorScheme (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Help.ColorScheme (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.Column.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Column.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.ColorScheme.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.ColorScheme.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.ColorScheme.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -74,18 +61,18 @@
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -112,17 +99,14 @@ <h2 title="Class CommandLine.Help.ColorScheme" class="title">Class CommandLine.H
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.Help.ColorScheme</span>
+<pre>public static class <span class="strong">CommandLine.Help.ColorScheme</span>
 extends java.lang.Object</pre>
 <div class="block">All usage help message are generated with a color scheme that assigns certain styles and colors to common
  parts of a usage message: the command name, options, positional parameters and option parameters.
  Users may customize these styles by creating Help with a custom color scheme.
  <p>Note that these options and styles may not be rendered if ANSI escape codes are not
- <a href="../picocli/CommandLine.Help.Ansi.html#enabled--">enabled</a>.</p></div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Help.html#defaultColorScheme-picocli.CommandLine.Help.Ansi-"><code>CommandLine.Help.defaultColorScheme(Ansi)</code></a></dd>
-</dl>
+ <a href="../picocli/CommandLine.Help.Ansi.html#enabled()">enabled</a>.</p></div>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Help.html#defaultColorScheme(picocli.CommandLine.Help.Ansi)"><code>CommandLine.Help.defaultColorScheme(Ansi)</code></a></dd></dl>
 </li>
 </ul>
 </div>
@@ -131,11 +115,11 @@ <h2 title="Class CommandLine.Help.ColorScheme" class="title">Class CommandLine.H
 <li class="blockList">
 <!-- =========== FIELD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.summary">
+<li class="blockList"><a name="field_summary">
 <!--   -->
 </a>
 <h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
 <caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -143,41 +127,41 @@ <h3>Field Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.util.List&lt;<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#commandStyles">commandStyles</a></span></code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.ColorScheme.html#commandStyles">commandStyles</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#optionParamStyles">optionParamStyles</a></span></code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.ColorScheme.html#optionParamStyles">optionParamStyles</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.util.List&lt;<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#optionStyles">optionStyles</a></span></code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.ColorScheme.html#optionStyles">optionStyles</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#parameterStyles">parameterStyles</a></span></code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.ColorScheme.html#parameterStyles">parameterStyles</a></strong></code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#ColorScheme--">ColorScheme</a></span>()</code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.ColorScheme.html#CommandLine.Help.ColorScheme()">CommandLine.Help.ColorScheme</a></strong>()</code>
 <div class="block">Constructs a new ColorScheme with <a href="../picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#ColorScheme-picocli.CommandLine.Help.Ansi-">ColorScheme</a></span>(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.ColorScheme.html#CommandLine.Help.ColorScheme(picocli.CommandLine.Help.Ansi)">CommandLine.Help.ColorScheme</a></strong>(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
 <div class="block">Constructs a new ColorScheme with the specified Ansi enabled mode.</div>
 </td>
 </tr>
@@ -186,77 +170,77 @@ <h3>Constructor Summary</h3>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#ansi--">ansi</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.ColorScheme.html#ansi()">ansi</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#applySystemProperties--">applySystemProperties</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.ColorScheme.html#applySystemProperties()">applySystemProperties</a></strong>()</code>
 <div class="block">Replaces colors and styles in this scheme with ones specified in system properties, and returns this scheme.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#commands-picocli.CommandLine.Help.Ansi.IStyle...-">commands</a></span>(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.ColorScheme.html#commands(picocli.CommandLine.Help.Ansi.IStyle...)">commands</a></strong>(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
 <div class="block">Adds the specified styles to the registered styles for commands in this color scheme and returns this color scheme.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#commandText-java.lang.String-">commandText</a></span>(java.lang.String&nbsp;command)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.ColorScheme.html#commandText(java.lang.String)">commandText</a></strong>(java.lang.String&nbsp;command)</code>
 <div class="block">Returns a Text with all command styles applied to the specified command string.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#optionParams-picocli.CommandLine.Help.Ansi.IStyle...-">optionParams</a></span>(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.ColorScheme.html#optionParams(picocli.CommandLine.Help.Ansi.IStyle...)">optionParams</a></strong>(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
 <div class="block">Adds the specified styles to the registered styles for option parameters in this color scheme and returns this color scheme.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#optionParamText-java.lang.String-">optionParamText</a></span>(java.lang.String&nbsp;optionParam)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.ColorScheme.html#optionParamText(java.lang.String)">optionParamText</a></strong>(java.lang.String&nbsp;optionParam)</code>
 <div class="block">Returns a Text with all optionParam styles applied to the specified optionParam string.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#options-picocli.CommandLine.Help.Ansi.IStyle...-">options</a></span>(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.ColorScheme.html#options(picocli.CommandLine.Help.Ansi.IStyle...)">options</a></strong>(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
 <div class="block">Adds the specified styles to the registered styles for options in this color scheme and returns this color scheme.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#optionText-java.lang.String-">optionText</a></span>(java.lang.String&nbsp;option)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.ColorScheme.html#optionText(java.lang.String)">optionText</a></strong>(java.lang.String&nbsp;option)</code>
 <div class="block">Returns a Text with all option styles applied to the specified option string.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#parameters-picocli.CommandLine.Help.Ansi.IStyle...-">parameters</a></span>(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.ColorScheme.html#parameters(picocli.CommandLine.Help.Ansi.IStyle...)">parameters</a></strong>(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
 <div class="block">Adds the specified styles to the registered styles for positional parameters in this color scheme and returns this color scheme.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#parameterText-java.lang.String-">parameterText</a></span>(java.lang.String&nbsp;parameter)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.ColorScheme.html#parameterText(java.lang.String)">parameterText</a></strong>(java.lang.String&nbsp;parameter)</code>
 <div class="block">Returns a Text with all parameter styles applied to the specified parameter string.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -272,7 +256,7 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ FIELD DETAIL =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.detail">
+<li class="blockList"><a name="field_detail">
 <!--   -->
 </a>
 <h3>Field Detail</h3>
@@ -316,43 +300,40 @@ <h4>optionParamStyles</h4>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ColorScheme--">
+<a name="CommandLine.Help.ColorScheme()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>ColorScheme</h4>
-<pre>public&nbsp;ColorScheme()</pre>
+<h4>CommandLine.Help.ColorScheme</h4>
+<pre>public&nbsp;CommandLine.Help.ColorScheme()</pre>
 <div class="block">Constructs a new ColorScheme with <a href="../picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
 </li>
 </ul>
-<a name="ColorScheme-picocli.CommandLine.Help.Ansi-">
+<a name="CommandLine.Help.ColorScheme(picocli.CommandLine.Help.Ansi)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ColorScheme</h4>
-<pre>public&nbsp;ColorScheme(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
+<h4>CommandLine.Help.ColorScheme</h4>
+<pre>public&nbsp;CommandLine.Help.ColorScheme(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
 <div class="block">Constructs a new ColorScheme with the specified Ansi enabled mode.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ansi</code> - whether to emit ANSI escape codes or not</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>ansi</code> - whether to emit ANSI escape codes or not</dd></dl>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="commands-picocli.CommandLine.Help.Ansi.IStyle...-">
+<a name="commands(picocli.CommandLine.Help.Ansi.IStyle...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -360,15 +341,11 @@ <h3>Method Detail</h3>
 <h4>commands</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;commands(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</pre>
 <div class="block">Adds the specified styles to the registered styles for commands in this color scheme and returns this color scheme.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>styles</code> - the styles to add to the registered styles for commands in this color scheme</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this color scheme to enable method chaining for a more fluent API</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>styles</code> - the styles to add to the registered styles for commands in this color scheme</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this color scheme to enable method chaining for a more fluent API</dd></dl>
 </li>
 </ul>
-<a name="options-picocli.CommandLine.Help.Ansi.IStyle...-">
+<a name="options(picocli.CommandLine.Help.Ansi.IStyle...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -376,15 +353,11 @@ <h4>commands</h4>
 <h4>options</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;options(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</pre>
 <div class="block">Adds the specified styles to the registered styles for options in this color scheme and returns this color scheme.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>styles</code> - the styles to add to registered the styles for options in this color scheme</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this color scheme to enable method chaining for a more fluent API</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>styles</code> - the styles to add to registered the styles for options in this color scheme</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this color scheme to enable method chaining for a more fluent API</dd></dl>
 </li>
 </ul>
-<a name="parameters-picocli.CommandLine.Help.Ansi.IStyle...-">
+<a name="parameters(picocli.CommandLine.Help.Ansi.IStyle...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -392,15 +365,11 @@ <h4>options</h4>
 <h4>parameters</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;parameters(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</pre>
 <div class="block">Adds the specified styles to the registered styles for positional parameters in this color scheme and returns this color scheme.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>styles</code> - the styles to add to registered the styles for parameters in this color scheme</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this color scheme to enable method chaining for a more fluent API</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>styles</code> - the styles to add to registered the styles for parameters in this color scheme</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this color scheme to enable method chaining for a more fluent API</dd></dl>
 </li>
 </ul>
-<a name="optionParams-picocli.CommandLine.Help.Ansi.IStyle...-">
+<a name="optionParams(picocli.CommandLine.Help.Ansi.IStyle...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -408,15 +377,11 @@ <h4>parameters</h4>
 <h4>optionParams</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;optionParams(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</pre>
 <div class="block">Adds the specified styles to the registered styles for option parameters in this color scheme and returns this color scheme.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>styles</code> - the styles to add to the registered styles for option parameters in this color scheme</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this color scheme to enable method chaining for a more fluent API</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>styles</code> - the styles to add to the registered styles for option parameters in this color scheme</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this color scheme to enable method chaining for a more fluent API</dd></dl>
 </li>
 </ul>
-<a name="commandText-java.lang.String-">
+<a name="commandText(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -424,15 +389,11 @@ <h4>optionParams</h4>
 <h4>commandText</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;commandText(java.lang.String&nbsp;command)</pre>
 <div class="block">Returns a Text with all command styles applied to the specified command string.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>command</code> - the command string to apply the registered command styles to</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a Text with all command styles applied to the specified command string</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>command</code> - the command string to apply the registered command styles to</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a Text with all command styles applied to the specified command string</dd></dl>
 </li>
 </ul>
-<a name="optionText-java.lang.String-">
+<a name="optionText(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -440,15 +401,11 @@ <h4>commandText</h4>
 <h4>optionText</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;optionText(java.lang.String&nbsp;option)</pre>
 <div class="block">Returns a Text with all option styles applied to the specified option string.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>option</code> - the option string to apply the registered option styles to</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a Text with all option styles applied to the specified option string</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>option</code> - the option string to apply the registered option styles to</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a Text with all option styles applied to the specified option string</dd></dl>
 </li>
 </ul>
-<a name="parameterText-java.lang.String-">
+<a name="parameterText(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -456,15 +413,11 @@ <h4>optionText</h4>
 <h4>parameterText</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;parameterText(java.lang.String&nbsp;parameter)</pre>
 <div class="block">Returns a Text with all parameter styles applied to the specified parameter string.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>parameter</code> - the parameter string to apply the registered parameter styles to</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a Text with all parameter styles applied to the specified parameter string</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>parameter</code> - the parameter string to apply the registered parameter styles to</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a Text with all parameter styles applied to the specified parameter string</dd></dl>
 </li>
 </ul>
-<a name="optionParamText-java.lang.String-">
+<a name="optionParamText(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -472,15 +425,11 @@ <h4>parameterText</h4>
 <h4>optionParamText</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;optionParamText(java.lang.String&nbsp;optionParam)</pre>
 <div class="block">Returns a Text with all optionParam styles applied to the specified optionParam string.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>optionParam</code> - the option parameter string to apply the registered option parameter styles to</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a Text with all option parameter styles applied to the specified option parameter string</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>optionParam</code> - the option parameter string to apply the registered option parameter styles to</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a Text with all option parameter styles applied to the specified option parameter string</dd></dl>
 </li>
 </ul>
-<a name="applySystemProperties--">
+<a name="applySystemProperties()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -493,14 +442,11 @@ <h4>applySystemProperties</h4>
      <li><code>picocli.color.options</code></li>
      <li><code>picocli.color.parameters</code></li>
      <li><code>picocli.color.optionParams</code></li>
- </ul><p>Property values can be anything that <a href="../picocli/CommandLine.Help.Ansi.Style.html#parse-java.lang.String-"><code>CommandLine.Help.Ansi.Style.parse(String)</code></a> can handle.</p></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this ColorScheme</dd>
-</dl>
+ </ul><p>Property values can be anything that <a href="../picocli/CommandLine.Help.Ansi.Style.html#parse(java.lang.String)"><code>CommandLine.Help.Ansi.Style.parse(String)</code></a> can handle.</p></div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this ColorScheme</dd></dl>
 </li>
 </ul>
-<a name="ansi--">
+<a name="ansi()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -517,11 +463,9 @@ <h4>ansi</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -536,15 +480,15 @@ <h4>ansi</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.Column.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Column.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.ColorScheme.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.ColorScheme.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.ColorScheme.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -562,18 +506,18 @@ <h4>ansi</h4>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Help.Column.Overflow.html b/docs/apidocs/picocli/CommandLine.Help.Column.Overflow.html
index d709aa540..2d44e61c9 100644
--- a/docs/apidocs/picocli/CommandLine.Help.Column.Overflow.html
+++ b/docs/apidocs/picocli/CommandLine.Help.Column.Overflow.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Help.Column.Overflow (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Help.Column.Overflow (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.Column.Overflow (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Help.Column.Overflow (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":9,"i1":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.Column.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Column.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.Column.Overflow.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Column.Overflow.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.Column.Overflow.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -74,18 +61,18 @@
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li><a href="#enum_constant_summary">Enum Constants</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li><a href="#enum_constant_detail">Enum Constants</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -121,7 +108,7 @@ <h2 title="Enum CommandLine.Help.Column.Overflow" class="title">Enum CommandLine
 </dl>
 <hr>
 <br>
-<pre>public static enum <span class="typeNameLabel">CommandLine.Help.Column.Overflow</span>
+<pre>public static enum <span class="strong">CommandLine.Help.Column.Overflow</span>
 extends java.lang.Enum&lt;<a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a>&gt;</pre>
 <div class="block">Policy for handling text that is longer than the column width:
   span multiple columns, wrap to the next row, or simply truncate the portion that doesn't fit.</div>
@@ -133,62 +120,62 @@ <h2 title="Enum CommandLine.Help.Column.Overflow" class="title">Enum CommandLine
 <li class="blockList">
 <!-- =========== ENUM CONSTANT SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="enum.constant.summary">
+<li class="blockList"><a name="enum_constant_summary">
 <!--   -->
 </a>
 <h3>Enum Constant Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
 <caption><span>Enum Constants</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Enum Constant and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Column.Overflow.html#SPAN">SPAN</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Column.Overflow.html#SPAN">SPAN</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Column.Overflow.html#TRUNCATE">TRUNCATE</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Column.Overflow.html#TRUNCATE">TRUNCATE</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Column.Overflow.html#WRAP">WRAP</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Column.Overflow.html#WRAP">WRAP</a></strong></code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Column.Overflow.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;name)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Column.Overflow.html#valueOf(java.lang.String)">valueOf</a></strong>(java.lang.String&nbsp;name)</code>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Column.Overflow.html#values--">values</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Column.Overflow.html#values()">values</a></strong>()</code>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Enum">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Enum">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Enum</h3>
 <code>clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -204,7 +191,7 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ ENUM CONSTANT DETAIL =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="enum.constant.detail">
+<li class="blockList"><a name="enum_constant_detail">
 <!--   -->
 </a>
 <h3>Enum Constant Detail</h3>
@@ -239,11 +226,11 @@ <h4>WRAP</h4>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="values--">
+<a name="values()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -257,13 +244,10 @@ <h4>values</h4>
 for (CommandLine.Help.Column.Overflow c : CommandLine.Help.Column.Overflow.values())
 &nbsp;   System.out.println(c);
 </pre></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an array containing the constants of this enum type, in the order they are declared</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>an array containing the constants of this enum type, in the order they are declared</dd></dl>
 </li>
 </ul>
-<a name="valueOf-java.lang.String-">
+<a name="valueOf(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -274,15 +258,11 @@ <h4>valueOf</h4>
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 
 not permitted.)</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - the name of the enum constant to be returned.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the enum constant with the specified name</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>name</code> - the name of the enum constant to be returned.</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the enum constant with the specified name</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code>java.lang.IllegalArgumentException</code> - if this enum type has no constant with the specified name</dd>
-<dd><code>java.lang.NullPointerException</code> - if the argument is null</dd>
-</dl>
+<dd><code>java.lang.NullPointerException</code> - if the argument is null</dd></dl>
 </li>
 </ul>
 </li>
@@ -293,11 +273,9 @@ <h4>valueOf</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -312,15 +290,15 @@ <h4>valueOf</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.Column.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Column.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.Column.Overflow.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Column.Overflow.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.Column.Overflow.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -338,18 +316,18 @@ <h4>valueOf</h4>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li><a href="#enum_constant_summary">Enum Constants</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li><a href="#enum_constant_detail">Enum Constants</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Help.Column.html b/docs/apidocs/picocli/CommandLine.Help.Column.html
index 867800880..b5bb329bd 100644
--- a/docs/apidocs/picocli/CommandLine.Help.Column.html
+++ b/docs/apidocs/picocli/CommandLine.Help.Column.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Help.Column (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Help.Column (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.Column (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Help.Column (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.Column.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Column.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.Column.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -67,19 +60,19 @@
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+<li><a href="#nested_class_summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Object">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -106,7 +99,7 @@ <h2 title="Class CommandLine.Help.Column" class="title">Class CommandLine.Help.C
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.Help.Column</span>
+<pre>public static class <span class="strong">CommandLine.Help.Column</span>
 extends java.lang.Object</pre>
 <div class="block">Columns define the width, indent (leading number of spaces in a column before the value) and
  <a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">Overflow</a> policy of a column in a <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">TextTable</a>.</div>
@@ -118,11 +111,11 @@ <h2 title="Class CommandLine.Help.Column" class="title">Class CommandLine.Help.C
 <li class="blockList">
 <!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="nested.class.summary">
+<li class="blockList"><a name="nested_class_summary">
 <!--   -->
 </a>
 <h3>Nested Class Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
 <caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -130,7 +123,7 @@ <h3>Nested Class Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a></strong></code>
 <div class="block">Policy for handling text that is longer than the column width:
   span multiple columns, wrap to the next row, or simply truncate the portion that doesn't fit.</div>
 </td>
@@ -140,11 +133,11 @@ <h3>Nested Class Summary</h3>
 </ul>
 <!-- =========== FIELD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.summary">
+<li class="blockList"><a name="field_summary">
 <!--   -->
 </a>
 <h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
 <caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -152,19 +145,19 @@ <h3>Field Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Column.html#indent">indent</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Column.html#indent">indent</a></strong></code>
 <div class="block">Indent (number of empty spaces at the start of the column preceding the text value)</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Column.html#overflow">overflow</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Column.html#overflow">overflow</a></strong></code>
 <div class="block">Policy that determines how to handle values larger than the column width.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Column.html#width">width</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Column.html#width">width</a></strong></code>
 <div class="block">Column width in characters</div>
 </td>
 </tr>
@@ -173,31 +166,31 @@ <h3>Field Summary</h3>
 </ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Column.html#Column-int-int-picocli.CommandLine.Help.Column.Overflow-">Column</a></span>(int&nbsp;width,
-      int&nbsp;indent,
-      <a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a>&nbsp;overflow)</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Column.html#CommandLine.Help.Column(int,%20int,%20picocli.CommandLine.Help.Column.Overflow)">CommandLine.Help.Column</a></strong>(int&nbsp;width,
+                       int&nbsp;indent,
+                       <a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a>&nbsp;overflow)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -213,7 +206,7 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ FIELD DETAIL =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.detail">
+<li class="blockList"><a name="field_detail">
 <!--   -->
 </a>
 <h3>Field Detail</h3>
@@ -251,19 +244,19 @@ <h4>overflow</h4>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="Column-int-int-picocli.CommandLine.Help.Column.Overflow-">
+<a name="CommandLine.Help.Column(int, int, picocli.CommandLine.Help.Column.Overflow)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>Column</h4>
-<pre>public&nbsp;Column(int&nbsp;width,
-              int&nbsp;indent,
-              <a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a>&nbsp;overflow)</pre>
+<h4>CommandLine.Help.Column</h4>
+<pre>public&nbsp;CommandLine.Help.Column(int&nbsp;width,
+                       int&nbsp;indent,
+                       <a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a>&nbsp;overflow)</pre>
 </li>
 </ul>
 </li>
@@ -274,11 +267,9 @@ <h4>Column</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -293,15 +284,15 @@ <h4>Column</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.Column.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Column.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.Column.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -318,19 +309,19 @@ <h4>Column</h4>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+<li><a href="#nested_class_summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Object">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Help.IOptionRenderer.html b/docs/apidocs/picocli/CommandLine.Help.IOptionRenderer.html
index 6c745fe60..83ad5fb03 100644
--- a/docs/apidocs/picocli/CommandLine.Help.IOptionRenderer.html
+++ b/docs/apidocs/picocli/CommandLine.Help.IOptionRenderer.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Help.IOptionRenderer (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Help.IOptionRenderer (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.IOptionRenderer (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Help.IOptionRenderer (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.IOptionRenderer.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.IOptionRenderer.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.IOptionRenderer.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -76,16 +63,16 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -104,7 +91,7 @@ <h2 title="Interface CommandLine.Help.IOptionRenderer" class="title">Interface C
 </dl>
 <hr>
 <br>
-<pre>public static interface <span class="typeNameLabel">CommandLine.Help.IOptionRenderer</span></pre>
+<pre>public static interface <span class="strong">CommandLine.Help.IOptionRenderer</span></pre>
 <div class="block">When customizing online help for <a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>Option</code></a> details, a custom <code>IOptionRenderer</code> can be
  used to create textual representation of an Option in a tabular format: one or more rows, each containing
  one or more columns. The <a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli"><code>Layout</code></a> is responsible for placing these text values in the
@@ -117,19 +104,19 @@ <h2 title="Interface CommandLine.Help.IOptionRenderer" class="title">Interface C
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>[][]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.IOptionRenderer.html#render-picocli.CommandLine.Model.OptionSpec-picocli.CommandLine.Help.IParamLabelRenderer-picocli.CommandLine.Help.ColorScheme-">render</a></span>(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.IOptionRenderer.html#render(picocli.CommandLine.Model.OptionSpec,%20picocli.CommandLine.Help.IParamLabelRenderer,%20picocli.CommandLine.Help.ColorScheme)">render</a></strong>(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option,
       <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;parameterLabelRenderer,
       <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;scheme)</code>
 <div class="block">Returns a text representation of the specified option and its parameter(s) if any.</div>
@@ -146,30 +133,23 @@ <h3>Method Summary</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="render-picocli.CommandLine.Model.OptionSpec-picocli.CommandLine.Help.IParamLabelRenderer-picocli.CommandLine.Help.ColorScheme-">
+<a name="render(picocli.CommandLine.Model.OptionSpec, picocli.CommandLine.Help.IParamLabelRenderer, picocli.CommandLine.Help.ColorScheme)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>render</h4>
 <pre><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>[][]&nbsp;render(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option,
-                                      <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;parameterLabelRenderer,
-                                      <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;scheme)</pre>
+                                    <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;parameterLabelRenderer,
+                                    <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;scheme)</pre>
 <div class="block">Returns a text representation of the specified option and its parameter(s) if any.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>option</code> - the command line option to show online usage help for</dd>
-<dd><code>parameterLabelRenderer</code> - responsible for rendering option parameters to text</dd>
-<dd><code>scheme</code> - color scheme for applying ansi color styles to options and option parameters</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a 2-dimensional array of text values: one or more rows, each containing one or more columns</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>option</code> - the command line option to show online usage help for</dd><dd><code>parameterLabelRenderer</code> - responsible for rendering option parameters to text</dd><dd><code>scheme</code> - color scheme for applying ansi color styles to options and option parameters</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a 2-dimensional array of text values: one or more rows, each containing one or more columns</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
 </li>
@@ -180,11 +160,9 @@ <h4>render</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -199,15 +177,15 @@ <h4>render</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.IOptionRenderer.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.IOptionRenderer.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.IOptionRenderer.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -227,16 +205,16 @@ <h4>render</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Help.IParamLabelRenderer.html b/docs/apidocs/picocli/CommandLine.Help.IParamLabelRenderer.html
index 63379498c..a10882111 100644
--- a/docs/apidocs/picocli/CommandLine.Help.IParamLabelRenderer.html
+++ b/docs/apidocs/picocli/CommandLine.Help.IParamLabelRenderer.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Help.IParamLabelRenderer (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Help.IParamLabelRenderer (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.IParamLabelRenderer (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Help.IParamLabelRenderer (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.IParamLabelRenderer.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.IParamLabelRenderer.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.IParamLabelRenderer.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -76,16 +63,16 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -104,7 +91,7 @@ <h2 title="Interface CommandLine.Help.IParamLabelRenderer" class="title">Interfa
 </dl>
 <hr>
 <br>
-<pre>public static interface <span class="typeNameLabel">CommandLine.Help.IParamLabelRenderer</span></pre>
+<pre>public static interface <span class="strong">CommandLine.Help.IParamLabelRenderer</span></pre>
 <div class="block">When customizing online usage help for an option parameter or a positional parameter, a custom
  <code>IParamLabelRenderer</code> can be used to render the parameter name or label to a String.</div>
 </li>
@@ -115,28 +102,28 @@ <h2 title="Interface CommandLine.Help.IParamLabelRenderer" class="title">Interfa
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.IParamLabelRenderer.html#renderParameterLabel-picocli.CommandLine.Model.ArgSpec-picocli.CommandLine.Help.Ansi-java.util.List-">renderParameterLabel</a></span>(<a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a>&nbsp;argSpec,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.IParamLabelRenderer.html#renderParameterLabel(picocli.CommandLine.Model.ArgSpec,%20picocli.CommandLine.Help.Ansi,%20java.util.List)">renderParameterLabel</a></strong>(<a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a>&nbsp;argSpec,
                     <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
                     java.util.List&lt;<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&gt;&nbsp;styles)</code>
 <div class="block">Returns a text rendering of the option parameter or positional parameter; returns an empty string
  <code>""</code> if the option is a boolean and does not take a parameter.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.IParamLabelRenderer.html#separator--">separator</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.IParamLabelRenderer.html#separator()">separator</a></strong>()</code>
 <div class="block">Returns the separator between option name and param label.</div>
 </td>
 </tr>
@@ -151,34 +138,27 @@ <h3>Method Summary</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="renderParameterLabel-picocli.CommandLine.Model.ArgSpec-picocli.CommandLine.Help.Ansi-java.util.List-">
+<a name="renderParameterLabel(picocli.CommandLine.Model.ArgSpec, picocli.CommandLine.Help.Ansi, java.util.List)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>renderParameterLabel</h4>
 <pre><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;renderParameterLabel(<a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a>&nbsp;argSpec,
-                                                <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
-                                                java.util.List&lt;<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&gt;&nbsp;styles)</pre>
+                                              <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
+                                              java.util.List&lt;<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&gt;&nbsp;styles)</pre>
 <div class="block">Returns a text rendering of the option parameter or positional parameter; returns an empty string
  <code>""</code> if the option is a boolean and does not take a parameter.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>argSpec</code> - the named or positional parameter with a parameter label</dd>
-<dd><code>ansi</code> - determines whether ANSI escape codes should be emitted or not</dd>
-<dd><code>styles</code> - the styles to apply to the parameter label</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a text rendering of the Option parameter or positional parameter</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>argSpec</code> - the named or positional parameter with a parameter label</dd><dd><code>ansi</code> - determines whether ANSI escape codes should be emitted or not</dd><dd><code>styles</code> - the styles to apply to the parameter label</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a text rendering of the Option parameter or positional parameter</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="separator--">
+<a name="separator()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -186,10 +166,7 @@ <h4>renderParameterLabel</h4>
 <h4>separator</h4>
 <pre>java.lang.String&nbsp;separator()</pre>
 <div class="block">Returns the separator between option name and param label.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the separator between option name and param label</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the separator between option name and param label</dd></dl>
 </li>
 </ul>
 </li>
@@ -200,11 +177,9 @@ <h4>separator</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -219,15 +194,15 @@ <h4>separator</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.IParamLabelRenderer.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.IParamLabelRenderer.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.IParamLabelRenderer.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -247,16 +222,16 @@ <h4>separator</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Help.IParameterRenderer.html b/docs/apidocs/picocli/CommandLine.Help.IParameterRenderer.html
index 7fe00f34a..a2c50ed07 100644
--- a/docs/apidocs/picocli/CommandLine.Help.IParameterRenderer.html
+++ b/docs/apidocs/picocli/CommandLine.Help.IParameterRenderer.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Help.IParameterRenderer (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Help.IParameterRenderer (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.IParameterRenderer (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Help.IParameterRenderer (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.IParameterRenderer.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.IParameterRenderer.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.IParameterRenderer.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -76,16 +63,16 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -104,7 +91,7 @@ <h2 title="Interface CommandLine.Help.IParameterRenderer" class="title">Interfac
 </dl>
 <hr>
 <br>
-<pre>public static interface <span class="typeNameLabel">CommandLine.Help.IParameterRenderer</span></pre>
+<pre>public static interface <span class="strong">CommandLine.Help.IParameterRenderer</span></pre>
 <div class="block">When customizing online help for <a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">positional parameters</a> details, a custom <code>IParameterRenderer</code>
  can be used to create textual representation of a Parameters field in a tabular format: one or more rows,
  each containing one or more columns. The <a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli"><code>Layout</code></a> is responsible for placing these text
@@ -117,19 +104,19 @@ <h2 title="Interface CommandLine.Help.IParameterRenderer" class="title">Interfac
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>[][]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.IParameterRenderer.html#render-picocli.CommandLine.Model.PositionalParamSpec-picocli.CommandLine.Help.IParamLabelRenderer-picocli.CommandLine.Help.ColorScheme-">render</a></span>(<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&nbsp;param,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.IParameterRenderer.html#render(picocli.CommandLine.Model.PositionalParamSpec,%20picocli.CommandLine.Help.IParamLabelRenderer,%20picocli.CommandLine.Help.ColorScheme)">render</a></strong>(<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&nbsp;param,
       <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;parameterLabelRenderer,
       <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;scheme)</code>
 <div class="block">Returns a text representation of the specified positional parameter.</div>
@@ -146,30 +133,23 @@ <h3>Method Summary</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="render-picocli.CommandLine.Model.PositionalParamSpec-picocli.CommandLine.Help.IParamLabelRenderer-picocli.CommandLine.Help.ColorScheme-">
+<a name="render(picocli.CommandLine.Model.PositionalParamSpec, picocli.CommandLine.Help.IParamLabelRenderer, picocli.CommandLine.Help.ColorScheme)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>render</h4>
 <pre><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>[][]&nbsp;render(<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&nbsp;param,
-                                      <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;parameterLabelRenderer,
-                                      <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;scheme)</pre>
+                                    <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;parameterLabelRenderer,
+                                    <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;scheme)</pre>
 <div class="block">Returns a text representation of the specified positional parameter.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>param</code> - the positional parameter to show online usage help for</dd>
-<dd><code>parameterLabelRenderer</code> - responsible for rendering parameter labels to text</dd>
-<dd><code>scheme</code> - color scheme for applying ansi color styles to positional parameters</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a 2-dimensional array of text values: one or more rows, each containing one or more columns</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>param</code> - the positional parameter to show online usage help for</dd><dd><code>parameterLabelRenderer</code> - responsible for rendering parameter labels to text</dd><dd><code>scheme</code> - color scheme for applying ansi color styles to positional parameters</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a 2-dimensional array of text values: one or more rows, each containing one or more columns</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
 </li>
@@ -180,11 +160,9 @@ <h4>render</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -199,15 +177,15 @@ <h4>render</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.IParameterRenderer.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.IParameterRenderer.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.IParameterRenderer.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -227,16 +205,16 @@ <h4>render</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Help.Layout.html b/docs/apidocs/picocli/CommandLine.Help.Layout.html
index 2d00b8ca4..6f25f4931 100644
--- a/docs/apidocs/picocli/CommandLine.Help.Layout.html
+++ b/docs/apidocs/picocli/CommandLine.Help.Layout.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Help.Layout (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Help.Layout (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.Layout (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Help.Layout (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.Layout.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Layout.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.Layout.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -74,18 +61,18 @@
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -112,19 +99,16 @@ <h2 title="Class CommandLine.Help.Layout" class="title">Class CommandLine.Help.L
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.Help.Layout</span>
+<pre>public static class <span class="strong">CommandLine.Help.Layout</span>
 extends java.lang.Object</pre>
 <div class="block">Use a Layout to format usage help text for options and parameters in tabular format.
  <p>Delegates to the renderers to create <a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><code>CommandLine.Help.Ansi.Text</code></a> values for the annotated fields, and uses a
  <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><code>CommandLine.Help.TextTable</code></a> to display these values in tabular format. Layout is responsible for deciding which values
  to display where in the table. By default, Layout shows one option or parameter per table row.</p>
- <p>Customize by overriding the <a href="../picocli/CommandLine.Help.Layout.html#layout-picocli.CommandLine.Model.ArgSpec-picocli.CommandLine.Help.Ansi.Text:A:A-"><code>layout(CommandLine.Model.ArgSpec, CommandLine.Help.Ansi.Text[][])</code></a> method.</p></div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli"><code>rendering options to text</code></a>, 
+ <p>Customize by overriding the <a href="../picocli/CommandLine.Help.Layout.html#layout(picocli.CommandLine.Model.ArgSpec,%20picocli.CommandLine.Help.Ansi.Text[][])"><code>layout(CommandLine.Model.ArgSpec, CommandLine.Help.Ansi.Text[][])</code></a> method.</p></div>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli"><code>rendering options to text</code></a>, 
 <a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli"><code>rendering parameters to text</code></a>, 
-<a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><code>showing values in a tabular format</code></a></dd>
-</dl>
+<a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><code>showing values in a tabular format</code></a></dd></dl>
 </li>
 </ul>
 </div>
@@ -133,11 +117,11 @@ <h2 title="Class CommandLine.Help.Layout" class="title">Class CommandLine.Help.L
 <li class="blockList">
 <!-- =========== FIELD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.summary">
+<li class="blockList"><a name="field_summary">
 <!--   -->
 </a>
 <h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
 <caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -145,54 +129,54 @@ <h3>Field Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Layout.html#colorScheme">colorScheme</a></span></code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Layout.html#colorScheme">colorScheme</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>protected <a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Layout.html#optionRenderer">optionRenderer</a></span></code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Layout.html#optionRenderer">optionRenderer</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected <a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Layout.html#parameterRenderer">parameterRenderer</a></span></code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Layout.html#parameterRenderer">parameterRenderer</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>protected <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Layout.html#table">table</a></span></code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Layout.html#table">table</a></strong></code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Layout.html#Layout-picocli.CommandLine.Help.ColorScheme-">Layout</a></span>(<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Layout.html#CommandLine.Help.Layout(picocli.CommandLine.Help.ColorScheme)">CommandLine.Help.Layout</a></strong>(<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</code>
 <div class="block">Constructs a Layout with the specified color scheme, a new default TextTable, the
- <a href="../picocli/CommandLine.Help.html#createDefaultOptionRenderer--">default option renderer</a>, and the
- <a href="../picocli/CommandLine.Help.html#createDefaultParameterRenderer--">default parameter renderer</a>.</div>
+ <a href="../picocli/CommandLine.Help.html#createDefaultOptionRenderer()">default option renderer</a>, and the
+ <a href="../picocli/CommandLine.Help.html#createDefaultParameterRenderer()">default parameter renderer</a>.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Layout.html#Layout-picocli.CommandLine.Help.ColorScheme-picocli.CommandLine.Help.TextTable-">Layout</a></span>(<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme,
-      <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a>&nbsp;textTable)</code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Layout.html#CommandLine.Help.Layout(picocli.CommandLine.Help.ColorScheme,%20picocli.CommandLine.Help.TextTable)">CommandLine.Help.Layout</a></strong>(<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme,
+                       <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a>&nbsp;textTable)</code>
 <div class="block">Constructs a Layout with the specified color scheme, the specified TextTable, the
- <a href="../picocli/CommandLine.Help.html#createDefaultOptionRenderer--">default option renderer</a>, and the
- <a href="../picocli/CommandLine.Help.html#createDefaultParameterRenderer--">default parameter renderer</a>.</div>
+ <a href="../picocli/CommandLine.Help.html#createDefaultOptionRenderer()">default option renderer</a>, and the
+ <a href="../picocli/CommandLine.Help.html#createDefaultParameterRenderer()">default parameter renderer</a>.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Layout.html#Layout-picocli.CommandLine.Help.ColorScheme-picocli.CommandLine.Help.TextTable-picocli.CommandLine.Help.IOptionRenderer-picocli.CommandLine.Help.IParameterRenderer-">Layout</a></span>(<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme,
-      <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a>&nbsp;textTable,
-      <a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a>&nbsp;optionRenderer,
-      <a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a>&nbsp;parameterRenderer)</code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Layout.html#CommandLine.Help.Layout(picocli.CommandLine.Help.ColorScheme,%20picocli.CommandLine.Help.TextTable,%20picocli.CommandLine.Help.IOptionRenderer,%20picocli.CommandLine.Help.IParameterRenderer)">CommandLine.Help.Layout</a></strong>(<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme,
+                       <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a>&nbsp;textTable,
+                       <a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a>&nbsp;optionRenderer,
+                       <a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a>&nbsp;parameterRenderer)</code>
 <div class="block">Constructs a Layout with the specified color scheme, the specified TextTable, the
  specified option renderer and the specified parameter renderer.</div>
 </td>
@@ -202,64 +186,64 @@ <h3>Constructor Summary</h3>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Layout.html#addOption-picocli.CommandLine.Model.OptionSpec-picocli.CommandLine.Help.IParamLabelRenderer-">addOption</a></span>(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Layout.html#addOption(picocli.CommandLine.Model.OptionSpec,%20picocli.CommandLine.Help.IParamLabelRenderer)">addOption</a></strong>(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option,
          <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</code>
 <div class="block">Delegates to the <a href="../picocli/CommandLine.Help.Layout.html#optionRenderer"><code>option renderer</code></a> of this layout to obtain
- text values for the specified <a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>CommandLine.Model.OptionSpec</code></a>, and then calls the <a href="../picocli/CommandLine.Help.Layout.html#layout-picocli.CommandLine.Model.ArgSpec-picocli.CommandLine.Help.Ansi.Text:A:A-"><code>layout(CommandLine.Model.ArgSpec, CommandLine.Help.Ansi.Text[][])</code></a>
+ text values for the specified <a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>CommandLine.Model.OptionSpec</code></a>, and then calls the <a href="../picocli/CommandLine.Help.Layout.html#layout(picocli.CommandLine.Model.ArgSpec,%20picocli.CommandLine.Help.Ansi.Text[][])"><code>layout(CommandLine.Model.ArgSpec, CommandLine.Help.Ansi.Text[][])</code></a>
  method to write these text values into the correct cells in the TextTable.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Layout.html#addOptions-java.util.List-picocli.CommandLine.Help.IParamLabelRenderer-">addOptions</a></span>(java.util.List&lt;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;&nbsp;options,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Layout.html#addOptions(java.util.List,%20picocli.CommandLine.Help.IParamLabelRenderer)">addOptions</a></strong>(java.util.List&lt;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;&nbsp;options,
           <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</code>
-<div class="block">Calls <a href="../picocli/CommandLine.Help.Layout.html#addOption-picocli.CommandLine.Model.OptionSpec-picocli.CommandLine.Help.IParamLabelRenderer-"><code>addOption(CommandLine.Model.OptionSpec, CommandLine.Help.IParamLabelRenderer)</code></a> for all non-hidden Options in the list.</div>
+<div class="block">Calls <a href="../picocli/CommandLine.Help.Layout.html#addOption(picocli.CommandLine.Model.OptionSpec,%20picocli.CommandLine.Help.IParamLabelRenderer)"><code>addOption(CommandLine.Model.OptionSpec, CommandLine.Help.IParamLabelRenderer)</code></a> for all non-hidden Options in the list.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Layout.html#addPositionalParameter-picocli.CommandLine.Model.PositionalParamSpec-picocli.CommandLine.Help.IParamLabelRenderer-">addPositionalParameter</a></span>(<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&nbsp;param,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Layout.html#addPositionalParameter(picocli.CommandLine.Model.PositionalParamSpec,%20picocli.CommandLine.Help.IParamLabelRenderer)">addPositionalParameter</a></strong>(<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&nbsp;param,
                       <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</code>
 <div class="block">Delegates to the <a href="../picocli/CommandLine.Help.Layout.html#parameterRenderer"><code>parameter renderer</code></a> of this layout
  to obtain text values for the specified <a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">positional parameter</a>, and then calls
- <a href="../picocli/CommandLine.Help.Layout.html#layout-picocli.CommandLine.Model.ArgSpec-picocli.CommandLine.Help.Ansi.Text:A:A-"><code>layout(CommandLine.Model.ArgSpec, CommandLine.Help.Ansi.Text[][])</code></a> to write these text values into the correct cells in the TextTable.</div>
+ <a href="../picocli/CommandLine.Help.Layout.html#layout(picocli.CommandLine.Model.ArgSpec,%20picocli.CommandLine.Help.Ansi.Text[][])"><code>layout(CommandLine.Model.ArgSpec, CommandLine.Help.Ansi.Text[][])</code></a> to write these text values into the correct cells in the TextTable.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Layout.html#addPositionalParameters-java.util.List-picocli.CommandLine.Help.IParamLabelRenderer-">addPositionalParameters</a></span>(java.util.List&lt;<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&gt;&nbsp;params,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Layout.html#addPositionalParameters(java.util.List,%20picocli.CommandLine.Help.IParamLabelRenderer)">addPositionalParameters</a></strong>(java.util.List&lt;<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&gt;&nbsp;params,
                        <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</code>
-<div class="block">Calls <a href="../picocli/CommandLine.Help.Layout.html#addPositionalParameter-picocli.CommandLine.Model.PositionalParamSpec-picocli.CommandLine.Help.IParamLabelRenderer-"><code>addPositionalParameter(CommandLine.Model.PositionalParamSpec, CommandLine.Help.IParamLabelRenderer)</code></a> for all non-hidden Parameters in the list.</div>
+<div class="block">Calls <a href="../picocli/CommandLine.Help.Layout.html#addPositionalParameter(picocli.CommandLine.Model.PositionalParamSpec,%20picocli.CommandLine.Help.IParamLabelRenderer)"><code>addPositionalParameter(CommandLine.Model.PositionalParamSpec, CommandLine.Help.IParamLabelRenderer)</code></a> for all non-hidden Parameters in the list.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Layout.html#layout-picocli.CommandLine.Model.ArgSpec-picocli.CommandLine.Help.Ansi.Text:A:A-">layout</a></span>(<a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a>&nbsp;argSpec,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Layout.html#layout(picocli.CommandLine.Model.ArgSpec,%20picocli.CommandLine.Help.Ansi.Text[][])">layout</a></strong>(<a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a>&nbsp;argSpec,
       <a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>[][]&nbsp;cellValues)</code>
 <div class="block">Copies the specified text values into the correct cells in the <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><code>CommandLine.Help.TextTable</code></a>.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Layout.html#toString--">toString</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Layout.html#toString()">toString</a></strong>()</code>
 <div class="block">Returns the section of the usage help message accumulated in the TextTable owned by this layout.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -275,7 +259,7 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ FIELD DETAIL =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.detail">
+<li class="blockList"><a name="field_detail">
 <!--   -->
 </a>
 <h3>Field Detail</h3>
@@ -319,170 +303,132 @@ <h4>parameterRenderer</h4>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="Layout-picocli.CommandLine.Help.ColorScheme-">
+<a name="CommandLine.Help.Layout(picocli.CommandLine.Help.ColorScheme)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>Layout</h4>
-<pre>public&nbsp;Layout(<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</pre>
+<h4>CommandLine.Help.Layout</h4>
+<pre>public&nbsp;CommandLine.Help.Layout(<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</pre>
 <div class="block">Constructs a Layout with the specified color scheme, a new default TextTable, the
- <a href="../picocli/CommandLine.Help.html#createDefaultOptionRenderer--">default option renderer</a>, and the
- <a href="../picocli/CommandLine.Help.html#createDefaultParameterRenderer--">default parameter renderer</a>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>colorScheme</code> - the color scheme to use for common, auto-generated parts of the usage help message</dd>
-</dl>
+ <a href="../picocli/CommandLine.Help.html#createDefaultOptionRenderer()">default option renderer</a>, and the
+ <a href="../picocli/CommandLine.Help.html#createDefaultParameterRenderer()">default parameter renderer</a>.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>colorScheme</code> - the color scheme to use for common, auto-generated parts of the usage help message</dd></dl>
 </li>
 </ul>
-<a name="Layout-picocli.CommandLine.Help.ColorScheme-picocli.CommandLine.Help.TextTable-">
+<a name="CommandLine.Help.Layout(picocli.CommandLine.Help.ColorScheme, picocli.CommandLine.Help.TextTable)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>Layout</h4>
-<pre>public&nbsp;Layout(<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme,
-              <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a>&nbsp;textTable)</pre>
+<h4>CommandLine.Help.Layout</h4>
+<pre>public&nbsp;CommandLine.Help.Layout(<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme,
+                       <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a>&nbsp;textTable)</pre>
 <div class="block">Constructs a Layout with the specified color scheme, the specified TextTable, the
- <a href="../picocli/CommandLine.Help.html#createDefaultOptionRenderer--">default option renderer</a>, and the
- <a href="../picocli/CommandLine.Help.html#createDefaultParameterRenderer--">default parameter renderer</a>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>colorScheme</code> - the color scheme to use for common, auto-generated parts of the usage help message</dd>
-<dd><code>textTable</code> - the TextTable to lay out parts of the usage help message in tabular format</dd>
-</dl>
+ <a href="../picocli/CommandLine.Help.html#createDefaultOptionRenderer()">default option renderer</a>, and the
+ <a href="../picocli/CommandLine.Help.html#createDefaultParameterRenderer()">default parameter renderer</a>.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>colorScheme</code> - the color scheme to use for common, auto-generated parts of the usage help message</dd><dd><code>textTable</code> - the TextTable to lay out parts of the usage help message in tabular format</dd></dl>
 </li>
 </ul>
-<a name="Layout-picocli.CommandLine.Help.ColorScheme-picocli.CommandLine.Help.TextTable-picocli.CommandLine.Help.IOptionRenderer-picocli.CommandLine.Help.IParameterRenderer-">
+<a name="CommandLine.Help.Layout(picocli.CommandLine.Help.ColorScheme, picocli.CommandLine.Help.TextTable, picocli.CommandLine.Help.IOptionRenderer, picocli.CommandLine.Help.IParameterRenderer)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>Layout</h4>
-<pre>public&nbsp;Layout(<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme,
-              <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a>&nbsp;textTable,
-              <a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a>&nbsp;optionRenderer,
-              <a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a>&nbsp;parameterRenderer)</pre>
+<h4>CommandLine.Help.Layout</h4>
+<pre>public&nbsp;CommandLine.Help.Layout(<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme,
+                       <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a>&nbsp;textTable,
+                       <a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a>&nbsp;optionRenderer,
+                       <a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a>&nbsp;parameterRenderer)</pre>
 <div class="block">Constructs a Layout with the specified color scheme, the specified TextTable, the
  specified option renderer and the specified parameter renderer.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>colorScheme</code> - the color scheme to use for common, auto-generated parts of the usage help message</dd>
-<dd><code>optionRenderer</code> - the object responsible for rendering Options to Text</dd>
-<dd><code>parameterRenderer</code> - the object responsible for rendering Parameters to Text</dd>
-<dd><code>textTable</code> - the TextTable to lay out parts of the usage help message in tabular format</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>colorScheme</code> - the color scheme to use for common, auto-generated parts of the usage help message</dd><dd><code>optionRenderer</code> - the object responsible for rendering Options to Text</dd><dd><code>parameterRenderer</code> - the object responsible for rendering Parameters to Text</dd><dd><code>textTable</code> - the TextTable to lay out parts of the usage help message in tabular format</dd></dl>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="layout-picocli.CommandLine.Model.ArgSpec-picocli.CommandLine.Help.Ansi.Text:A:A-">
+<a name="layout(picocli.CommandLine.Model.ArgSpec, picocli.CommandLine.Help.Ansi.Text[][])">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>layout</h4>
 <pre>public&nbsp;void&nbsp;layout(<a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a>&nbsp;argSpec,
-                   <a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>[][]&nbsp;cellValues)</pre>
+          <a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>[][]&nbsp;cellValues)</pre>
 <div class="block">Copies the specified text values into the correct cells in the <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><code>CommandLine.Help.TextTable</code></a>. This implementation
- delegates to <a href="../picocli/CommandLine.Help.TextTable.html#addRowValues-picocli.CommandLine.Help.Ansi.Text...-"><code>CommandLine.Help.TextTable.addRowValues(CommandLine.Help.Ansi.Text...)</code></a> for each row of values.
+ delegates to <a href="../picocli/CommandLine.Help.TextTable.html#addRowValues(picocli.CommandLine.Help.Ansi.Text...)"><code>CommandLine.Help.TextTable.addRowValues(CommandLine.Help.Ansi.Text...)</code></a> for each row of values.
  <p>Subclasses may override.</p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>argSpec</code> - the Option or Parameters</dd>
-<dd><code>cellValues</code> - the text values representing the Option/Parameters, to be displayed in tabular form</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>argSpec</code> - the Option or Parameters</dd><dd><code>cellValues</code> - the text values representing the Option/Parameters, to be displayed in tabular form</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="addOptions-java.util.List-picocli.CommandLine.Help.IParamLabelRenderer-">
+<a name="addOptions(java.util.List, picocli.CommandLine.Help.IParamLabelRenderer)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>addOptions</h4>
 <pre>public&nbsp;void&nbsp;addOptions(java.util.List&lt;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;&nbsp;options,
-                       <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</pre>
-<div class="block">Calls <a href="../picocli/CommandLine.Help.Layout.html#addOption-picocli.CommandLine.Model.OptionSpec-picocli.CommandLine.Help.IParamLabelRenderer-"><code>addOption(CommandLine.Model.OptionSpec, CommandLine.Help.IParamLabelRenderer)</code></a> for all non-hidden Options in the list.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>options</code> - options to add usage descriptions for</dd>
-<dd><code>paramLabelRenderer</code> - object that knows how to render option parameters</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+              <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</pre>
+<div class="block">Calls <a href="../picocli/CommandLine.Help.Layout.html#addOption(picocli.CommandLine.Model.OptionSpec,%20picocli.CommandLine.Help.IParamLabelRenderer)"><code>addOption(CommandLine.Model.OptionSpec, CommandLine.Help.IParamLabelRenderer)</code></a> for all non-hidden Options in the list.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>options</code> - options to add usage descriptions for</dd><dd><code>paramLabelRenderer</code> - object that knows how to render option parameters</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="addOption-picocli.CommandLine.Model.OptionSpec-picocli.CommandLine.Help.IParamLabelRenderer-">
+<a name="addOption(picocli.CommandLine.Model.OptionSpec, picocli.CommandLine.Help.IParamLabelRenderer)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>addOption</h4>
 <pre>public&nbsp;void&nbsp;addOption(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option,
-                      <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</pre>
+             <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</pre>
 <div class="block">Delegates to the <a href="../picocli/CommandLine.Help.Layout.html#optionRenderer"><code>option renderer</code></a> of this layout to obtain
- text values for the specified <a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>CommandLine.Model.OptionSpec</code></a>, and then calls the <a href="../picocli/CommandLine.Help.Layout.html#layout-picocli.CommandLine.Model.ArgSpec-picocli.CommandLine.Help.Ansi.Text:A:A-"><code>layout(CommandLine.Model.ArgSpec, CommandLine.Help.Ansi.Text[][])</code></a>
+ text values for the specified <a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>CommandLine.Model.OptionSpec</code></a>, and then calls the <a href="../picocli/CommandLine.Help.Layout.html#layout(picocli.CommandLine.Model.ArgSpec,%20picocli.CommandLine.Help.Ansi.Text[][])"><code>layout(CommandLine.Model.ArgSpec, CommandLine.Help.Ansi.Text[][])</code></a>
  method to write these text values into the correct cells in the TextTable.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>option</code> - the option argument</dd>
-<dd><code>paramLabelRenderer</code> - knows how to render option parameters</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>option</code> - the option argument</dd><dd><code>paramLabelRenderer</code> - knows how to render option parameters</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="addPositionalParameters-java.util.List-picocli.CommandLine.Help.IParamLabelRenderer-">
+<a name="addPositionalParameters(java.util.List, picocli.CommandLine.Help.IParamLabelRenderer)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>addPositionalParameters</h4>
 <pre>public&nbsp;void&nbsp;addPositionalParameters(java.util.List&lt;<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&gt;&nbsp;params,
-                                    <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</pre>
-<div class="block">Calls <a href="../picocli/CommandLine.Help.Layout.html#addPositionalParameter-picocli.CommandLine.Model.PositionalParamSpec-picocli.CommandLine.Help.IParamLabelRenderer-"><code>addPositionalParameter(CommandLine.Model.PositionalParamSpec, CommandLine.Help.IParamLabelRenderer)</code></a> for all non-hidden Parameters in the list.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>params</code> - positional parameters to add usage descriptions for</dd>
-<dd><code>paramLabelRenderer</code> - knows how to render option parameters</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+                           <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</pre>
+<div class="block">Calls <a href="../picocli/CommandLine.Help.Layout.html#addPositionalParameter(picocli.CommandLine.Model.PositionalParamSpec,%20picocli.CommandLine.Help.IParamLabelRenderer)"><code>addPositionalParameter(CommandLine.Model.PositionalParamSpec, CommandLine.Help.IParamLabelRenderer)</code></a> for all non-hidden Parameters in the list.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>params</code> - positional parameters to add usage descriptions for</dd><dd><code>paramLabelRenderer</code> - knows how to render option parameters</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="addPositionalParameter-picocli.CommandLine.Model.PositionalParamSpec-picocli.CommandLine.Help.IParamLabelRenderer-">
+<a name="addPositionalParameter(picocli.CommandLine.Model.PositionalParamSpec, picocli.CommandLine.Help.IParamLabelRenderer)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>addPositionalParameter</h4>
 <pre>public&nbsp;void&nbsp;addPositionalParameter(<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&nbsp;param,
-                                   <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</pre>
+                          <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</pre>
 <div class="block">Delegates to the <a href="../picocli/CommandLine.Help.Layout.html#parameterRenderer"><code>parameter renderer</code></a> of this layout
  to obtain text values for the specified <a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">positional parameter</a>, and then calls
- <a href="../picocli/CommandLine.Help.Layout.html#layout-picocli.CommandLine.Model.ArgSpec-picocli.CommandLine.Help.Ansi.Text:A:A-"><code>layout(CommandLine.Model.ArgSpec, CommandLine.Help.Ansi.Text[][])</code></a> to write these text values into the correct cells in the TextTable.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>param</code> - the positional parameter</dd>
-<dd><code>paramLabelRenderer</code> - knows how to render option parameters</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+ <a href="../picocli/CommandLine.Help.Layout.html#layout(picocli.CommandLine.Model.ArgSpec,%20picocli.CommandLine.Help.Ansi.Text[][])"><code>layout(CommandLine.Model.ArgSpec, CommandLine.Help.Ansi.Text[][])</code></a> to write these text values into the correct cells in the TextTable.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>param</code> - the positional parameter</dd><dd><code>paramLabelRenderer</code> - knows how to render option parameters</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="toString--">
+<a name="toString()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -491,7 +437,7 @@ <h4>toString</h4>
 <pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
 <div class="block">Returns the section of the usage help message accumulated in the TextTable owned by this layout.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dt><strong>Overrides:</strong></dt>
 <dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
 </dl>
 </li>
@@ -504,11 +450,9 @@ <h4>toString</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -523,15 +467,15 @@ <h4>toString</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.Layout.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Layout.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.Layout.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -549,18 +493,18 @@ <h4>toString</h4>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Help.TextTable.Cell.html b/docs/apidocs/picocli/CommandLine.Help.TextTable.Cell.html
index b140f29e0..2576402c4 100644
--- a/docs/apidocs/picocli/CommandLine.Help.TextTable.Cell.html
+++ b/docs/apidocs/picocli/CommandLine.Help.TextTable.Cell.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Help.TextTable.Cell (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Help.TextTable.Cell (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.TextTable.Cell (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Help.TextTable.Cell (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.TextTable.Cell.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.TextTable.Cell.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.TextTable.Cell.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -68,18 +61,18 @@
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Object">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -106,13 +99,11 @@ <h2 title="Class CommandLine.Help.TextTable.Cell" class="title">Class CommandLin
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.Help.TextTable.Cell</span>
+<pre>public static class <span class="strong">CommandLine.Help.TextTable.Cell</span>
 extends java.lang.Object</pre>
 <div class="block">Helper class to index positions in a <code>Help.TextTable</code>.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -121,11 +112,11 @@ <h2 title="Class CommandLine.Help.TextTable.Cell" class="title">Class CommandLin
 <li class="blockList">
 <!-- =========== FIELD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.summary">
+<li class="blockList"><a name="field_summary">
 <!--   -->
 </a>
 <h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
 <caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -133,13 +124,13 @@ <h3>Field Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.Cell.html#column">column</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.TextTable.Cell.html#column">column</a></strong></code>
 <div class="block">Table column index (zero based).</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.Cell.html#row">row</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.TextTable.Cell.html#row">row</a></strong></code>
 <div class="block">Table row index (zero based).</div>
 </td>
 </tr>
@@ -148,18 +139,18 @@ <h3>Field Summary</h3>
 </ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.Cell.html#Cell-int-int-">Cell</a></span>(int&nbsp;column,
-    int&nbsp;row)</code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.TextTable.Cell.html#CommandLine.Help.TextTable.Cell(int,%20int)">CommandLine.Help.TextTable.Cell</a></strong>(int&nbsp;column,
+                               int&nbsp;row)</code>
 <div class="block">Constructs a new Cell with the specified coordinates in the table.</div>
 </td>
 </tr>
@@ -168,12 +159,12 @@ <h3>Constructor Summary</h3>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -189,7 +180,7 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ FIELD DETAIL =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.detail">
+<li class="blockList"><a name="field_detail">
 <!--   -->
 </a>
 <h3>Field Detail</h3>
@@ -217,24 +208,20 @@ <h4>row</h4>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="Cell-int-int-">
+<a name="CommandLine.Help.TextTable.Cell(int, int)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>Cell</h4>
-<pre>public&nbsp;Cell(int&nbsp;column,
-            int&nbsp;row)</pre>
+<h4>CommandLine.Help.TextTable.Cell</h4>
+<pre>public&nbsp;CommandLine.Help.TextTable.Cell(int&nbsp;column,
+                               int&nbsp;row)</pre>
 <div class="block">Constructs a new Cell with the specified coordinates in the table.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>column</code> - the zero-based table column</dd>
-<dd><code>row</code> - the zero-based table row</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>column</code> - the zero-based table column</dd><dd><code>row</code> - the zero-based table row</dd></dl>
 </li>
 </ul>
 </li>
@@ -245,11 +232,9 @@ <h4>Cell</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -264,15 +249,15 @@ <h4>Cell</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.TextTable.Cell.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.TextTable.Cell.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.TextTable.Cell.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -290,18 +275,18 @@ <h4>Cell</h4>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Object">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Help.TextTable.html b/docs/apidocs/picocli/CommandLine.Help.TextTable.html
index 5ee3d7d62..fd2e6c1b7 100644
--- a/docs/apidocs/picocli/CommandLine.Help.TextTable.html
+++ b/docs/apidocs/picocli/CommandLine.Help.TextTable.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Help.TextTable (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Help.TextTable (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.TextTable (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Help.TextTable (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":42,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.TextTable.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.TextTable.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.TextTable.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -73,19 +60,19 @@
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#nested_class_summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -112,7 +99,7 @@ <h2 title="Class CommandLine.Help.TextTable" class="title">Class CommandLine.Hel
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.Help.TextTable</span>
+<pre>public static class <span class="strong">CommandLine.Help.TextTable</span>
 extends java.lang.Object</pre>
 <div class="block"><p>Responsible for spacing out <a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><code>CommandLine.Help.Ansi.Text</code></a> values according to the <a href="../picocli/CommandLine.Help.Column.html" title="class in picocli"><code>CommandLine.Help.Column</code></a> definitions the table was
  created with. Columns have a width, indentation, and an overflow policy that decides what to do if a value is
@@ -125,11 +112,11 @@ <h2 title="Class CommandLine.Help.TextTable" class="title">Class CommandLine.Hel
 <li class="blockList">
 <!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="nested.class.summary">
+<li class="blockList"><a name="nested_class_summary">
 <!--   -->
 </a>
 <h3>Nested Class Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
 <caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -137,7 +124,7 @@ <h3>Nested Class Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli">CommandLine.Help.TextTable.Cell</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli">CommandLine.Help.TextTable.Cell</a></strong></code>
 <div class="block">Helper class to index positions in a <code>Help.TextTable</code>.</div>
 </td>
 </tr>
@@ -146,11 +133,11 @@ <h3>Nested Class Summary</h3>
 </ul>
 <!-- =========== FIELD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.summary">
+<li class="blockList"><a name="field_summary">
 <!--   -->
 </a>
 <h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
 <caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -158,19 +145,19 @@ <h3>Field Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.html#columns">columns</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.TextTable.html#columns">columns</a></strong></code>
 <div class="block">The column definitions of this table.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>protected java.util.List&lt;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.html#columnValues">columnValues</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.TextTable.html#columnValues">columnValues</a></strong></code>
 <div class="block">The <code>char[]</code> slots of the <code>TextTable</code> to copy text values into.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.html#indentWrappedLines">indentWrappedLines</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.TextTable.html#indentWrappedLines">indentWrappedLines</a></strong></code>
 <div class="block">By default, indent wrapped lines by 2 spaces.</div>
 </td>
 </tr>
@@ -179,17 +166,17 @@ <h3>Field Summary</h3>
 </ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.html#TextTable-picocli.CommandLine.Help.Ansi-">TextTable</a></span>(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.TextTable.html#CommandLine.Help.TextTable(picocli.CommandLine.Help.Ansi)">CommandLine.Help.TextTable</a></strong>(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
 <div class="block">Constructs a TextTable with five columns as follows:
  
  required option/parameter marker (width: 2, indent: 0, TRUNCATE on overflow)
@@ -201,14 +188,14 @@ <h3>Constructor Summary</h3>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.html#TextTable-picocli.CommandLine.Help.Ansi-picocli.CommandLine.Help.Column...-">TextTable</a></span>(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
-         <a href="../picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a>...&nbsp;columns)</code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.TextTable.html#CommandLine.Help.TextTable(picocli.CommandLine.Help.Ansi,%20picocli.CommandLine.Help.Column...)">CommandLine.Help.TextTable</a></strong>(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
+                          <a href="../picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a>...&nbsp;columns)</code>
 <div class="block">Constructs a <code>TextTable</code> with the specified columns.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.html#TextTable-picocli.CommandLine.Help.Ansi-int...-">TextTable</a></span>(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
-         int...&nbsp;columnWidths)</code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.TextTable.html#CommandLine.Help.TextTable(picocli.CommandLine.Help.Ansi,%20int...)">CommandLine.Help.TextTable</a></strong>(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
+                          int...&nbsp;columnWidths)</code>
 <div class="block">Constructs a new TextTable with columns with the specified width, all SPANning  multiple columns on
  overflow except the last column which WRAPS to the next row.</div>
 </td>
@@ -218,79 +205,79 @@ <h3>Constructor Summary</h3>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.html#addEmptyRow--">addEmptyRow</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.TextTable.html#addEmptyRow()">addEmptyRow</a></strong>()</code>
 <div class="block">Adds the required <code>char[]</code> slots for a new row to the <a href="../picocli/CommandLine.Help.TextTable.html#columnValues"><code>columnValues</code></a> field.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.html#addRowValues-picocli.CommandLine.Help.Ansi.Text...-">addRowValues</a></span>(<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>...&nbsp;values)</code>
-<div class="block">Adds a new <a href="../picocli/CommandLine.Help.TextTable.html#addEmptyRow--">empty row</a>, then calls <a href="../picocli/CommandLine.Help.TextTable.html#putValue-int-int-picocli.CommandLine.Help.Ansi.Text-"><code>putValue</code></a> for each of the specified values, adding more empty rows
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.TextTable.html#addRowValues(picocli.CommandLine.Help.Ansi.Text...)">addRowValues</a></strong>(<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>...&nbsp;values)</code>
+<div class="block">Adds a new <a href="../picocli/CommandLine.Help.TextTable.html#addEmptyRow()">empty row</a>, then calls <a href="../picocli/CommandLine.Help.TextTable.html#putValue(int,%20int,%20picocli.CommandLine.Help.Ansi.Text)"><code>putValue</code></a> for each of the specified values, adding more empty rows
  if the return value indicates that the value spanned multiple columns or was wrapped to multiple rows.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.html#addRowValues-java.lang.String...-">addRowValues</a></span>(java.lang.String...&nbsp;values)</code>
-<div class="block">Delegates to <a href="../picocli/CommandLine.Help.TextTable.html#addRowValues-picocli.CommandLine.Help.Ansi.Text...-"><code>addRowValues(CommandLine.Help.Ansi.Text...)</code></a>.</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.TextTable.html#addRowValues(java.lang.String...)">addRowValues</a></strong>(java.lang.String...&nbsp;values)</code>
+<div class="block">Delegates to <a href="../picocli/CommandLine.Help.TextTable.html#addRowValues(picocli.CommandLine.Help.Ansi.Text...)"><code>addRowValues(CommandLine.Help.Ansi.Text...)</code></a>.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.html#cellAt-int-int-">cellAt</a></span>(int&nbsp;row,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.TextTable.html#cellAt(int,%20int)">cellAt</a></strong>(int&nbsp;row,
       int&nbsp;col)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">use <a href="../picocli/CommandLine.Help.TextTable.html#textAt-int-int-"><code>textAt(int, int)</code></a> instead</span></div>
+<div class="block"><strong>Deprecated.</strong>&nbsp;
+<div class="block"><i>use <a href="../picocli/CommandLine.Help.TextTable.html#textAt(int,%20int)"><code>textAt(int, int)</code></a> instead</i></div>
 </div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli">CommandLine.Help.TextTable.Cell</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.html#putValue-int-int-picocli.CommandLine.Help.Ansi.Text-">putValue</a></span>(int&nbsp;row,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.TextTable.html#putValue(int,%20int,%20picocli.CommandLine.Help.Ansi.Text)">putValue</a></strong>(int&nbsp;row,
         int&nbsp;col,
         <a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;value)</code>
 <div class="block">Writes the specified value into the cell at the specified row and column and returns the last row and
  column written to.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.html#rowCount--">rowCount</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.TextTable.html#rowCount()">rowCount</a></strong>()</code>
 <div class="block">Returns the current number of rows of this <code>TextTable</code>.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.html#textAt-int-int-">textAt</a></span>(int&nbsp;row,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.TextTable.html#textAt(int,%20int)">textAt</a></strong>(int&nbsp;row,
       int&nbsp;col)</code>
 <div class="block">Returns the <code>Text</code> slot at the specified row and column to write a text value into.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.html#toString--">toString</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.TextTable.html#toString()">toString</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr id="i8" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.StringBuilder</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.html#toString-java.lang.StringBuilder-">toString</a></span>(java.lang.StringBuilder&nbsp;text)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.TextTable.html#toString(java.lang.StringBuilder)">toString</a></strong>(java.lang.StringBuilder&nbsp;text)</code>
 <div class="block">Copies the text representation that we built up from the options into the specified StringBuilder.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -306,7 +293,7 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ FIELD DETAIL =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.detail">
+<li class="blockList"><a name="field_detail">
 <!--   -->
 </a>
 <h3>Field Detail</h3>
@@ -344,17 +331,17 @@ <h4>indentWrappedLines</h4>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="TextTable-picocli.CommandLine.Help.Ansi-">
+<a name="CommandLine.Help.TextTable(picocli.CommandLine.Help.Ansi)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>TextTable</h4>
-<pre>public&nbsp;TextTable(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
+<h4>CommandLine.Help.TextTable</h4>
+<pre>public&nbsp;CommandLine.Help.TextTable(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
 <div class="block">Constructs a TextTable with five columns as follows:
  <ol>
  <li>required option/parameter marker (width: 2, indent: 0, TRUNCATE on overflow)</li>
@@ -363,74 +350,57 @@ <h4>TextTable</h4>
  <li>long option name(s) (width: 24, indent: 1, SPAN multiple columns on overflow)</li>
  <li>description line(s) (width: 51, indent: 1, WRAP to next row on overflow)</li>
  </ol></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ansi</code> - whether to emit ANSI escape codes or not</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>ansi</code> - whether to emit ANSI escape codes or not</dd></dl>
 </li>
 </ul>
-<a name="TextTable-picocli.CommandLine.Help.Ansi-int...-">
+<a name="CommandLine.Help.TextTable(picocli.CommandLine.Help.Ansi, int...)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>TextTable</h4>
-<pre>public&nbsp;TextTable(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
-                 int...&nbsp;columnWidths)</pre>
+<h4>CommandLine.Help.TextTable</h4>
+<pre>public&nbsp;CommandLine.Help.TextTable(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
+                          int...&nbsp;columnWidths)</pre>
 <div class="block">Constructs a new TextTable with columns with the specified width, all SPANning  multiple columns on
  overflow except the last column which WRAPS to the next row.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ansi</code> - whether to emit ANSI escape codes or not</dd>
-<dd><code>columnWidths</code> - the width of the table columns (all columns have zero indent)</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>ansi</code> - whether to emit ANSI escape codes or not</dd><dd><code>columnWidths</code> - the width of the table columns (all columns have zero indent)</dd></dl>
 </li>
 </ul>
-<a name="TextTable-picocli.CommandLine.Help.Ansi-picocli.CommandLine.Help.Column...-">
+<a name="CommandLine.Help.TextTable(picocli.CommandLine.Help.Ansi, picocli.CommandLine.Help.Column...)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>TextTable</h4>
-<pre>public&nbsp;TextTable(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
-                 <a href="../picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a>...&nbsp;columns)</pre>
+<h4>CommandLine.Help.TextTable</h4>
+<pre>public&nbsp;CommandLine.Help.TextTable(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
+                          <a href="../picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a>...&nbsp;columns)</pre>
 <div class="block">Constructs a <code>TextTable</code> with the specified columns.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ansi</code> - whether to emit ANSI escape codes or not</dd>
-<dd><code>columns</code> - columns to construct this TextTable with</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>ansi</code> - whether to emit ANSI escape codes or not</dd><dd><code>columns</code> - columns to construct this TextTable with</dd></dl>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="textAt-int-int-">
+<a name="textAt(int, int)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>textAt</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;textAt(int&nbsp;row,
-                                         int&nbsp;col)</pre>
+                                int&nbsp;col)</pre>
 <div class="block">Returns the <code>Text</code> slot at the specified row and column to write a text value into.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>row</code> - the row of the cell whose Text to return</dd>
-<dd><code>col</code> - the column of the cell whose Text to return</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the Text object at the specified row and column</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>row</code> - the row of the cell whose Text to return</dd><dd><code>col</code> - the column of the cell whose Text to return</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the Text object at the specified row and column</dd><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd></dl>
 </li>
 </ul>
-<a name="cellAt-int-int-">
+<a name="cellAt(int, int)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -438,19 +408,14 @@ <h4>textAt</h4>
 <h4>cellAt</h4>
 <pre>@Deprecated
 public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;cellAt(int&nbsp;row,
-                                                      int&nbsp;col)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">use <a href="../picocli/CommandLine.Help.TextTable.html#textAt-int-int-"><code>textAt(int, int)</code></a> instead</span></div>
+                                           int&nbsp;col)</pre>
+<div class="block"><span class="strong">Deprecated.</span>&nbsp;<i>use <a href="../picocli/CommandLine.Help.TextTable.html#textAt(int,%20int)"><code>textAt(int, int)</code></a> instead</i></div>
 <div class="block">Returns the <code>Text</code> slot at the specified row and column to write a text value into.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>row</code> - the row of the cell whose Text to return</dd>
-<dd><code>col</code> - the column of the cell whose Text to return</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the Text object at the specified row and column</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>row</code> - the row of the cell whose Text to return</dd><dd><code>col</code> - the column of the cell whose Text to return</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the Text object at the specified row and column</dd></dl>
 </li>
 </ul>
-<a name="rowCount--">
+<a name="rowCount()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -458,13 +423,10 @@ <h4>cellAt</h4>
 <h4>rowCount</h4>
 <pre>public&nbsp;int&nbsp;rowCount()</pre>
 <div class="block">Returns the current number of rows of this <code>TextTable</code>.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the current number of rows in this TextTable</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the current number of rows in this TextTable</dd></dl>
 </li>
 </ul>
-<a name="addEmptyRow--">
+<a name="addEmptyRow()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -474,64 +436,51 @@ <h4>addEmptyRow</h4>
 <div class="block">Adds the required <code>char[]</code> slots for a new row to the <a href="../picocli/CommandLine.Help.TextTable.html#columnValues"><code>columnValues</code></a> field.</div>
 </li>
 </ul>
-<a name="addRowValues-java.lang.String...-">
+<a name="addRowValues(java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>addRowValues</h4>
 <pre>public&nbsp;void&nbsp;addRowValues(java.lang.String...&nbsp;values)</pre>
-<div class="block">Delegates to <a href="../picocli/CommandLine.Help.TextTable.html#addRowValues-picocli.CommandLine.Help.Ansi.Text...-"><code>addRowValues(CommandLine.Help.Ansi.Text...)</code></a>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>values</code> - the text values to display in each column of the current row</dd>
-</dl>
+<div class="block">Delegates to <a href="../picocli/CommandLine.Help.TextTable.html#addRowValues(picocli.CommandLine.Help.Ansi.Text...)"><code>addRowValues(CommandLine.Help.Ansi.Text...)</code></a>.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>values</code> - the text values to display in each column of the current row</dd></dl>
 </li>
 </ul>
-<a name="addRowValues-picocli.CommandLine.Help.Ansi.Text...-">
+<a name="addRowValues(picocli.CommandLine.Help.Ansi.Text...)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>addRowValues</h4>
 <pre>public&nbsp;void&nbsp;addRowValues(<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>...&nbsp;values)</pre>
-<div class="block">Adds a new <a href="../picocli/CommandLine.Help.TextTable.html#addEmptyRow--">empty row</a>, then calls <a href="../picocli/CommandLine.Help.TextTable.html#putValue-int-int-picocli.CommandLine.Help.Ansi.Text-"><code>putValue</code></a> for each of the specified values, adding more empty rows
+<div class="block">Adds a new <a href="../picocli/CommandLine.Help.TextTable.html#addEmptyRow()">empty row</a>, then calls <a href="../picocli/CommandLine.Help.TextTable.html#putValue(int,%20int,%20picocli.CommandLine.Help.Ansi.Text)"><code>putValue</code></a> for each of the specified values, adding more empty rows
  if the return value indicates that the value spanned multiple columns or was wrapped to multiple rows.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>values</code> - the values to write into a new row in this TextTable</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.IllegalArgumentException</code> - if the number of values exceeds the number of Columns in this table</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>values</code> - the values to write into a new row in this TextTable</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code>java.lang.IllegalArgumentException</code> - if the number of values exceeds the number of Columns in this table</dd></dl>
 </li>
 </ul>
-<a name="putValue-int-int-picocli.CommandLine.Help.Ansi.Text-">
+<a name="putValue(int, int, picocli.CommandLine.Help.Ansi.Text)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>putValue</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli">CommandLine.Help.TextTable.Cell</a>&nbsp;putValue(int&nbsp;row,
-                                                int&nbsp;col,
-                                                <a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;value)</pre>
+                                       int&nbsp;col,
+                                       <a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;value)</pre>
 <div class="block">Writes the specified value into the cell at the specified row and column and returns the last row and
  column written to. Depending on the Column's <a href="../picocli/CommandLine.Help.Column.html#overflow"><code>Overflow</code></a> policy, the value may span
  multiple columns or wrap to multiple rows when larger than the column width.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>row</code> - the target row in the table</dd>
-<dd><code>col</code> - the target column in the table to write to</dd>
-<dd><code>value</code> - the value to write</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a Cell indicating the position in the table that was last written to (since 2.0)</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.IllegalArgumentException</code> - if the specified row exceeds the table's <a href="../picocli/CommandLine.Help.TextTable.html#rowCount--">row count</a></dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0 (previous versions returned a <code>java.awt.Point</code> object)</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>row</code> - the target row in the table</dd><dd><code>col</code> - the target column in the table to write to</dd><dd><code>value</code> - the value to write</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a Cell indicating the position in the table that was last written to (since 2.0)</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code>java.lang.IllegalArgumentException</code> - if the specified row exceeds the table's <a href="../picocli/CommandLine.Help.TextTable.html#rowCount()">row count</a></dd><dt><span class="strong">Since:</span></dt>
+  <dd>2.0 (previous versions returned a <code>java.awt.Point</code> object)</dd></dl>
 </li>
 </ul>
-<a name="toString-java.lang.StringBuilder-">
+<a name="toString(java.lang.StringBuilder)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -539,15 +488,11 @@ <h4>putValue</h4>
 <h4>toString</h4>
 <pre>public&nbsp;java.lang.StringBuilder&nbsp;toString(java.lang.StringBuilder&nbsp;text)</pre>
 <div class="block">Copies the text representation that we built up from the options into the specified StringBuilder.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>text</code> - the StringBuilder to write into</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the specified StringBuilder object (to allow method chaining and a more fluid API)</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>text</code> - the StringBuilder to write into</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the specified StringBuilder object (to allow method chaining and a more fluid API)</dd></dl>
 </li>
 </ul>
-<a name="toString--">
+<a name="toString()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -555,7 +500,7 @@ <h4>toString</h4>
 <h4>toString</h4>
 <pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dt><strong>Overrides:</strong></dt>
 <dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
 </dl>
 </li>
@@ -568,11 +513,9 @@ <h4>toString</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -587,15 +530,15 @@ <h4>toString</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.TextTable.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.TextTable.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.TextTable.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -612,19 +555,19 @@ <h4>toString</h4>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#nested_class_summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Help.Visibility.html b/docs/apidocs/picocli/CommandLine.Help.Visibility.html
index 6d9a9400c..d783b7b1f 100644
--- a/docs/apidocs/picocli/CommandLine.Help.Visibility.html
+++ b/docs/apidocs/picocli/CommandLine.Help.Visibility.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Help.Visibility (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Help.Visibility (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.Visibility (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Help.Visibility (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":9,"i1":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.HelpCommand.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.HelpCommand.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.Visibility.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Visibility.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.Visibility.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -74,18 +61,18 @@
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li><a href="#enum_constant_summary">Enum Constants</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li><a href="#enum_constant_detail">Enum Constants</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -121,7 +108,7 @@ <h2 title="Enum CommandLine.Help.Visibility" class="title">Enum CommandLine.Help
 </dl>
 <hr>
 <br>
-<pre>public static enum <span class="typeNameLabel">CommandLine.Help.Visibility</span>
+<pre>public static enum <span class="strong">CommandLine.Help.Visibility</span>
 extends java.lang.Enum&lt;<a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli">CommandLine.Help.Visibility</a>&gt;</pre>
 <div class="block">Controls the visibility of certain aspects of the usage help message.</div>
 </li>
@@ -132,62 +119,62 @@ <h2 title="Enum CommandLine.Help.Visibility" class="title">Enum CommandLine.Help
 <li class="blockList">
 <!-- =========== ENUM CONSTANT SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="enum.constant.summary">
+<li class="blockList"><a name="enum_constant_summary">
 <!--   -->
 </a>
 <h3>Enum Constant Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
 <caption><span>Enum Constants</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Enum Constant and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Visibility.html#ALWAYS">ALWAYS</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Visibility.html#ALWAYS">ALWAYS</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Visibility.html#NEVER">NEVER</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Visibility.html#NEVER">NEVER</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Visibility.html#ON_DEMAND">ON_DEMAND</a></span></code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.Visibility.html#ON_DEMAND">ON_DEMAND</a></strong></code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli">CommandLine.Help.Visibility</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Visibility.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;name)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Visibility.html#valueOf(java.lang.String)">valueOf</a></strong>(java.lang.String&nbsp;name)</code>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli">CommandLine.Help.Visibility</a>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Visibility.html#values--">values</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Visibility.html#values()">values</a></strong>()</code>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Enum">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Enum">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Enum</h3>
 <code>clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -203,7 +190,7 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ ENUM CONSTANT DETAIL =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="enum.constant.detail">
+<li class="blockList"><a name="enum_constant_detail">
 <!--   -->
 </a>
 <h3>Enum Constant Detail</h3>
@@ -238,11 +225,11 @@ <h4>ON_DEMAND</h4>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="values--">
+<a name="values()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -256,13 +243,10 @@ <h4>values</h4>
 for (CommandLine.Help.Visibility c : CommandLine.Help.Visibility.values())
 &nbsp;   System.out.println(c);
 </pre></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an array containing the constants of this enum type, in the order they are declared</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>an array containing the constants of this enum type, in the order they are declared</dd></dl>
 </li>
 </ul>
-<a name="valueOf-java.lang.String-">
+<a name="valueOf(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -273,15 +257,11 @@ <h4>valueOf</h4>
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 
 not permitted.)</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - the name of the enum constant to be returned.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the enum constant with the specified name</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>name</code> - the name of the enum constant to be returned.</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the enum constant with the specified name</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code>java.lang.IllegalArgumentException</code> - if this enum type has no constant with the specified name</dd>
-<dd><code>java.lang.NullPointerException</code> - if the argument is null</dd>
-</dl>
+<dd><code>java.lang.NullPointerException</code> - if the argument is null</dd></dl>
 </li>
 </ul>
 </li>
@@ -292,11 +272,9 @@ <h4>valueOf</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -311,15 +289,15 @@ <h4>valueOf</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.HelpCommand.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.HelpCommand.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.Visibility.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Visibility.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.Visibility.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -337,18 +315,18 @@ <h4>valueOf</h4>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li><a href="#enum_constant_summary">Enum Constants</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li><a href="#enum_constant_detail">Enum Constants</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Help.html b/docs/apidocs/picocli/CommandLine.Help.html
index ed901cbc1..74a2217f0 100644
--- a/docs/apidocs/picocli/CommandLine.Help.html
+++ b/docs/apidocs/picocli/CommandLine.Help.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Help (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Help (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Help (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":42,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":9,"i12":9,"i13":9,"i14":9,"i15":9,"i16":10,"i17":9,"i18":10,"i19":10,"i20":42,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":9,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":9,"i35":42,"i36":10,"i37":10,"i38":10};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -73,19 +60,19 @@
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#nested_class_summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -112,7 +99,7 @@ <h2 title="Class CommandLine.Help" class="title">Class CommandLine.Help</h2>
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.Help</span>
+<pre>public static class <span class="strong">CommandLine.Help</span>
 extends java.lang.Object</pre>
 <div class="block">A collection of methods and inner classes that provide fine-grained control over the contents and layout of
  the usage help message to display to end users when help is requested or invalid input values were specified.
@@ -120,14 +107,14 @@ <h3>Layered API</h3>
  <p>The <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a> annotation provides the easiest way to customize usage help messages. See
  the <a href="https://remkop.github.io/picocli/index.html#_usage_help">Manual</a> for details.</p>
  <p>This Help class provides high-level functions to create sections of the usage help message and headings
- for these sections. Instead of calling the <a href="../picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.ColorScheme-"><code>CommandLine.usage(PrintStream, CommandLine.Help.ColorScheme)</code></a>
+ for these sections. Instead of calling the <a href="../picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.ColorScheme)"><code>CommandLine.usage(PrintStream, CommandLine.Help.ColorScheme)</code></a>
  method, application authors may want to create a custom usage help message by reorganizing sections in a
  different order and/or adding custom sections.</p>
  <p>Finally, the Help class contains inner classes and interfaces that can be used to create custom help messages.</p>
  <h4>IOptionRenderer and IParameterRenderer</h4>
  <p>Renders a field annotated with <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> to an array of <a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><code>CommandLine.Help.Ansi.Text</code></a> values.
  By default, these values are</p><ul>
- <li>mandatory marker character (if the option/parameter is <a href="../picocli/CommandLine.Option.html#required--"><code>required</code></a>)</li>
+ <li>mandatory marker character (if the option/parameter is <a href="../picocli/CommandLine.Option.html#required()"><code>required</code></a>)</li>
  <li>short option name (empty for parameters)</li>
  <li>comma or empty (empty for parameters)</li>
  <li>long option names (the parameter <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli"><code>label</code></a> for parameters)</li>
@@ -153,11 +140,11 @@ <h4>Text</h4>
 <li class="blockList">
 <!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="nested.class.summary">
+<li class="blockList"><a name="nested_class_summary">
 <!--   -->
 </a>
 <h3>Nested Class Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
 <caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -165,27 +152,27 @@ <h3>Nested Class Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a></strong></code>
 <div class="block">Provides methods and inner classes to support using ANSI escape codes in usage help messages.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></strong></code>
 <div class="block">All usage help message are generated with a color scheme that assigns certain styles and colors to common
  parts of a usage message: the command name, options, positional parameters and option parameters.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a></strong></code>
 <div class="block">Columns define the width, indent (leading number of spaces in a column before the value) and
  <a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">Overflow</a> policy of a column in a <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">TextTable</a>.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a></strong></code>
 <div class="block">When customizing online help for <a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>Option</code></a> details, a custom <code>IOptionRenderer</code> can be
  used to create textual representation of an Option in a tabular format: one or more rows, each containing
  one or more columns.</div>
@@ -193,7 +180,7 @@ <h3>Nested Class Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a></strong></code>
 <div class="block">When customizing online help for <a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">positional parameters</a> details, a custom <code>IParameterRenderer</code>
  can be used to create textual representation of a Parameters field in a tabular format: one or more rows,
  each containing one or more columns.</div>
@@ -201,27 +188,27 @@ <h3>Nested Class Summary</h3>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a></strong></code>
 <div class="block">When customizing online usage help for an option parameter or a positional parameter, a custom
  <code>IParamLabelRenderer</code> can be used to render the parameter name or label to a String.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></strong></code>
 <div class="block">Use a Layout to format usage help text for options and parameters in tabular format.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></strong></code>
 <div class="block">Responsible for spacing out <a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><code>CommandLine.Help.Ansi.Text</code></a> values according to the <a href="../picocli/CommandLine.Help.Column.html" title="class in picocli"><code>CommandLine.Help.Column</code></a> definitions the table was
  created with.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli">CommandLine.Help.Visibility</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli">CommandLine.Help.Visibility</a></strong></code>
 <div class="block">Controls the visibility of certain aspects of the usage help message.</div>
 </td>
 </tr>
@@ -230,11 +217,11 @@ <h3>Nested Class Summary</h3>
 </ul>
 <!-- =========== FIELD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.summary">
+<li class="blockList"><a name="field_summary">
 <!--   -->
 </a>
 <h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
 <caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -242,13 +229,13 @@ <h3>Field Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#DEFAULT_COMMAND_NAME">DEFAULT_COMMAND_NAME</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#DEFAULT_COMMAND_NAME">DEFAULT_COMMAND_NAME</a></strong></code>
 <div class="block">Constant String holding the default program name, value defined in <a href="../picocli/CommandLine.Model.CommandSpec.html#DEFAULT_COMMAND_NAME"><code>CommandLine.Model.CommandSpec.DEFAULT_COMMAND_NAME</code></a>.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>protected static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#DEFAULT_SEPARATOR">DEFAULT_SEPARATOR</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#DEFAULT_SEPARATOR">DEFAULT_SEPARATOR</a></strong></code>
 <div class="block">Constant String holding the default string that separates options from option parameters, value defined in <a href="../picocli/CommandLine.Model.ParserSpec.html#DEFAULT_SEPARATOR"><code>CommandLine.Model.ParserSpec.DEFAULT_SEPARATOR</code></a>.</div>
 </td>
 </tr>
@@ -257,40 +244,40 @@ <h3>Field Summary</h3>
 </ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#Help-picocli.CommandLine.Model.CommandSpec-picocli.CommandLine.Help.ColorScheme-">Help</a></span>(<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;commandSpec,
-    <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.html#CommandLine.Help(picocli.CommandLine.Model.CommandSpec,%20picocli.CommandLine.Help.ColorScheme)">CommandLine.Help</a></strong>(<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;commandSpec,
+                <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</code>
 <div class="block">Constructs a new <code>Help</code> instance with the specified color scheme, initialized from annotatations
  on the specified class and superclasses.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#Help-java.lang.Object-">Help</a></span>(java.lang.Object&nbsp;command)</code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.html#CommandLine.Help(java.lang.Object)">CommandLine.Help</a></strong>(java.lang.Object&nbsp;command)</code>
 <div class="block">Constructs a new <code>Help</code> instance with a default color scheme, initialized from annotatations
  on the specified class and superclasses.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#Help-java.lang.Object-picocli.CommandLine.Help.Ansi-">Help</a></span>(java.lang.Object&nbsp;command,
-    <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.html#CommandLine.Help(java.lang.Object,%20picocli.CommandLine.Help.Ansi)">CommandLine.Help</a></strong>(java.lang.Object&nbsp;command,
+                <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
 <div class="block">Constructs a new <code>Help</code> instance with a default color scheme, initialized from annotatations
  on the specified class and superclasses.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#Help-java.lang.Object-picocli.CommandLine.Help.ColorScheme-">Help</a></span>(java.lang.Object&nbsp;command,
-    <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">use <code>picocli.CommandLine.Help#Help(picocli.CommandLine.Model.CommandSpec, picocli.CommandLine.Help.ColorScheme)</code></span></div>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Help.html#CommandLine.Help(java.lang.Object,%20picocli.CommandLine.Help.ColorScheme)">CommandLine.Help</a></strong>(java.lang.Object&nbsp;command,
+                <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</code>
+<div class="block"><strong>Deprecated.</strong>&nbsp;
+<div class="block"><i>use <code>picocli.CommandLine.Help#Help(picocli.CommandLine.Model.CommandSpec, picocli.CommandLine.Help.ColorScheme)</code></i></div>
 </div>
 </td>
 </tr>
@@ -299,282 +286,282 @@ <h3>Constructor Summary</h3>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#abbreviatedSynopsis--">abbreviatedSynopsis</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#abbreviatedSynopsis()">abbreviatedSynopsis</a></strong>()</code>
 <div class="block">Generates a generic synopsis like <code>&lt;command name&gt; [OPTIONS] [PARAM1 [PARAM2]...]</code>, omitting parts
  that don't apply to the command (e.g., does not show [OPTIONS] if the command has no options).</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#addAllSubcommands-java.util.Map-">addAllSubcommands</a></span>(java.util.Map&lt;java.lang.String,<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;commands)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#addAllSubcommands(java.util.Map)">addAllSubcommands</a></strong>(java.util.Map&lt;java.lang.String,<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;commands)</code>
 <div class="block">Registers all specified subcommands with this Help.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#addSubcommand-java.lang.String-java.lang.Object-">addSubcommand</a></span>(java.lang.String&nbsp;commandName,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#addSubcommand(java.lang.String,%20java.lang.Object)">addSubcommand</a></strong>(java.lang.String&nbsp;commandName,
              java.lang.Object&nbsp;command)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;&nbsp;</div>
+<div class="block"><strong>Deprecated.</strong>&nbsp;&nbsp;</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#ansi--">ansi</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#ansi()">ansi</a></strong>()</code>
 <div class="block">Returns whether ANSI escape codes are enabled or not.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#colorScheme--">colorScheme</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#colorScheme()">colorScheme</a></strong>()</code>
 <div class="block">Returns the <code>ColorScheme</code> model that this Help was constructed with.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#commandList--">commandList</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#commandList()">commandList</a></strong>()</code>
 <div class="block">Returns a 2-column list with command names and the first line of their header or (if absent) description.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#commandListHeading-java.lang.Object...-">commandListHeading</a></span>(java.lang.Object...&nbsp;params)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#commandListHeading(java.lang.Object...)">commandListHeading</a></strong>(java.lang.Object...&nbsp;params)</code>
 <div class="block">Returns the text displayed before the command list; an empty string if there are no commands,
  otherwise the result of <code>String.format(commandListHeading, params)</code>.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#createDefaultLayout--">createDefaultLayout</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#createDefaultLayout()">createDefaultLayout</a></strong>()</code>
 <div class="block">Returns a <code>Layout</code> instance configured with the user preferences captured in this Help instance.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#createDefaultOptionRenderer--">createDefaultOptionRenderer</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#createDefaultOptionRenderer()">createDefaultOptionRenderer</a></strong>()</code>
 <div class="block">Returns a new default OptionRenderer which converts <a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>Options</code></a> to five columns of text to match
   the default <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">TextTable</a> column layout.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#createDefaultParameterRenderer--">createDefaultParameterRenderer</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#createDefaultParameterRenderer()">createDefaultParameterRenderer</a></strong>()</code>
 <div class="block">Returns a new default ParameterRenderer which converts <a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">positional parameters</a> to four columns of
  text to match the default <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">TextTable</a> column layout.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#createDefaultParamLabelRenderer--">createDefaultParamLabelRenderer</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#createDefaultParamLabelRenderer()">createDefaultParamLabelRenderer</a></strong>()</code>
 <div class="block">Returns a new default value renderer that separates option parameters from their option name
  with the specified separator string, surrounds optional parameters with <code>'['</code> and <code>']'</code>
  characters and uses ellipses ("...") to indicate that any number of a parameter are allowed.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#createMinimalOptionRenderer--">createMinimalOptionRenderer</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#createMinimalOptionRenderer()">createMinimalOptionRenderer</a></strong>()</code>
 <div class="block">Returns a new minimal OptionRenderer which converts <a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>Options</code></a> to a single row with two columns
  of text: an option name and a description.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#createMinimalParameterRenderer--">createMinimalParameterRenderer</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#createMinimalParameterRenderer()">createMinimalParameterRenderer</a></strong>()</code>
 <div class="block">Returns a new minimal ParameterRenderer which converts <a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">positional parameters</a>
  to a single row with two columns of text: an option name and a description.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#createMinimalParamLabelRenderer--">createMinimalParamLabelRenderer</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#createMinimalParamLabelRenderer()">createMinimalParamLabelRenderer</a></strong>()</code>
 <div class="block">Returns a value renderer that returns the <code>paramLabel</code> if defined or the field name otherwise.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static java.util.Comparator&lt;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#createShortOptionArityAndNameComparator--">createShortOptionArityAndNameComparator</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#createShortOptionArityAndNameComparator()">createShortOptionArityAndNameComparator</a></strong>()</code>
 <div class="block">Sorts <a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>OptionSpecs</code></a> by their option <a href="../picocli/CommandLine.Range.html#max">max arity</a> first, by
- <a href="../picocli/CommandLine.Range.html#min">min arity</a> next, and by <a href="../picocli/CommandLine.Help.html#createShortOptionNameComparator--">option name</a> last.</div>
+ <a href="../picocli/CommandLine.Range.html#min">min arity</a> next, and by <a href="../picocli/CommandLine.Help.html#createShortOptionNameComparator()">option name</a> last.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static java.util.Comparator&lt;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#createShortOptionNameComparator--">createShortOptionNameComparator</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#createShortOptionNameComparator()">createShortOptionNameComparator</a></strong>()</code>
 <div class="block">Sorts <a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>OptionSpecs</code></a> by their option name in case-insensitive alphabetic order.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#customSynopsis-java.lang.Object...-">customSynopsis</a></span>(java.lang.Object...&nbsp;params)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#customSynopsis(java.lang.Object...)">customSynopsis</a></strong>(java.lang.Object...&nbsp;params)</code>
 <div class="block">Returns command custom synopsis as a string.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#defaultColorScheme-picocli.CommandLine.Help.Ansi-">defaultColorScheme</a></span>(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#defaultColorScheme(picocli.CommandLine.Help.Ansi)">defaultColorScheme</a></strong>(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
 <div class="block">Creates and returns a new <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli"><code>CommandLine.Help.ColorScheme</code></a> initialized with picocli default values: commands are bold,
   options and parameters use a yellow foreground, and option parameters use italic.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#description-java.lang.Object...-">description</a></span>(java.lang.Object...&nbsp;params)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#description(java.lang.Object...)">description</a></strong>(java.lang.Object...&nbsp;params)</code>
 <div class="block">Returns command description text as a string.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#descriptionHeading-java.lang.Object...-">descriptionHeading</a></span>(java.lang.Object...&nbsp;params)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#descriptionHeading(java.lang.Object...)">descriptionHeading</a></strong>(java.lang.Object...&nbsp;params)</code>
 <div class="block">Returns the text displayed before the description text; an empty string if there is no description,
  otherwise the result of <code>String.format(descriptionHeading, params)</code>.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#detailedSynopsis-java.util.Comparator-boolean-">detailedSynopsis</a></span>(java.util.Comparator&lt;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;&nbsp;optionSort,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#detailedSynopsis(java.util.Comparator,%20boolean)">detailedSynopsis</a></strong>(java.util.Comparator&lt;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;&nbsp;optionSort,
                 boolean&nbsp;clusterBooleanOptions)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">use <a href="../picocli/CommandLine.Help.html#detailedSynopsis-int-java.util.Comparator-boolean-"><code>detailedSynopsis(int, Comparator, boolean)</code></a> instead.</span></div>
+<div class="block"><strong>Deprecated.</strong>&nbsp;
+<div class="block"><i>use <a href="../picocli/CommandLine.Help.html#detailedSynopsis(int,%20java.util.Comparator,%20boolean)"><code>detailedSynopsis(int, Comparator, boolean)</code></a> instead.</i></div>
 </div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#detailedSynopsis-int-java.util.Comparator-boolean-">detailedSynopsis</a></span>(int&nbsp;synopsisHeadingLength,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#detailedSynopsis(int,%20java.util.Comparator,%20boolean)">detailedSynopsis</a></strong>(int&nbsp;synopsisHeadingLength,
                 java.util.Comparator&lt;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;&nbsp;optionSort,
                 boolean&nbsp;clusterBooleanOptions)</code>
 <div class="block">Generates a detailed synopsis message showing all options and parameters.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#footer-java.lang.Object...-">footer</a></span>(java.lang.Object...&nbsp;params)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#footer(java.lang.Object...)">footer</a></strong>(java.lang.Object...&nbsp;params)</code>
 <div class="block">Returns command footer text as a string.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#footerHeading-java.lang.Object...-">footerHeading</a></span>(java.lang.Object...&nbsp;params)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#footerHeading(java.lang.Object...)">footerHeading</a></strong>(java.lang.Object...&nbsp;params)</code>
 <div class="block">Returns the text displayed before the footer text; the result of <code>String.format(footerHeading, params)</code>.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#header-java.lang.Object...-">header</a></span>(java.lang.Object...&nbsp;params)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#header(java.lang.Object...)">header</a></strong>(java.lang.Object...&nbsp;params)</code>
 <div class="block">Returns the command header text as a string.</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#headerHeading-java.lang.Object...-">headerHeading</a></span>(java.lang.Object...&nbsp;params)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#headerHeading(java.lang.Object...)">headerHeading</a></strong>(java.lang.Object...&nbsp;params)</code>
 <div class="block">Returns the text displayed before the header text; the result of <code>String.format(headerHeading, params)</code>.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static java.lang.StringBuilder</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#join-picocli.CommandLine.Help.Ansi-java.lang.String:A-java.lang.StringBuilder-java.lang.Object...-">join</a></span>(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#join(picocli.CommandLine.Help.Ansi,%20java.lang.String[],%20java.lang.StringBuilder,%20java.lang.Object...)">join</a></strong>(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
     java.lang.String[]&nbsp;values,
     java.lang.StringBuilder&nbsp;sb,
     java.lang.Object...&nbsp;params)</code>
 <div class="block">Formats each of the specified values and appends it to the specified StringBuilder.</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#optionList--">optionList</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#optionList()">optionList</a></strong>()</code>
 <div class="block">Returns a description of the <a href="../picocli/CommandLine.Option.html" title="annotation in picocli">options</a> supported by the application.</div>
 </td>
 </tr>
-<tr id="i28" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#optionList-picocli.CommandLine.Help.Layout-java.util.Comparator-picocli.CommandLine.Help.IParamLabelRenderer-">optionList</a></span>(<a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a>&nbsp;layout,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#optionList(picocli.CommandLine.Help.Layout,%20java.util.Comparator,%20picocli.CommandLine.Help.IParamLabelRenderer)">optionList</a></strong>(<a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a>&nbsp;layout,
           java.util.Comparator&lt;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;&nbsp;optionSort,
           <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;valueLabelRenderer)</code>
 <div class="block">Sorts all <code>Options</code> with the specified <code>comparator</code> (if the comparator is non-<code>null</code>),
- then <a href="../picocli/CommandLine.Help.Layout.html#addOption-picocli.CommandLine.Model.OptionSpec-picocli.CommandLine.Help.IParamLabelRenderer-">adds</a> all non-hidden options to the
+ then <a href="../picocli/CommandLine.Help.Layout.html#addOption(picocli.CommandLine.Model.OptionSpec,%20picocli.CommandLine.Help.IParamLabelRenderer)">adds</a> all non-hidden options to the
  specified TextTable and returns the result of TextTable.toString().</div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#optionListHeading-java.lang.Object...-">optionListHeading</a></span>(java.lang.Object...&nbsp;params)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#optionListHeading(java.lang.Object...)">optionListHeading</a></strong>(java.lang.Object...&nbsp;params)</code>
 <div class="block">Returns the text displayed before the option list; an empty string if there are no options,
  otherwise the result of <code>String.format(optionListHeading, params)</code>.</div>
 </td>
 </tr>
-<tr id="i30" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#parameterLabelRenderer--">parameterLabelRenderer</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#parameterLabelRenderer()">parameterLabelRenderer</a></strong>()</code>
 <div class="block">Option and positional parameter value label renderer used for the synopsis line(s) and the option list.</div>
 </td>
 </tr>
-<tr id="i31" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#parameterList--">parameterList</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#parameterList()">parameterList</a></strong>()</code>
 <div class="block">Returns the section of the usage help message that lists the parameters with their descriptions.</div>
 </td>
 </tr>
-<tr id="i32" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#parameterList-picocli.CommandLine.Help.Layout-picocli.CommandLine.Help.IParamLabelRenderer-">parameterList</a></span>(<a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a>&nbsp;layout,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#parameterList(picocli.CommandLine.Help.Layout,%20picocli.CommandLine.Help.IParamLabelRenderer)">parameterList</a></strong>(<a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a>&nbsp;layout,
              <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</code>
 <div class="block">Returns the section of the usage help message that lists the parameters with their descriptions.</div>
 </td>
 </tr>
-<tr id="i33" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#parameterListHeading-java.lang.Object...-">parameterListHeading</a></span>(java.lang.Object...&nbsp;params)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#parameterListHeading(java.lang.Object...)">parameterListHeading</a></strong>(java.lang.Object...&nbsp;params)</code>
 <div class="block">Returns the text displayed before the positional parameter list; an empty string if there are no positional
  parameters, otherwise the result of <code>String.format(parameterListHeading, params)</code>.</div>
 </td>
 </tr>
-<tr id="i34" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static java.util.Comparator&lt;java.lang.String&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#shortestFirst--">shortestFirst</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#shortestFirst()">shortestFirst</a></strong>()</code>
 <div class="block">Sorts short strings before longer strings.</div>
 </td>
 </tr>
-<tr id="i35" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#synopsis--">synopsis</a></span>()</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">use <a href="../picocli/CommandLine.Help.html#synopsis-int-"><code>synopsis(int)</code></a> instead</span></div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#synopsis()">synopsis</a></strong>()</code>
+<div class="block"><strong>Deprecated.</strong>&nbsp;
+<div class="block"><i>use <a href="../picocli/CommandLine.Help.html#synopsis(int)"><code>synopsis(int)</code></a> instead</i></div>
 </div>
 </td>
 </tr>
-<tr id="i36" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#synopsis-int-">synopsis</a></span>(int&nbsp;synopsisHeadingLength)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#synopsis(int)">synopsis</a></strong>(int&nbsp;synopsisHeadingLength)</code>
 <div class="block">Returns a synopsis for the command, reserving the specified space for the synopsis heading.</div>
 </td>
 </tr>
-<tr id="i37" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#synopsisHeading-java.lang.Object...-">synopsisHeading</a></span>(java.lang.Object...&nbsp;params)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#synopsisHeading(java.lang.Object...)">synopsisHeading</a></strong>(java.lang.Object...&nbsp;params)</code>
 <div class="block">Returns the text displayed before the synopsis text; the result of <code>String.format(synopsisHeading, params)</code>.</div>
 </td>
 </tr>
-<tr id="i38" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#synopsisHeadingLength--">synopsisHeadingLength</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html#synopsisHeadingLength()">synopsisHeadingLength</a></strong>()</code>
 <div class="block">Returns the number of characters the synopsis heading will take on the same line as the synopsis.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -590,7 +577,7 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ FIELD DETAIL =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.detail">
+<li class="blockList"><a name="field_detail">
 <!--   -->
 </a>
 <h3>Field Detail</h3>
@@ -602,10 +589,7 @@ <h3>Field Detail</h3>
 <h4>DEFAULT_COMMAND_NAME</h4>
 <pre>protected static final&nbsp;java.lang.String DEFAULT_COMMAND_NAME</pre>
 <div class="block">Constant String holding the default program name, value defined in <a href="../picocli/CommandLine.Model.CommandSpec.html#DEFAULT_COMMAND_NAME"><code>CommandLine.Model.CommandSpec.DEFAULT_COMMAND_NAME</code></a>.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#picocli.CommandLine.Help.DEFAULT_COMMAND_NAME">Constant Field Values</a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../constant-values.html#picocli.CommandLine.Help.DEFAULT_COMMAND_NAME">Constant Field Values</a></dd></dl>
 </li>
 </ul>
 <a name="DEFAULT_SEPARATOR">
@@ -616,97 +600,79 @@ <h4>DEFAULT_COMMAND_NAME</h4>
 <h4>DEFAULT_SEPARATOR</h4>
 <pre>protected static final&nbsp;java.lang.String DEFAULT_SEPARATOR</pre>
 <div class="block">Constant String holding the default string that separates options from option parameters, value defined in <a href="../picocli/CommandLine.Model.ParserSpec.html#DEFAULT_SEPARATOR"><code>CommandLine.Model.ParserSpec.DEFAULT_SEPARATOR</code></a>.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#picocli.CommandLine.Help.DEFAULT_SEPARATOR">Constant Field Values</a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../constant-values.html#picocli.CommandLine.Help.DEFAULT_SEPARATOR">Constant Field Values</a></dd></dl>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="Help-java.lang.Object-">
+<a name="CommandLine.Help(java.lang.Object)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>Help</h4>
-<pre>public&nbsp;Help(java.lang.Object&nbsp;command)</pre>
+<h4>CommandLine.Help</h4>
+<pre>public&nbsp;CommandLine.Help(java.lang.Object&nbsp;command)</pre>
 <div class="block">Constructs a new <code>Help</code> instance with a default color scheme, initialized from annotatations
  on the specified class and superclasses.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>command</code> - the annotated object to create usage help for</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>command</code> - the annotated object to create usage help for</dd></dl>
 </li>
 </ul>
-<a name="Help-java.lang.Object-picocli.CommandLine.Help.Ansi-">
+<a name="CommandLine.Help(java.lang.Object, picocli.CommandLine.Help.Ansi)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>Help</h4>
-<pre>public&nbsp;Help(java.lang.Object&nbsp;command,
-            <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
+<h4>CommandLine.Help</h4>
+<pre>public&nbsp;CommandLine.Help(java.lang.Object&nbsp;command,
+                <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
 <div class="block">Constructs a new <code>Help</code> instance with a default color scheme, initialized from annotatations
  on the specified class and superclasses.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>command</code> - the annotated object to create usage help for</dd>
-<dd><code>ansi</code> - whether to emit ANSI escape codes or not</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>command</code> - the annotated object to create usage help for</dd><dd><code>ansi</code> - whether to emit ANSI escape codes or not</dd></dl>
 </li>
 </ul>
-<a name="Help-java.lang.Object-picocli.CommandLine.Help.ColorScheme-">
+<a name="CommandLine.Help(java.lang.Object, picocli.CommandLine.Help.ColorScheme)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>Help</h4>
+<h4>CommandLine.Help</h4>
 <pre>@Deprecated
-public&nbsp;Help(java.lang.Object&nbsp;command,
-                         <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">use <code>picocli.CommandLine.Help#Help(picocli.CommandLine.Model.CommandSpec, picocli.CommandLine.Help.ColorScheme)</code></span></div>
+public&nbsp;CommandLine.Help(java.lang.Object&nbsp;command,
+                           <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</pre>
+<div class="block"><span class="strong">Deprecated.</span>&nbsp;<i>use <code>picocli.CommandLine.Help#Help(picocli.CommandLine.Model.CommandSpec, picocli.CommandLine.Help.ColorScheme)</code></i></div>
 <div class="block">Constructs a new <code>Help</code> instance with the specified color scheme, initialized from annotatations
  on the specified class and superclasses.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>command</code> - the annotated object to create usage help for</dd>
-<dd><code>colorScheme</code> - the color scheme to use</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>command</code> - the annotated object to create usage help for</dd><dd><code>colorScheme</code> - the color scheme to use</dd></dl>
 </li>
 </ul>
-<a name="Help-picocli.CommandLine.Model.CommandSpec-picocli.CommandLine.Help.ColorScheme-">
+<a name="CommandLine.Help(picocli.CommandLine.Model.CommandSpec, picocli.CommandLine.Help.ColorScheme)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>Help</h4>
-<pre>public&nbsp;Help(<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;commandSpec,
-            <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</pre>
+<h4>CommandLine.Help</h4>
+<pre>public&nbsp;CommandLine.Help(<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;commandSpec,
+                <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</pre>
 <div class="block">Constructs a new <code>Help</code> instance with the specified color scheme, initialized from annotatations
  on the specified class and superclasses.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>commandSpec</code> - the command model to create usage help for</dd>
-<dd><code>colorScheme</code> - the color scheme to use</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>commandSpec</code> - the command model to create usage help for</dd><dd><code>colorScheme</code> - the color scheme to use</dd></dl>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="colorScheme--">
+<a name="colorScheme()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -714,13 +680,11 @@ <h3>Method Detail</h3>
 <h4>colorScheme</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme()</pre>
 <div class="block">Returns the <code>ColorScheme</code> model that this Help was constructed with.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="parameterLabelRenderer--">
+<a name="parameterLabelRenderer()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -728,12 +692,12 @@ <h4>colorScheme</h4>
 <h4>parameterLabelRenderer</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;parameterLabelRenderer()</pre>
 <div class="block">Option and positional parameter value label renderer used for the synopsis line(s) and the option list.
- By default initialized to the result of <a href="../picocli/CommandLine.Help.html#createDefaultParamLabelRenderer--"><code>createDefaultParamLabelRenderer()</code></a>, which takes a snapshot
- of the <a href="../picocli/CommandLine.Model.ParserSpec.html#separator--"><code>CommandLine.Model.ParserSpec.separator()</code></a> at construction time. If the separator is modified after Help construction, you
- may need to re-initialize this field by calling <a href="../picocli/CommandLine.Help.html#createDefaultParamLabelRenderer--"><code>createDefaultParamLabelRenderer()</code></a> again.</div>
+ By default initialized to the result of <a href="../picocli/CommandLine.Help.html#createDefaultParamLabelRenderer()"><code>createDefaultParamLabelRenderer()</code></a>, which takes a snapshot
+ of the <a href="../picocli/CommandLine.Model.ParserSpec.html#separator()"><code>CommandLine.Model.ParserSpec.separator()</code></a> at construction time. If the separator is modified after Help construction, you
+ may need to re-initialize this field by calling <a href="../picocli/CommandLine.Help.html#createDefaultParamLabelRenderer()"><code>createDefaultParamLabelRenderer()</code></a> again.</div>
 </li>
 </ul>
-<a name="addAllSubcommands-java.util.Map-">
+<a name="addAllSubcommands(java.util.Map)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -741,17 +705,11 @@ <h4>parameterLabelRenderer</h4>
 <h4>addAllSubcommands</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a>&nbsp;addAllSubcommands(java.util.Map&lt;java.lang.String,<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;commands)</pre>
 <div class="block">Registers all specified subcommands with this Help.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>commands</code> - maps the command names to the associated CommandLine object</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this Help instance (for method chaining)</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#getSubcommands--"><code>CommandLine.getSubcommands()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>commands</code> - maps the command names to the associated CommandLine object</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this Help instance (for method chaining)</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#getSubcommands()"><code>CommandLine.getSubcommands()</code></a></dd></dl>
 </li>
 </ul>
-<a name="addSubcommand-java.lang.String-java.lang.Object-">
+<a name="addSubcommand(java.lang.String, java.lang.Object)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -759,19 +717,14 @@ <h4>addAllSubcommands</h4>
 <h4>addSubcommand</h4>
 <pre>@Deprecated
 public&nbsp;<a href="../picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a>&nbsp;addSubcommand(java.lang.String&nbsp;commandName,
-                                                   java.lang.Object&nbsp;command)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+                                        java.lang.Object&nbsp;command)</pre>
+<div class="block"><span class="strong">Deprecated.</span>&nbsp;<i></i></div>
 <div class="block">Registers the specified subcommand with this Help.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>commandName</code> - the name of the subcommand to display in the usage message</dd>
-<dd><code>command</code> - the <code>CommandSpec</code> or <code>@Command</code> annotated object to get more information from</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this Help instance (for method chaining)</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>commandName</code> - the name of the subcommand to display in the usage message</dd><dd><code>command</code> - the <code>CommandSpec</code> or <code>@Command</code> annotated object to get more information from</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this Help instance (for method chaining)</dd></dl>
 </li>
 </ul>
-<a name="synopsis--">
+<a name="synopsis()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -779,18 +732,13 @@ <h4>addSubcommand</h4>
 <h4>synopsis</h4>
 <pre>@Deprecated
 public&nbsp;java.lang.String&nbsp;synopsis()</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">use <a href="../picocli/CommandLine.Help.html#synopsis-int-"><code>synopsis(int)</code></a> instead</span></div>
+<div class="block"><span class="strong">Deprecated.</span>&nbsp;<i>use <a href="../picocli/CommandLine.Help.html#synopsis(int)"><code>synopsis(int)</code></a> instead</i></div>
 <div class="block">Returns a synopsis for the command without reserving space for the synopsis heading.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a synopsis</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Help.html#abbreviatedSynopsis--"><code>abbreviatedSynopsis()</code></a>, 
-<a href="../picocli/CommandLine.Help.html#detailedSynopsis-java.util.Comparator-boolean-"><code>detailedSynopsis(Comparator, boolean)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a synopsis</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Help.html#abbreviatedSynopsis()"><code>abbreviatedSynopsis()</code></a>, 
+<a href="../picocli/CommandLine.Help.html#detailedSynopsis(java.util.Comparator,%20boolean)"><code>detailedSynopsis(Comparator, boolean)</code></a></dd></dl>
 </li>
 </ul>
-<a name="synopsis-int-">
+<a name="synopsis(int)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -798,19 +746,13 @@ <h4>synopsis</h4>
 <h4>synopsis</h4>
 <pre>public&nbsp;java.lang.String&nbsp;synopsis(int&nbsp;synopsisHeadingLength)</pre>
 <div class="block">Returns a synopsis for the command, reserving the specified space for the synopsis heading.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>synopsisHeadingLength</code> - the length of the synopsis heading that will be displayed on the same line</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a synopsis</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Help.html#abbreviatedSynopsis--"><code>abbreviatedSynopsis()</code></a>, 
-<a href="../picocli/CommandLine.Help.html#detailedSynopsis-java.util.Comparator-boolean-"><code>detailedSynopsis(Comparator, boolean)</code></a>, 
-<a href="../picocli/CommandLine.Help.html#synopsisHeading-java.lang.Object...-"><code>synopsisHeading(java.lang.Object...)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>synopsisHeadingLength</code> - the length of the synopsis heading that will be displayed on the same line</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a synopsis</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Help.html#abbreviatedSynopsis()"><code>abbreviatedSynopsis()</code></a>, 
+<a href="../picocli/CommandLine.Help.html#detailedSynopsis(java.util.Comparator,%20boolean)"><code>detailedSynopsis(Comparator, boolean)</code></a>, 
+<a href="../picocli/CommandLine.Help.html#synopsisHeading(java.lang.Object...)"><code>synopsisHeading(java.lang.Object...)</code></a></dd></dl>
 </li>
 </ul>
-<a name="abbreviatedSynopsis--">
+<a name="abbreviatedSynopsis()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -819,13 +761,10 @@ <h4>abbreviatedSynopsis</h4>
 <pre>public&nbsp;java.lang.String&nbsp;abbreviatedSynopsis()</pre>
 <div class="block">Generates a generic synopsis like <code>&lt;command name&gt; [OPTIONS] [PARAM1 [PARAM2]...]</code>, omitting parts
  that don't apply to the command (e.g., does not show [OPTIONS] if the command has no options).</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a generic synopsis</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a generic synopsis</dd></dl>
 </li>
 </ul>
-<a name="detailedSynopsis-java.util.Comparator-boolean-">
+<a name="detailedSynopsis(java.util.Comparator, boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -833,43 +772,31 @@ <h4>abbreviatedSynopsis</h4>
 <h4>detailedSynopsis</h4>
 <pre>@Deprecated
 public&nbsp;java.lang.String&nbsp;detailedSynopsis(java.util.Comparator&lt;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;&nbsp;optionSort,
-                                                      boolean&nbsp;clusterBooleanOptions)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">use <a href="../picocli/CommandLine.Help.html#detailedSynopsis-int-java.util.Comparator-boolean-"><code>detailedSynopsis(int, Comparator, boolean)</code></a> instead.</span></div>
+                                           boolean&nbsp;clusterBooleanOptions)</pre>
+<div class="block"><span class="strong">Deprecated.</span>&nbsp;<i>use <a href="../picocli/CommandLine.Help.html#detailedSynopsis(int,%20java.util.Comparator,%20boolean)"><code>detailedSynopsis(int, Comparator, boolean)</code></a> instead.</i></div>
 <div class="block">Generates a detailed synopsis message showing all options and parameters. Follows the unix convention of
  showing optional options and parameters in square brackets (<code>[ ]</code>).</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>optionSort</code> - comparator to sort options or <code>null</code> if options should not be sorted</dd>
-<dd><code>clusterBooleanOptions</code> - <code>true</code> if boolean short options should be clustered into a single string</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a detailed synopsis</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>optionSort</code> - comparator to sort options or <code>null</code> if options should not be sorted</dd><dd><code>clusterBooleanOptions</code> - <code>true</code> if boolean short options should be clustered into a single string</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a detailed synopsis</dd></dl>
 </li>
 </ul>
-<a name="detailedSynopsis-int-java.util.Comparator-boolean-">
+<a name="detailedSynopsis(int, java.util.Comparator, boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>detailedSynopsis</h4>
 <pre>public&nbsp;java.lang.String&nbsp;detailedSynopsis(int&nbsp;synopsisHeadingLength,
-                                         java.util.Comparator&lt;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;&nbsp;optionSort,
-                                         boolean&nbsp;clusterBooleanOptions)</pre>
+                                java.util.Comparator&lt;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;&nbsp;optionSort,
+                                boolean&nbsp;clusterBooleanOptions)</pre>
 <div class="block">Generates a detailed synopsis message showing all options and parameters. Follows the unix convention of
  showing optional options and parameters in square brackets (<code>[ ]</code>).</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>synopsisHeadingLength</code> - the length of the synopsis heading that will be displayed on the same line</dd>
-<dd><code>optionSort</code> - comparator to sort options or <code>null</code> if options should not be sorted</dd>
-<dd><code>clusterBooleanOptions</code> - <code>true</code> if boolean short options should be clustered into a single string</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a detailed synopsis</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>synopsisHeadingLength</code> - the length of the synopsis heading that will be displayed on the same line</dd><dd><code>optionSort</code> - comparator to sort options or <code>null</code> if options should not be sorted</dd><dd><code>clusterBooleanOptions</code> - <code>true</code> if boolean short options should be clustered into a single string</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a detailed synopsis</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="synopsisHeadingLength--">
+<a name="synopsisHeadingLength()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -877,15 +804,10 @@ <h4>detailedSynopsis</h4>
 <h4>synopsisHeadingLength</h4>
 <pre>public&nbsp;int&nbsp;synopsisHeadingLength()</pre>
 <div class="block">Returns the number of characters the synopsis heading will take on the same line as the synopsis.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the number of characters the synopsis heading will take on the same line as the synopsis.</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Help.html#detailedSynopsis-int-java.util.Comparator-boolean-"><code>detailedSynopsis(int, Comparator, boolean)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the number of characters the synopsis heading will take on the same line as the synopsis.</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Help.html#detailedSynopsis(int,%20java.util.Comparator,%20boolean)"><code>detailedSynopsis(int, Comparator, boolean)</code></a></dd></dl>
 </li>
 </ul>
-<a name="optionList--">
+<a name="optionList()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -893,42 +815,30 @@ <h4>synopsisHeadingLength</h4>
 <h4>optionList</h4>
 <pre>public&nbsp;java.lang.String&nbsp;optionList()</pre>
 <div class="block"><p>Returns a description of the <a href="../picocli/CommandLine.Option.html" title="annotation in picocli">options</a> supported by the application.
- This implementation <a href="../picocli/CommandLine.Help.html#createShortOptionNameComparator--">sorts options alphabetically</a>, and shows
- only the <a href="../picocli/CommandLine.Option.html#hidden--">non-hidden</a> options in a <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">tabular format</a>
- using the <a href="../picocli/CommandLine.Help.html#createDefaultOptionRenderer--">default renderer</a> and <a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli">default layout</a>.</p></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the fully formatted option list</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Help.html#optionList-picocli.CommandLine.Help.Layout-java.util.Comparator-picocli.CommandLine.Help.IParamLabelRenderer-"><code>optionList(Layout, Comparator, IParamLabelRenderer)</code></a></dd>
-</dl>
+ This implementation <a href="../picocli/CommandLine.Help.html#createShortOptionNameComparator()">sorts options alphabetically</a>, and shows
+ only the <a href="../picocli/CommandLine.Option.html#hidden()">non-hidden</a> options in a <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">tabular format</a>
+ using the <a href="../picocli/CommandLine.Help.html#createDefaultOptionRenderer()">default renderer</a> and <a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli">default layout</a>.</p></div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the fully formatted option list</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Help.html#optionList(picocli.CommandLine.Help.Layout,%20java.util.Comparator,%20picocli.CommandLine.Help.IParamLabelRenderer)"><code>optionList(Layout, Comparator, IParamLabelRenderer)</code></a></dd></dl>
 </li>
 </ul>
-<a name="optionList-picocli.CommandLine.Help.Layout-java.util.Comparator-picocli.CommandLine.Help.IParamLabelRenderer-">
+<a name="optionList(picocli.CommandLine.Help.Layout, java.util.Comparator, picocli.CommandLine.Help.IParamLabelRenderer)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>optionList</h4>
 <pre>public&nbsp;java.lang.String&nbsp;optionList(<a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a>&nbsp;layout,
-                                   java.util.Comparator&lt;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;&nbsp;optionSort,
-                                   <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;valueLabelRenderer)</pre>
+                          java.util.Comparator&lt;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;&nbsp;optionSort,
+                          <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;valueLabelRenderer)</pre>
 <div class="block">Sorts all <code>Options</code> with the specified <code>comparator</code> (if the comparator is non-<code>null</code>),
- then <a href="../picocli/CommandLine.Help.Layout.html#addOption-picocli.CommandLine.Model.OptionSpec-picocli.CommandLine.Help.IParamLabelRenderer-">adds</a> all non-hidden options to the
+ then <a href="../picocli/CommandLine.Help.Layout.html#addOption(picocli.CommandLine.Model.OptionSpec,%20picocli.CommandLine.Help.IParamLabelRenderer)">adds</a> all non-hidden options to the
  specified TextTable and returns the result of TextTable.toString().</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>layout</code> - responsible for rendering the option list</dd>
-<dd><code>optionSort</code> - determines in what order <code>Options</code> should be listed. Declared order if <code>null</code></dd>
-<dd><code>valueLabelRenderer</code> - used for options with a parameter</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the fully formatted option list</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>layout</code> - responsible for rendering the option list</dd><dd><code>optionSort</code> - determines in what order <code>Options</code> should be listed. Declared order if <code>null</code></dd><dd><code>valueLabelRenderer</code> - used for options with a parameter</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the fully formatted option list</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="parameterList--">
+<a name="parameterList()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -936,53 +846,38 @@ <h4>optionList</h4>
 <h4>parameterList</h4>
 <pre>public&nbsp;java.lang.String&nbsp;parameterList()</pre>
 <div class="block">Returns the section of the usage help message that lists the parameters with their descriptions.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the section of the usage help message that lists the parameters</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the section of the usage help message that lists the parameters</dd></dl>
 </li>
 </ul>
-<a name="parameterList-picocli.CommandLine.Help.Layout-picocli.CommandLine.Help.IParamLabelRenderer-">
+<a name="parameterList(picocli.CommandLine.Help.Layout, picocli.CommandLine.Help.IParamLabelRenderer)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>parameterList</h4>
 <pre>public&nbsp;java.lang.String&nbsp;parameterList(<a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a>&nbsp;layout,
-                                      <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</pre>
+                             <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</pre>
 <div class="block">Returns the section of the usage help message that lists the parameters with their descriptions.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>layout</code> - the layout to use</dd>
-<dd><code>paramLabelRenderer</code> - for rendering parameter names</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the section of the usage help message that lists the parameters</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>layout</code> - the layout to use</dd><dd><code>paramLabelRenderer</code> - for rendering parameter names</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the section of the usage help message that lists the parameters</dd></dl>
 </li>
 </ul>
-<a name="join-picocli.CommandLine.Help.Ansi-java.lang.String:A-java.lang.StringBuilder-java.lang.Object...-">
+<a name="join(picocli.CommandLine.Help.Ansi, java.lang.String[], java.lang.StringBuilder, java.lang.Object...)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>join</h4>
 <pre>public static&nbsp;java.lang.StringBuilder&nbsp;join(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
-                                           java.lang.String[]&nbsp;values,
-                                           java.lang.StringBuilder&nbsp;sb,
-                                           java.lang.Object...&nbsp;params)</pre>
+                           java.lang.String[]&nbsp;values,
+                           java.lang.StringBuilder&nbsp;sb,
+                           java.lang.Object...&nbsp;params)</pre>
 <div class="block">Formats each of the specified values and appends it to the specified StringBuilder.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ansi</code> - whether the result should contain ANSI escape codes or not</dd>
-<dd><code>values</code> - the values to format and append to the StringBuilder</dd>
-<dd><code>sb</code> - the StringBuilder to collect the formatted strings</dd>
-<dd><code>params</code> - the parameters to pass to the format method when formatting each value</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the specified StringBuilder</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>ansi</code> - whether the result should contain ANSI escape codes or not</dd><dd><code>values</code> - the values to format and append to the StringBuilder</dd><dd><code>sb</code> - the StringBuilder to collect the formatted strings</dd><dd><code>params</code> - the parameters to pass to the format method when formatting each value</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the specified StringBuilder</dd></dl>
 </li>
 </ul>
-<a name="customSynopsis-java.lang.Object...-">
+<a name="customSynopsis(java.lang.Object...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -990,17 +885,13 @@ <h4>join</h4>
 <h4>customSynopsis</h4>
 <pre>public&nbsp;java.lang.String&nbsp;customSynopsis(java.lang.Object...&nbsp;params)</pre>
 <div class="block">Returns command custom synopsis as a string. A custom synopsis can be zero or more lines, and can be
- specified declaratively with the <a href="../picocli/CommandLine.Command.html#customSynopsis--"><code>CommandLine.Command.customSynopsis()</code></a> annotation attribute or programmatically
- by setting the Help instance's <a href="../picocli/CommandLine.Help.html#customSynopsis-java.lang.Object...-"><code>customSynopsis(java.lang.Object...)</code></a> field.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>params</code> - Arguments referenced by the format specifiers in the synopsis strings</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the custom synopsis lines combined into a single String (which may be empty)</dd>
-</dl>
+ specified declaratively with the <a href="../picocli/CommandLine.Command.html#customSynopsis()"><code>CommandLine.Command.customSynopsis()</code></a> annotation attribute or programmatically
+ by setting the Help instance's <a href="../picocli/CommandLine.Help.html#customSynopsis(java.lang.Object...)"><code>customSynopsis(java.lang.Object...)</code></a> field.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>params</code> - Arguments referenced by the format specifiers in the synopsis strings</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the custom synopsis lines combined into a single String (which may be empty)</dd></dl>
 </li>
 </ul>
-<a name="description-java.lang.Object...-">
+<a name="description(java.lang.Object...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1008,17 +899,13 @@ <h4>customSynopsis</h4>
 <h4>description</h4>
 <pre>public&nbsp;java.lang.String&nbsp;description(java.lang.Object...&nbsp;params)</pre>
 <div class="block">Returns command description text as a string. Description text can be zero or more lines, and can be specified
- declaratively with the <a href="../picocli/CommandLine.Command.html#description--"><code>CommandLine.Command.description()</code></a> annotation attribute or programmatically by
- setting the Help instance's <a href="../picocli/CommandLine.Help.html#description-java.lang.Object...-"><code>description(java.lang.Object...)</code></a> field.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>params</code> - Arguments referenced by the format specifiers in the description strings</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the description lines combined into a single String (which may be empty)</dd>
-</dl>
+ declaratively with the <a href="../picocli/CommandLine.Command.html#description()"><code>CommandLine.Command.description()</code></a> annotation attribute or programmatically by
+ setting the Help instance's <a href="../picocli/CommandLine.Help.html#description(java.lang.Object...)"><code>description(java.lang.Object...)</code></a> field.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>params</code> - Arguments referenced by the format specifiers in the description strings</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the description lines combined into a single String (which may be empty)</dd></dl>
 </li>
 </ul>
-<a name="header-java.lang.Object...-">
+<a name="header(java.lang.Object...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1026,17 +913,13 @@ <h4>description</h4>
 <h4>header</h4>
 <pre>public&nbsp;java.lang.String&nbsp;header(java.lang.Object...&nbsp;params)</pre>
 <div class="block">Returns the command header text as a string. Header text can be zero or more lines, and can be specified
- declaratively with the <a href="../picocli/CommandLine.Command.html#header--"><code>CommandLine.Command.header()</code></a> annotation attribute or programmatically by
- setting the Help instance's <a href="../picocli/CommandLine.Help.html#header-java.lang.Object...-"><code>header(java.lang.Object...)</code></a> field.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>params</code> - Arguments referenced by the format specifiers in the header strings</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the header lines combined into a single String (which may be empty)</dd>
-</dl>
+ declaratively with the <a href="../picocli/CommandLine.Command.html#header()"><code>CommandLine.Command.header()</code></a> annotation attribute or programmatically by
+ setting the Help instance's <a href="../picocli/CommandLine.Help.html#header(java.lang.Object...)"><code>header(java.lang.Object...)</code></a> field.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>params</code> - Arguments referenced by the format specifiers in the header strings</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the header lines combined into a single String (which may be empty)</dd></dl>
 </li>
 </ul>
-<a name="footer-java.lang.Object...-">
+<a name="footer(java.lang.Object...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1044,17 +927,13 @@ <h4>header</h4>
 <h4>footer</h4>
 <pre>public&nbsp;java.lang.String&nbsp;footer(java.lang.Object...&nbsp;params)</pre>
 <div class="block">Returns command footer text as a string. Footer text can be zero or more lines, and can be specified
- declaratively with the <a href="../picocli/CommandLine.Command.html#footer--"><code>CommandLine.Command.footer()</code></a> annotation attribute or programmatically by
- setting the Help instance's <a href="../picocli/CommandLine.Help.html#footer-java.lang.Object...-"><code>footer(java.lang.Object...)</code></a> field.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>params</code> - Arguments referenced by the format specifiers in the footer strings</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the footer lines combined into a single String (which may be empty)</dd>
-</dl>
+ declaratively with the <a href="../picocli/CommandLine.Command.html#footer()"><code>CommandLine.Command.footer()</code></a> annotation attribute or programmatically by
+ setting the Help instance's <a href="../picocli/CommandLine.Help.html#footer(java.lang.Object...)"><code>footer(java.lang.Object...)</code></a> field.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>params</code> - Arguments referenced by the format specifiers in the footer strings</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the footer lines combined into a single String (which may be empty)</dd></dl>
 </li>
 </ul>
-<a name="headerHeading-java.lang.Object...-">
+<a name="headerHeading(java.lang.Object...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1062,15 +941,11 @@ <h4>footer</h4>
 <h4>headerHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;headerHeading(java.lang.Object...&nbsp;params)</pre>
 <div class="block">Returns the text displayed before the header text; the result of <code>String.format(headerHeading, params)</code>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>params</code> - the parameters to use to format the header heading</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the formatted header heading</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>params</code> - the parameters to use to format the header heading</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the formatted header heading</dd></dl>
 </li>
 </ul>
-<a name="synopsisHeading-java.lang.Object...-">
+<a name="synopsisHeading(java.lang.Object...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1078,15 +953,11 @@ <h4>headerHeading</h4>
 <h4>synopsisHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;synopsisHeading(java.lang.Object...&nbsp;params)</pre>
 <div class="block">Returns the text displayed before the synopsis text; the result of <code>String.format(synopsisHeading, params)</code>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>params</code> - the parameters to use to format the synopsis heading</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the formatted synopsis heading</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>params</code> - the parameters to use to format the synopsis heading</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the formatted synopsis heading</dd></dl>
 </li>
 </ul>
-<a name="descriptionHeading-java.lang.Object...-">
+<a name="descriptionHeading(java.lang.Object...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1095,15 +966,11 @@ <h4>descriptionHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;descriptionHeading(java.lang.Object...&nbsp;params)</pre>
 <div class="block">Returns the text displayed before the description text; an empty string if there is no description,
  otherwise the result of <code>String.format(descriptionHeading, params)</code>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>params</code> - the parameters to use to format the description heading</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the formatted description heading</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>params</code> - the parameters to use to format the description heading</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the formatted description heading</dd></dl>
 </li>
 </ul>
-<a name="parameterListHeading-java.lang.Object...-">
+<a name="parameterListHeading(java.lang.Object...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1112,15 +979,11 @@ <h4>parameterListHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;parameterListHeading(java.lang.Object...&nbsp;params)</pre>
 <div class="block">Returns the text displayed before the positional parameter list; an empty string if there are no positional
  parameters, otherwise the result of <code>String.format(parameterListHeading, params)</code>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>params</code> - the parameters to use to format the parameter list heading</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the formatted parameter list heading</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>params</code> - the parameters to use to format the parameter list heading</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the formatted parameter list heading</dd></dl>
 </li>
 </ul>
-<a name="optionListHeading-java.lang.Object...-">
+<a name="optionListHeading(java.lang.Object...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1129,15 +992,11 @@ <h4>optionListHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;optionListHeading(java.lang.Object...&nbsp;params)</pre>
 <div class="block">Returns the text displayed before the option list; an empty string if there are no options,
  otherwise the result of <code>String.format(optionListHeading, params)</code>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>params</code> - the parameters to use to format the option list heading</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the formatted option list heading</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>params</code> - the parameters to use to format the option list heading</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the formatted option list heading</dd></dl>
 </li>
 </ul>
-<a name="commandListHeading-java.lang.Object...-">
+<a name="commandListHeading(java.lang.Object...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1146,15 +1005,11 @@ <h4>commandListHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;commandListHeading(java.lang.Object...&nbsp;params)</pre>
 <div class="block">Returns the text displayed before the command list; an empty string if there are no commands,
  otherwise the result of <code>String.format(commandListHeading, params)</code>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>params</code> - the parameters to use to format the command list heading</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the formatted command list heading</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>params</code> - the parameters to use to format the command list heading</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the formatted command list heading</dd></dl>
 </li>
 </ul>
-<a name="footerHeading-java.lang.Object...-">
+<a name="footerHeading(java.lang.Object...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1162,15 +1017,11 @@ <h4>commandListHeading</h4>
 <h4>footerHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;footerHeading(java.lang.Object...&nbsp;params)</pre>
 <div class="block">Returns the text displayed before the footer text; the result of <code>String.format(footerHeading, params)</code>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>params</code> - the parameters to use to format the footer heading</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the formatted footer heading</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>params</code> - the parameters to use to format the footer heading</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the formatted footer heading</dd></dl>
 </li>
 </ul>
-<a name="commandList--">
+<a name="commandList()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1178,13 +1029,10 @@ <h4>footerHeading</h4>
 <h4>commandList</h4>
 <pre>public&nbsp;java.lang.String&nbsp;commandList()</pre>
 <div class="block">Returns a 2-column list with command names and the first line of their header or (if absent) description.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a usage help section describing the added commands</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a usage help section describing the added commands</dd></dl>
 </li>
 </ul>
-<a name="createDefaultLayout--">
+<a name="createDefaultLayout()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1192,13 +1040,10 @@ <h4>commandList</h4>
 <h4>createDefaultLayout</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a>&nbsp;createDefaultLayout()</pre>
 <div class="block">Returns a <code>Layout</code> instance configured with the user preferences captured in this Help instance.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a Layout</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a Layout</dd></dl>
 </li>
 </ul>
-<a name="createDefaultOptionRenderer--">
+<a name="createDefaultOptionRenderer()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1212,17 +1057,14 @@ <h4>createDefaultOptionRenderer</h4>
  <li>2-character short option name (or empty string if no short option exists)</li>
  <li>comma separator (only if both short option and long option exist, empty string otherwise)</li>
  <li>comma-separated string with long option name(s)</li>
- <li>first element of the <a href="../picocli/CommandLine.Model.ArgSpec.html#description--"><code>CommandLine.Model.ArgSpec.description()</code></a> array</li>
+ <li>first element of the <a href="../picocli/CommandLine.Model.ArgSpec.html#description()"><code>CommandLine.Model.ArgSpec.description()</code></a> array</li>
  </ol>
- <p>Following this, there will be one row for each of the remaining elements of the <a href="../picocli/CommandLine.Model.ArgSpec.html#description--"><code>CommandLine.Model.ArgSpec.description()</code></a> array, and these rows look like <code>{"", "", "", "", option.description()[i]}</code>.</p>
+ <p>Following this, there will be one row for each of the remaining elements of the <a href="../picocli/CommandLine.Model.ArgSpec.html#description()"><code>CommandLine.Model.ArgSpec.description()</code></a> array, and these rows look like <code>{"", "", "", "", option.description()[i]}</code>.</p>
  <p>If configured, this option renderer adds an additional row to display the default field value.</p></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new default OptionRenderer</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a new default OptionRenderer</dd></dl>
 </li>
 </ul>
-<a name="createMinimalOptionRenderer--">
+<a name="createMinimalOptionRenderer()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1231,13 +1073,10 @@ <h4>createMinimalOptionRenderer</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a>&nbsp;createMinimalOptionRenderer()</pre>
 <div class="block">Returns a new minimal OptionRenderer which converts <a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>Options</code></a> to a single row with two columns
  of text: an option name and a description. If multiple names or descriptions exist, the first value is used.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new minimal OptionRenderer</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a new minimal OptionRenderer</dd></dl>
 </li>
 </ul>
-<a name="createDefaultParameterRenderer--">
+<a name="createDefaultParameterRenderer()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1250,17 +1089,14 @@ <h4>createDefaultParameterRenderer</h4>
  <li>empty string </li>
  <li>empty string </li>
  <li>parameter(s) label as rendered by the <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli"><code>CommandLine.Help.IParamLabelRenderer</code></a></li>
- <li>first element of the <a href="../picocli/CommandLine.Model.ArgSpec.html#description--"><code>CommandLine.Model.ArgSpec.description()</code></a> array</li>
+ <li>first element of the <a href="../picocli/CommandLine.Model.ArgSpec.html#description()"><code>CommandLine.Model.ArgSpec.description()</code></a> array</li>
  </ol>
- <p>Following this, there will be one row for each of the remaining elements of the <a href="../picocli/CommandLine.Model.ArgSpec.html#description--"><code>CommandLine.Model.ArgSpec.description()</code></a> array, and these rows look like <code>{"", "", "", param.description()[i]}</code>.</p>
+ <p>Following this, there will be one row for each of the remaining elements of the <a href="../picocli/CommandLine.Model.ArgSpec.html#description()"><code>CommandLine.Model.ArgSpec.description()</code></a> array, and these rows look like <code>{"", "", "", param.description()[i]}</code>.</p>
  <p>If configured, this parameter renderer adds an additional row to display the default field value.</p></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new default ParameterRenderer</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a new default ParameterRenderer</dd></dl>
 </li>
 </ul>
-<a name="createMinimalParameterRenderer--">
+<a name="createMinimalParameterRenderer()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1269,13 +1105,10 @@ <h4>createMinimalParameterRenderer</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a>&nbsp;createMinimalParameterRenderer()</pre>
 <div class="block">Returns a new minimal ParameterRenderer which converts <a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">positional parameters</a>
  to a single row with two columns of text: an option name and a description. If multiple descriptions exist, the first value is used.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new minimal ParameterRenderer</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a new minimal ParameterRenderer</dd></dl>
 </li>
 </ul>
-<a name="createMinimalParamLabelRenderer--">
+<a name="createMinimalParamLabelRenderer()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1283,13 +1116,10 @@ <h4>createMinimalParameterRenderer</h4>
 <h4>createMinimalParamLabelRenderer</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;createMinimalParamLabelRenderer()</pre>
 <div class="block">Returns a value renderer that returns the <code>paramLabel</code> if defined or the field name otherwise.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new minimal ParamLabelRenderer</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a new minimal ParamLabelRenderer</dd></dl>
 </li>
 </ul>
-<a name="createDefaultParamLabelRenderer--">
+<a name="createDefaultParamLabelRenderer()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1299,13 +1129,10 @@ <h4>createDefaultParamLabelRenderer</h4>
 <div class="block">Returns a new default value renderer that separates option parameters from their option name
  with the specified separator string, surrounds optional parameters with <code>'['</code> and <code>']'</code>
  characters and uses ellipses ("...") to indicate that any number of a parameter are allowed.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new default ParamLabelRenderer</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a new default ParamLabelRenderer</dd></dl>
 </li>
 </ul>
-<a name="createShortOptionNameComparator--">
+<a name="createShortOptionNameComparator()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1314,13 +1141,10 @@ <h4>createShortOptionNameComparator</h4>
 <pre>public static&nbsp;java.util.Comparator&lt;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;&nbsp;createShortOptionNameComparator()</pre>
 <div class="block">Sorts <a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>OptionSpecs</code></a> by their option name in case-insensitive alphabetic order. If an
  option has multiple names, the shortest name is used for the sorting. Help options follow non-help options.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a comparator that sorts OptionSpecs by their option name in case-insensitive alphabetic order</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a comparator that sorts OptionSpecs by their option name in case-insensitive alphabetic order</dd></dl>
 </li>
 </ul>
-<a name="createShortOptionArityAndNameComparator--">
+<a name="createShortOptionArityAndNameComparator()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1328,14 +1152,11 @@ <h4>createShortOptionNameComparator</h4>
 <h4>createShortOptionArityAndNameComparator</h4>
 <pre>public static&nbsp;java.util.Comparator&lt;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;&nbsp;createShortOptionArityAndNameComparator()</pre>
 <div class="block">Sorts <a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>OptionSpecs</code></a> by their option <a href="../picocli/CommandLine.Range.html#max">max arity</a> first, by
- <a href="../picocli/CommandLine.Range.html#min">min arity</a> next, and by <a href="../picocli/CommandLine.Help.html#createShortOptionNameComparator--">option name</a> last.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a comparator that sorts OptionSpecs by arity first, then their option name</dd>
-</dl>
+ <a href="../picocli/CommandLine.Range.html#min">min arity</a> next, and by <a href="../picocli/CommandLine.Help.html#createShortOptionNameComparator()">option name</a> last.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a comparator that sorts OptionSpecs by arity first, then their option name</dd></dl>
 </li>
 </ul>
-<a name="shortestFirst--">
+<a name="shortestFirst()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1343,13 +1164,10 @@ <h4>createShortOptionArityAndNameComparator</h4>
 <h4>shortestFirst</h4>
 <pre>public static&nbsp;java.util.Comparator&lt;java.lang.String&gt;&nbsp;shortestFirst()</pre>
 <div class="block">Sorts short strings before longer strings.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a comparators that sorts short strings before longer strings</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a comparators that sorts short strings before longer strings</dd></dl>
 </li>
 </ul>
-<a name="ansi--">
+<a name="ansi()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1357,13 +1175,10 @@ <h4>shortestFirst</h4>
 <h4>ansi</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi()</pre>
 <div class="block">Returns whether ANSI escape codes are enabled or not.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>whether ANSI escape codes are enabled or not</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>whether ANSI escape codes are enabled or not</dd></dl>
 </li>
 </ul>
-<a name="defaultColorScheme-picocli.CommandLine.Help.Ansi-">
+<a name="defaultColorScheme(picocli.CommandLine.Help.Ansi)">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -1372,12 +1187,8 @@ <h4>defaultColorScheme</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;defaultColorScheme(<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
 <div class="block">Creates and returns a new <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli"><code>CommandLine.Help.ColorScheme</code></a> initialized with picocli default values: commands are bold,
   options and parameters use a yellow foreground, and option parameters use italic.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ansi</code> - whether the usage help message should contain ANSI escape codes or not</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new default color scheme</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>ansi</code> - whether the usage help message should contain ANSI escape codes or not</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a new default color scheme</dd></dl>
 </li>
 </ul>
 </li>
@@ -1388,11 +1199,9 @@ <h4>defaultColorScheme</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -1407,15 +1216,15 @@ <h4>defaultColorScheme</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Help.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Help.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -1432,19 +1241,19 @@ <h4>defaultColorScheme</h4>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#nested_class_summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.HelpCommand.html b/docs/apidocs/picocli/CommandLine.HelpCommand.html
index 465b6a1ca..453b56097 100644
--- a/docs/apidocs/picocli/CommandLine.HelpCommand.html
+++ b/docs/apidocs/picocli/CommandLine.HelpCommand.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.HelpCommand (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.HelpCommand (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.HelpCommand (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.HelpCommand (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.HelpCommand.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.HelpCommand.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.HelpCommand.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -75,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -116,7 +103,7 @@ <h2 title="Class CommandLine.HelpCommand" class="title">Class CommandLine.HelpCo
 </dl>
 <hr>
 <br>
-<pre>public static final class <span class="typeNameLabel">CommandLine.HelpCommand</span>
+<pre>public static final class <span class="strong">CommandLine.HelpCommand</span>
 extends java.lang.Object
 implements <a href="../picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli">CommandLine.IHelpCommandInitializable</a>, java.lang.Runnable</pre>
 <div class="block">Help command that can be installed as a subcommand on all application commands. When invoked with a subcommand
@@ -131,10 +118,8 @@ <h2 title="Class CommandLine.HelpCommand" class="title">Class CommandLine.HelpCo
  // print help for command
  command help
  </pre></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -143,51 +128,51 @@ <h2 title="Class CommandLine.HelpCommand" class="title">Class CommandLine.HelpCo
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.HelpCommand.html#HelpCommand--">HelpCommand</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.HelpCommand.html#CommandLine.HelpCommand()">CommandLine.HelpCommand</a></strong>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.HelpCommand.html#init-picocli.CommandLine-picocli.CommandLine.Help.Ansi-java.io.PrintStream-java.io.PrintStream-">init</a></span>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;helpCommandLine,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.HelpCommand.html#init(picocli.CommandLine,%20picocli.CommandLine.Help.Ansi,%20java.io.PrintStream,%20java.io.PrintStream)">init</a></strong>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;helpCommandLine,
     <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
     java.io.PrintStream&nbsp;out,
     java.io.PrintStream&nbsp;err)</code>
 <div class="block">Initializes this object with the information needed to implement a help command that provides usage help for other commands.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.HelpCommand.html#run--">run</a></span>()</code>
-<div class="block">Invokes <a href="../picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>usage</code></a> for the specified command, or for the parent command.</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.HelpCommand.html#run()">run</a></strong>()</code>
+<div class="block">Invokes <a href="../picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>usage</code></a> for the specified command, or for the parent command.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -203,61 +188,56 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="HelpCommand--">
+<a name="CommandLine.HelpCommand()">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>HelpCommand</h4>
-<pre>public&nbsp;HelpCommand()</pre>
+<h4>CommandLine.HelpCommand</h4>
+<pre>public&nbsp;CommandLine.HelpCommand()</pre>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="run--">
+<a name="run()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
 <pre>public&nbsp;void&nbsp;run()</pre>
-<div class="block">Invokes <a href="../picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>usage</code></a> for the specified command, or for the parent command.</div>
+<div class="block">Invokes <a href="../picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>usage</code></a> for the specified command, or for the parent command.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dt><strong>Specified by:</strong></dt>
 <dd><code>run</code>&nbsp;in interface&nbsp;<code>java.lang.Runnable</code></dd>
 </dl>
 </li>
 </ul>
-<a name="init-picocli.CommandLine-picocli.CommandLine.Help.Ansi-java.io.PrintStream-java.io.PrintStream-">
+<a name="init(picocli.CommandLine, picocli.CommandLine.Help.Ansi, java.io.PrintStream, java.io.PrintStream)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>init</h4>
 <pre>public&nbsp;void&nbsp;init(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;helpCommandLine,
-                 <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
-                 java.io.PrintStream&nbsp;out,
-                 java.io.PrintStream&nbsp;err)</pre>
+        <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
+        java.io.PrintStream&nbsp;out,
+        java.io.PrintStream&nbsp;err)</pre>
 <div class="block">Initializes this object with the information needed to implement a help command that provides usage help for other commands.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.IHelpCommandInitializable.html#init-picocli.CommandLine-picocli.CommandLine.Help.Ansi-java.io.PrintStream-java.io.PrintStream-">init</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli">CommandLine.IHelpCommandInitializable</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>helpCommandLine</code> - provides access to this command's parent and sibling commands</dd>
-<dd><code>ansi</code> - whether to use Ansi colors or not</dd>
-<dd><code>out</code> - the stream to print the usage help message to</dd>
-<dd><code>err</code> - the error stream to print any diagnostic messages to, in addition to the output from the exception handler</dd>
-</dl>
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.IHelpCommandInitializable.html#init(picocli.CommandLine,%20picocli.CommandLine.Help.Ansi,%20java.io.PrintStream,%20java.io.PrintStream)">init</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli">CommandLine.IHelpCommandInitializable</a></code></dd>
+<dt><span class="strong">Parameters:</span></dt><dd><code>helpCommandLine</code> - provides access to this command's parent and sibling commands</dd><dd><code>ansi</code> - whether to use Ansi colors or not</dd><dd><code>out</code> - the stream to print the usage help message to</dd><dd><code>err</code> - the error stream to print any diagnostic messages to, in addition to the output from the exception handler</dd></dl>
 </li>
 </ul>
 </li>
@@ -268,11 +248,9 @@ <h4>init</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -287,15 +265,15 @@ <h4>init</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.HelpCommand.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.HelpCommand.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.HelpCommand.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -314,17 +292,17 @@ <h4>init</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.IExceptionHandler.html b/docs/apidocs/picocli/CommandLine.IExceptionHandler.html
index 8f7692afd..a26947ddb 100644
--- a/docs/apidocs/picocli/CommandLine.IExceptionHandler.html
+++ b/docs/apidocs/picocli/CommandLine.IExceptionHandler.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.IExceptionHandler (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.IExceptionHandler (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.IExceptionHandler (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.IExceptionHandler (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":38};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],32:["t6","Deprecated Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.HelpCommand.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.HelpCommand.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.IExceptionHandler.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.IExceptionHandler.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.IExceptionHandler.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -76,16 +63,16 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -107,26 +94,23 @@ <h2 title="Interface CommandLine.IExceptionHandler" class="title">Interface Comm
 <dd><a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a></dd>
 </dl>
 <hr>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use <a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><code>CommandLine.IExceptionHandler2</code></a> instead.</span></div>
+<div class="block"><strong>Deprecated.</strong>&nbsp;
+<div class="block"><i>Use <a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><code>CommandLine.IExceptionHandler2</code></a> instead.</i></div>
 </div>
 <br>
 <pre>@Deprecated
-public static interface <span class="typeNameLabel">CommandLine.IExceptionHandler</span></pre>
+public static interface <span class="strong">CommandLine.IExceptionHandler</span></pre>
 <div class="block">Represents a function that can handle a <code>ParameterException</code> that occurred while
- <a href="../picocli/CommandLine.html#parse-java.lang.String...-">parsing</a> the command line arguments. This is a
+ <a href="../picocli/CommandLine.html#parse(java.lang.String...)">parsing</a> the command line arguments. This is a
  <a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html">functional interface</a>
- whose functional method is <a href="../picocli/CommandLine.IExceptionHandler.html#handleException-picocli.CommandLine.ParameterException-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>handleException(CommandLine.ParameterException, PrintStream, CommandLine.Help.Ansi, String...)</code></a>.
+ whose functional method is <a href="../picocli/CommandLine.IExceptionHandler.html#handleException(picocli.CommandLine.ParameterException,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>handleException(CommandLine.ParameterException, PrintStream, CommandLine.Help.Ansi, String...)</code></a>.
  <p>
- Implementations of this function can be passed to the <a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler-java.io.PrintStream-picocli.CommandLine.Help.Ansi-picocli.CommandLine.IExceptionHandler-java.lang.String...-"><code>CommandLine::parseWithHandlers</code></a>
+ Implementations of this function can be passed to the <a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20picocli.CommandLine.IExceptionHandler,%20java.lang.String...)"><code>CommandLine::parseWithHandlers</code></a>
  methods to handle situations when the command line could not be parsed.
  </p></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><code>CommandLine.DefaultExceptionHandler</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><code>CommandLine.DefaultExceptionHandler</code></a></dd></dl>
 </li>
 </ul>
 </div>
@@ -135,24 +119,24 @@ <h2 title="Interface CommandLine.IExceptionHandler" class="title">Interface Comm
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.util.List&lt;java.lang.Object&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.IExceptionHandler.html#handleException-picocli.CommandLine.ParameterException-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">handleException</a></span>(<a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a>&nbsp;ex,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.IExceptionHandler.html#handleException(picocli.CommandLine.ParameterException,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)">handleException</a></strong>(<a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a>&nbsp;ex,
                java.io.PrintStream&nbsp;out,
                <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
                java.lang.String...&nbsp;args)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block">Handles a <code>ParameterException</code> that occurred while <a href="../picocli/CommandLine.html#parse-java.lang.String...-">parsing</a> the command
+<div class="block"><strong>Deprecated.</strong>&nbsp;</div>
+<div class="block">Handles a <code>ParameterException</code> that occurred while <a href="../picocli/CommandLine.html#parse(java.lang.String...)">parsing</a> the command
  line arguments and optionally returns a list of results.</div>
 </td>
 </tr>
@@ -167,33 +151,26 @@ <h3>Method Summary</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="handleException-picocli.CommandLine.ParameterException-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">
+<a name="handleException(picocli.CommandLine.ParameterException, java.io.PrintStream, picocli.CommandLine.Help.Ansi, java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>handleException</h4>
 <pre>java.util.List&lt;java.lang.Object&gt;&nbsp;handleException(<a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a>&nbsp;ex,
-                                                 java.io.PrintStream&nbsp;out,
-                                                 <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
-                                                 java.lang.String...&nbsp;args)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block">Handles a <code>ParameterException</code> that occurred while <a href="../picocli/CommandLine.html#parse-java.lang.String...-">parsing</a> the command
+                                               java.io.PrintStream&nbsp;out,
+                                               <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
+                                               java.lang.String...&nbsp;args)</pre>
+<div class="block"><span class="strong">Deprecated.</span>&nbsp;</div>
+<div class="block">Handles a <code>ParameterException</code> that occurred while <a href="../picocli/CommandLine.html#parse(java.lang.String...)">parsing</a> the command
  line arguments and optionally returns a list of results.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ex</code> - the ParameterException describing the problem that occurred while parsing the command line arguments,
-           and the CommandLine representing the command or subcommand whose input was invalid</dd>
-<dd><code>out</code> - the <code>PrintStream</code> to print help to if requested</dd>
-<dd><code>ansi</code> - for printing help messages using ANSI styles and colors</dd>
-<dd><code>args</code> - the command line arguments that could not be parsed</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a list of results, or an empty list if there are no results</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>ex</code> - the ParameterException describing the problem that occurred while parsing the command line arguments,
+           and the CommandLine representing the command or subcommand whose input was invalid</dd><dd><code>out</code> - the <code>PrintStream</code> to print help to if requested</dd><dd><code>ansi</code> - for printing help messages using ANSI styles and colors</dd><dd><code>args</code> - the command line arguments that could not be parsed</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a list of results, or an empty list if there are no results</dd></dl>
 </li>
 </ul>
 </li>
@@ -204,11 +181,9 @@ <h4>handleException</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -223,15 +198,15 @@ <h4>handleException</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.HelpCommand.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.HelpCommand.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.IExceptionHandler.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.IExceptionHandler.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.IExceptionHandler.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -251,16 +226,16 @@ <h4>handleException</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.IExceptionHandler2.html b/docs/apidocs/picocli/CommandLine.IExceptionHandler2.html
index 95b812a9a..dbebd5377 100644
--- a/docs/apidocs/picocli/CommandLine.IExceptionHandler2.html
+++ b/docs/apidocs/picocli/CommandLine.IExceptionHandler2.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.IExceptionHandler2 (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.IExceptionHandler2 (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.IExceptionHandler2 (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.IExceptionHandler2 (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.IFactory.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.IFactory.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.IExceptionHandler2.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.IExceptionHandler2.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.IExceptionHandler2.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -76,16 +63,16 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -98,10 +85,7 @@ <h2 title="Interface CommandLine.IExceptionHandler2" class="title">Interface Com
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>R</code> - the return type of this handler</dd>
-</dl>
+<dl><dt><span class="strong">Type Parameters:</span></dt><dd><code>R</code> - the return type of this handler</dd></dl>
 <dl>
 <dt>All Known Implementing Classes:</dt>
 <dd><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a></dd>
@@ -112,21 +96,18 @@ <h2 title="Interface CommandLine.IExceptionHandler2" class="title">Interface Com
 </dl>
 <hr>
 <br>
-<pre>public static interface <span class="typeNameLabel">CommandLine.IExceptionHandler2&lt;R&gt;</span></pre>
+<pre>public static interface <span class="strong">CommandLine.IExceptionHandler2&lt;R&gt;</span></pre>
 <div class="block">Classes implementing this interface know how to handle <code>ParameterExceptions</code> (usually from invalid user input)
  and <code>ExecutionExceptions</code> that occurred while executing the <code>Runnable</code> or <code>Callable</code> command.
  <p>
  Implementations of this interface can be passed to the
- <a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>CommandLine::parseWithHandlers</code></a> method.
+ <a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)"><code>CommandLine::parseWithHandlers</code></a> method.
  </p><p>
  This interface replaces the <a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli"><code>CommandLine.IParseResultHandler</code></a> interface.
  </p></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><code>CommandLine.DefaultExceptionHandler</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><code>CommandLine.DefaultExceptionHandler</code></a></dd></dl>
 </li>
 </ul>
 </div>
@@ -135,31 +116,29 @@ <h2 title="Interface CommandLine.IExceptionHandler2" class="title">Interface Com
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.IExceptionHandler2.html" title="type parameter in CommandLine.IExceptionHandler2">R</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.IExceptionHandler2.html#handleExecutionException-picocli.CommandLine.ExecutionException-R-picocli.CommandLine.ParseResult-">handleExecutionException</a></span>(<a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a>&nbsp;ex,
-                        <a href="../picocli/CommandLine.IExceptionHandler2.html" title="type parameter in CommandLine.IExceptionHandler2">R</a>&nbsp;prototypeReturnValue,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.IExceptionHandler2.html#handleExecutionException(picocli.CommandLine.ExecutionException,%20picocli.CommandLine.ParseResult)">handleExecutionException</a></strong>(<a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a>&nbsp;ex,
                         <a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)</code>
 <div class="block">Handles a <code>ExecutionException</code> that occurred while executing the <code>Runnable</code> or
  <code>Callable</code> command and optionally returns a list of results.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.IExceptionHandler2.html" title="type parameter in CommandLine.IExceptionHandler2">R</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.IExceptionHandler2.html#handleParseException-picocli.CommandLine.ParameterException-R-java.lang.String:A-">handleParseException</a></span>(<a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a>&nbsp;ex,
-                    <a href="../picocli/CommandLine.IExceptionHandler2.html" title="type parameter in CommandLine.IExceptionHandler2">R</a>&nbsp;prototypeReturnValue,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.IExceptionHandler2.html#handleParseException(picocli.CommandLine.ParameterException,%20java.lang.String[])">handleParseException</a></strong>(<a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a>&nbsp;ex,
                     java.lang.String[]&nbsp;args)</code>
-<div class="block">Handles a <code>ParameterException</code> that occurred while <a href="../picocli/CommandLine.html#parseArgs-java.lang.String...-">parsing</a> the command
+<div class="block">Handles a <code>ParameterException</code> that occurred while <a href="../picocli/CommandLine.html#parseArgs(java.lang.String...)">parsing</a> the command
  line arguments and optionally returns a list of results.</div>
 </td>
 </tr>
@@ -174,58 +153,38 @@ <h3>Method Summary</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="handleParseException-picocli.CommandLine.ParameterException-java.lang.Object-java.lang.String:A-">
-<!--   -->
-</a><a name="handleParseException-picocli.CommandLine.ParameterException-R-java.lang.String:A-">
+<a name="handleParseException(picocli.CommandLine.ParameterException, java.lang.String[])">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>handleParseException</h4>
 <pre><a href="../picocli/CommandLine.IExceptionHandler2.html" title="type parameter in CommandLine.IExceptionHandler2">R</a>&nbsp;handleParseException(<a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a>&nbsp;ex,
-                       <a href="../picocli/CommandLine.IExceptionHandler2.html" title="type parameter in CommandLine.IExceptionHandler2">R</a>&nbsp;prototypeReturnValue,
-                       java.lang.String[]&nbsp;args)</pre>
-<div class="block">Handles a <code>ParameterException</code> that occurred while <a href="../picocli/CommandLine.html#parseArgs-java.lang.String...-">parsing</a> the command
+                     java.lang.String[]&nbsp;args)</pre>
+<div class="block">Handles a <code>ParameterException</code> that occurred while <a href="../picocli/CommandLine.html#parseArgs(java.lang.String...)">parsing</a> the command
  line arguments and optionally returns a list of results.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ex</code> - the ParameterException describing the problem that occurred while parsing the command line arguments,
-           and the CommandLine representing the command or subcommand whose input was invalid</dd>
-<dd><code>prototypeReturnValue</code> - prototype return value, may be returned as is or may be used by the
-                               handler for internal processing and a completely different object is returned</dd>
-<dd><code>args</code> - the command line arguments that could not be parsed</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an object resulting from handling the exception</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>ex</code> - the ParameterException describing the problem that occurred while parsing the command line arguments,
+           and the CommandLine representing the command or subcommand whose input was invalid</dd><dd><code>args</code> - the command line arguments that could not be parsed</dd>
+<dt><span class="strong">Returns:</span></dt><dd>an object resulting from handling the exception</dd></dl>
 </li>
 </ul>
-<a name="handleExecutionException-picocli.CommandLine.ExecutionException-java.lang.Object-picocli.CommandLine.ParseResult-">
-<!--   -->
-</a><a name="handleExecutionException-picocli.CommandLine.ExecutionException-R-picocli.CommandLine.ParseResult-">
+<a name="handleExecutionException(picocli.CommandLine.ExecutionException, picocli.CommandLine.ParseResult)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>handleExecutionException</h4>
 <pre><a href="../picocli/CommandLine.IExceptionHandler2.html" title="type parameter in CommandLine.IExceptionHandler2">R</a>&nbsp;handleExecutionException(<a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a>&nbsp;ex,
-                           <a href="../picocli/CommandLine.IExceptionHandler2.html" title="type parameter in CommandLine.IExceptionHandler2">R</a>&nbsp;prototypeReturnValue,
-                           <a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)</pre>
+                         <a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)</pre>
 <div class="block">Handles a <code>ExecutionException</code> that occurred while executing the <code>Runnable</code> or
  <code>Callable</code> command and optionally returns a list of results.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ex</code> - the ExecutionException describing the problem that occurred while executing the <code>Runnable</code> or
-          <code>Callable</code> command, and the CommandLine representing the command or subcommand that was being executed</dd>
-<dd><code>prototypeReturnValue</code> - prototype return value, may be returned as is or may be used by the
-                               handler for internal processing and a completely different object is returned</dd>
-<dd><code>parseResult</code> - the result of parsing the command line arguments</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an object resulting from handling the exception</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>ex</code> - the ExecutionException describing the problem that occurred while executing the <code>Runnable</code> or
+          <code>Callable</code> command, and the CommandLine representing the command or subcommand that was being executed</dd><dd><code>parseResult</code> - the result of parsing the command line arguments</dd>
+<dt><span class="strong">Returns:</span></dt><dd>an object resulting from handling the exception</dd></dl>
 </li>
 </ul>
 </li>
@@ -236,11 +195,9 @@ <h4>handleExecutionException</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -255,15 +212,15 @@ <h4>handleExecutionException</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.IFactory.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.IFactory.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.IExceptionHandler2.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.IExceptionHandler2.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.IExceptionHandler2.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -283,16 +240,16 @@ <h4>handleExecutionException</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.IFactory.html b/docs/apidocs/picocli/CommandLine.IFactory.html
index df99f4c21..ba241d270 100644
--- a/docs/apidocs/picocli/CommandLine.IFactory.html
+++ b/docs/apidocs/picocli/CommandLine.IFactory.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.IFactory (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.IFactory (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.IFactory (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.IFactory (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.IFactory.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.IFactory.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.IFactory.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -76,16 +63,16 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -104,13 +91,11 @@ <h2 title="Interface CommandLine.IFactory" class="title">Interface CommandLine.I
 </dl>
 <hr>
 <br>
-<pre>public static interface <span class="typeNameLabel">CommandLine.IFactory</span></pre>
+<pre>public static interface <span class="strong">CommandLine.IFactory</span></pre>
 <div class="block">Factory for instantiating classes that are registered declaratively with annotation attributes, like
- <a href="../picocli/CommandLine.Command.html#subcommands--"><code>CommandLine.Command.subcommands()</code></a>, <a href="../picocli/CommandLine.Option.html#converter--"><code>CommandLine.Option.converter()</code></a>, <a href="../picocli/CommandLine.Parameters.html#converter--"><code>CommandLine.Parameters.converter()</code></a> and <a href="../picocli/CommandLine.Command.html#versionProvider--"><code>CommandLine.Command.versionProvider()</code></a>.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.2</dd>
-</dl>
+ <a href="../picocli/CommandLine.Command.html#subcommands()"><code>CommandLine.Command.subcommands()</code></a>, <a href="../picocli/CommandLine.Option.html#converter()"><code>CommandLine.Option.converter()</code></a>, <a href="../picocli/CommandLine.Parameters.html#converter()"><code>CommandLine.Parameters.converter()</code></a> and <a href="../picocli/CommandLine.Command.html#versionProvider()"><code>CommandLine.Command.versionProvider()</code></a>.</div>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>2.2</dd></dl>
 </li>
 </ul>
 </div>
@@ -119,19 +104,19 @@ <h2 title="Interface CommandLine.IFactory" class="title">Interface CommandLine.I
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>&lt;K&gt;&nbsp;K</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.IFactory.html#create-java.lang.Class-">create</a></span>(java.lang.Class&lt;K&gt;&nbsp;cls)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.IFactory.html#create(java.lang.Class)">create</a></strong>(java.lang.Class&lt;K&gt;&nbsp;cls)</code>
 <div class="block">Creates and returns an instance of the specified class.</div>
 </td>
 </tr>
@@ -146,29 +131,23 @@ <h3>Method Summary</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="create-java.lang.Class-">
+<a name="create(java.lang.Class)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>create</h4>
 <pre>&lt;K&gt;&nbsp;K&nbsp;create(java.lang.Class&lt;K&gt;&nbsp;cls)
-      throws java.lang.Exception</pre>
+         throws java.lang.Exception</pre>
 <div class="block">Creates and returns an instance of the specified class.</div>
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>K</code> - the type to instantiate</dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>cls</code> - the class to instantiate</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the new instance</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.Exception</code> - an exception detailing what went wrong when creating the instance</dd>
-</dl>
+<dl><dt><span class="strong">Type Parameters:</span></dt><dd><code>K</code> - the type to instantiate</dd><dt><span class="strong">Parameters:</span></dt><dd><code>cls</code> - the class to instantiate</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the new instance</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code>java.lang.Exception</code> - an exception detailing what went wrong when creating the instance</dd></dl>
 </li>
 </ul>
 </li>
@@ -179,11 +158,9 @@ <h4>create</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -198,15 +175,15 @@ <h4>create</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.IFactory.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.IFactory.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.IFactory.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -226,16 +203,16 @@ <h4>create</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.IHelpCommandInitializable.html b/docs/apidocs/picocli/CommandLine.IHelpCommandInitializable.html
index 2f143991d..f57628a08 100644
--- a/docs/apidocs/picocli/CommandLine.IHelpCommandInitializable.html
+++ b/docs/apidocs/picocli/CommandLine.IHelpCommandInitializable.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.IHelpCommandInitializable (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.IHelpCommandInitializable (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.IHelpCommandInitializable (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.IHelpCommandInitializable (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.IFactory.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.IFactory.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.IHelpCommandInitializable.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.IHelpCommandInitializable.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.IHelpCommandInitializable.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -76,16 +63,16 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -108,20 +95,18 @@ <h2 title="Interface CommandLine.IHelpCommandInitializable" class="title">Interf
 </dl>
 <hr>
 <br>
-<pre>public static interface <span class="typeNameLabel">CommandLine.IHelpCommandInitializable</span></pre>
+<pre>public static interface <span class="strong">CommandLine.IHelpCommandInitializable</span></pre>
 <div class="block">Help commands that provide usage help for other commands can implement this interface to be initialized with the information they need.
- <p>The <a href="../picocli/CommandLine.html#printHelpIfRequested-java.util.List-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>CommandLine::printHelpIfRequested</code></a> method calls the
- <a href="../picocli/CommandLine.IHelpCommandInitializable.html#init-picocli.CommandLine-picocli.CommandLine.Help.Ansi-java.io.PrintStream-java.io.PrintStream-"><code>init</code></a> method on commands marked as <a href="../picocli/CommandLine.Command.html#helpCommand--"><code>helpCommand</code></a>
+ <p>The <a href="../picocli/CommandLine.html#printHelpIfRequested(java.util.List,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>CommandLine::printHelpIfRequested</code></a> method calls the
+ <a href="../picocli/CommandLine.IHelpCommandInitializable.html#init(picocli.CommandLine,%20picocli.CommandLine.Help.Ansi,%20java.io.PrintStream,%20java.io.PrintStream)"><code>init</code></a> method on commands marked as <a href="../picocli/CommandLine.Command.html#helpCommand()"><code>helpCommand</code></a>
  before the help command's <code>run</code> or <code>call</code> method is called.</p>
  <p><b>Implementation note:</b></p><p>
  If an error occurs in the <code>run</code> or <code>call</code> method while processing the help request, it is recommended custom Help
  commands throw a <a href="../picocli/CommandLine.ParameterException.html" title="class in picocli"><code>CommandLine.ParameterException</code></a> with a reference to the parent command. The <a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><code>CommandLine.DefaultExceptionHandler</code></a> will print
  the error message and the usage for the parent command, and will terminate with the exit code of the exception handler if one was set.
  </p></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -130,19 +115,19 @@ <h2 title="Interface CommandLine.IHelpCommandInitializable" class="title">Interf
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.IHelpCommandInitializable.html#init-picocli.CommandLine-picocli.CommandLine.Help.Ansi-java.io.PrintStream-java.io.PrintStream-">init</a></span>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;helpCommandLine,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.IHelpCommandInitializable.html#init(picocli.CommandLine,%20picocli.CommandLine.Help.Ansi,%20java.io.PrintStream,%20java.io.PrintStream)">init</a></strong>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;helpCommandLine,
     <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
     java.io.PrintStream&nbsp;out,
     java.io.PrintStream&nbsp;err)</code>
@@ -160,28 +145,22 @@ <h3>Method Summary</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="init-picocli.CommandLine-picocli.CommandLine.Help.Ansi-java.io.PrintStream-java.io.PrintStream-">
+<a name="init(picocli.CommandLine, picocli.CommandLine.Help.Ansi, java.io.PrintStream, java.io.PrintStream)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>init</h4>
 <pre>void&nbsp;init(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;helpCommandLine,
-          <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
-          java.io.PrintStream&nbsp;out,
-          java.io.PrintStream&nbsp;err)</pre>
+        <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
+        java.io.PrintStream&nbsp;out,
+        java.io.PrintStream&nbsp;err)</pre>
 <div class="block">Initializes this object with the information needed to implement a help command that provides usage help for other commands.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>helpCommandLine</code> - provides access to this command's parent and sibling commands</dd>
-<dd><code>ansi</code> - whether to use Ansi colors or not</dd>
-<dd><code>out</code> - the stream to print the usage help message to</dd>
-<dd><code>err</code> - the error stream to print any diagnostic messages to, in addition to the output from the exception handler</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>helpCommandLine</code> - provides access to this command's parent and sibling commands</dd><dd><code>ansi</code> - whether to use Ansi colors or not</dd><dd><code>out</code> - the stream to print the usage help message to</dd><dd><code>err</code> - the error stream to print any diagnostic messages to, in addition to the output from the exception handler</dd></dl>
 </li>
 </ul>
 </li>
@@ -192,11 +171,9 @@ <h4>init</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -211,15 +188,15 @@ <h4>init</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.IFactory.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.IFactory.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.IHelpCommandInitializable.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.IHelpCommandInitializable.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.IHelpCommandInitializable.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -239,16 +216,16 @@ <h4>init</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.IParseResultHandler.html b/docs/apidocs/picocli/CommandLine.IParseResultHandler.html
index d668b755b..87e3e543d 100644
--- a/docs/apidocs/picocli/CommandLine.IParseResultHandler.html
+++ b/docs/apidocs/picocli/CommandLine.IParseResultHandler.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.IParseResultHandler (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.IParseResultHandler (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.IParseResultHandler (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.IParseResultHandler (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":38};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],32:["t6","Deprecated Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.IParseResultHandler.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.IParseResultHandler.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.IParseResultHandler.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -76,16 +63,16 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -107,28 +94,25 @@ <h2 title="Interface CommandLine.IParseResultHandler" class="title">Interface Co
 <dd><a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a></dd>
 </dl>
 <hr>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use <a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><code>CommandLine.IParseResultHandler2</code></a> instead.</span></div>
+<div class="block"><strong>Deprecated.</strong>&nbsp;
+<div class="block"><i>Use <a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><code>CommandLine.IParseResultHandler2</code></a> instead.</i></div>
 </div>
 <br>
 <pre>@Deprecated
-public static interface <span class="typeNameLabel">CommandLine.IParseResultHandler</span></pre>
+public static interface <span class="strong">CommandLine.IParseResultHandler</span></pre>
 <div class="block">Represents a function that can process a List of <code>CommandLine</code> objects resulting from successfully
- <a href="../picocli/CommandLine.html#parse-java.lang.String...-">parsing</a> the command line arguments. This is a
+ <a href="../picocli/CommandLine.html#parse(java.lang.String...)">parsing</a> the command line arguments. This is a
  <a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html">functional interface</a>
- whose functional method is <a href="../picocli/CommandLine.IParseResultHandler.html#handleParseResult-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>handleParseResult(List, PrintStream, CommandLine.Help.Ansi)</code></a>.
+ whose functional method is <a href="../picocli/CommandLine.IParseResultHandler.html#handleParseResult(java.util.List,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>handleParseResult(List, PrintStream, CommandLine.Help.Ansi)</code></a>.
  <p>
- Implementations of this functions can be passed to the <a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler-java.io.PrintStream-picocli.CommandLine.Help.Ansi-picocli.CommandLine.IExceptionHandler-java.lang.String...-"><code>CommandLine::parseWithHandler</code></a>
+ Implementations of this functions can be passed to the <a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20picocli.CommandLine.IExceptionHandler,%20java.lang.String...)"><code>CommandLine::parseWithHandler</code></a>
  methods to take some next step after the command line was successfully parsed.
  </p></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.RunFirst.html" title="class in picocli"><code>CommandLine.RunFirst</code></a>, 
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.RunFirst.html" title="class in picocli"><code>CommandLine.RunFirst</code></a>, 
 <a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a>, 
-<a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><code>CommandLine.RunAll</code></a></dd>
-</dl>
+<a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><code>CommandLine.RunAll</code></a></dd></dl>
 </li>
 </ul>
 </div>
@@ -137,24 +121,24 @@ <h2 title="Interface CommandLine.IParseResultHandler" class="title">Interface Co
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.util.List&lt;java.lang.Object&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.IParseResultHandler.html#handleParseResult-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">handleParseResult</a></span>(java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.IParseResultHandler.html#handleParseResult(java.util.List,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">handleParseResult</a></strong>(java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands,
                  java.io.PrintStream&nbsp;out,
                  <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+<div class="block"><strong>Deprecated.</strong>&nbsp;</div>
 <div class="block">Processes a List of <code>CommandLine</code> objects resulting from successfully
- <a href="../picocli/CommandLine.html#parse-java.lang.String...-">parsing</a> the command line arguments and optionally returns a list of results.</div>
+ <a href="../picocli/CommandLine.html#parse(java.lang.String...)">parsing</a> the command line arguments and optionally returns a list of results.</div>
 </td>
 </tr>
 </table>
@@ -168,36 +152,30 @@ <h3>Method Summary</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="handleParseResult-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">
+<a name="handleParseResult(java.util.List, java.io.PrintStream, picocli.CommandLine.Help.Ansi)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>handleParseResult</h4>
 <pre>java.util.List&lt;java.lang.Object&gt;&nbsp;handleParseResult(java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands,
-                                                   java.io.PrintStream&nbsp;out,
-                                                   <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)
-                                            throws <a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+                                                 java.io.PrintStream&nbsp;out,
+                                                 <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)
+                                                   throws <a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></pre>
+<div class="block"><span class="strong">Deprecated.</span>&nbsp;</div>
 <div class="block">Processes a List of <code>CommandLine</code> objects resulting from successfully
- <a href="../picocli/CommandLine.html#parse-java.lang.String...-">parsing</a> the command line arguments and optionally returns a list of results.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>parsedCommands</code> - the <code>CommandLine</code> objects that resulted from successfully parsing the command line arguments</dd>
-<dd><code>out</code> - the <code>PrintStream</code> to print help to if requested</dd>
-<dd><code>ansi</code> - for printing help messages using ANSI styles and colors</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a list of results, or an empty list if there are no results</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+ <a href="../picocli/CommandLine.html#parse(java.lang.String...)">parsing</a> the command line arguments and optionally returns a list of results.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>parsedCommands</code> - the <code>CommandLine</code> objects that resulted from successfully parsing the command line arguments</dd><dd><code>out</code> - the <code>PrintStream</code> to print help to if requested</dd><dd><code>ansi</code> - for printing help messages using ANSI styles and colors</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a list of results, or an empty list if there are no results</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></code> - if a help command was invoked for an unknown subcommand. Any <code>ParameterExceptions</code>
       thrown from this method are treated as if this exception was thrown during parsing and passed to the <a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><code>CommandLine.IExceptionHandler</code></a></dd>
 <dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if a problem occurred while processing the parse results; use
-      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine--"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd>
-</dl>
+      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine()"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd></dl>
 </li>
 </ul>
 </li>
@@ -208,11 +186,9 @@ <h4>handleParseResult</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -227,15 +203,15 @@ <h4>handleParseResult</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.IParseResultHandler.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.IParseResultHandler.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.IParseResultHandler.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -255,16 +231,16 @@ <h4>handleParseResult</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.IParseResultHandler2.html b/docs/apidocs/picocli/CommandLine.IParseResultHandler2.html
index 8c8dbf9fc..bab299d22 100644
--- a/docs/apidocs/picocli/CommandLine.IParseResultHandler2.html
+++ b/docs/apidocs/picocli/CommandLine.IParseResultHandler2.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.IParseResultHandler2 (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.IParseResultHandler2 (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.IParseResultHandler2 (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.IParseResultHandler2 (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.IParseResultHandler2.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.IParseResultHandler2.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.IParseResultHandler2.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -76,16 +63,16 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -98,13 +85,10 @@ <h2 title="Interface CommandLine.IParseResultHandler2" class="title">Interface C
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>R</code> - the return type of this handler</dd>
-</dl>
+<dl><dt><span class="strong">Type Parameters:</span></dt><dd><code>R</code> - the return type of this handler</dd></dl>
 <dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>, <a href="../picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli">CommandLine.AbstractSimpleParseResultHandler</a>, <a href="../picocli/CommandLine.RunAll.html" title="class in picocli">CommandLine.RunAll</a>, <a href="../picocli/CommandLine.RunFirst.html" title="class in picocli">CommandLine.RunFirst</a>, <a href="../picocli/CommandLine.RunLast.html" title="class in picocli">CommandLine.RunLast</a></dd>
+<dd><a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>, <a href="../picocli/CommandLine.RunAll.html" title="class in picocli">CommandLine.RunAll</a>, <a href="../picocli/CommandLine.RunFirst.html" title="class in picocli">CommandLine.RunFirst</a>, <a href="../picocli/CommandLine.RunLast.html" title="class in picocli">CommandLine.RunLast</a></dd>
 </dl>
 <dl>
 <dt>Enclosing class:</dt>
@@ -112,27 +96,24 @@ <h2 title="Interface CommandLine.IParseResultHandler2" class="title">Interface C
 </dl>
 <hr>
 <br>
-<pre>public static interface <span class="typeNameLabel">CommandLine.IParseResultHandler2&lt;R&gt;</span></pre>
+<pre>public static interface <span class="strong">CommandLine.IParseResultHandler2&lt;R&gt;</span></pre>
 <div class="block">Represents a function that can process the <code>ParseResult</code> object resulting from successfully
- <a href="../picocli/CommandLine.html#parseArgs-java.lang.String...-">parsing</a> the command line arguments. This is a
+ <a href="../picocli/CommandLine.html#parseArgs(java.lang.String...)">parsing</a> the command line arguments. This is a
  <a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html">functional interface</a>
- whose functional method is <a href="../picocli/CommandLine.IParseResultHandler2.html#handleParseResult-picocli.CommandLine.ParseResult-R-"><code>handleParseResult(CommandLine.ParseResult, Object)</code></a>.
+ whose functional method is <a href="../picocli/CommandLine.IParseResultHandler2.html#handleParseResult(picocli.CommandLine.ParseResult)"><code>handleParseResult(CommandLine.ParseResult)</code></a>.
  <p>
- Implementations of this function can be passed to the <a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>CommandLine::parseWithHandlers</code></a>
+ Implementations of this function can be passed to the <a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)"><code>CommandLine::parseWithHandlers</code></a>
  methods to take some next step after the command line was successfully parsed.
  </p><p>
  This interface replaces the <a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli"><code>CommandLine.IParseResultHandler</code></a> interface; it takes the parse result as a <code>ParseResult</code>
  object instead of a List of <code>CommandLine</code> objects, and it has the freedom to select the <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli"><code>CommandLine.Help.Ansi</code></a> style
  to use and what <code>PrintStreams</code> to print to.
  </p></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.RunFirst.html" title="class in picocli"><code>CommandLine.RunFirst</code></a>, 
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.RunFirst.html" title="class in picocli"><code>CommandLine.RunFirst</code></a>, 
 <a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a>, 
-<a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><code>CommandLine.RunAll</code></a></dd>
-</dl>
+<a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><code>CommandLine.RunAll</code></a></dd></dl>
 </li>
 </ul>
 </div>
@@ -141,22 +122,21 @@ <h2 title="Interface CommandLine.IParseResultHandler2" class="title">Interface C
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.IParseResultHandler2.html" title="type parameter in CommandLine.IParseResultHandler2">R</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.IParseResultHandler2.html#handleParseResult-picocli.CommandLine.ParseResult-R-">handleParseResult</a></span>(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult,
-                 <a href="../picocli/CommandLine.IParseResultHandler2.html" title="type parameter in CommandLine.IParseResultHandler2">R</a>&nbsp;prototypeReturnValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.IParseResultHandler2.html#handleParseResult(picocli.CommandLine.ParseResult)">handleParseResult</a></strong>(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)</code>
 <div class="block">Processes the <code>ParseResult</code> object resulting from successfully
- <a href="../picocli/CommandLine.html#parseArgs-java.lang.String...-">parsing</a> the command line arguments and returns a return value.</div>
+ <a href="../picocli/CommandLine.html#parseArgs(java.lang.String...)">parsing</a> the command line arguments and returns a return value.</div>
 </td>
 </tr>
 </table>
@@ -170,37 +150,26 @@ <h3>Method Summary</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="handleParseResult-picocli.CommandLine.ParseResult-java.lang.Object-">
-<!--   -->
-</a><a name="handleParseResult-picocli.CommandLine.ParseResult-R-">
+<a name="handleParseResult(picocli.CommandLine.ParseResult)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>handleParseResult</h4>
-<pre><a href="../picocli/CommandLine.IParseResultHandler2.html" title="type parameter in CommandLine.IParseResultHandler2">R</a>&nbsp;handleParseResult(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult,
-                    <a href="../picocli/CommandLine.IParseResultHandler2.html" title="type parameter in CommandLine.IParseResultHandler2">R</a>&nbsp;prototypeReturnValue)
-             throws <a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></pre>
+<pre><a href="../picocli/CommandLine.IParseResultHandler2.html" title="type parameter in CommandLine.IParseResultHandler2">R</a>&nbsp;handleParseResult(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)
+                    throws <a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></pre>
 <div class="block">Processes the <code>ParseResult</code> object resulting from successfully
- <a href="../picocli/CommandLine.html#parseArgs-java.lang.String...-">parsing</a> the command line arguments and returns a return value.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>parseResult</code> - the <code>ParseResult</code> that resulted from successfully parsing the command line arguments</dd>
-<dd><code>prototypeReturnValue</code> - prototype return value, may be returned as is when the user requested help for example,
-                               or may be used to collect results from multiple subcommands, or may be used by the
-                               handler for internal processing and a completely different object is returned</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an object resulting from handling the parse result</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+ <a href="../picocli/CommandLine.html#parseArgs(java.lang.String...)">parsing</a> the command line arguments and returns a return value.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>parseResult</code> - the <code>ParseResult</code> that resulted from successfully parsing the command line arguments</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></code> - if a help command was invoked for an unknown subcommand. Any <code>ParameterExceptions</code>
       thrown from this method are treated as if this exception was thrown during parsing and passed to the <a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><code>CommandLine.IExceptionHandler2</code></a></dd>
 <dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if a problem occurred while processing the parse results; use
-      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine--"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd>
-</dl>
+      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine()"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd></dl>
 </li>
 </ul>
 </li>
@@ -211,11 +180,9 @@ <h4>handleParseResult</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -230,15 +197,15 @@ <h4>handleParseResult</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.IParseResultHandler2.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.IParseResultHandler2.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.IParseResultHandler2.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -258,16 +225,16 @@ <h4>handleParseResult</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.ITypeConverter.html b/docs/apidocs/picocli/CommandLine.ITypeConverter.html
index dbcda06bd..06c09cca8 100644
--- a/docs/apidocs/picocli/CommandLine.ITypeConverter.html
+++ b/docs/apidocs/picocli/CommandLine.ITypeConverter.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.ITypeConverter (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.ITypeConverter (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.ITypeConverter (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.ITypeConverter (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.IVersionProvider.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.IVersionProvider.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.ITypeConverter.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.ITypeConverter.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.ITypeConverter.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -76,16 +63,16 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -98,24 +85,21 @@ <h2 title="Interface CommandLine.ITypeConverter" class="title">Interface Command
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>K</code> - the type of the object that is the result of the conversion</dd>
-</dl>
+<dl><dt><span class="strong">Type Parameters:</span></dt><dd><code>K</code> - the type of the object that is the result of the conversion</dd></dl>
 <dl>
 <dt>Enclosing class:</dt>
 <dd><a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a></dd>
 </dl>
 <hr>
 <br>
-<pre>public static interface <span class="typeNameLabel">CommandLine.ITypeConverter&lt;K&gt;</span></pre>
+<pre>public static interface <span class="strong">CommandLine.ITypeConverter&lt;K&gt;</span></pre>
 <div class="block"><p>
  When parsing command line arguments and initializing
  fields annotated with <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>@Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>@Parameters</code></a>,
  String values can be converted to any type for which a <code>ITypeConverter</code> is registered.
  </p><p>
  This interface defines the contract for classes that know how to convert a String into some domain object.
- Custom converters can be registered with the <a href="../picocli/CommandLine.html#registerConverter-java.lang.Class-picocli.CommandLine.ITypeConverter-"><code>CommandLine.registerConverter(Class, ITypeConverter)</code></a> method.
+ Custom converters can be registered with the <a href="../picocli/CommandLine.html#registerConverter(java.lang.Class,%20picocli.CommandLine.ITypeConverter)"><code>CommandLine.registerConverter(Class, ITypeConverter)</code></a> method.
  </p><p>
  Java 8 lambdas make it easy to register custom type converters:
  </p>
@@ -152,19 +136,19 @@ <h2 title="Interface CommandLine.ITypeConverter" class="title">Interface Command
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.ITypeConverter.html" title="type parameter in CommandLine.ITypeConverter">K</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ITypeConverter.html#convert-java.lang.String-">convert</a></span>(java.lang.String&nbsp;value)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ITypeConverter.html#convert(java.lang.String)">convert</a></strong>(java.lang.String&nbsp;value)</code>
 <div class="block">Converts the specified command line argument value to some domain object.</div>
 </td>
 </tr>
@@ -179,27 +163,23 @@ <h3>Method Summary</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="convert-java.lang.String-">
+<a name="convert(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>convert</h4>
 <pre><a href="../picocli/CommandLine.ITypeConverter.html" title="type parameter in CommandLine.ITypeConverter">K</a>&nbsp;convert(java.lang.String&nbsp;value)
-   throws java.lang.Exception</pre>
+          throws java.lang.Exception</pre>
 <div class="block">Converts the specified command line argument value to some domain object.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>value</code> - the command line argument String value</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the resulting domain object</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.Exception</code> - an exception detailing what went wrong during the conversion</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>value</code> - the command line argument String value</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the resulting domain object</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code>java.lang.Exception</code> - an exception detailing what went wrong during the conversion</dd></dl>
 </li>
 </ul>
 </li>
@@ -210,11 +190,9 @@ <h4>convert</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -229,15 +207,15 @@ <h4>convert</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.IVersionProvider.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.IVersionProvider.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.ITypeConverter.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.ITypeConverter.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.ITypeConverter.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -257,16 +235,16 @@ <h4>convert</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.IVersionProvider.html b/docs/apidocs/picocli/CommandLine.IVersionProvider.html
index 8666fd68a..7978deb65 100644
--- a/docs/apidocs/picocli/CommandLine.IVersionProvider.html
+++ b/docs/apidocs/picocli/CommandLine.IVersionProvider.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.IVersionProvider (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.IVersionProvider (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.IVersionProvider (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.IVersionProvider (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.IVersionProvider.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.IVersionProvider.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.IVersionProvider.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -76,16 +63,16 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -104,13 +91,11 @@ <h2 title="Interface CommandLine.IVersionProvider" class="title">Interface Comma
 </dl>
 <hr>
 <br>
-<pre>public static interface <span class="typeNameLabel">CommandLine.IVersionProvider</span></pre>
+<pre>public static interface <span class="strong">CommandLine.IVersionProvider</span></pre>
 <div class="block">Provides version information for a command. Commands may configure a provider with the
- <a href="../picocli/CommandLine.Command.html#versionProvider--"><code>CommandLine.Command.versionProvider()</code></a> annotation attribute.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.2</dd>
-</dl>
+ <a href="../picocli/CommandLine.Command.html#versionProvider()"><code>CommandLine.Command.versionProvider()</code></a> annotation attribute.</div>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>2.2</dd></dl>
 </li>
 </ul>
 </div>
@@ -119,19 +104,19 @@ <h2 title="Interface CommandLine.IVersionProvider" class="title">Interface Comma
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.IVersionProvider.html#getVersion--">getVersion</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.IVersionProvider.html#getVersion()">getVersion</a></strong>()</code>
 <div class="block">Returns version information for a command.</div>
 </td>
 </tr>
@@ -146,25 +131,22 @@ <h3>Method Summary</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="getVersion--">
+<a name="getVersion()">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getVersion</h4>
 <pre>java.lang.String[]&nbsp;getVersion()
-                       throws java.lang.Exception</pre>
+                              throws java.lang.Exception</pre>
 <div class="block">Returns version information for a command.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>version information (each string in the array is displayed on a separate line)</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.Exception</code> - an exception detailing what went wrong when obtaining version information</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>version information (each string in the array is displayed on a separate line)</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code>java.lang.Exception</code> - an exception detailing what went wrong when obtaining version information</dd></dl>
 </li>
 </ul>
 </li>
@@ -175,11 +157,9 @@ <h4>getVersion</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -194,15 +174,15 @@ <h4>getVersion</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.IVersionProvider.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.IVersionProvider.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.IVersionProvider.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -222,16 +202,16 @@ <h4>getVersion</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.InitializationException.html b/docs/apidocs/picocli/CommandLine.InitializationException.html
index e2799d4ff..63905a50c 100644
--- a/docs/apidocs/picocli/CommandLine.InitializationException.html
+++ b/docs/apidocs/picocli/CommandLine.InitializationException.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.InitializationException (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.InitializationException (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.InitializationException (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.InitializationException (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.InitializationException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.InitializationException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.InitializationException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -69,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Throwable">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -134,15 +127,12 @@ <h2 title="Class CommandLine.InitializationException" class="title">Class Comman
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.InitializationException</span>
+<pre>public static class <span class="strong">CommandLine.InitializationException</span>
 extends <a href="../picocli/CommandLine.PicocliException.html" title="class in picocli">CommandLine.PicocliException</a></pre>
 <div class="block">Exception indicating a problem during <code>CommandLine</code> initialization.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../serialized-form.html#picocli.CommandLine.InitializationException">Serialized Form</a></dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../serialized-form.html#picocli.CommandLine.InitializationException">Serialized Form</a></dd></dl>
 </li>
 </ul>
 </div>
@@ -151,40 +141,40 @@ <h2 title="Class CommandLine.InitializationException" class="title">Class Comman
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.InitializationException.html#InitializationException-java.lang.String-">InitializationException</a></span>(java.lang.String&nbsp;msg)</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.InitializationException.html#CommandLine.InitializationException(java.lang.String)">CommandLine.InitializationException</a></strong>(java.lang.String&nbsp;msg)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.InitializationException.html#InitializationException-java.lang.String-java.lang.Exception-">InitializationException</a></span>(java.lang.String&nbsp;msg,
-                       java.lang.Exception&nbsp;ex)</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.InitializationException.html#CommandLine.InitializationException(java.lang.String,%20java.lang.Exception)">CommandLine.InitializationException</a></strong>(java.lang.String&nbsp;msg,
+                                   java.lang.Exception&nbsp;ex)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Throwable">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
 <code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -200,27 +190,27 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="InitializationException-java.lang.String-">
+<a name="CommandLine.InitializationException(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>InitializationException</h4>
-<pre>public&nbsp;InitializationException(java.lang.String&nbsp;msg)</pre>
+<h4>CommandLine.InitializationException</h4>
+<pre>public&nbsp;CommandLine.InitializationException(java.lang.String&nbsp;msg)</pre>
 </li>
 </ul>
-<a name="InitializationException-java.lang.String-java.lang.Exception-">
+<a name="CommandLine.InitializationException(java.lang.String, java.lang.Exception)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>InitializationException</h4>
-<pre>public&nbsp;InitializationException(java.lang.String&nbsp;msg,
-                               java.lang.Exception&nbsp;ex)</pre>
+<h4>CommandLine.InitializationException</h4>
+<pre>public&nbsp;CommandLine.InitializationException(java.lang.String&nbsp;msg,
+                                   java.lang.Exception&nbsp;ex)</pre>
 </li>
 </ul>
 </li>
@@ -231,11 +221,9 @@ <h4>InitializationException</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -250,15 +238,15 @@ <h4>InitializationException</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.InitializationException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.InitializationException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.InitializationException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -277,17 +265,17 @@ <h4>InitializationException</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Throwable">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.MaxValuesforFieldExceededException.html b/docs/apidocs/picocli/CommandLine.MaxValuesforFieldExceededException.html
index e5a3fd91c..3bca29279 100644
--- a/docs/apidocs/picocli/CommandLine.MaxValuesforFieldExceededException.html
+++ b/docs/apidocs/picocli/CommandLine.MaxValuesforFieldExceededException.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.MaxValuesforFieldExceededException (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.MaxValuesforFieldExceededException (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.MaxValuesforFieldExceededException (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.MaxValuesforFieldExceededException (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.IVersionProvider.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.IVersionProvider.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.MaxValuesforFieldExceededException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.MaxValuesforFieldExceededException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.MaxValuesforFieldExceededException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -69,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.picocli.CommandLine.ParameterException">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_picocli.CommandLine.ParameterException">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -135,13 +128,10 @@ <h2 title="Class CommandLine.MaxValuesforFieldExceededException" class="title">C
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.MaxValuesforFieldExceededException</span>
+<pre>public static class <span class="strong">CommandLine.MaxValuesforFieldExceededException</span>
 extends <a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></pre>
-<div class="block">Exception indicating that more values were specified for an option or parameter than its <a href="../picocli/CommandLine.Option.html#arity--"><code>arity</code></a> allows.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../serialized-form.html#picocli.CommandLine.MaxValuesforFieldExceededException">Serialized Form</a></dd>
-</dl>
+<div class="block">Exception indicating that more values were specified for an option or parameter than its <a href="../picocli/CommandLine.Option.html#arity()"><code>arity</code></a> allows.</div>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../serialized-form.html#picocli.CommandLine.MaxValuesforFieldExceededException">Serialized Form</a></dd></dl>
 </li>
 </ul>
 </div>
@@ -150,44 +140,44 @@ <h2 title="Class CommandLine.MaxValuesforFieldExceededException" class="title">C
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.MaxValuesforFieldExceededException.html#MaxValuesforFieldExceededException-picocli.CommandLine-java.lang.String-">MaxValuesforFieldExceededException</a></span>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                                  java.lang.String&nbsp;msg)</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.MaxValuesforFieldExceededException.html#CommandLine.MaxValuesforFieldExceededException(picocli.CommandLine,%20java.lang.String)">CommandLine.MaxValuesforFieldExceededException</a></strong>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                                              java.lang.String&nbsp;msg)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.picocli.CommandLine.ParameterException">
+<li class="blockList"><a name="methods_inherited_from_class_picocli.CommandLine.ParameterException">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;picocli.<a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></h3>
-<code><a href="../picocli/CommandLine.ParameterException.html#getCommandLine--">getCommandLine</a></code></li>
+<code><a href="../picocli/CommandLine.ParameterException.html#getCommandLine()">getCommandLine</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Throwable">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
 <code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -203,18 +193,18 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="MaxValuesforFieldExceededException-picocli.CommandLine-java.lang.String-">
+<a name="CommandLine.MaxValuesforFieldExceededException(picocli.CommandLine, java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>MaxValuesforFieldExceededException</h4>
-<pre>public&nbsp;MaxValuesforFieldExceededException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                                          java.lang.String&nbsp;msg)</pre>
+<h4>CommandLine.MaxValuesforFieldExceededException</h4>
+<pre>public&nbsp;CommandLine.MaxValuesforFieldExceededException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                                              java.lang.String&nbsp;msg)</pre>
 </li>
 </ul>
 </li>
@@ -225,11 +215,9 @@ <h4>MaxValuesforFieldExceededException</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -244,15 +232,15 @@ <h4>MaxValuesforFieldExceededException</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.IVersionProvider.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.IVersionProvider.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.MaxValuesforFieldExceededException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.MaxValuesforFieldExceededException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.MaxValuesforFieldExceededException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -271,17 +259,17 @@ <h4>MaxValuesforFieldExceededException</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.picocli.CommandLine.ParameterException">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_picocli.CommandLine.ParameterException">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.MissingParameterException.html b/docs/apidocs/picocli/CommandLine.MissingParameterException.html
index e196fc69b..7239cc344 100644
--- a/docs/apidocs/picocli/CommandLine.MissingParameterException.html
+++ b/docs/apidocs/picocli/CommandLine.MissingParameterException.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.MissingParameterException (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.MissingParameterException (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.MissingParameterException (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.MissingParameterException (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.MissingParameterException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.MissingParameterException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.MissingParameterException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -69,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.picocli.CommandLine.ParameterException">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_picocli.CommandLine.ParameterException">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -135,13 +128,10 @@ <h2 title="Class CommandLine.MissingParameterException" class="title">Class Comm
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.MissingParameterException</span>
+<pre>public static class <span class="strong">CommandLine.MissingParameterException</span>
 extends <a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></pre>
 <div class="block">Exception indicating that a required parameter was not specified.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../serialized-form.html#picocli.CommandLine.MissingParameterException">Serialized Form</a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../serialized-form.html#picocli.CommandLine.MissingParameterException">Serialized Form</a></dd></dl>
 </li>
 </ul>
 </div>
@@ -150,44 +140,44 @@ <h2 title="Class CommandLine.MissingParameterException" class="title">Class Comm
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.MissingParameterException.html#MissingParameterException-picocli.CommandLine-java.lang.String-">MissingParameterException</a></span>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                         java.lang.String&nbsp;msg)</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.MissingParameterException.html#CommandLine.MissingParameterException(picocli.CommandLine,%20java.lang.String)">CommandLine.MissingParameterException</a></strong>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                                     java.lang.String&nbsp;msg)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.picocli.CommandLine.ParameterException">
+<li class="blockList"><a name="methods_inherited_from_class_picocli.CommandLine.ParameterException">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;picocli.<a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></h3>
-<code><a href="../picocli/CommandLine.ParameterException.html#getCommandLine--">getCommandLine</a></code></li>
+<code><a href="../picocli/CommandLine.ParameterException.html#getCommandLine()">getCommandLine</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Throwable">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
 <code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -203,18 +193,18 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="MissingParameterException-picocli.CommandLine-java.lang.String-">
+<a name="CommandLine.MissingParameterException(picocli.CommandLine, java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>MissingParameterException</h4>
-<pre>public&nbsp;MissingParameterException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                                 java.lang.String&nbsp;msg)</pre>
+<h4>CommandLine.MissingParameterException</h4>
+<pre>public&nbsp;CommandLine.MissingParameterException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                                     java.lang.String&nbsp;msg)</pre>
 </li>
 </ul>
 </li>
@@ -225,11 +215,9 @@ <h4>MissingParameterException</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -244,15 +232,15 @@ <h4>MissingParameterException</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.MissingParameterException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.MissingParameterException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.MissingParameterException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -271,17 +259,17 @@ <h4>MissingParameterException</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.picocli.CommandLine.ParameterException">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_picocli.CommandLine.ParameterException">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.MissingTypeConverterException.html b/docs/apidocs/picocli/CommandLine.MissingTypeConverterException.html
index 4133c19e8..1c9742a66 100644
--- a/docs/apidocs/picocli/CommandLine.MissingTypeConverterException.html
+++ b/docs/apidocs/picocli/CommandLine.MissingTypeConverterException.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.MissingTypeConverterException (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.MissingTypeConverterException (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.MissingTypeConverterException (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.MissingTypeConverterException (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Mixin.html" title="annotation in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Mixin.html" title="annotation in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.MissingTypeConverterException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.MissingTypeConverterException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.MissingTypeConverterException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -69,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.picocli.CommandLine.ParameterException">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_picocli.CommandLine.ParameterException">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -135,14 +128,11 @@ <h2 title="Class CommandLine.MissingTypeConverterException" class="title">Class
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.MissingTypeConverterException</span>
+<pre>public static class <span class="strong">CommandLine.MissingTypeConverterException</span>
 extends <a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></pre>
 <div class="block">Exception indicating that an annotated field had a type for which no <a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><code>CommandLine.ITypeConverter</code></a> was
- <a href="../picocli/CommandLine.html#registerConverter-java.lang.Class-picocli.CommandLine.ITypeConverter-">registered</a>.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../serialized-form.html#picocli.CommandLine.MissingTypeConverterException">Serialized Form</a></dd>
-</dl>
+ <a href="../picocli/CommandLine.html#registerConverter(java.lang.Class,%20picocli.CommandLine.ITypeConverter)">registered</a>.</div>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../serialized-form.html#picocli.CommandLine.MissingTypeConverterException">Serialized Form</a></dd></dl>
 </li>
 </ul>
 </div>
@@ -151,44 +141,44 @@ <h2 title="Class CommandLine.MissingTypeConverterException" class="title">Class
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.MissingTypeConverterException.html#MissingTypeConverterException-picocli.CommandLine-java.lang.String-">MissingTypeConverterException</a></span>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                             java.lang.String&nbsp;msg)</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.MissingTypeConverterException.html#CommandLine.MissingTypeConverterException(picocli.CommandLine,%20java.lang.String)">CommandLine.MissingTypeConverterException</a></strong>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                                         java.lang.String&nbsp;msg)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.picocli.CommandLine.ParameterException">
+<li class="blockList"><a name="methods_inherited_from_class_picocli.CommandLine.ParameterException">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;picocli.<a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></h3>
-<code><a href="../picocli/CommandLine.ParameterException.html#getCommandLine--">getCommandLine</a></code></li>
+<code><a href="../picocli/CommandLine.ParameterException.html#getCommandLine()">getCommandLine</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Throwable">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
 <code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -204,18 +194,18 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="MissingTypeConverterException-picocli.CommandLine-java.lang.String-">
+<a name="CommandLine.MissingTypeConverterException(picocli.CommandLine, java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>MissingTypeConverterException</h4>
-<pre>public&nbsp;MissingTypeConverterException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                                     java.lang.String&nbsp;msg)</pre>
+<h4>CommandLine.MissingTypeConverterException</h4>
+<pre>public&nbsp;CommandLine.MissingTypeConverterException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                                         java.lang.String&nbsp;msg)</pre>
 </li>
 </ul>
 </li>
@@ -226,11 +216,9 @@ <h4>MissingTypeConverterException</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -245,15 +233,15 @@ <h4>MissingTypeConverterException</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Mixin.html" title="annotation in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Mixin.html" title="annotation in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.MissingTypeConverterException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.MissingTypeConverterException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.MissingTypeConverterException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -272,17 +260,17 @@ <h4>MissingTypeConverterException</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.picocli.CommandLine.ParameterException">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_picocli.CommandLine.ParameterException">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Mixin.html b/docs/apidocs/picocli/CommandLine.Mixin.html
index 754cb0e8f..8507b9db0 100644
--- a/docs/apidocs/picocli/CommandLine.Mixin.html
+++ b/docs/apidocs/picocli/CommandLine.Mixin.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Mixin (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Mixin (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Mixin (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Mixin (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Mixin.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Mixin.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Mixin.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -67,17 +60,15 @@
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
 <li>Required&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
+<li><a href="#annotation_type_optional_element_summary">Optional</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
+<li><a href="#annotation_type_element_detail">Element</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -93,8 +84,8 @@ <h2 title="Annotation Type CommandLine.Mixin" class="title">Annotation Type Comm
 <hr>
 <br>
 <pre>@Retention(value=RUNTIME)
- @Target(value=FIELD)
-public static @interface <span class="memberNameLabel">CommandLine.Mixin</span></pre>
+@Target(value=FIELD)
+public static @interface <span class="strong">CommandLine.Mixin</span></pre>
 <div class="block"><p>
  Fields annotated with <code>@Mixin</code> are "expanded" into the current command: <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>@Option</code></a> and
  <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>@Parameters</code></a> in the mixin class are added to the options and positional parameters of this command.
@@ -125,10 +116,8 @@ <h2 title="Annotation Type CommandLine.Mixin" class="title">Annotation Type Comm
      private boolean versionHelp;
  }
  </pre></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -137,11 +126,11 @@ <h2 title="Annotation Type CommandLine.Mixin" class="title">Annotation Type Comm
 <li class="blockList">
 <!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="annotation.type.optional.element.summary">
+<li class="blockList"><a name="annotation_type_optional_element_summary">
 <!--   -->
 </a>
 <h3>Optional Element Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
 <caption><span>Optional Elements</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -149,7 +138,7 @@ <h3>Optional Element Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Mixin.html#name--">name</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Mixin.html#name()">name</a></strong></code>
 <div class="block">Optionally specify a name that the mixin object can be retrieved with from the <code>CommandSpec</code>.</div>
 </td>
 </tr>
@@ -164,11 +153,11 @@ <h3>Optional Element Summary</h3>
 <li class="blockList">
 <!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="annotation.type.element.detail">
+<li class="blockList"><a name="annotation_type_element_detail">
 <!--   -->
 </a>
 <h3>Element Detail</h3>
-<a name="name--">
+<a name="name()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -177,10 +166,7 @@ <h4>name</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;name</pre>
 <div class="block">Optionally specify a name that the mixin object can be retrieved with from the <code>CommandSpec</code>.
  If not specified the name of the annotated field is used.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a String to register the mixin object with, or an empty String if the name of the annotated field should be used</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a String to register the mixin object with, or an empty String if the name of the annotated field should be used</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>""</dd>
@@ -195,11 +181,9 @@ <h4>name</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -214,15 +198,15 @@ <h4>name</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Mixin.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Mixin.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Mixin.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -239,17 +223,15 @@ <h4>name</h4>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
 <li>Required&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
+<li><a href="#annotation_type_optional_element_summary">Optional</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
+<li><a href="#annotation_type_element_detail">Element</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Model.ArgSpec.html b/docs/apidocs/picocli/CommandLine.Model.ArgSpec.html
index 662862aa0..17873c2b5 100644
--- a/docs/apidocs/picocli/CommandLine.Model.ArgSpec.html
+++ b/docs/apidocs/picocli/CommandLine.Model.ArgSpec.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Model.ArgSpec (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Model.ArgSpec (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Model.ArgSpec (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Model.ArgSpec (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":6,"i10":6,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.ArgSpec.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.ArgSpec.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.ArgSpec.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -76,16 +63,16 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -116,13 +103,11 @@ <h2 title="Class CommandLine.Model.ArgSpec" class="title">Class CommandLine.Mode
 </dl>
 <hr>
 <br>
-<pre>public abstract static class <span class="typeNameLabel">CommandLine.Model.ArgSpec</span>
+<pre>public abstract static class <span class="strong">CommandLine.Model.ArgSpec</span>
 extends java.lang.Object</pre>
 <div class="block">Models the shared attributes of <a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>CommandLine.Model.OptionSpec</code></a> and <a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli"><code>CommandLine.Model.PositionalParamSpec</code></a>.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -131,124 +116,124 @@ <h2 title="Class CommandLine.Model.ArgSpec" class="title">Class CommandLine.Mode
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ArgSpec.html#arity--">arity</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ArgSpec.html#arity()">arity</a></strong>()</code>
 <div class="block">Returns how many arguments this option or positional parameter requires.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.Class&lt;?&gt;[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ArgSpec.html#auxiliaryTypes--">auxiliaryTypes</a></span>()</code>
-<div class="block">Returns auxiliary type information used when the <a href="../picocli/CommandLine.Model.ArgSpec.html#type--"><code>type()</code></a> is a generic <code>Collection</code>, <code>Map</code> or an abstract class.</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ArgSpec.html#auxiliaryTypes()">auxiliaryTypes</a></strong>()</code>
+<div class="block">Returns auxiliary type information used when the <a href="../picocli/CommandLine.Model.ArgSpec.html#type()"><code>type()</code></a> is a generic <code>Collection</code>, <code>Map</code> or an abstract class.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ArgSpec.html#binding--">binding</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ArgSpec.html#binding()">binding</a></strong>()</code>
 <div class="block">Returns the <a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><code>CommandLine.Model.IBinding</code></a> that is responsible for getting and setting the value of this argument.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli">CommandLine.ITypeConverter</a>&lt;?&gt;[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ArgSpec.html#converters--">converters</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ArgSpec.html#converters()">converters</a></strong>()</code>
 <div class="block">Returns one or more <a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><code>type converters</code></a> to use to convert the command line
  argument into a strongly typed value (or key-value pair for map fields).</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.Object</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ArgSpec.html#defaultValue--">defaultValue</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ArgSpec.html#defaultValue()">defaultValue</a></strong>()</code>
 <div class="block">Returns the default value of this option or positional parameter.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ArgSpec.html#description--">description</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ArgSpec.html#description()">description</a></strong>()</code>
 <div class="block">Returns the description of this option, used when generating the usage documentation.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ArgSpec.html#equals-java.lang.Object-">equals</a></span>(java.lang.Object&nbsp;obj)</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ArgSpec.html#equals(java.lang.Object)">equals</a></strong>(java.lang.Object&nbsp;obj)</code>&nbsp;</td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ArgSpec.html#hashCode--">hashCode</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ArgSpec.html#hashCode()">hashCode</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr id="i8" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ArgSpec.html#hidden--">hidden</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ArgSpec.html#hidden()">hidden</a></strong>()</code>
 <div class="block">Returns whether this option should be excluded from the usage message.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>abstract boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ArgSpec.html#isOption--">isOption</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ArgSpec.html#isOption()">isOption</a></strong>()</code>
 <div class="block">Returns <code>true</code> if this argument is a named option, <code>false</code> otherwise.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>abstract boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ArgSpec.html#isPositional--">isPositional</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ArgSpec.html#isPositional()">isPositional</a></strong>()</code>
 <div class="block">Returns <code>true</code> if this argument is a positional parameter, <code>false</code> otherwise.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ArgSpec.html#paramLabel--">paramLabel</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ArgSpec.html#paramLabel()">paramLabel</a></strong>()</code>
 <div class="block">Returns the name of the option or positional parameter used in the usage help message.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.util.List&lt;java.lang.String&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ArgSpec.html#rawStringValues--">rawStringValues</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ArgSpec.html#rawStringValues()">rawStringValues</a></strong>()</code>
 <div class="block">Returns the command line arguments matched by this option or positional parameter spec.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ArgSpec.html#required--">required</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ArgSpec.html#required()">required</a></strong>()</code>
 <div class="block">Returns whether this is a required option or positional parameter.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli">CommandLine.Help.Visibility</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ArgSpec.html#showDefaultValue--">showDefaultValue</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ArgSpec.html#showDefaultValue()">showDefaultValue</a></strong>()</code>
 <div class="block">Returns whether this option or positional parameter's default value should be shown in the usage help.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ArgSpec.html#splitRegex--">splitRegex</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ArgSpec.html#splitRegex()">splitRegex</a></strong>()</code>
 <div class="block">Returns a regular expression to split option parameter values or <code>""</code> if the value should not be split.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ArgSpec.html#toString--">toString</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ArgSpec.html#toString()">toString</a></strong>()</code>
 <div class="block">Returns a string respresentation of this option or positional parameter.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.Class&lt;?&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ArgSpec.html#type--">type</a></span>()</code>
-<div class="block">Returns the type to convert the option or positional parameter to before <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue-java.lang.Object-">setting</a> the value.</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ArgSpec.html#type()">type</a></strong>()</code>
+<div class="block">Returns the type to convert the option or positional parameter to before <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue(java.lang.Object)">setting</a> the value.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -264,11 +249,11 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="required--">
+<a name="required()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -276,13 +261,10 @@ <h3>Method Detail</h3>
 <h4>required</h4>
 <pre>public&nbsp;boolean&nbsp;required()</pre>
 <div class="block">Returns whether this is a required option or positional parameter.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Option.html#required--"><code>CommandLine.Option.required()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Option.html#required()"><code>CommandLine.Option.required()</code></a></dd></dl>
 </li>
 </ul>
-<a name="description--">
+<a name="description()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -290,13 +272,10 @@ <h4>required</h4>
 <h4>description</h4>
 <pre>public&nbsp;java.lang.String[]&nbsp;description()</pre>
 <div class="block">Returns the description of this option, used when generating the usage documentation.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Option.html#description--"><code>CommandLine.Option.description()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Option.html#description()"><code>CommandLine.Option.description()</code></a></dd></dl>
 </li>
 </ul>
-<a name="arity--">
+<a name="arity()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -304,13 +283,10 @@ <h4>description</h4>
 <h4>arity</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a>&nbsp;arity()</pre>
 <div class="block">Returns how many arguments this option or positional parameter requires.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Option.html#arity--"><code>CommandLine.Option.arity()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Option.html#arity()"><code>CommandLine.Option.arity()</code></a></dd></dl>
 </li>
 </ul>
-<a name="paramLabel--">
+<a name="paramLabel()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -318,27 +294,21 @@ <h4>arity</h4>
 <h4>paramLabel</h4>
 <pre>public&nbsp;java.lang.String&nbsp;paramLabel()</pre>
 <div class="block">Returns the name of the option or positional parameter used in the usage help message.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Option.html#paramLabel--"><code>{@link Parameters#paramLabel()}</code></a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Option.html#paramLabel()"><code>{@link Parameters#paramLabel()}</code></a></dd></dl>
 </li>
 </ul>
-<a name="auxiliaryTypes--">
+<a name="auxiliaryTypes()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>auxiliaryTypes</h4>
 <pre>public&nbsp;java.lang.Class&lt;?&gt;[]&nbsp;auxiliaryTypes()</pre>
-<div class="block">Returns auxiliary type information used when the <a href="../picocli/CommandLine.Model.ArgSpec.html#type--"><code>type()</code></a> is a generic <code>Collection</code>, <code>Map</code> or an abstract class.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Option.html#type--"><code>CommandLine.Option.type()</code></a></dd>
-</dl>
+<div class="block">Returns auxiliary type information used when the <a href="../picocli/CommandLine.Model.ArgSpec.html#type()"><code>type()</code></a> is a generic <code>Collection</code>, <code>Map</code> or an abstract class.</div>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Option.html#type()"><code>CommandLine.Option.type()</code></a></dd></dl>
 </li>
 </ul>
-<a name="converters--">
+<a name="converters()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -348,13 +318,10 @@ <h4>converters</h4>
 <div class="block">Returns one or more <a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><code>type converters</code></a> to use to convert the command line
  argument into a strongly typed value (or key-value pair for map fields). This is useful when a particular
  option or positional parameter should use a custom conversion that is different from the normal conversion for the arg spec's type.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Option.html#converter--"><code>CommandLine.Option.converter()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Option.html#converter()"><code>CommandLine.Option.converter()</code></a></dd></dl>
 </li>
 </ul>
-<a name="splitRegex--">
+<a name="splitRegex()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -362,13 +329,10 @@ <h4>converters</h4>
 <h4>splitRegex</h4>
 <pre>public&nbsp;java.lang.String&nbsp;splitRegex()</pre>
 <div class="block">Returns a regular expression to split option parameter values or <code>""</code> if the value should not be split.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Option.html#split--"><code>CommandLine.Option.split()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Option.html#split()"><code>CommandLine.Option.split()</code></a></dd></dl>
 </li>
 </ul>
-<a name="hidden--">
+<a name="hidden()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -376,23 +340,20 @@ <h4>splitRegex</h4>
 <h4>hidden</h4>
 <pre>public&nbsp;boolean&nbsp;hidden()</pre>
 <div class="block">Returns whether this option should be excluded from the usage message.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Option.html#hidden--"><code>CommandLine.Option.hidden()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Option.html#hidden()"><code>CommandLine.Option.hidden()</code></a></dd></dl>
 </li>
 </ul>
-<a name="type--">
+<a name="type()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>type</h4>
 <pre>public&nbsp;java.lang.Class&lt;?&gt;&nbsp;type()</pre>
-<div class="block">Returns the type to convert the option or positional parameter to before <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue-java.lang.Object-">setting</a> the value.</div>
+<div class="block">Returns the type to convert the option or positional parameter to before <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue(java.lang.Object)">setting</a> the value.</div>
 </li>
 </ul>
-<a name="defaultValue--">
+<a name="defaultValue()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -402,7 +363,7 @@ <h4>defaultValue</h4>
 <div class="block">Returns the default value of this option or positional parameter.</div>
 </li>
 </ul>
-<a name="showDefaultValue--">
+<a name="showDefaultValue()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -412,7 +373,7 @@ <h4>showDefaultValue</h4>
 <div class="block">Returns whether this option or positional parameter's default value should be shown in the usage help.</div>
 </li>
 </ul>
-<a name="binding--">
+<a name="binding()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -422,7 +383,7 @@ <h4>binding</h4>
 <div class="block">Returns the <a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><code>CommandLine.Model.IBinding</code></a> that is responsible for getting and setting the value of this argument.</div>
 </li>
 </ul>
-<a name="isOption--">
+<a name="isOption()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -432,7 +393,7 @@ <h4>isOption</h4>
 <div class="block">Returns <code>true</code> if this argument is a named option, <code>false</code> otherwise.</div>
 </li>
 </ul>
-<a name="isPositional--">
+<a name="isPositional()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -442,7 +403,7 @@ <h4>isPositional</h4>
 <div class="block">Returns <code>true</code> if this argument is a positional parameter, <code>false</code> otherwise.</div>
 </li>
 </ul>
-<a name="rawStringValues--">
+<a name="rawStringValues()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -450,13 +411,10 @@ <h4>isPositional</h4>
 <h4>rawStringValues</h4>
 <pre>public&nbsp;java.util.List&lt;java.lang.String&gt;&nbsp;rawStringValues()</pre>
 <div class="block">Returns the command line arguments matched by this option or positional parameter spec.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the matched arguments as found on the command line: empty Strings for options without value, the values have not been <a href="../picocli/CommandLine.Model.ArgSpec.html#splitRegex--">split</a>, and for map properties values may look like <code>"key=value"</code></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the matched arguments as found on the command line: empty Strings for options without value, the values have not been <a href="../picocli/CommandLine.Model.ArgSpec.html#splitRegex()">split</a>, and for map properties values may look like <code>"key=value"</code></dd></dl>
 </li>
 </ul>
-<a name="toString--">
+<a name="toString()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -465,12 +423,12 @@ <h4>toString</h4>
 <pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
 <div class="block">Returns a string respresentation of this option or positional parameter.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dt><strong>Overrides:</strong></dt>
 <dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
 </dl>
 </li>
 </ul>
-<a name="equals-java.lang.Object-">
+<a name="equals(java.lang.Object)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -478,12 +436,12 @@ <h4>toString</h4>
 <h4>equals</h4>
 <pre>public&nbsp;boolean&nbsp;equals(java.lang.Object&nbsp;obj)</pre>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dt><strong>Overrides:</strong></dt>
 <dd><code>equals</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
 </dl>
 </li>
 </ul>
-<a name="hashCode--">
+<a name="hashCode()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -491,7 +449,7 @@ <h4>equals</h4>
 <h4>hashCode</h4>
 <pre>public&nbsp;int&nbsp;hashCode()</pre>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dt><strong>Overrides:</strong></dt>
 <dd><code>hashCode</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
 </dl>
 </li>
@@ -504,11 +462,9 @@ <h4>hashCode</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -523,15 +479,15 @@ <h4>hashCode</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.ArgSpec.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.ArgSpec.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.ArgSpec.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -551,16 +507,16 @@ <h4>hashCode</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Model.CommandSpec.html b/docs/apidocs/picocli/CommandLine.Model.CommandSpec.html
index ebcc0a8d0..533cec3f6 100644
--- a/docs/apidocs/picocli/CommandLine.Model.CommandSpec.html
+++ b/docs/apidocs/picocli/CommandLine.Model.CommandSpec.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Model.CommandSpec (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Model.CommandSpec (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Model.CommandSpec (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Model.CommandSpec (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":9,"i10":9,"i11":9,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.CommandSpec.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.CommandSpec.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.CommandSpec.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -76,16 +63,16 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -112,7 +99,7 @@ <h2 title="Class CommandLine.Model.CommandSpec" class="title">Class CommandLine.
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.Model.CommandSpec</span>
+<pre>public static class <span class="strong">CommandLine.Model.CommandSpec</span>
 extends java.lang.Object</pre>
 <div class="block">The <code>CommandSpec</code> class models a command specification, including the options, positional parameters and subcommands
  supported by the command, as well as attributes for the version help message and the usage help message of the command.
@@ -127,10 +114,8 @@ <h2 title="Class CommandLine.Model.CommandSpec" class="title">Class CommandLine.
  </p><p>Picocli can construct a <code>CommandSpec</code> automatically from classes with <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>@Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>@Option</code></a> and
  <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>@Parameters</code></a> annotations. Alternatively a <code>CommandSpec</code> can be constructed programmatically.
  </p></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -139,255 +124,255 @@ <h2 title="Class CommandLine.Model.CommandSpec" class="title">Class CommandLine.
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#add-picocli.CommandLine.Model.ArgSpec-">add</a></span>(<a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a>&nbsp;arg)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#add(picocli.CommandLine.Model.ArgSpec)">add</a></strong>(<a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a>&nbsp;arg)</code>
 <div class="block">Adds the specified option spec or positional parameter spec to the list of configured arguments to expect.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#addMixin-java.lang.String-picocli.CommandLine.Model.CommandSpec-">addMixin</a></span>(java.lang.String&nbsp;name,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#addMixin(java.lang.String,%20picocli.CommandLine.Model.CommandSpec)">addMixin</a></strong>(java.lang.String&nbsp;name,
         <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;mixin)</code>
 <div class="block">Adds the specified mixin <code>CommandSpec</code> object to the map of mixins for this command.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#addOption-picocli.CommandLine.Model.OptionSpec-">addOption</a></span>(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#addOption(picocli.CommandLine.Model.OptionSpec)">addOption</a></strong>(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option)</code>
 <div class="block">Adds the specified option spec to the list of configured arguments to expect.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#addPositional-picocli.CommandLine.Model.PositionalParamSpec-">addPositional</a></span>(<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&nbsp;positional)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#addPositional(picocli.CommandLine.Model.PositionalParamSpec)">addPositional</a></strong>(<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&nbsp;positional)</code>
 <div class="block">Adds the specified positional parameter spec to the list of configured arguments to expect.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#addSubcommand-java.lang.String-picocli.CommandLine.Model.CommandSpec-">addSubcommand</a></span>(java.lang.String&nbsp;name,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#addSubcommand(java.lang.String,%20picocli.CommandLine.Model.CommandSpec)">addSubcommand</a></strong>(java.lang.String&nbsp;name,
              <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;subcommand)</code>
 <div class="block">Adds the specified subcommand with the specified name.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#addSubcommand-java.lang.String-picocli.CommandLine-">addSubcommand</a></span>(java.lang.String&nbsp;name,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#addSubcommand(java.lang.String,%20picocli.CommandLine)">addSubcommand</a></strong>(java.lang.String&nbsp;name,
              <a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine)</code>
 <div class="block">Adds the specified subcommand with the specified name.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#addUnmatchedArgsBinding-picocli.CommandLine.Model.UnmatchedArgsBinding-">addUnmatchedArgsBinding</a></span>(<a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a>&nbsp;spec)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#addUnmatchedArgsBinding(picocli.CommandLine.Model.UnmatchedArgsBinding)">addUnmatchedArgsBinding</a></strong>(<a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a>&nbsp;spec)</code>
 <div class="block">Adds the specified <code>UnmatchedArgsBinding</code> to the list of model objects to capture unmatched arguments for this command.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#commandLine--">commandLine</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#commandLine()">commandLine</a></strong>()</code>
 <div class="block">Returns the CommandLine constructed with this <code>CommandSpec</code> model.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#commandLine-picocli.CommandLine-">commandLine</a></span>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#commandLine(picocli.CommandLine)">commandLine</a></strong>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine)</code>
 <div class="block">Sets the CommandLine constructed with this <code>CommandSpec</code> model.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#create--">create</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#create()">create</a></strong>()</code>
 <div class="block">Creates and returns a new <code>CommandSpec</code> without any associated user object.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#forAnnotatedObject-java.lang.Object-">forAnnotatedObject</a></span>(java.lang.Object&nbsp;userObject)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#forAnnotatedObject(java.lang.Object)">forAnnotatedObject</a></strong>(java.lang.Object&nbsp;userObject)</code>
 <div class="block">Creates and returns a new <code>CommandSpec</code> initialized from the specified associated user object.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#forAnnotatedObject-java.lang.Object-picocli.CommandLine.IFactory-">forAnnotatedObject</a></span>(java.lang.Object&nbsp;userObject,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#forAnnotatedObject(java.lang.Object,%20picocli.CommandLine.IFactory)">forAnnotatedObject</a></strong>(java.lang.Object&nbsp;userObject,
                   <a href="../picocli/CommandLine.IFactory.html" title="interface in picocli">CommandLine.IFactory</a>&nbsp;factory)</code>
 <div class="block">Creates and returns a new <code>CommandSpec</code> initialized from the specified associated user object.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#helpCommand--">helpCommand</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#helpCommand()">helpCommand</a></strong>()</code>
 <div class="block">Returns whether this subcommand is a help command, and required options and positional
  parameters of the parent command should not be validated.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#helpCommand-boolean-">helpCommand</a></span>(boolean&nbsp;newValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#helpCommand(boolean)">helpCommand</a></strong>(boolean&nbsp;newValue)</code>
 <div class="block">Sets whether this is a help command and required parameter checking should be suspended.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.util.Map&lt;java.lang.String,<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#mixins--">mixins</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#mixins()">mixins</a></strong>()</code>
 <div class="block">Returns a map of the mixin names to mixin <code>CommandSpec</code> objects configured for this command.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#mixinStandardHelpOptions--">mixinStandardHelpOptions</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#mixinStandardHelpOptions()">mixinStandardHelpOptions</a></strong>()</code>
 <div class="block">Returns <code>true</code> if the standard help options have been mixed in with this command, <code>false</code> otherwise.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#mixinStandardHelpOptions-boolean-">mixinStandardHelpOptions</a></span>(boolean&nbsp;newValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#mixinStandardHelpOptions(boolean)">mixinStandardHelpOptions</a></strong>(boolean&nbsp;newValue)</code>
 <div class="block">Sets whether the standard help options should be mixed in with this command.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#name--">name</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#name()">name</a></strong>()</code>
 <div class="block">Returns the String to use as the program name in the synopsis line of the help message.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#name-java.lang.String-">name</a></span>(java.lang.String&nbsp;name)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#name(java.lang.String)">name</a></strong>(java.lang.String&nbsp;name)</code>
 <div class="block">Sets the String to use as the program name in the synopsis line of the help message.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#options--">options</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#options()">options</a></strong>()</code>
 <div class="block">Returns the list of options configured for this command.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.util.Map&lt;java.lang.String,<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#optionsMap--">optionsMap</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#optionsMap()">optionsMap</a></strong>()</code>
 <div class="block">Returns a map of the option names to option spec objects configured for this command.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#parent--">parent</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#parent()">parent</a></strong>()</code>
 <div class="block">Returns the parent command of this subcommand, or <code>null</code> if this is a top-level command.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#parent-picocli.CommandLine.Model.CommandSpec-">parent</a></span>(<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;parent)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#parent(picocli.CommandLine.Model.CommandSpec)">parent</a></strong>(<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;parent)</code>
 <div class="block">Sets the parent command of this subcommand.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#parser--">parser</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#parser()">parser</a></strong>()</code>
 <div class="block">Returns the parser specification for this command.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.util.List&lt;<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#positionalParameters--">positionalParameters</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#positionalParameters()">positionalParameters</a></strong>()</code>
 <div class="block">Returns the list of positional parameters configured for this command.</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.util.Map&lt;java.lang.Character,<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#posixOptionsMap--">posixOptionsMap</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#posixOptionsMap()">posixOptionsMap</a></strong>()</code>
 <div class="block">Returns a map of the short (single character) option names to option spec objects configured for this command.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.util.List&lt;<a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#requiredArgs--">requiredArgs</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#requiredArgs()">requiredArgs</a></strong>()</code>
 <div class="block">Returns the list of required options and positional parameters configured for this command.</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.util.Map&lt;java.lang.String,<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#subcommands--">subcommands</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#subcommands()">subcommands</a></strong>()</code>
 <div class="block">Returns a read-only view of the subcommand map.</div>
 </td>
 </tr>
-<tr id="i28" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#toString--">toString</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#toString()">toString</a></strong>()</code>
 <div class="block">Returns a string representation of this command, used in error messages and trace messages.</div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;<a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#unmatchedArgsBindings--">unmatchedArgsBindings</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#unmatchedArgsBindings()">unmatchedArgsBindings</a></strong>()</code>
 <div class="block">Returns the list of <a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli"><code>UnmatchedArgumentsBindings</code></a> configured for this command;
  each <code>UnmatchedArgsBinding</code> captures the arguments that could not be matched to any options or positional parameters.</div>
 </td>
 </tr>
-<tr id="i30" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#usageMessage--">usageMessage</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#usageMessage()">usageMessage</a></strong>()</code>
 <div class="block">Returns the usage help message specification for this command.</div>
 </td>
 </tr>
-<tr id="i31" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.Object</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#userObject--">userObject</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#userObject()">userObject</a></strong>()</code>
 <div class="block">Returns the user object associated with this command.</div>
 </td>
 </tr>
-<tr id="i32" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#version--">version</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#version()">version</a></strong>()</code>
 <div class="block">Returns version information for this command, to print to the console when the user specifies an
- <a href="../picocli/CommandLine.Model.OptionSpec.html#versionHelp--">option</a> to request version help.</div>
+ <a href="../picocli/CommandLine.Model.OptionSpec.html#versionHelp()">option</a> to request version help.</div>
 </td>
 </tr>
-<tr id="i33" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#version-java.lang.String...-">version</a></span>(java.lang.String...&nbsp;version)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#version(java.lang.String...)">version</a></strong>(java.lang.String...&nbsp;version)</code>
 <div class="block">Sets version information literals for this command, to print to the console when the user specifies an
- <a href="../picocli/CommandLine.Model.OptionSpec.html#versionHelp--">option</a> to request version help.</div>
+ <a href="../picocli/CommandLine.Model.OptionSpec.html#versionHelp()">option</a> to request version help.</div>
 </td>
 </tr>
-<tr id="i34" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.IVersionProvider.html" title="interface in picocli">CommandLine.IVersionProvider</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#versionProvider--">versionProvider</a></span>()</code>
-<div class="block">Returns the version provider for this command, to generate the <a href="../picocli/CommandLine.Model.CommandSpec.html#version--"><code>version()</code></a> strings.</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#versionProvider()">versionProvider</a></strong>()</code>
+<div class="block">Returns the version provider for this command, to generate the <a href="../picocli/CommandLine.Model.CommandSpec.html#version()"><code>version()</code></a> strings.</div>
 </td>
 </tr>
-<tr id="i35" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#versionProvider-picocli.CommandLine.IVersionProvider-">versionProvider</a></span>(<a href="../picocli/CommandLine.IVersionProvider.html" title="interface in picocli">CommandLine.IVersionProvider</a>&nbsp;versionProvider)</code>
-<div class="block">Sets version provider for this command, to generate the <a href="../picocli/CommandLine.Model.CommandSpec.html#version--"><code>version()</code></a> strings.</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#versionProvider(picocli.CommandLine.IVersionProvider)">versionProvider</a></strong>(<a href="../picocli/CommandLine.IVersionProvider.html" title="interface in picocli">CommandLine.IVersionProvider</a>&nbsp;versionProvider)</code>
+<div class="block">Sets version provider for this command, to generate the <a href="../picocli/CommandLine.Model.CommandSpec.html#version()"><code>version()</code></a> strings.</div>
 </td>
 </tr>
-<tr id="i36" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#withToString-java.lang.String-">withToString</a></span>(java.lang.String&nbsp;newValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#withToString(java.lang.String)">withToString</a></strong>(java.lang.String&nbsp;newValue)</code>
 <div class="block">Sets the string representation of this command, used in error messages and trace messages.</div>
 </td>
 </tr>
-<tr id="i37" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html#wrapWithoutInspection-java.lang.Object-">wrapWithoutInspection</a></span>(java.lang.Object&nbsp;userObject)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html#wrapWithoutInspection(java.lang.Object)">wrapWithoutInspection</a></strong>(java.lang.Object&nbsp;userObject)</code>
 <div class="block">Creates and returns a new <code>CommandSpec</code> with the specified associated user object.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -403,11 +388,11 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="create--">
+<a name="create()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -417,7 +402,7 @@ <h4>create</h4>
 <div class="block">Creates and returns a new <code>CommandSpec</code> without any associated user object.</div>
 </li>
 </ul>
-<a name="wrapWithoutInspection-java.lang.Object-">
+<a name="wrapWithoutInspection(java.lang.Object)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -426,13 +411,10 @@ <h4>wrapWithoutInspection</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;wrapWithoutInspection(java.lang.Object&nbsp;userObject)</pre>
 <div class="block">Creates and returns a new <code>CommandSpec</code> with the specified associated user object.
  The specified user object is <em>not</em> inspected for annotations.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>userObject</code> - the associated user object. May be any object, may be <code>null</code>.</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>userObject</code> - the associated user object. May be any object, may be <code>null</code>.</dd></dl>
 </li>
 </ul>
-<a name="forAnnotatedObject-java.lang.Object-">
+<a name="forAnnotatedObject(java.lang.Object)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -441,30 +423,23 @@ <h4>forAnnotatedObject</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;forAnnotatedObject(java.lang.Object&nbsp;userObject)</pre>
 <div class="block">Creates and returns a new <code>CommandSpec</code> initialized from the specified associated user object. The specified
  user object must have at least one <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>userObject</code> - the user object annotated with <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> and/or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotations.</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>userObject</code> - the user object annotated with <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> and/or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotations.</dd></dl>
 </li>
 </ul>
-<a name="forAnnotatedObject-java.lang.Object-picocli.CommandLine.IFactory-">
+<a name="forAnnotatedObject(java.lang.Object, picocli.CommandLine.IFactory)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>forAnnotatedObject</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;forAnnotatedObject(java.lang.Object&nbsp;userObject,
-                                                               <a href="../picocli/CommandLine.IFactory.html" title="interface in picocli">CommandLine.IFactory</a>&nbsp;factory)</pre>
+                                               <a href="../picocli/CommandLine.IFactory.html" title="interface in picocli">CommandLine.IFactory</a>&nbsp;factory)</pre>
 <div class="block">Creates and returns a new <code>CommandSpec</code> initialized from the specified associated user object. The specified
  user object must have at least one <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>userObject</code> - the user object annotated with <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> and/or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotations.</dd>
-<dd><code>factory</code> - the factory used to create instances of <a href="../picocli/CommandLine.Command.html#subcommands--">subcommands</a>, <a href="../picocli/CommandLine.Option.html#converter--">converters</a>, etc., that are registered declaratively with annotation attributes</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>userObject</code> - the user object annotated with <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> and/or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotations.</dd><dd><code>factory</code> - the factory used to create instances of <a href="../picocli/CommandLine.Command.html#subcommands()">subcommands</a>, <a href="../picocli/CommandLine.Option.html#converter()">converters</a>, etc., that are registered declaratively with annotation attributes</dd></dl>
 </li>
 </ul>
-<a name="userObject--">
+<a name="userObject()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -472,13 +447,10 @@ <h4>forAnnotatedObject</h4>
 <h4>userObject</h4>
 <pre>public&nbsp;java.lang.Object&nbsp;userObject()</pre>
 <div class="block">Returns the user object associated with this command.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#getCommand--"><code>CommandLine.getCommand()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#getCommand()"><code>CommandLine.getCommand()</code></a></dd></dl>
 </li>
 </ul>
-<a name="commandLine--">
+<a name="commandLine()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -488,7 +460,7 @@ <h4>commandLine</h4>
 <div class="block">Returns the CommandLine constructed with this <code>CommandSpec</code> model.</div>
 </li>
 </ul>
-<a name="commandLine-picocli.CommandLine-">
+<a name="commandLine(picocli.CommandLine)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -498,7 +470,7 @@ <h4>commandLine</h4>
 <div class="block">Sets the CommandLine constructed with this <code>CommandSpec</code> model.</div>
 </li>
 </ul>
-<a name="parser--">
+<a name="parser()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -508,7 +480,7 @@ <h4>parser</h4>
 <div class="block">Returns the parser specification for this command.</div>
 </li>
 </ul>
-<a name="usageMessage--">
+<a name="usageMessage()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -518,7 +490,7 @@ <h4>usageMessage</h4>
 <div class="block">Returns the usage help message specification for this command.</div>
 </li>
 </ul>
-<a name="subcommands--">
+<a name="subcommands()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -528,43 +500,33 @@ <h4>subcommands</h4>
 <div class="block">Returns a read-only view of the subcommand map.</div>
 </li>
 </ul>
-<a name="addSubcommand-java.lang.String-picocli.CommandLine.Model.CommandSpec-">
+<a name="addSubcommand(java.lang.String, picocli.CommandLine.Model.CommandSpec)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>addSubcommand</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;addSubcommand(java.lang.String&nbsp;name,
-                                                   <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;subcommand)</pre>
+                                          <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;subcommand)</pre>
 <div class="block">Adds the specified subcommand with the specified name.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - subcommand name - when this String is encountered in the command line arguments the subcommand is invoked</dd>
-<dd><code>subcommand</code> - describes the subcommand to envoke when the name is encountered on the command line</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this <code>CommandSpec</code> object for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>name</code> - subcommand name - when this String is encountered in the command line arguments the subcommand is invoked</dd><dd><code>subcommand</code> - describes the subcommand to envoke when the name is encountered on the command line</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this <code>CommandSpec</code> object for method chaining</dd></dl>
 </li>
 </ul>
-<a name="addSubcommand-java.lang.String-picocli.CommandLine-">
+<a name="addSubcommand(java.lang.String, picocli.CommandLine)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>addSubcommand</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;addSubcommand(java.lang.String&nbsp;name,
-                                                   <a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine)</pre>
+                                          <a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine)</pre>
 <div class="block">Adds the specified subcommand with the specified name.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - subcommand name - when this String is encountered in the command line arguments the subcommand is invoked</dd>
-<dd><code>commandLine</code> - the subcommand to envoke when the name is encountered on the command line</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this <code>CommandSpec</code> object for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>name</code> - subcommand name - when this String is encountered in the command line arguments the subcommand is invoked</dd><dd><code>commandLine</code> - the subcommand to envoke when the name is encountered on the command line</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this <code>CommandSpec</code> object for method chaining</dd></dl>
 </li>
 </ul>
-<a name="parent--">
+<a name="parent()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -574,7 +536,7 @@ <h4>parent</h4>
 <div class="block">Returns the parent command of this subcommand, or <code>null</code> if this is a top-level command.</div>
 </li>
 </ul>
-<a name="parent-picocli.CommandLine.Model.CommandSpec-">
+<a name="parent(picocli.CommandLine.Model.CommandSpec)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -582,13 +544,10 @@ <h4>parent</h4>
 <h4>parent</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;parent(<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;parent)</pre>
 <div class="block">Sets the parent command of this subcommand.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this CommandSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this CommandSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="add-picocli.CommandLine.Model.ArgSpec-">
+<a name="add(picocli.CommandLine.Model.ArgSpec)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -596,15 +555,11 @@ <h4>parent</h4>
 <h4>add</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;add(<a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a>&nbsp;arg)</pre>
 <div class="block">Adds the specified option spec or positional parameter spec to the list of configured arguments to expect.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>arg</code> - the option spec or positional parameter spec to add</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this CommandSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>arg</code> - the option spec or positional parameter spec to add</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this CommandSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="addOption-picocli.CommandLine.Model.OptionSpec-">
+<a name="addOption(picocli.CommandLine.Model.OptionSpec)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -612,17 +567,13 @@ <h4>add</h4>
 <h4>addOption</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;addOption(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option)</pre>
 <div class="block">Adds the specified option spec to the list of configured arguments to expect.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>option</code> - the option spec to add</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this CommandSpec for method chaining</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli">CommandLine.DuplicateOptionAnnotationsException</a></code> - if any of the names of the specified option is the same as the name of another option</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>option</code> - the option spec to add</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this CommandSpec for method chaining</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code><a href="../picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli">CommandLine.DuplicateOptionAnnotationsException</a></code> - if any of the names of the specified option is the same as the name of another option</dd></dl>
 </li>
 </ul>
-<a name="addPositional-picocli.CommandLine.Model.PositionalParamSpec-">
+<a name="addPositional(picocli.CommandLine.Model.PositionalParamSpec)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -630,33 +581,24 @@ <h4>addOption</h4>
 <h4>addPositional</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;addPositional(<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&nbsp;positional)</pre>
 <div class="block">Adds the specified positional parameter spec to the list of configured arguments to expect.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>positional</code> - the positional parameter spec to add</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this CommandSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>positional</code> - the positional parameter spec to add</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this CommandSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="addMixin-java.lang.String-picocli.CommandLine.Model.CommandSpec-">
+<a name="addMixin(java.lang.String, picocli.CommandLine.Model.CommandSpec)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>addMixin</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;addMixin(java.lang.String&nbsp;name,
-                                              <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;mixin)</pre>
+                                     <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;mixin)</pre>
 <div class="block">Adds the specified mixin <code>CommandSpec</code> object to the map of mixins for this command.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - the name that can be used to later retrieve the mixin</dd>
-<dd><code>mixin</code> - the mixin whose options and positional parameters and other attributes to add to this command</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this CommandSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>name</code> - the name that can be used to later retrieve the mixin</dd><dd><code>mixin</code> - the mixin whose options and positional parameters and other attributes to add to this command</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this CommandSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="addUnmatchedArgsBinding-picocli.CommandLine.Model.UnmatchedArgsBinding-">
+<a name="addUnmatchedArgsBinding(picocli.CommandLine.Model.UnmatchedArgsBinding)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -664,15 +606,11 @@ <h4>addMixin</h4>
 <h4>addUnmatchedArgsBinding</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;addUnmatchedArgsBinding(<a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a>&nbsp;spec)</pre>
 <div class="block">Adds the specified <code>UnmatchedArgsBinding</code> to the list of model objects to capture unmatched arguments for this command.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>spec</code> - the unmatched arguments binding to capture unmatched arguments</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this CommandSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>spec</code> - the unmatched arguments binding to capture unmatched arguments</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this CommandSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="mixins--">
+<a name="mixins()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -680,13 +618,10 @@ <h4>addUnmatchedArgsBinding</h4>
 <h4>mixins</h4>
 <pre>public&nbsp;java.util.Map&lt;java.lang.String,<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&gt;&nbsp;mixins()</pre>
 <div class="block">Returns a map of the mixin names to mixin <code>CommandSpec</code> objects configured for this command.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an immutable map of mixins added to this command.</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>an immutable map of mixins added to this command.</dd></dl>
 </li>
 </ul>
-<a name="options--">
+<a name="options()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -694,13 +629,10 @@ <h4>mixins</h4>
 <h4>options</h4>
 <pre>public&nbsp;java.util.List&lt;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;&nbsp;options()</pre>
 <div class="block">Returns the list of options configured for this command.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an immutable list of options that this command recognizes.</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>an immutable list of options that this command recognizes.</dd></dl>
 </li>
 </ul>
-<a name="positionalParameters--">
+<a name="positionalParameters()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -708,13 +640,10 @@ <h4>options</h4>
 <h4>positionalParameters</h4>
 <pre>public&nbsp;java.util.List&lt;<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&gt;&nbsp;positionalParameters()</pre>
 <div class="block">Returns the list of positional parameters configured for this command.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an immutable list of positional parameters that this command recognizes.</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>an immutable list of positional parameters that this command recognizes.</dd></dl>
 </li>
 </ul>
-<a name="optionsMap--">
+<a name="optionsMap()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -722,13 +651,10 @@ <h4>positionalParameters</h4>
 <h4>optionsMap</h4>
 <pre>public&nbsp;java.util.Map&lt;java.lang.String,<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;&nbsp;optionsMap()</pre>
 <div class="block">Returns a map of the option names to option spec objects configured for this command.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an immutable map of options that this command recognizes.</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>an immutable map of options that this command recognizes.</dd></dl>
 </li>
 </ul>
-<a name="posixOptionsMap--">
+<a name="posixOptionsMap()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -736,13 +662,10 @@ <h4>optionsMap</h4>
 <h4>posixOptionsMap</h4>
 <pre>public&nbsp;java.util.Map&lt;java.lang.Character,<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;&nbsp;posixOptionsMap()</pre>
 <div class="block">Returns a map of the short (single character) option names to option spec objects configured for this command.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an immutable map of options that this command recognizes.</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>an immutable map of options that this command recognizes.</dd></dl>
 </li>
 </ul>
-<a name="requiredArgs--">
+<a name="requiredArgs()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -750,13 +673,10 @@ <h4>posixOptionsMap</h4>
 <h4>requiredArgs</h4>
 <pre>public&nbsp;java.util.List&lt;<a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a>&gt;&nbsp;requiredArgs()</pre>
 <div class="block">Returns the list of required options and positional parameters configured for this command.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an immutable list of the required options and positional parameters for this command.</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>an immutable list of the required options and positional parameters for this command.</dd></dl>
 </li>
 </ul>
-<a name="unmatchedArgsBindings--">
+<a name="unmatchedArgsBindings()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -767,7 +687,7 @@ <h4>unmatchedArgsBindings</h4>
  each <code>UnmatchedArgsBinding</code> captures the arguments that could not be matched to any options or positional parameters.</div>
 </li>
 </ul>
-<a name="name--">
+<a name="name()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -775,10 +695,10 @@ <h4>unmatchedArgsBindings</h4>
 <h4>name</h4>
 <pre>public&nbsp;java.lang.String&nbsp;name()</pre>
 <div class="block">Returns the String to use as the program name in the synopsis line of the help message.
- <a href="../picocli/CommandLine.Model.CommandSpec.html#DEFAULT_COMMAND_NAME"><code>DEFAULT_COMMAND_NAME</code></a> by default, initialized from <a href="../picocli/CommandLine.Command.html#name--"><code>CommandLine.Command.name()</code></a> if defined.</div>
+ <a href="../picocli/CommandLine.Model.CommandSpec.html#DEFAULT_COMMAND_NAME"><code>DEFAULT_COMMAND_NAME</code></a> by default, initialized from <a href="../picocli/CommandLine.Command.html#name()"><code>CommandLine.Command.name()</code></a> if defined.</div>
 </li>
 </ul>
-<a name="version--">
+<a name="version()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -786,28 +706,22 @@ <h4>name</h4>
 <h4>version</h4>
 <pre>public&nbsp;java.lang.String[]&nbsp;version()</pre>
 <div class="block">Returns version information for this command, to print to the console when the user specifies an
- <a href="../picocli/CommandLine.Model.OptionSpec.html#versionHelp--">option</a> to request version help. This is not part of the usage help message.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the version strings generated by the <a href="../picocli/CommandLine.Model.CommandSpec.html#versionProvider--"><code>version provider</code></a> if one is set, otherwise the <a href="../picocli/CommandLine.Model.CommandSpec.html#version-java.lang.String...-">version literals</a></dd>
-</dl>
+ <a href="../picocli/CommandLine.Model.OptionSpec.html#versionHelp()">option</a> to request version help. This is not part of the usage help message.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the version strings generated by the <a href="../picocli/CommandLine.Model.CommandSpec.html#versionProvider()"><code>version provider</code></a> if one is set, otherwise the <a href="../picocli/CommandLine.Model.CommandSpec.html#version(java.lang.String...)">version literals</a></dd></dl>
 </li>
 </ul>
-<a name="versionProvider--">
+<a name="versionProvider()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>versionProvider</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.IVersionProvider.html" title="interface in picocli">CommandLine.IVersionProvider</a>&nbsp;versionProvider()</pre>
-<div class="block">Returns the version provider for this command, to generate the <a href="../picocli/CommandLine.Model.CommandSpec.html#version--"><code>version()</code></a> strings.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the version provider or <code>null</code> if the version strings should be returned from the <a href="../picocli/CommandLine.Model.CommandSpec.html#version-java.lang.String...-">version literals</a>.</dd>
-</dl>
+<div class="block">Returns the version provider for this command, to generate the <a href="../picocli/CommandLine.Model.CommandSpec.html#version()"><code>version()</code></a> strings.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the version provider or <code>null</code> if the version strings should be returned from the <a href="../picocli/CommandLine.Model.CommandSpec.html#version(java.lang.String...)">version literals</a>.</dd></dl>
 </li>
 </ul>
-<a name="helpCommand--">
+<a name="helpCommand()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -816,16 +730,11 @@ <h4>helpCommand</h4>
 <pre>public&nbsp;boolean&nbsp;helpCommand()</pre>
 <div class="block">Returns whether this subcommand is a help command, and required options and positional
  parameters of the parent command should not be validated.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd><code>true</code> if this subcommand is a help command and picocli should not check for missing required
-      options and positional parameters on the parent command</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Command.html#helpCommand--"><code>CommandLine.Command.helpCommand()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd><code>true</code> if this subcommand is a help command and picocli should not check for missing required
+      options and positional parameters on the parent command</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Command.html#helpCommand()"><code>CommandLine.Command.helpCommand()</code></a></dd></dl>
 </li>
 </ul>
-<a name="mixinStandardHelpOptions--">
+<a name="mixinStandardHelpOptions()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -835,7 +744,7 @@ <h4>mixinStandardHelpOptions</h4>
 <div class="block">Returns <code>true</code> if the standard help options have been mixed in with this command, <code>false</code> otherwise.</div>
 </li>
 </ul>
-<a name="toString--">
+<a name="toString()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -844,12 +753,12 @@ <h4>toString</h4>
 <pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
 <div class="block">Returns a string representation of this command, used in error messages and trace messages.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dt><strong>Overrides:</strong></dt>
 <dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
 </dl>
 </li>
 </ul>
-<a name="name-java.lang.String-">
+<a name="name(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -857,13 +766,10 @@ <h4>toString</h4>
 <h4>name</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;name(java.lang.String&nbsp;name)</pre>
 <div class="block">Sets the String to use as the program name in the synopsis line of the help message.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this CommandSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this CommandSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="version-java.lang.String...-">
+<a name="version(java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -871,30 +777,23 @@ <h4>name</h4>
 <h4>version</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;version(java.lang.String...&nbsp;version)</pre>
 <div class="block">Sets version information literals for this command, to print to the console when the user specifies an
- <a href="../picocli/CommandLine.Model.OptionSpec.html#versionHelp--">option</a> to request version help. Only used if no <a href="../picocli/CommandLine.Model.CommandSpec.html#versionProvider--"><code>versionProvider</code></a> is set.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this CommandSpec for method chaining</dd>
-</dl>
+ <a href="../picocli/CommandLine.Model.OptionSpec.html#versionHelp()">option</a> to request version help. Only used if no <a href="../picocli/CommandLine.Model.CommandSpec.html#versionProvider()"><code>versionProvider</code></a> is set.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this CommandSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="versionProvider-picocli.CommandLine.IVersionProvider-">
+<a name="versionProvider(picocli.CommandLine.IVersionProvider)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>versionProvider</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;versionProvider(<a href="../picocli/CommandLine.IVersionProvider.html" title="interface in picocli">CommandLine.IVersionProvider</a>&nbsp;versionProvider)</pre>
-<div class="block">Sets version provider for this command, to generate the <a href="../picocli/CommandLine.Model.CommandSpec.html#version--"><code>version()</code></a> strings.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>versionProvider</code> - the version provider to use to generate the version strings, or <code>null</code> if the <a href="../picocli/CommandLine.Model.CommandSpec.html#version-java.lang.String...-">version literals</a> should be used.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this CommandSpec for method chaining</dd>
-</dl>
+<div class="block">Sets version provider for this command, to generate the <a href="../picocli/CommandLine.Model.CommandSpec.html#version()"><code>version()</code></a> strings.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>versionProvider</code> - the version provider to use to generate the version strings, or <code>null</code> if the <a href="../picocli/CommandLine.Model.CommandSpec.html#version(java.lang.String...)">version literals</a> should be used.</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this CommandSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="helpCommand-boolean-">
+<a name="helpCommand(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -902,15 +801,10 @@ <h4>versionProvider</h4>
 <h4>helpCommand</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;helpCommand(boolean&nbsp;newValue)</pre>
 <div class="block">Sets whether this is a help command and required parameter checking should be suspended.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this CommandSpec for method chaining</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Command.html#helpCommand--"><code>CommandLine.Command.helpCommand()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this CommandSpec for method chaining</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Command.html#helpCommand()"><code>CommandLine.Command.helpCommand()</code></a></dd></dl>
 </li>
 </ul>
-<a name="mixinStandardHelpOptions-boolean-">
+<a name="mixinStandardHelpOptions(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -918,15 +812,10 @@ <h4>helpCommand</h4>
 <h4>mixinStandardHelpOptions</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;mixinStandardHelpOptions(boolean&nbsp;newValue)</pre>
 <div class="block">Sets whether the standard help options should be mixed in with this command.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this CommandSpec for method chaining</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Command.html#mixinStandardHelpOptions--"><code>CommandLine.Command.mixinStandardHelpOptions()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this CommandSpec for method chaining</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Command.html#mixinStandardHelpOptions()"><code>CommandLine.Command.mixinStandardHelpOptions()</code></a></dd></dl>
 </li>
 </ul>
-<a name="withToString-java.lang.String-">
+<a name="withToString(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -934,12 +823,8 @@ <h4>mixinStandardHelpOptions</h4>
 <h4>withToString</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;withToString(java.lang.String&nbsp;newValue)</pre>
 <div class="block">Sets the string representation of this command, used in error messages and trace messages.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>newValue</code> - the string representation</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this CommandSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>newValue</code> - the string representation</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this CommandSpec for method chaining</dd></dl>
 </li>
 </ul>
 </li>
@@ -950,11 +835,9 @@ <h4>withToString</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -969,15 +852,15 @@ <h4>withToString</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.CommandSpec.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.CommandSpec.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.CommandSpec.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -997,16 +880,16 @@ <h4>withToString</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Model.IBinding.html b/docs/apidocs/picocli/CommandLine.Model.IBinding.html
index 0a9152cff..77be7cbac 100644
--- a/docs/apidocs/picocli/CommandLine.Model.IBinding.html
+++ b/docs/apidocs/picocli/CommandLine.Model.IBinding.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Model.IBinding (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Model.IBinding (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Model.IBinding (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Model.IBinding (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.IBinding.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.IBinding.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.IBinding.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -76,16 +63,16 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -104,15 +91,13 @@ <h2 title="Interface CommandLine.Model.IBinding" class="title">Interface Command
 </dl>
 <hr>
 <br>
-<pre>public static interface <span class="typeNameLabel">CommandLine.Model.IBinding</span></pre>
+<pre>public static interface <span class="strong">CommandLine.Model.IBinding</span></pre>
 <div class="block">Customizable binding for obtaining and modifying the current value of an option or positional parameter.
  When an option or positional parameter is matched on the command line, its binding is invoked to capture the value.
  For example, an option can be bound to a field or a method, and when the option is matched on the command line, the
  field's value is set or the method is invoked with the option parameter value.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -121,25 +106,25 @@ <h2 title="Interface CommandLine.Model.IBinding" class="title">Interface Command
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>&lt;T&gt;&nbsp;T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.IBinding.html#get--">get</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.IBinding.html#get()">get</a></strong>()</code>
 <div class="block">Returns the current value of the binding.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>&lt;T&gt;&nbsp;T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.IBinding.html#set-T-">set</a></span>(T&nbsp;value)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.IBinding.html#set(T)">set</a></strong>(T&nbsp;value)</code>
 <div class="block">Sets the new value of the binding.</div>
 </td>
 </tr>
@@ -154,50 +139,42 @@ <h3>Method Summary</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="get--">
+<a name="get()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>get</h4>
 <pre>&lt;T&gt;&nbsp;T&nbsp;get()
-   throws <a href="../picocli/CommandLine.PicocliException.html" title="class in picocli">CommandLine.PicocliException</a></pre>
+      throws <a href="../picocli/CommandLine.PicocliException.html" title="class in picocli">CommandLine.PicocliException</a></pre>
 <div class="block">Returns the current value of the binding. For multi-value options and positional parameters, this method returns an
  array, collection or map to add values to.</div>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../picocli/CommandLine.PicocliException.html" title="class in picocli">CommandLine.PicocliException</a></code> - if a problem occurred while obtaining the current value</dd>
-</dl>
+<dl><dt><span class="strong">Throws:</span></dt>
+<dd><code><a href="../picocli/CommandLine.PicocliException.html" title="class in picocli">CommandLine.PicocliException</a></code> - if a problem occurred while obtaining the current value</dd></dl>
 </li>
 </ul>
-<a name="set-java.lang.Object-">
+<a name="set(java.lang.Object)">
 <!--   -->
-</a><a name="set-T-">
+</a><a name="set(T)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>set</h4>
 <pre>&lt;T&gt;&nbsp;T&nbsp;set(T&nbsp;value)
-   throws <a href="../picocli/CommandLine.PicocliException.html" title="class in picocli">CommandLine.PicocliException</a></pre>
+      throws <a href="../picocli/CommandLine.PicocliException.html" title="class in picocli">CommandLine.PicocliException</a></pre>
 <div class="block">Sets the new value of the binding. For multi-value options and positional parameters, this method is used to
  set a new array instance that is one element larger than the previous instance, or to initialize the collection
- or map when the <a href="../picocli/CommandLine.Model.IBinding.html#get--"><code>getter</code></a> returned <code>null</code>. For single-value options and positional parameters,
+ or map when the <a href="../picocli/CommandLine.Model.IBinding.html#get()"><code>getter</code></a> returned <code>null</code>. For single-value options and positional parameters,
  this method simply sets the value.</div>
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>T</code> - type of the value</dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>value</code> - the new value of the binding</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the previous value of the binding (if supported by this binding)</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../picocli/CommandLine.PicocliException.html" title="class in picocli">CommandLine.PicocliException</a></code> - if a problem occurred while setting the new value</dd>
-</dl>
+<dl><dt><span class="strong">Type Parameters:</span></dt><dd><code>T</code> - type of the value</dd><dt><span class="strong">Parameters:</span></dt><dd><code>value</code> - the new value of the binding</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the previous value of the binding (if supported by this binding)</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code><a href="../picocli/CommandLine.PicocliException.html" title="class in picocli">CommandLine.PicocliException</a></code> - if a problem occurred while setting the new value</dd></dl>
 </li>
 </ul>
 </li>
@@ -208,11 +185,9 @@ <h4>set</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -227,15 +202,15 @@ <h4>set</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.IBinding.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.IBinding.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.IBinding.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -255,16 +230,16 @@ <h4>set</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Model.OptionSpec.Builder.html b/docs/apidocs/picocli/CommandLine.Model.OptionSpec.Builder.html
index a81fb9587..8a4065faa 100644
--- a/docs/apidocs/picocli/CommandLine.Model.OptionSpec.Builder.html
+++ b/docs/apidocs/picocli/CommandLine.Model.OptionSpec.Builder.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Model.OptionSpec.Builder (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Model.OptionSpec.Builder (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Model.OptionSpec.Builder (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Model.OptionSpec.Builder (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.OptionSpec.Builder.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.OptionSpec.Builder.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.OptionSpec.Builder.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -76,16 +63,16 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -112,13 +99,11 @@ <h2 title="Class CommandLine.Model.OptionSpec.Builder" class="title">Class Comma
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.Model.OptionSpec.Builder</span>
+<pre>public static class <span class="strong">CommandLine.Model.OptionSpec.Builder</span>
 extends java.lang.Object</pre>
 <div class="block">Builder responsible for creating valid <code>OptionSpec</code> objects.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -127,139 +112,139 @@ <h2 title="Class CommandLine.Model.OptionSpec.Builder" class="title">Class Comma
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#arity-picocli.CommandLine.Range-">arity</a></span>(<a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a>&nbsp;arity)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#arity(picocli.CommandLine.Range)">arity</a></strong>(<a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a>&nbsp;arity)</code>
 <div class="block">Sets how many arguments this option or positional parameter requires, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#arity-java.lang.String-">arity</a></span>(java.lang.String&nbsp;range)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#arity(java.lang.String)">arity</a></strong>(java.lang.String&nbsp;range)</code>
 <div class="block">Sets how many arguments this option or positional parameter requires, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#auxiliaryTypes-java.lang.Class...-">auxiliaryTypes</a></span>(java.lang.Class&lt;?&gt;...&nbsp;types)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#auxiliaryTypes(java.lang.Class...)">auxiliaryTypes</a></strong>(java.lang.Class&lt;?&gt;...&nbsp;types)</code>
 <div class="block">Sets auxiliary type information, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#binding-picocli.CommandLine.Model.IBinding-">binding</a></span>(<a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a>&nbsp;binding)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#binding(picocli.CommandLine.Model.IBinding)">binding</a></strong>(<a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a>&nbsp;binding)</code>
 <div class="block">Sets the <a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><code>CommandLine.Model.IBinding</code></a> that is responsible for getting and setting the value of this argument to the specified value, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#build--">build</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#build()">build</a></strong>()</code>
 <div class="block">Returns a valid <code>OptionSpec</code> instance.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#converters-picocli.CommandLine.ITypeConverter...-">converters</a></span>(<a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli">CommandLine.ITypeConverter</a>&lt;?&gt;...&nbsp;cs)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#converters(picocli.CommandLine.ITypeConverter...)">converters</a></strong>(<a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli">CommandLine.ITypeConverter</a>&lt;?&gt;...&nbsp;cs)</code>
 <div class="block">Sets option/positional param-specific converter (or converters for Maps), and returns this builder.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#defaultValue-java.lang.Object-">defaultValue</a></span>(java.lang.Object&nbsp;defaultValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#defaultValue(java.lang.Object)">defaultValue</a></strong>(java.lang.Object&nbsp;defaultValue)</code>
 <div class="block">Sets the default value of this option or positional parameter to the specified value, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#description-java.lang.String...-">description</a></span>(java.lang.String...&nbsp;description)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#description(java.lang.String...)">description</a></strong>(java.lang.String...&nbsp;description)</code>
 <div class="block">Sets the description of this option, used when generating the usage documentation, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#help-boolean-">help</a></span>(boolean&nbsp;help)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#help(boolean)">help</a></strong>(boolean&nbsp;help)</code>
 <div class="block">Sets whether this option disables validation of the other arguments, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#hidden-boolean-">hidden</a></span>(boolean&nbsp;hidden)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#hidden(boolean)">hidden</a></strong>(boolean&nbsp;hidden)</code>
 <div class="block">Sets whether this option should be excluded from the usage message, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#names-java.lang.String...-">names</a></span>(java.lang.String...&nbsp;names)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#names(java.lang.String...)">names</a></strong>(java.lang.String...&nbsp;names)</code>
 <div class="block">Replaces the option names with the specified values.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#paramLabel-java.lang.String-">paramLabel</a></span>(java.lang.String&nbsp;paramLabel)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#paramLabel(java.lang.String)">paramLabel</a></strong>(java.lang.String&nbsp;paramLabel)</code>
 <div class="block">Sets the name of the option or positional parameter used in the usage help message, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#required-boolean-">required</a></span>(boolean&nbsp;required)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#required(boolean)">required</a></strong>(boolean&nbsp;required)</code>
 <div class="block">Sets whether this is a required option or positional parameter, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>protected <a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#self--">self</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#self()">self</a></strong>()</code>
 <div class="block">Returns this builder.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#showDefaultValue-picocli.CommandLine.Help.Visibility-">showDefaultValue</a></span>(<a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli">CommandLine.Help.Visibility</a>&nbsp;visibility)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#showDefaultValue(picocli.CommandLine.Help.Visibility)">showDefaultValue</a></strong>(<a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli">CommandLine.Help.Visibility</a>&nbsp;visibility)</code>
 <div class="block">Sets whether this option or positional parameter's default value should be shown in the usage help, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#splitRegex-java.lang.String-">splitRegex</a></span>(java.lang.String&nbsp;splitRegex)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#splitRegex(java.lang.String)">splitRegex</a></strong>(java.lang.String&nbsp;splitRegex)</code>
 <div class="block">Sets a regular expression to split option parameter values or <code>""</code> if the value should not be split, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#type-java.lang.Class-">type</a></span>(java.lang.Class&lt;?&gt;&nbsp;propertyType)</code>
-<div class="block">Sets the type to convert the option or positional parameter to before <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue-java.lang.Object-">setting</a> the value, and returns this builder.</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#type(java.lang.Class)">type</a></strong>(java.lang.Class&lt;?&gt;&nbsp;propertyType)</code>
+<div class="block">Sets the type to convert the option or positional parameter to before <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue(java.lang.Object)">setting</a> the value, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#usageHelp-boolean-">usageHelp</a></span>(boolean&nbsp;usageHelp)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#usageHelp(boolean)">usageHelp</a></strong>(boolean&nbsp;usageHelp)</code>
 <div class="block">Sets whether this option allows the user to request usage help, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#versionHelp-boolean-">versionHelp</a></span>(boolean&nbsp;versionHelp)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#versionHelp(boolean)">versionHelp</a></strong>(boolean&nbsp;versionHelp)</code>
 <div class="block">Sets whether this option allows the user to request version information, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#withToString-java.lang.String-">withToString</a></span>(java.lang.String&nbsp;toString)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html#withToString(java.lang.String)">withToString</a></strong>(java.lang.String&nbsp;toString)</code>
 <div class="block">Sets the string respresentation of this option or positional parameter to the specified value, and returns this builder.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -275,11 +260,11 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="build--">
+<a name="build()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -289,7 +274,7 @@ <h4>build</h4>
 <div class="block">Returns a valid <code>OptionSpec</code> instance.</div>
 </li>
 </ul>
-<a name="self--">
+<a name="self()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -299,7 +284,7 @@ <h4>self</h4>
 <div class="block">Returns this builder.</div>
 </li>
 </ul>
-<a name="names-java.lang.String...-">
+<a name="names(java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -307,13 +292,10 @@ <h4>self</h4>
 <h4>names</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a>&nbsp;names(java.lang.String...&nbsp;names)</pre>
 <div class="block">Replaces the option names with the specified values. At least one option name is required, and returns this builder.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this builder instance to provide a fluent interface</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this builder instance to provide a fluent interface</dd></dl>
 </li>
 </ul>
-<a name="help-boolean-">
+<a name="help(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -323,7 +305,7 @@ <h4>help</h4>
 <div class="block">Sets whether this option disables validation of the other arguments, and returns this builder.</div>
 </li>
 </ul>
-<a name="usageHelp-boolean-">
+<a name="usageHelp(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -333,7 +315,7 @@ <h4>usageHelp</h4>
 <div class="block">Sets whether this option allows the user to request usage help, and returns this builder.</div>
 </li>
 </ul>
-<a name="versionHelp-boolean-">
+<a name="versionHelp(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -343,7 +325,7 @@ <h4>versionHelp</h4>
 <div class="block">Sets whether this option allows the user to request version information, and returns this builder.</div>
 </li>
 </ul>
-<a name="required-boolean-">
+<a name="required(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -353,7 +335,7 @@ <h4>required</h4>
 <div class="block">Sets whether this is a required option or positional parameter, and returns this builder.</div>
 </li>
 </ul>
-<a name="description-java.lang.String...-">
+<a name="description(java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -363,7 +345,7 @@ <h4>description</h4>
 <div class="block">Sets the description of this option, used when generating the usage documentation, and returns this builder.</div>
 </li>
 </ul>
-<a name="arity-java.lang.String-">
+<a name="arity(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -373,7 +355,7 @@ <h4>arity</h4>
 <div class="block">Sets how many arguments this option or positional parameter requires, and returns this builder.</div>
 </li>
 </ul>
-<a name="arity-picocli.CommandLine.Range-">
+<a name="arity(picocli.CommandLine.Range)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -383,7 +365,7 @@ <h4>arity</h4>
 <div class="block">Sets how many arguments this option or positional parameter requires, and returns this builder.</div>
 </li>
 </ul>
-<a name="paramLabel-java.lang.String-">
+<a name="paramLabel(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -393,7 +375,7 @@ <h4>paramLabel</h4>
 <div class="block">Sets the name of the option or positional parameter used in the usage help message, and returns this builder.</div>
 </li>
 </ul>
-<a name="auxiliaryTypes-java.lang.Class...-">
+<a name="auxiliaryTypes(java.lang.Class...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -401,14 +383,11 @@ <h4>paramLabel</h4>
 <h4>auxiliaryTypes</h4>
 <pre>public&nbsp;T&nbsp;auxiliaryTypes(java.lang.Class&lt;?&gt;...&nbsp;types)</pre>
 <div class="block">Sets auxiliary type information, and returns this builder.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>types</code> - the element type(s) when the <a href="../picocli/CommandLine.Model.ArgSpec.html#type--"><code>CommandLine.Model.ArgSpec.type()</code></a> is a generic <code>Collection</code> or a <code>Map</code>;
- or the concrete type when the <a href="../picocli/CommandLine.Model.ArgSpec.html#type--"><code>CommandLine.Model.ArgSpec.type()</code></a> is an abstract class.</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>types</code> - the element type(s) when the <a href="../picocli/CommandLine.Model.ArgSpec.html#type()"><code>CommandLine.Model.ArgSpec.type()</code></a> is a generic <code>Collection</code> or a <code>Map</code>;
+ or the concrete type when the <a href="../picocli/CommandLine.Model.ArgSpec.html#type()"><code>CommandLine.Model.ArgSpec.type()</code></a> is an abstract class.</dd></dl>
 </li>
 </ul>
-<a name="converters-picocli.CommandLine.ITypeConverter...-">
+<a name="converters(picocli.CommandLine.ITypeConverter...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -418,7 +397,7 @@ <h4>converters</h4>
 <div class="block">Sets option/positional param-specific converter (or converters for Maps), and returns this builder.</div>
 </li>
 </ul>
-<a name="splitRegex-java.lang.String-">
+<a name="splitRegex(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -428,7 +407,7 @@ <h4>splitRegex</h4>
 <div class="block">Sets a regular expression to split option parameter values or <code>""</code> if the value should not be split, and returns this builder.</div>
 </li>
 </ul>
-<a name="showDefaultValue-picocli.CommandLine.Help.Visibility-">
+<a name="showDefaultValue(picocli.CommandLine.Help.Visibility)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -438,7 +417,7 @@ <h4>showDefaultValue</h4>
 <div class="block">Sets whether this option or positional parameter's default value should be shown in the usage help, and returns this builder.</div>
 </li>
 </ul>
-<a name="hidden-boolean-">
+<a name="hidden(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -448,21 +427,18 @@ <h4>hidden</h4>
 <div class="block">Sets whether this option should be excluded from the usage message, and returns this builder.</div>
 </li>
 </ul>
-<a name="type-java.lang.Class-">
+<a name="type(java.lang.Class)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>type</h4>
 <pre>public&nbsp;T&nbsp;type(java.lang.Class&lt;?&gt;&nbsp;propertyType)</pre>
-<div class="block">Sets the type to convert the option or positional parameter to before <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue-java.lang.Object-">setting</a> the value, and returns this builder.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>propertyType</code> - the type of this option or parameter. For multi-value options and positional parameters this can be an array, or a (sub-type of) Collection or Map.</dd>
-</dl>
+<div class="block">Sets the type to convert the option or positional parameter to before <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue(java.lang.Object)">setting</a> the value, and returns this builder.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>propertyType</code> - the type of this option or parameter. For multi-value options and positional parameters this can be an array, or a (sub-type of) Collection or Map.</dd></dl>
 </li>
 </ul>
-<a name="defaultValue-java.lang.Object-">
+<a name="defaultValue(java.lang.Object)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -472,7 +448,7 @@ <h4>defaultValue</h4>
 <div class="block">Sets the default value of this option or positional parameter to the specified value, and returns this builder.</div>
 </li>
 </ul>
-<a name="binding-picocli.CommandLine.Model.IBinding-">
+<a name="binding(picocli.CommandLine.Model.IBinding)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -482,7 +458,7 @@ <h4>binding</h4>
 <div class="block">Sets the <a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><code>CommandLine.Model.IBinding</code></a> that is responsible for getting and setting the value of this argument to the specified value, and returns this builder.</div>
 </li>
 </ul>
-<a name="withToString-java.lang.String-">
+<a name="withToString(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -500,11 +476,9 @@ <h4>withToString</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -519,15 +493,15 @@ <h4>withToString</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.OptionSpec.Builder.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.OptionSpec.Builder.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.OptionSpec.Builder.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -547,16 +521,16 @@ <h4>withToString</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Model.OptionSpec.html b/docs/apidocs/picocli/CommandLine.Model.OptionSpec.html
index 0cedffa52..98e19ab27 100644
--- a/docs/apidocs/picocli/CommandLine.Model.OptionSpec.html
+++ b/docs/apidocs/picocli/CommandLine.Model.OptionSpec.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Model.OptionSpec (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Model.OptionSpec (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Model.OptionSpec (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Model.OptionSpec (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":9,"i1":9,"i2":10,"i3":10,"i4":42,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.OptionSpec.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.OptionSpec.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.OptionSpec.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -73,19 +60,19 @@
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#nested_class_summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -117,34 +104,34 @@ <h2 title="Class CommandLine.Model.OptionSpec" class="title">Class CommandLine.M
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.Model.OptionSpec</span>
+<pre>public static class <span class="strong">CommandLine.Model.OptionSpec</span>
 extends <a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></pre>
 <div class="block">The <code>OptionSpec</code> class models aspects of a <em>named option</em> of a <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">command</a>, including whether
  it is required or optional, the option parameters supported (or required) by the option,
  and attributes for the usage help message describing the option.
  <p>
  An option has one or more names. The option is matched when the parser encounters one of the option names in the command line arguments.
- Depending on the option's <a href="../picocli/CommandLine.Model.ArgSpec.html#arity--"><code>arity</code></a>,
- the parser may expect it to have option parameters. The parser will call <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue-java.lang.Object-"><code>setValue</code></a> on
+ Depending on the option's <a href="../picocli/CommandLine.Model.ArgSpec.html#arity()"><code>arity</code></a>,
+ the parser may expect it to have option parameters. The parser will call <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue(java.lang.Object)"><code>setValue</code></a> on
  the matched option for each of the option parameters encountered.
  </p><p>
  For multi-value options, the <code>type</code> may be an array, a <code>Collection</code> or a <code>Map</code>. In this case
- the parser will get the data structure by calling <a href="../picocli/CommandLine.Model.ArgSpec.html#getValue--"><code>getValue</code></a> and modify the contents of this data structure.
+ the parser will get the data structure by calling <a href="../picocli/CommandLine.Model.ArgSpec.html#getValue()"><code>getValue</code></a> and modify the contents of this data structure.
  (In the case of arrays, the array is replaced with a new instance with additional elements.)
  </p><p>
  Before calling the setter, picocli converts the option parameter value from a String to the option parameter's type.
  </p>
  <ul>
-   <li>If a option-specific <a href="../picocli/CommandLine.Model.ArgSpec.html#converters--"><code>converter</code></a> is configured, this will be used for type conversion.
+   <li>If a option-specific <a href="../picocli/CommandLine.Model.ArgSpec.html#converters()"><code>converter</code></a> is configured, this will be used for type conversion.
    If the option's type is a <code>Map</code>, the map may have different types for its keys and its values, so
-   <a href="../picocli/CommandLine.Model.ArgSpec.html#converters--"><code>converters</code></a> should provide two converters: one for the map keys and one for the map values.</li>
-   <li>Otherwise, the option's <a href="../picocli/CommandLine.Model.ArgSpec.html#type--"><code>type</code></a> is used to look up a converter in the list of
-   <a href="../picocli/CommandLine.html#registerConverter-java.lang.Class-picocli.CommandLine.ITypeConverter-">registered converters</a>.
+   <a href="../picocli/CommandLine.Model.ArgSpec.html#converters()"><code>converters</code></a> should provide two converters: one for the map keys and one for the map values.</li>
+   <li>Otherwise, the option's <a href="../picocli/CommandLine.Model.ArgSpec.html#type()"><code>type</code></a> is used to look up a converter in the list of
+   <a href="../picocli/CommandLine.html#registerConverter(java.lang.Class,%20picocli.CommandLine.ITypeConverter)">registered converters</a>.
    For multi-value options,
    the <code>type</code> may be an array, or a <code>Collection</code> or a <code>Map</code>. In that case the elements are converted
-   based on the option's <a href="../picocli/CommandLine.Model.ArgSpec.html#auxiliaryTypes--"><code>auxiliaryTypes</code></a>. The auxiliaryType is used to look up
+   based on the option's <a href="../picocli/CommandLine.Model.ArgSpec.html#auxiliaryTypes()"><code>auxiliaryTypes</code></a>. The auxiliaryType is used to look up
    the converter(s) to use to convert the individual parameter values.
-   Maps may have different types for its keys and its values, so <a href="../picocli/CommandLine.Model.ArgSpec.html#auxiliaryTypes--"><code>auxiliaryTypes</code></a>
+   Maps may have different types for its keys and its values, so <a href="../picocli/CommandLine.Model.ArgSpec.html#auxiliaryTypes()"><code>auxiliaryTypes</code></a>
    should provide two types: one for the map keys and one for the map values.</li>
  </ul>
  <p>
@@ -154,15 +141,13 @@ <h2 title="Class CommandLine.Model.OptionSpec" class="title">Class CommandLine.M
  </p><p>
  When an <code>OptionSpec</code> is created from an <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>@Option</code></a> -annotated field or method, it is "bound"
  to that field or method: this field is set (or the method is invoked) when the option is matched and
- <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue-java.lang.Object-"><code>setValue</code></a> is called.
+ <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue(java.lang.Object)"><code>setValue</code></a> is called.
  Programmatically constructed <code>OptionSpec</code> instances will remember the value passed to the
- <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue-java.lang.Object-"><code>setValue</code></a> method so it can be retrieved with the <a href="../picocli/CommandLine.Model.ArgSpec.html#getValue--"><code>getValue</code></a> method.
+ <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue(java.lang.Object)"><code>setValue</code></a> method so it can be retrieved with the <a href="../picocli/CommandLine.Model.ArgSpec.html#getValue()"><code>getValue</code></a> method.
  This behaviour can be customized by installing a custom <a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><code>CommandLine.Model.IBinding</code></a> on the <code>OptionSpec</code>.
  </p></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -171,11 +156,11 @@ <h2 title="Class CommandLine.Model.OptionSpec" class="title">Class CommandLine.M
 <li class="blockList">
 <!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="nested.class.summary">
+<li class="blockList"><a name="nested_class_summary">
 <!--   -->
 </a>
 <h3>Nested Class Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
 <caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -183,7 +168,7 @@ <h3>Nested Class Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></strong></code>
 <div class="block">Builder responsible for creating valid <code>OptionSpec</code> objects.</div>
 </td>
 </tr>
@@ -192,87 +177,87 @@ <h3>Nested Class Summary</h3>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.html#builder-java.lang.String:A-">builder</a></span>(java.lang.String[]&nbsp;names)</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.html#builder(java.lang.String[])">builder</a></strong>(java.lang.String[]&nbsp;names)</code>&nbsp;</td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.html#builder-java.lang.String-java.lang.String...-">builder</a></span>(java.lang.String&nbsp;name,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.html#builder(java.lang.String,%20java.lang.String...)">builder</a></strong>(java.lang.String&nbsp;name,
        java.lang.String...&nbsp;names)</code>&nbsp;</td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.html#equals-java.lang.Object-">equals</a></span>(java.lang.Object&nbsp;obj)</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.html#equals(java.lang.Object)">equals</a></strong>(java.lang.Object&nbsp;obj)</code>&nbsp;</td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.html#hashCode--">hashCode</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.html#hashCode()">hashCode</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr id="i4" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.html#help--">help</a></span>()</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use <a href="../picocli/CommandLine.Model.OptionSpec.html#usageHelp--"><code>usageHelp()</code></a> and <a href="../picocli/CommandLine.Model.OptionSpec.html#versionHelp--"><code>versionHelp()</code></a> instead.</span></div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.html#help()">help</a></strong>()</code>
+<div class="block"><strong>Deprecated.</strong>&nbsp;
+<div class="block"><i>Use <a href="../picocli/CommandLine.Model.OptionSpec.html#usageHelp()"><code>usageHelp()</code></a> and <a href="../picocli/CommandLine.Model.OptionSpec.html#versionHelp()"><code>versionHelp()</code></a> instead.</i></div>
 </div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.html#isOption--">isOption</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.html#isOption()">isOption</a></strong>()</code>
 <div class="block">Returns <code>true</code> if this argument is a named option, <code>false</code> otherwise.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.html#isPositional--">isPositional</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.html#isPositional()">isPositional</a></strong>()</code>
 <div class="block">Returns <code>true</code> if this argument is a positional parameter, <code>false</code> otherwise.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.html#names--">names</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.html#names()">names</a></strong>()</code>
 <div class="block">Returns one or more option names.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.html#toBuilder--">toBuilder</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.html#toBuilder()">toBuilder</a></strong>()</code>
 <div class="block">Returns a new Builder initialized with the attributes from this <code>OptionSpec</code>.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.html#usageHelp--">usageHelp</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.html#usageHelp()">usageHelp</a></strong>()</code>
 <div class="block">Returns whether this option allows the user to request usage help.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.html#versionHelp--">versionHelp</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.html#versionHelp()">versionHelp</a></strong>()</code>
 <div class="block">Returns whether this option allows the user to request version information.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.picocli.CommandLine.Model.ArgSpec">
+<li class="blockList"><a name="methods_inherited_from_class_picocli.CommandLine.Model.ArgSpec">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;picocli.<a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></h3>
-<code><a href="../picocli/CommandLine.Model.ArgSpec.html#arity--">arity</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#auxiliaryTypes--">auxiliaryTypes</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#binding--">binding</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#converters--">converters</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#defaultValue--">defaultValue</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#description--">description</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#hidden--">hidden</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#paramLabel--">paramLabel</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#rawStringValues--">rawStringValues</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#required--">required</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#showDefaultValue--">showDefaultValue</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#splitRegex--">splitRegex</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#toString--">toString</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#type--">type</a></code></li>
+<code><a href="../picocli/CommandLine.Model.ArgSpec.html#arity()">arity</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#auxiliaryTypes()">auxiliaryTypes</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#binding()">binding</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#converters()">converters</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#defaultValue()">defaultValue</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#description()">description</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#hidden()">hidden</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#paramLabel()">paramLabel</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#rawStringValues()">rawStringValues</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#required()">required</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#showDefaultValue()">showDefaultValue</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#splitRegex()">splitRegex</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#toString()">toString</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#type()">type</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -288,21 +273,21 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="builder-java.lang.String-java.lang.String...-">
+<a name="builder(java.lang.String, java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>builder</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a>&nbsp;builder(java.lang.String&nbsp;name,
-                                                           java.lang.String...&nbsp;names)</pre>
+                                           java.lang.String...&nbsp;names)</pre>
 </li>
 </ul>
-<a name="builder-java.lang.String:A-">
+<a name="builder(java.lang.String[])">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -311,7 +296,7 @@ <h4>builder</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a>&nbsp;builder(java.lang.String[]&nbsp;names)</pre>
 </li>
 </ul>
-<a name="toBuilder--">
+<a name="toBuilder()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -319,43 +304,40 @@ <h4>builder</h4>
 <h4>toBuilder</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a>&nbsp;toBuilder()</pre>
 <div class="block">Returns a new Builder initialized with the attributes from this <code>OptionSpec</code>. Calling <code>build</code> immediately will return a copy of this <code>OptionSpec</code>.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a builder that can create a copy of this spec</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a builder that can create a copy of this spec</dd></dl>
 </li>
 </ul>
-<a name="isOption--">
+<a name="isOption()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>isOption</h4>
 <pre>public&nbsp;boolean&nbsp;isOption()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html#isOption--">CommandLine.Model.ArgSpec</a></code></span></div>
+<div class="block"><strong>Description copied from class:&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html#isOption()">CommandLine.Model.ArgSpec</a></code></strong></div>
 <div class="block">Returns <code>true</code> if this argument is a named option, <code>false</code> otherwise.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.Model.ArgSpec.html#isOption--">isOption</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></code></dd>
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.Model.ArgSpec.html#isOption()">isOption</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></code></dd>
 </dl>
 </li>
 </ul>
-<a name="isPositional--">
+<a name="isPositional()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>isPositional</h4>
 <pre>public&nbsp;boolean&nbsp;isPositional()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html#isPositional--">CommandLine.Model.ArgSpec</a></code></span></div>
+<div class="block"><strong>Description copied from class:&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html#isPositional()">CommandLine.Model.ArgSpec</a></code></strong></div>
 <div class="block">Returns <code>true</code> if this argument is a positional parameter, <code>false</code> otherwise.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.Model.ArgSpec.html#isPositional--">isPositional</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></code></dd>
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.Model.ArgSpec.html#isPositional()">isPositional</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></code></dd>
 </dl>
 </li>
 </ul>
-<a name="names--">
+<a name="names()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -363,13 +345,10 @@ <h4>isPositional</h4>
 <h4>names</h4>
 <pre>public&nbsp;java.lang.String[]&nbsp;names()</pre>
 <div class="block">Returns one or more option names. At least one option name is required.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Option.html#names--"><code>CommandLine.Option.names()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Option.html#names()"><code>CommandLine.Option.names()</code></a></dd></dl>
 </li>
 </ul>
-<a name="help--">
+<a name="help()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -377,15 +356,12 @@ <h4>names</h4>
 <h4>help</h4>
 <pre>@Deprecated
 public&nbsp;boolean&nbsp;help()</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../picocli/CommandLine.Model.OptionSpec.html#usageHelp--"><code>usageHelp()</code></a> and <a href="../picocli/CommandLine.Model.OptionSpec.html#versionHelp--"><code>versionHelp()</code></a> instead.</span></div>
+<div class="block"><span class="strong">Deprecated.</span>&nbsp;<i>Use <a href="../picocli/CommandLine.Model.OptionSpec.html#usageHelp()"><code>usageHelp()</code></a> and <a href="../picocli/CommandLine.Model.OptionSpec.html#versionHelp()"><code>versionHelp()</code></a> instead.</i></div>
 <div class="block">Returns whether this option disables validation of the other arguments.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Option.html#help--"><code>CommandLine.Option.help()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Option.html#help()"><code>CommandLine.Option.help()</code></a></dd></dl>
 </li>
 </ul>
-<a name="usageHelp--">
+<a name="usageHelp()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -393,13 +369,10 @@ <h4>help</h4>
 <h4>usageHelp</h4>
 <pre>public&nbsp;boolean&nbsp;usageHelp()</pre>
 <div class="block">Returns whether this option allows the user to request usage help.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Option.html#usageHelp--"><code>CommandLine.Option.usageHelp()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Option.html#usageHelp()"><code>CommandLine.Option.usageHelp()</code></a></dd></dl>
 </li>
 </ul>
-<a name="versionHelp--">
+<a name="versionHelp()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -407,13 +380,10 @@ <h4>usageHelp</h4>
 <h4>versionHelp</h4>
 <pre>public&nbsp;boolean&nbsp;versionHelp()</pre>
 <div class="block">Returns whether this option allows the user to request version information.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Option.html#versionHelp--"><code>CommandLine.Option.versionHelp()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Option.html#versionHelp()"><code>CommandLine.Option.versionHelp()</code></a></dd></dl>
 </li>
 </ul>
-<a name="equals-java.lang.Object-">
+<a name="equals(java.lang.Object)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -421,12 +391,12 @@ <h4>versionHelp</h4>
 <h4>equals</h4>
 <pre>public&nbsp;boolean&nbsp;equals(java.lang.Object&nbsp;obj)</pre>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../picocli/CommandLine.Model.ArgSpec.html#equals-java.lang.Object-">equals</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></code></dd>
+<dt><strong>Overrides:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.Model.ArgSpec.html#equals(java.lang.Object)">equals</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></code></dd>
 </dl>
 </li>
 </ul>
-<a name="hashCode--">
+<a name="hashCode()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -434,8 +404,8 @@ <h4>equals</h4>
 <h4>hashCode</h4>
 <pre>public&nbsp;int&nbsp;hashCode()</pre>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../picocli/CommandLine.Model.ArgSpec.html#hashCode--">hashCode</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></code></dd>
+<dt><strong>Overrides:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.Model.ArgSpec.html#hashCode()">hashCode</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></code></dd>
 </dl>
 </li>
 </ul>
@@ -447,11 +417,9 @@ <h4>hashCode</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -466,15 +434,15 @@ <h4>hashCode</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.OptionSpec.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.OptionSpec.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.OptionSpec.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -491,19 +459,19 @@ <h4>hashCode</h4>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#nested_class_summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Model.ParserSpec.html b/docs/apidocs/picocli/CommandLine.Model.ParserSpec.html
index 8eaa2fb2b..b25c07aa7 100644
--- a/docs/apidocs/picocli/CommandLine.Model.ParserSpec.html
+++ b/docs/apidocs/picocli/CommandLine.Model.ParserSpec.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Model.ParserSpec (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Model.ParserSpec (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Model.ParserSpec (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Model.ParserSpec (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.ParserSpec.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.ParserSpec.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.ParserSpec.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -75,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -112,13 +99,11 @@ <h2 title="Class CommandLine.Model.ParserSpec" class="title">Class CommandLine.M
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.Model.ParserSpec</span>
+<pre>public static class <span class="strong">CommandLine.Model.ParserSpec</span>
 extends java.lang.Object</pre>
 <div class="block">Models parser configuration specification.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -127,92 +112,104 @@ <h2 title="Class CommandLine.Model.ParserSpec" class="title">Class CommandLine.M
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ParserSpec.html#ParserSpec--">ParserSpec</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Model.ParserSpec.html#CommandLine.Model.ParserSpec()">CommandLine.Model.ParserSpec</a></strong>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ParserSpec.html#expandAtFiles--">expandAtFiles</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ParserSpec.html#expandAtFiles()">expandAtFiles</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ParserSpec.html#expandAtFiles-boolean-">expandAtFiles</a></span>(boolean&nbsp;expandAtFiles)</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ParserSpec.html#expandAtFiles(boolean)">expandAtFiles</a></strong>(boolean&nbsp;expandAtFiles)</code>&nbsp;</td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ParserSpec.html#overwrittenOptionsAllowed()">overwrittenOptionsAllowed</a></strong>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></code></td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ParserSpec.html#overwrittenOptionsAllowed(boolean)">overwrittenOptionsAllowed</a></strong>(boolean&nbsp;overwrittenOptionsAllowed)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ParserSpec.html#overwrittenOptionsAllowed--">overwrittenOptionsAllowed</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ParserSpec.html#posixClusteredShortOptionsAllowed()">posixClusteredShortOptionsAllowed</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ParserSpec.html#overwrittenOptionsAllowed-boolean-">overwrittenOptionsAllowed</a></span>(boolean&nbsp;overwrittenOptionsAllowed)</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ParserSpec.html#posixClusteredShortOptionsAllowed(boolean)">posixClusteredShortOptionsAllowed</a></strong>(boolean&nbsp;posixClusteredShortOptionsAllowed)</code>&nbsp;</td>
 </tr>
-<tr id="i4" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ParserSpec.html#separator--">separator</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ParserSpec.html#separator()">separator</a></strong>()</code>
 <div class="block">Returns the String to use as the separator between options and option parameters.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ParserSpec.html#separator-java.lang.String-">separator</a></span>(java.lang.String&nbsp;separator)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ParserSpec.html#separator(java.lang.String)">separator</a></strong>(java.lang.String&nbsp;separator)</code>
 <div class="block">Sets the String to use as the separator between options and option parameters.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ParserSpec.html#stopAtPositional--">stopAtPositional</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ParserSpec.html#stopAtPositional()">stopAtPositional</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ParserSpec.html#stopAtPositional-boolean-">stopAtPositional</a></span>(boolean&nbsp;stopAtPositional)</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ParserSpec.html#stopAtPositional(boolean)">stopAtPositional</a></strong>(boolean&nbsp;stopAtPositional)</code>&nbsp;</td>
 </tr>
-<tr id="i8" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ParserSpec.html#stopAtUnmatched--">stopAtUnmatched</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ParserSpec.html#stopAtUnmatched()">stopAtUnmatched</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ParserSpec.html#stopAtUnmatched-boolean-">stopAtUnmatched</a></span>(boolean&nbsp;stopAtUnmatched)</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ParserSpec.html#stopAtUnmatched(boolean)">stopAtUnmatched</a></strong>(boolean&nbsp;stopAtUnmatched)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ParserSpec.html#toString()">toString</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr id="i10" class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ParserSpec.html#unmatchedArgumentsAllowed--">unmatchedArgumentsAllowed</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ParserSpec.html#unmatchedArgumentsAllowed()">unmatchedArgumentsAllowed</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ParserSpec.html#unmatchedArgumentsAllowed-boolean-">unmatchedArgumentsAllowed</a></span>(boolean&nbsp;unmatchedArgumentsAllowed)</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ParserSpec.html#unmatchedArgumentsAllowed(boolean)">unmatchedArgumentsAllowed</a></strong>(boolean&nbsp;unmatchedArgumentsAllowed)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
 </ul>
 </li>
 </ul>
@@ -224,28 +221,28 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ParserSpec--">
+<a name="CommandLine.Model.ParserSpec()">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ParserSpec</h4>
-<pre>public&nbsp;ParserSpec()</pre>
+<h4>CommandLine.Model.ParserSpec</h4>
+<pre>public&nbsp;CommandLine.Model.ParserSpec()</pre>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="separator--">
+<a name="separator()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -253,10 +250,10 @@ <h3>Method Detail</h3>
 <h4>separator</h4>
 <pre>public&nbsp;java.lang.String&nbsp;separator()</pre>
 <div class="block">Returns the String to use as the separator between options and option parameters. <code>"="</code> by default,
- initialized from <a href="../picocli/CommandLine.Command.html#separator--"><code>CommandLine.Command.separator()</code></a> if defined.</div>
+ initialized from <a href="../picocli/CommandLine.Command.html#separator()"><code>CommandLine.Command.separator()</code></a> if defined.</div>
 </li>
 </ul>
-<a name="stopAtUnmatched--">
+<a name="stopAtUnmatched()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -265,7 +262,7 @@ <h4>stopAtUnmatched</h4>
 <pre>public&nbsp;boolean&nbsp;stopAtUnmatched()</pre>
 </li>
 </ul>
-<a name="stopAtPositional--">
+<a name="stopAtPositional()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -274,7 +271,7 @@ <h4>stopAtPositional</h4>
 <pre>public&nbsp;boolean&nbsp;stopAtPositional()</pre>
 </li>
 </ul>
-<a name="overwrittenOptionsAllowed--">
+<a name="overwrittenOptionsAllowed()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -283,7 +280,7 @@ <h4>overwrittenOptionsAllowed</h4>
 <pre>public&nbsp;boolean&nbsp;overwrittenOptionsAllowed()</pre>
 </li>
 </ul>
-<a name="unmatchedArgumentsAllowed--">
+<a name="unmatchedArgumentsAllowed()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -292,7 +289,7 @@ <h4>unmatchedArgumentsAllowed</h4>
 <pre>public&nbsp;boolean&nbsp;unmatchedArgumentsAllowed()</pre>
 </li>
 </ul>
-<a name="expandAtFiles--">
+<a name="expandAtFiles()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -301,7 +298,16 @@ <h4>expandAtFiles</h4>
 <pre>public&nbsp;boolean&nbsp;expandAtFiles()</pre>
 </li>
 </ul>
-<a name="separator-java.lang.String-">
+<a name="posixClusteredShortOptionsAllowed()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>posixClusteredShortOptionsAllowed</h4>
+<pre>public&nbsp;boolean&nbsp;posixClusteredShortOptionsAllowed()</pre>
+</li>
+</ul>
+<a name="separator(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -309,13 +315,10 @@ <h4>expandAtFiles</h4>
 <h4>separator</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a>&nbsp;separator(java.lang.String&nbsp;separator)</pre>
 <div class="block">Sets the String to use as the separator between options and option parameters.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this ParserSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this ParserSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="stopAtUnmatched-boolean-">
+<a name="stopAtUnmatched(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -324,7 +327,7 @@ <h4>stopAtUnmatched</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a>&nbsp;stopAtUnmatched(boolean&nbsp;stopAtUnmatched)</pre>
 </li>
 </ul>
-<a name="stopAtPositional-boolean-">
+<a name="stopAtPositional(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -333,7 +336,7 @@ <h4>stopAtPositional</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a>&nbsp;stopAtPositional(boolean&nbsp;stopAtPositional)</pre>
 </li>
 </ul>
-<a name="overwrittenOptionsAllowed-boolean-">
+<a name="overwrittenOptionsAllowed(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -342,7 +345,7 @@ <h4>overwrittenOptionsAllowed</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a>&nbsp;overwrittenOptionsAllowed(boolean&nbsp;overwrittenOptionsAllowed)</pre>
 </li>
 </ul>
-<a name="unmatchedArgumentsAllowed-boolean-">
+<a name="unmatchedArgumentsAllowed(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -351,15 +354,37 @@ <h4>unmatchedArgumentsAllowed</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a>&nbsp;unmatchedArgumentsAllowed(boolean&nbsp;unmatchedArgumentsAllowed)</pre>
 </li>
 </ul>
-<a name="expandAtFiles-boolean-">
+<a name="expandAtFiles(boolean)">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>expandAtFiles</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a>&nbsp;expandAtFiles(boolean&nbsp;expandAtFiles)</pre>
 </li>
 </ul>
+<a name="posixClusteredShortOptionsAllowed(boolean)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>posixClusteredShortOptionsAllowed</h4>
+<pre>public&nbsp;<a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a>&nbsp;posixClusteredShortOptionsAllowed(boolean&nbsp;posixClusteredShortOptionsAllowed)</pre>
+</li>
+</ul>
+<a name="toString()">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><strong>Overrides:</strong></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>
@@ -368,11 +393,9 @@ <h4>expandAtFiles</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -387,15 +410,15 @@ <h4>expandAtFiles</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.ParserSpec.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.ParserSpec.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.ParserSpec.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -414,17 +437,17 @@ <h4>expandAtFiles</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Model.PositionalParamSpec.Builder.html b/docs/apidocs/picocli/CommandLine.Model.PositionalParamSpec.Builder.html
index f29e0af12..a91de5682 100644
--- a/docs/apidocs/picocli/CommandLine.Model.PositionalParamSpec.Builder.html
+++ b/docs/apidocs/picocli/CommandLine.Model.PositionalParamSpec.Builder.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Model.PositionalParamSpec.Builder (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Model.PositionalParamSpec.Builder (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Model.PositionalParamSpec.Builder (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Model.PositionalParamSpec.Builder (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.PositionalParamSpec.Builder.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.PositionalParamSpec.Builder.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.PositionalParamSpec.Builder.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -76,16 +63,16 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -112,13 +99,11 @@ <h2 title="Class CommandLine.Model.PositionalParamSpec.Builder" class="title">Cl
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.Model.PositionalParamSpec.Builder</span>
+<pre>public static class <span class="strong">CommandLine.Model.PositionalParamSpec.Builder</span>
 extends java.lang.Object</pre>
 <div class="block">Builder responsible for creating valid <code>PositionalParamSpec</code> objects.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -127,127 +112,127 @@ <h2 title="Class CommandLine.Model.PositionalParamSpec.Builder" class="title">Cl
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#arity-picocli.CommandLine.Range-">arity</a></span>(<a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a>&nbsp;arity)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#arity(picocli.CommandLine.Range)">arity</a></strong>(<a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a>&nbsp;arity)</code>
 <div class="block">Sets how many arguments this option or positional parameter requires, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#arity-java.lang.String-">arity</a></span>(java.lang.String&nbsp;range)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#arity(java.lang.String)">arity</a></strong>(java.lang.String&nbsp;range)</code>
 <div class="block">Sets how many arguments this option or positional parameter requires, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#auxiliaryTypes-java.lang.Class...-">auxiliaryTypes</a></span>(java.lang.Class&lt;?&gt;...&nbsp;types)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#auxiliaryTypes(java.lang.Class...)">auxiliaryTypes</a></strong>(java.lang.Class&lt;?&gt;...&nbsp;types)</code>
 <div class="block">Sets auxiliary type information, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#binding-picocli.CommandLine.Model.IBinding-">binding</a></span>(<a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a>&nbsp;binding)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#binding(picocli.CommandLine.Model.IBinding)">binding</a></strong>(<a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a>&nbsp;binding)</code>
 <div class="block">Sets the <a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><code>CommandLine.Model.IBinding</code></a> that is responsible for getting and setting the value of this argument to the specified value, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#build--">build</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#build()">build</a></strong>()</code>
 <div class="block">Returns a valid <code>PositionalParamSpec</code> instance.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#converters-picocli.CommandLine.ITypeConverter...-">converters</a></span>(<a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli">CommandLine.ITypeConverter</a>&lt;?&gt;...&nbsp;cs)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#converters(picocli.CommandLine.ITypeConverter...)">converters</a></strong>(<a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli">CommandLine.ITypeConverter</a>&lt;?&gt;...&nbsp;cs)</code>
 <div class="block">Sets option/positional param-specific converter (or converters for Maps), and returns this builder.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#defaultValue-java.lang.Object-">defaultValue</a></span>(java.lang.Object&nbsp;defaultValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#defaultValue(java.lang.Object)">defaultValue</a></strong>(java.lang.Object&nbsp;defaultValue)</code>
 <div class="block">Sets the default value of this option or positional parameter to the specified value, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#description-java.lang.String...-">description</a></span>(java.lang.String...&nbsp;description)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#description(java.lang.String...)">description</a></strong>(java.lang.String...&nbsp;description)</code>
 <div class="block">Sets the description of this option, used when generating the usage documentation, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#hidden-boolean-">hidden</a></span>(boolean&nbsp;hidden)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#hidden(boolean)">hidden</a></strong>(boolean&nbsp;hidden)</code>
 <div class="block">Sets whether this option should be excluded from the usage message, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli">CommandLine.Model.PositionalParamSpec.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#index-picocli.CommandLine.Range-">index</a></span>(<a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a>&nbsp;index)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#index(picocli.CommandLine.Range)">index</a></strong>(<a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a>&nbsp;index)</code>
 <div class="block">Sets the index or range specifying which of the command line arguments should be assigned to this positional parameter, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli">CommandLine.Model.PositionalParamSpec.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#index-java.lang.String-">index</a></span>(java.lang.String&nbsp;range)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#index(java.lang.String)">index</a></strong>(java.lang.String&nbsp;range)</code>
 <div class="block">Sets the index or range specifying which of the command line arguments should be assigned to this positional parameter, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#paramLabel-java.lang.String-">paramLabel</a></span>(java.lang.String&nbsp;paramLabel)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#paramLabel(java.lang.String)">paramLabel</a></strong>(java.lang.String&nbsp;paramLabel)</code>
 <div class="block">Sets the name of the option or positional parameter used in the usage help message, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#required-boolean-">required</a></span>(boolean&nbsp;required)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#required(boolean)">required</a></strong>(boolean&nbsp;required)</code>
 <div class="block">Sets whether this is a required option or positional parameter, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>protected <a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli">CommandLine.Model.PositionalParamSpec.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#self--">self</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#self()">self</a></strong>()</code>
 <div class="block">Returns this builder.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#showDefaultValue-picocli.CommandLine.Help.Visibility-">showDefaultValue</a></span>(<a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli">CommandLine.Help.Visibility</a>&nbsp;visibility)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#showDefaultValue(picocli.CommandLine.Help.Visibility)">showDefaultValue</a></strong>(<a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli">CommandLine.Help.Visibility</a>&nbsp;visibility)</code>
 <div class="block">Sets whether this option or positional parameter's default value should be shown in the usage help, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#splitRegex-java.lang.String-">splitRegex</a></span>(java.lang.String&nbsp;splitRegex)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#splitRegex(java.lang.String)">splitRegex</a></strong>(java.lang.String&nbsp;splitRegex)</code>
 <div class="block">Sets a regular expression to split option parameter values or <code>""</code> if the value should not be split, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#type-java.lang.Class-">type</a></span>(java.lang.Class&lt;?&gt;&nbsp;propertyType)</code>
-<div class="block">Sets the type to convert the option or positional parameter to before <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue-java.lang.Object-">setting</a> the value, and returns this builder.</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#type(java.lang.Class)">type</a></strong>(java.lang.Class&lt;?&gt;&nbsp;propertyType)</code>
+<div class="block">Sets the type to convert the option or positional parameter to before <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue(java.lang.Object)">setting</a> the value, and returns this builder.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#withToString-java.lang.String-">withToString</a></span>(java.lang.String&nbsp;toString)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html#withToString(java.lang.String)">withToString</a></strong>(java.lang.String&nbsp;toString)</code>
 <div class="block">Sets the string respresentation of this option or positional parameter to the specified value, and returns this builder.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -263,11 +248,11 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="build--">
+<a name="build()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -277,7 +262,7 @@ <h4>build</h4>
 <div class="block">Returns a valid <code>PositionalParamSpec</code> instance.</div>
 </li>
 </ul>
-<a name="self--">
+<a name="self()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -287,7 +272,7 @@ <h4>self</h4>
 <div class="block">Returns this builder.</div>
 </li>
 </ul>
-<a name="index-java.lang.String-">
+<a name="index(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -297,7 +282,7 @@ <h4>index</h4>
 <div class="block">Sets the index or range specifying which of the command line arguments should be assigned to this positional parameter, and returns this builder.</div>
 </li>
 </ul>
-<a name="index-picocli.CommandLine.Range-">
+<a name="index(picocli.CommandLine.Range)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -307,7 +292,7 @@ <h4>index</h4>
 <div class="block">Sets the index or range specifying which of the command line arguments should be assigned to this positional parameter, and returns this builder.</div>
 </li>
 </ul>
-<a name="required-boolean-">
+<a name="required(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -317,7 +302,7 @@ <h4>required</h4>
 <div class="block">Sets whether this is a required option or positional parameter, and returns this builder.</div>
 </li>
 </ul>
-<a name="description-java.lang.String...-">
+<a name="description(java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -327,7 +312,7 @@ <h4>description</h4>
 <div class="block">Sets the description of this option, used when generating the usage documentation, and returns this builder.</div>
 </li>
 </ul>
-<a name="arity-java.lang.String-">
+<a name="arity(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -337,7 +322,7 @@ <h4>arity</h4>
 <div class="block">Sets how many arguments this option or positional parameter requires, and returns this builder.</div>
 </li>
 </ul>
-<a name="arity-picocli.CommandLine.Range-">
+<a name="arity(picocli.CommandLine.Range)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -347,7 +332,7 @@ <h4>arity</h4>
 <div class="block">Sets how many arguments this option or positional parameter requires, and returns this builder.</div>
 </li>
 </ul>
-<a name="paramLabel-java.lang.String-">
+<a name="paramLabel(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -357,7 +342,7 @@ <h4>paramLabel</h4>
 <div class="block">Sets the name of the option or positional parameter used in the usage help message, and returns this builder.</div>
 </li>
 </ul>
-<a name="auxiliaryTypes-java.lang.Class...-">
+<a name="auxiliaryTypes(java.lang.Class...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -365,14 +350,11 @@ <h4>paramLabel</h4>
 <h4>auxiliaryTypes</h4>
 <pre>public&nbsp;T&nbsp;auxiliaryTypes(java.lang.Class&lt;?&gt;...&nbsp;types)</pre>
 <div class="block">Sets auxiliary type information, and returns this builder.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>types</code> - the element type(s) when the <a href="../picocli/CommandLine.Model.ArgSpec.html#type--"><code>CommandLine.Model.ArgSpec.type()</code></a> is a generic <code>Collection</code> or a <code>Map</code>;
- or the concrete type when the <a href="../picocli/CommandLine.Model.ArgSpec.html#type--"><code>CommandLine.Model.ArgSpec.type()</code></a> is an abstract class.</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>types</code> - the element type(s) when the <a href="../picocli/CommandLine.Model.ArgSpec.html#type()"><code>CommandLine.Model.ArgSpec.type()</code></a> is a generic <code>Collection</code> or a <code>Map</code>;
+ or the concrete type when the <a href="../picocli/CommandLine.Model.ArgSpec.html#type()"><code>CommandLine.Model.ArgSpec.type()</code></a> is an abstract class.</dd></dl>
 </li>
 </ul>
-<a name="converters-picocli.CommandLine.ITypeConverter...-">
+<a name="converters(picocli.CommandLine.ITypeConverter...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -382,7 +364,7 @@ <h4>converters</h4>
 <div class="block">Sets option/positional param-specific converter (or converters for Maps), and returns this builder.</div>
 </li>
 </ul>
-<a name="splitRegex-java.lang.String-">
+<a name="splitRegex(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -392,7 +374,7 @@ <h4>splitRegex</h4>
 <div class="block">Sets a regular expression to split option parameter values or <code>""</code> if the value should not be split, and returns this builder.</div>
 </li>
 </ul>
-<a name="showDefaultValue-picocli.CommandLine.Help.Visibility-">
+<a name="showDefaultValue(picocli.CommandLine.Help.Visibility)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -402,7 +384,7 @@ <h4>showDefaultValue</h4>
 <div class="block">Sets whether this option or positional parameter's default value should be shown in the usage help, and returns this builder.</div>
 </li>
 </ul>
-<a name="hidden-boolean-">
+<a name="hidden(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -412,21 +394,18 @@ <h4>hidden</h4>
 <div class="block">Sets whether this option should be excluded from the usage message, and returns this builder.</div>
 </li>
 </ul>
-<a name="type-java.lang.Class-">
+<a name="type(java.lang.Class)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>type</h4>
 <pre>public&nbsp;T&nbsp;type(java.lang.Class&lt;?&gt;&nbsp;propertyType)</pre>
-<div class="block">Sets the type to convert the option or positional parameter to before <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue-java.lang.Object-">setting</a> the value, and returns this builder.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>propertyType</code> - the type of this option or parameter. For multi-value options and positional parameters this can be an array, or a (sub-type of) Collection or Map.</dd>
-</dl>
+<div class="block">Sets the type to convert the option or positional parameter to before <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue(java.lang.Object)">setting</a> the value, and returns this builder.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>propertyType</code> - the type of this option or parameter. For multi-value options and positional parameters this can be an array, or a (sub-type of) Collection or Map.</dd></dl>
 </li>
 </ul>
-<a name="defaultValue-java.lang.Object-">
+<a name="defaultValue(java.lang.Object)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -436,7 +415,7 @@ <h4>defaultValue</h4>
 <div class="block">Sets the default value of this option or positional parameter to the specified value, and returns this builder.</div>
 </li>
 </ul>
-<a name="binding-picocli.CommandLine.Model.IBinding-">
+<a name="binding(picocli.CommandLine.Model.IBinding)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -446,7 +425,7 @@ <h4>binding</h4>
 <div class="block">Sets the <a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><code>CommandLine.Model.IBinding</code></a> that is responsible for getting and setting the value of this argument to the specified value, and returns this builder.</div>
 </li>
 </ul>
-<a name="withToString-java.lang.String-">
+<a name="withToString(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -464,11 +443,9 @@ <h4>withToString</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -483,15 +460,15 @@ <h4>withToString</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.PositionalParamSpec.Builder.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.PositionalParamSpec.Builder.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.PositionalParamSpec.Builder.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -511,16 +488,16 @@ <h4>withToString</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Model.PositionalParamSpec.html b/docs/apidocs/picocli/CommandLine.Model.PositionalParamSpec.html
index adf02e871..53cf2bae2 100644
--- a/docs/apidocs/picocli/CommandLine.Model.PositionalParamSpec.html
+++ b/docs/apidocs/picocli/CommandLine.Model.PositionalParamSpec.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Model.PositionalParamSpec (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Model.PositionalParamSpec (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Model.PositionalParamSpec (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Model.PositionalParamSpec (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":9,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.PositionalParamSpec.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.PositionalParamSpec.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.PositionalParamSpec.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -73,19 +60,19 @@
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#nested_class_summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -117,34 +104,34 @@ <h2 title="Class CommandLine.Model.PositionalParamSpec" class="title">Class Comm
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.Model.PositionalParamSpec</span>
+<pre>public static class <span class="strong">CommandLine.Model.PositionalParamSpec</span>
 extends <a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></pre>
 <div class="block">The <code>PositionalParamSpec</code> class models aspects of a <em>positional parameter</em> of a <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">command</a>, including whether
  it is required or optional, and attributes for the usage help message describing the positional parameter.
  <p>
- Positional parameters have an <a href="../picocli/CommandLine.Model.PositionalParamSpec.html#index--"><code>index</code></a> (or a range of indices). A positional parameter is matched when the parser
+ Positional parameters have an <a href="../picocli/CommandLine.Model.PositionalParamSpec.html#index()"><code>index</code></a> (or a range of indices). A positional parameter is matched when the parser
  encounters a command line argument at that index. Named options and their parameters do not change the index counter,
  so the command line can contain a mixture of positional parameters and named options.
  </p><p>
- Depending on the positional parameter's <a href="../picocli/CommandLine.Model.ArgSpec.html#arity--"><code>arity</code></a>, the parser may consume multiple command line
- arguments starting from the current index. The parser will call <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue-java.lang.Object-"><code>setValue</code></a> on
+ Depending on the positional parameter's <a href="../picocli/CommandLine.Model.ArgSpec.html#arity()"><code>arity</code></a>, the parser may consume multiple command line
+ arguments starting from the current index. The parser will call <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue(java.lang.Object)"><code>setValue</code></a> on
  the <code>PositionalParamSpec</code> for each of the parameters encountered.
  For multi-value positional parameters, the <code>type</code> may be an array, a <code>Collection</code> or a <code>Map</code>. In this case
- the parser will get the data structure by calling <a href="../picocli/CommandLine.Model.ArgSpec.html#getValue--"><code>getValue</code></a> and modify the contents of this data structure.
+ the parser will get the data structure by calling <a href="../picocli/CommandLine.Model.ArgSpec.html#getValue()"><code>getValue</code></a> and modify the contents of this data structure.
  (In the case of arrays, the array is replaced with a new instance with additional elements.)
  </p><p>
  Before calling the setter, picocli converts the positional parameter value from a String to the parameter's type.
  </p>
  <ul>
-   <li>If a positional parameter-specific <a href="../picocli/CommandLine.Model.ArgSpec.html#converters--"><code>converter</code></a> is configured, this will be used for type conversion.
+   <li>If a positional parameter-specific <a href="../picocli/CommandLine.Model.ArgSpec.html#converters()"><code>converter</code></a> is configured, this will be used for type conversion.
    If the positional parameter's type is a <code>Map</code>, the map may have different types for its keys and its values, so
-   <a href="../picocli/CommandLine.Model.ArgSpec.html#converters--"><code>converters</code></a> should provide two converters: one for the map keys and one for the map values.</li>
-   <li>Otherwise, the positional parameter's <a href="../picocli/CommandLine.Model.ArgSpec.html#type--"><code>type</code></a> is used to look up a converter in the list of
-   <a href="../picocli/CommandLine.html#registerConverter-java.lang.Class-picocli.CommandLine.ITypeConverter-">registered converters</a>. For multi-value positional parameters,
+   <a href="../picocli/CommandLine.Model.ArgSpec.html#converters()"><code>converters</code></a> should provide two converters: one for the map keys and one for the map values.</li>
+   <li>Otherwise, the positional parameter's <a href="../picocli/CommandLine.Model.ArgSpec.html#type()"><code>type</code></a> is used to look up a converter in the list of
+   <a href="../picocli/CommandLine.html#registerConverter(java.lang.Class,%20picocli.CommandLine.ITypeConverter)">registered converters</a>. For multi-value positional parameters,
    the <code>type</code> may be an array, or a <code>Collection</code> or a <code>Map</code>. In that case the elements are converted
-   based on the positional parameter's <a href="../picocli/CommandLine.Model.ArgSpec.html#auxiliaryTypes--"><code>auxiliaryTypes</code></a>. The auxiliaryType is used to look up
+   based on the positional parameter's <a href="../picocli/CommandLine.Model.ArgSpec.html#auxiliaryTypes()"><code>auxiliaryTypes</code></a>. The auxiliaryType is used to look up
    the converter(s) to use to convert the individual parameter values.
-   Maps may have different types for its keys and its values, so <a href="../picocli/CommandLine.Model.ArgSpec.html#auxiliaryTypes--"><code>auxiliaryTypes</code></a>
+   Maps may have different types for its keys and its values, so <a href="../picocli/CommandLine.Model.ArgSpec.html#auxiliaryTypes()"><code>auxiliaryTypes</code></a>
    should provide two types: one for the map keys and one for the map values.</li>
  </ul>
  <p>
@@ -154,15 +141,13 @@ <h2 title="Class CommandLine.Model.PositionalParamSpec" class="title">Class Comm
  </p><p>
  When a <code>PositionalParamSpec</code> is created from a <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>@Parameters</code></a> -annotated field or method,
  it is "bound" to that field or method: this field is set (or the method is invoked) when the position is matched
- and <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue-java.lang.Object-"><code>setValue</code></a> is called.
+ and <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue(java.lang.Object)"><code>setValue</code></a> is called.
  Programmatically constructed <code>PositionalParamSpec</code> instances will remember the value passed to the
- <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue-java.lang.Object-"><code>setValue</code></a> method so it can be retrieved with the <a href="../picocli/CommandLine.Model.ArgSpec.html#getValue--"><code>getValue</code></a> method.
+ <a href="../picocli/CommandLine.Model.ArgSpec.html#setValue(java.lang.Object)"><code>setValue</code></a> method so it can be retrieved with the <a href="../picocli/CommandLine.Model.ArgSpec.html#getValue()"><code>getValue</code></a> method.
  This behaviour can be customized by installing a custom <a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><code>CommandLine.Model.IBinding</code></a> on the <code>PositionalParamSpec</code>.
  </p></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -171,11 +156,11 @@ <h2 title="Class CommandLine.Model.PositionalParamSpec" class="title">Class Comm
 <li class="blockList">
 <!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="nested.class.summary">
+<li class="blockList"><a name="nested_class_summary">
 <!--   -->
 </a>
 <h3>Nested Class Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
 <caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -183,7 +168,7 @@ <h3>Nested Class Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli">CommandLine.Model.PositionalParamSpec.Builder</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli">CommandLine.Model.PositionalParamSpec.Builder</a></strong></code>
 <div class="block">Builder responsible for creating valid <code>PositionalParamSpec</code> objects.</div>
 </td>
 </tr>
@@ -192,62 +177,62 @@ <h3>Nested Class Summary</h3>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli">CommandLine.Model.PositionalParamSpec.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.html#builder--">builder</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.html#builder()">builder</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.html#equals-java.lang.Object-">equals</a></span>(java.lang.Object&nbsp;obj)</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.html#equals(java.lang.Object)">equals</a></strong>(java.lang.Object&nbsp;obj)</code>&nbsp;</td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.html#hashCode--">hashCode</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.html#hashCode()">hashCode</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.html#index--">index</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.html#index()">index</a></strong>()</code>
 <div class="block">Returns an index or range specifying which of the command line arguments should be assigned to this positional parameter.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.html#isOption--">isOption</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.html#isOption()">isOption</a></strong>()</code>
 <div class="block">Returns <code>true</code> if this argument is a named option, <code>false</code> otherwise.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.html#isPositional--">isPositional</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.html#isPositional()">isPositional</a></strong>()</code>
 <div class="block">Returns <code>true</code> if this argument is a positional parameter, <code>false</code> otherwise.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli">CommandLine.Model.PositionalParamSpec.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.html#toBuilder--">toBuilder</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.html#toBuilder()">toBuilder</a></strong>()</code>
 <div class="block">Returns a new Builder initialized with the attributes from this <code>PositionalParamSpec</code>.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.picocli.CommandLine.Model.ArgSpec">
+<li class="blockList"><a name="methods_inherited_from_class_picocli.CommandLine.Model.ArgSpec">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;picocli.<a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></h3>
-<code><a href="../picocli/CommandLine.Model.ArgSpec.html#arity--">arity</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#auxiliaryTypes--">auxiliaryTypes</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#binding--">binding</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#converters--">converters</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#defaultValue--">defaultValue</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#description--">description</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#hidden--">hidden</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#paramLabel--">paramLabel</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#rawStringValues--">rawStringValues</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#required--">required</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#showDefaultValue--">showDefaultValue</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#splitRegex--">splitRegex</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#toString--">toString</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#type--">type</a></code></li>
+<code><a href="../picocli/CommandLine.Model.ArgSpec.html#arity()">arity</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#auxiliaryTypes()">auxiliaryTypes</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#binding()">binding</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#converters()">converters</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#defaultValue()">defaultValue</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#description()">description</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#hidden()">hidden</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#paramLabel()">paramLabel</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#rawStringValues()">rawStringValues</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#required()">required</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#showDefaultValue()">showDefaultValue</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#splitRegex()">splitRegex</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#toString()">toString</a>, <a href="../picocli/CommandLine.Model.ArgSpec.html#type()">type</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -263,11 +248,11 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="toBuilder--">
+<a name="toBuilder()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -275,43 +260,40 @@ <h3>Method Detail</h3>
 <h4>toBuilder</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli">CommandLine.Model.PositionalParamSpec.Builder</a>&nbsp;toBuilder()</pre>
 <div class="block">Returns a new Builder initialized with the attributes from this <code>PositionalParamSpec</code>. Calling <code>build</code> immediately will return a copy of this <code>PositionalParamSpec</code>.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a builder that can create a copy of this spec</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a builder that can create a copy of this spec</dd></dl>
 </li>
 </ul>
-<a name="isOption--">
+<a name="isOption()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>isOption</h4>
 <pre>public&nbsp;boolean&nbsp;isOption()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html#isOption--">CommandLine.Model.ArgSpec</a></code></span></div>
+<div class="block"><strong>Description copied from class:&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html#isOption()">CommandLine.Model.ArgSpec</a></code></strong></div>
 <div class="block">Returns <code>true</code> if this argument is a named option, <code>false</code> otherwise.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.Model.ArgSpec.html#isOption--">isOption</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></code></dd>
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.Model.ArgSpec.html#isOption()">isOption</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></code></dd>
 </dl>
 </li>
 </ul>
-<a name="isPositional--">
+<a name="isPositional()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>isPositional</h4>
 <pre>public&nbsp;boolean&nbsp;isPositional()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html#isPositional--">CommandLine.Model.ArgSpec</a></code></span></div>
+<div class="block"><strong>Description copied from class:&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html#isPositional()">CommandLine.Model.ArgSpec</a></code></strong></div>
 <div class="block">Returns <code>true</code> if this argument is a positional parameter, <code>false</code> otherwise.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.Model.ArgSpec.html#isPositional--">isPositional</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></code></dd>
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.Model.ArgSpec.html#isPositional()">isPositional</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></code></dd>
 </dl>
 </li>
 </ul>
-<a name="index--">
+<a name="index()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -319,13 +301,10 @@ <h4>isPositional</h4>
 <h4>index</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a>&nbsp;index()</pre>
 <div class="block">Returns an index or range specifying which of the command line arguments should be assigned to this positional parameter.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Parameters.html#index--"><code>CommandLine.Parameters.index()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Parameters.html#index()"><code>CommandLine.Parameters.index()</code></a></dd></dl>
 </li>
 </ul>
-<a name="builder--">
+<a name="builder()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -334,7 +313,7 @@ <h4>builder</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli">CommandLine.Model.PositionalParamSpec.Builder</a>&nbsp;builder()</pre>
 </li>
 </ul>
-<a name="hashCode--">
+<a name="hashCode()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -342,12 +321,12 @@ <h4>builder</h4>
 <h4>hashCode</h4>
 <pre>public&nbsp;int&nbsp;hashCode()</pre>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../picocli/CommandLine.Model.ArgSpec.html#hashCode--">hashCode</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></code></dd>
+<dt><strong>Overrides:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.Model.ArgSpec.html#hashCode()">hashCode</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></code></dd>
 </dl>
 </li>
 </ul>
-<a name="equals-java.lang.Object-">
+<a name="equals(java.lang.Object)">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -355,8 +334,8 @@ <h4>hashCode</h4>
 <h4>equals</h4>
 <pre>public&nbsp;boolean&nbsp;equals(java.lang.Object&nbsp;obj)</pre>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../picocli/CommandLine.Model.ArgSpec.html#equals-java.lang.Object-">equals</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></code></dd>
+<dt><strong>Overrides:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.Model.ArgSpec.html#equals(java.lang.Object)">equals</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></code></dd>
 </dl>
 </li>
 </ul>
@@ -368,11 +347,9 @@ <h4>equals</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -387,15 +364,15 @@ <h4>equals</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.PositionalParamSpec.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.PositionalParamSpec.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.PositionalParamSpec.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -412,19 +389,19 @@ <h4>equals</h4>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#nested_class_summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Model.UnmatchedArgsBinding.html b/docs/apidocs/picocli/CommandLine.Model.UnmatchedArgsBinding.html
index 23d7e022f..6ac1a4a99 100644
--- a/docs/apidocs/picocli/CommandLine.Model.UnmatchedArgsBinding.html
+++ b/docs/apidocs/picocli/CommandLine.Model.UnmatchedArgsBinding.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Model.UnmatchedArgsBinding (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Model.UnmatchedArgsBinding (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Model.UnmatchedArgsBinding (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Model.UnmatchedArgsBinding (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":9,"i2":9,"i3":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.UnmatchedArgsBinding.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.UnmatchedArgsBinding.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.UnmatchedArgsBinding.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -76,16 +63,16 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -112,14 +99,12 @@ <h2 title="Class CommandLine.Model.UnmatchedArgsBinding" class="title">Class Com
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.Model.UnmatchedArgsBinding</span>
+<pre>public static class <span class="strong">CommandLine.Model.UnmatchedArgsBinding</span>
 extends java.lang.Object</pre>
 <div class="block">This class allows applications to specify a custom binding that will be invoked for unmatched arguments.
  The specified binding is responsible for deciding how to consume the unmatched arguments.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -128,43 +113,43 @@ <h2 title="Class CommandLine.Model.UnmatchedArgsBinding" class="title">Class Com
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html#binding--">binding</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html#binding()">binding</a></strong>()</code>
 <div class="block">Returns the binding responsible for consuming the unmatched arguments.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html#forStringArraySupplier-picocli.CommandLine.Model.IBinding-">forStringArraySupplier</a></span>(<a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a>&nbsp;binding)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html#forStringArraySupplier(picocli.CommandLine.Model.IBinding)">forStringArraySupplier</a></strong>(<a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a>&nbsp;binding)</code>
 <div class="block">Creates a <code>UnmatchedArgsBinding</code> for a binding that produces and consumes <code>String[]</code> objects.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html#forStringConsumer-picocli.CommandLine.Model.IBinding-">forStringConsumer</a></span>(<a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a>&nbsp;binding)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html#forStringConsumer(picocli.CommandLine.Model.IBinding)">forStringConsumer</a></strong>(<a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a>&nbsp;binding)</code>
 <div class="block">Creates a <code>UnmatchedArgsBinding</code> for a binding that consumes <code>String</code> objects.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html#forStringListSupplier-picocli.CommandLine.Model.IBinding-">forStringListSupplier</a></span>(<a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a>&nbsp;binding)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html#forStringListSupplier(picocli.CommandLine.Model.IBinding)">forStringListSupplier</a></strong>(<a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a>&nbsp;binding)</code>
 <div class="block">Creates a <code>UnmatchedArgsBinding</code> for a binding that produces and consumes <code>List&lt;String&gt;</code> objects.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -180,11 +165,11 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="forStringArraySupplier-picocli.CommandLine.Model.IBinding-">
+<a name="forStringArraySupplier(picocli.CommandLine.Model.IBinding)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -192,13 +177,10 @@ <h3>Method Detail</h3>
 <h4>forStringArraySupplier</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a>&nbsp;forStringArraySupplier(<a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a>&nbsp;binding)</pre>
 <div class="block">Creates a <code>UnmatchedArgsBinding</code> for a binding that produces and consumes <code>String[]</code> objects.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>binding</code> - Each new unmatched argument is added to the String[] array returned by the specified binding: a new String[] array with one extra element is created and set on the binding.</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>binding</code> - Each new unmatched argument is added to the String[] array returned by the specified binding: a new String[] array with one extra element is created and set on the binding.</dd></dl>
 </li>
 </ul>
-<a name="forStringListSupplier-picocli.CommandLine.Model.IBinding-">
+<a name="forStringListSupplier(picocli.CommandLine.Model.IBinding)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -206,13 +188,10 @@ <h4>forStringArraySupplier</h4>
 <h4>forStringListSupplier</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a>&nbsp;forStringListSupplier(<a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a>&nbsp;binding)</pre>
 <div class="block">Creates a <code>UnmatchedArgsBinding</code> for a binding that produces and consumes <code>List&lt;String&gt;</code> objects.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>binding</code> - Each new unmatched argument is added to the list returned by the specified binding. If the binding returns a <code>null</code> list, a new <code>ArrayList</code> is set on the binding.</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>binding</code> - Each new unmatched argument is added to the list returned by the specified binding. If the binding returns a <code>null</code> list, a new <code>ArrayList</code> is set on the binding.</dd></dl>
 </li>
 </ul>
-<a name="forStringConsumer-picocli.CommandLine.Model.IBinding-">
+<a name="forStringConsumer(picocli.CommandLine.Model.IBinding)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -220,13 +199,10 @@ <h4>forStringListSupplier</h4>
 <h4>forStringConsumer</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a>&nbsp;forStringConsumer(<a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a>&nbsp;binding)</pre>
 <div class="block">Creates a <code>UnmatchedArgsBinding</code> for a binding that consumes <code>String</code> objects.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>binding</code> - For each new unmatched argument, the <a href="../picocli/CommandLine.Model.IBinding.html#set-T-"><code>CommandLine.Model.IBinding.set(Object)</code></a> method is invoked on the specified binding with the unmatched argument.</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>binding</code> - For each new unmatched argument, the <a href="../picocli/CommandLine.Model.IBinding.html#set(T)"><code>CommandLine.Model.IBinding.set(Object)</code></a> method is invoked on the specified binding with the unmatched argument.</dd></dl>
 </li>
 </ul>
-<a name="binding--">
+<a name="binding()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -244,11 +220,9 @@ <h4>binding</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -263,15 +237,15 @@ <h4>binding</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.UnmatchedArgsBinding.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.UnmatchedArgsBinding.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.UnmatchedArgsBinding.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -291,16 +265,16 @@ <h4>binding</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Model.UsageMessageSpec.html b/docs/apidocs/picocli/CommandLine.Model.UsageMessageSpec.html
index 50df7fb16..64db0b71d 100644
--- a/docs/apidocs/picocli/CommandLine.Model.UsageMessageSpec.html
+++ b/docs/apidocs/picocli/CommandLine.Model.UsageMessageSpec.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Model.UsageMessageSpec (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Model.UsageMessageSpec (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Model.UsageMessageSpec (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Model.UsageMessageSpec (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.UsageMessageSpec.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.UsageMessageSpec.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.UsageMessageSpec.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -75,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -112,13 +99,11 @@ <h2 title="Class CommandLine.Model.UsageMessageSpec" class="title">Class Command
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.Model.UsageMessageSpec</span>
+<pre>public static class <span class="strong">CommandLine.Model.UsageMessageSpec</span>
 extends java.lang.Object</pre>
 <div class="block">Models the usage help message specification.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -127,230 +112,230 @@ <h2 title="Class CommandLine.Model.UsageMessageSpec" class="title">Class Command
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#UsageMessageSpec--">UsageMessageSpec</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#CommandLine.Model.UsageMessageSpec()">CommandLine.Model.UsageMessageSpec</a></strong>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#abbreviateSynopsis--">abbreviateSynopsis</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#abbreviateSynopsis()">abbreviateSynopsis</a></strong>()</code>
 <div class="block">Returns whether the synopsis line(s) should show an abbreviated synopsis without detailed option names.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#abbreviateSynopsis-boolean-">abbreviateSynopsis</a></span>(boolean&nbsp;newValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#abbreviateSynopsis(boolean)">abbreviateSynopsis</a></strong>(boolean&nbsp;newValue)</code>
 <div class="block">Sets whether the synopsis line(s) should show an abbreviated synopsis without detailed option names.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#commandListHeading--">commandListHeading</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#commandListHeading()">commandListHeading</a></strong>()</code>
 <div class="block">Returns the optional heading preceding the subcommand list.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#commandListHeading-java.lang.String-">commandListHeading</a></span>(java.lang.String&nbsp;newValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#commandListHeading(java.lang.String)">commandListHeading</a></strong>(java.lang.String&nbsp;newValue)</code>
 <div class="block">Sets the optional heading preceding the subcommand list.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#customSynopsis--">customSynopsis</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#customSynopsis()">customSynopsis</a></strong>()</code>
 <div class="block">Returns the optional custom synopsis lines to use instead of the auto-generated synopsis.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#customSynopsis-java.lang.String...-">customSynopsis</a></span>(java.lang.String...&nbsp;customSynopsis)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#customSynopsis(java.lang.String...)">customSynopsis</a></strong>(java.lang.String...&nbsp;customSynopsis)</code>
 <div class="block">Sets the optional custom synopsis lines to use instead of the auto-generated synopsis.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#description--">description</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#description()">description</a></strong>()</code>
 <div class="block">Returns the optional text lines to use as the description of the help message, displayed between the synopsis and the
  options list.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#description-java.lang.String...-">description</a></span>(java.lang.String...&nbsp;description)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#description(java.lang.String...)">description</a></strong>(java.lang.String...&nbsp;description)</code>
 <div class="block">Sets the optional text lines to use as the description of the help message, displayed between the synopsis and the
  options list.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#descriptionHeading--">descriptionHeading</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#descriptionHeading()">descriptionHeading</a></strong>()</code>
 <div class="block">Returns the optional heading preceding the description section.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#descriptionHeading-java.lang.String-">descriptionHeading</a></span>(java.lang.String&nbsp;newValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#descriptionHeading(java.lang.String)">descriptionHeading</a></strong>(java.lang.String&nbsp;newValue)</code>
 <div class="block">Sets the heading preceding the description section.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#footer--">footer</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#footer()">footer</a></strong>()</code>
 <div class="block">Returns the optional footer text lines displayed at the bottom of the help message.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#footer-java.lang.String...-">footer</a></span>(java.lang.String...&nbsp;footer)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#footer(java.lang.String...)">footer</a></strong>(java.lang.String...&nbsp;footer)</code>
 <div class="block">Sets the optional footer text lines displayed at the bottom of the help message.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#footerHeading--">footerHeading</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#footerHeading()">footerHeading</a></strong>()</code>
 <div class="block">Returns the optional heading preceding the footer section.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#footerHeading-java.lang.String-">footerHeading</a></span>(java.lang.String&nbsp;newValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#footerHeading(java.lang.String)">footerHeading</a></strong>(java.lang.String&nbsp;newValue)</code>
 <div class="block">Sets the optional heading preceding the footer section.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#header--">header</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#header()">header</a></strong>()</code>
 <div class="block">Returns the optional header lines displayed at the top of the help message.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#header-java.lang.String...-">header</a></span>(java.lang.String...&nbsp;header)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#header(java.lang.String...)">header</a></strong>(java.lang.String...&nbsp;header)</code>
 <div class="block">Sets the optional header lines displayed at the top of the help message.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#headerHeading--">headerHeading</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#headerHeading()">headerHeading</a></strong>()</code>
 <div class="block">Returns the optional heading preceding the header section.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#headerHeading-java.lang.String-">headerHeading</a></span>(java.lang.String&nbsp;headerHeading)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#headerHeading(java.lang.String)">headerHeading</a></strong>(java.lang.String&nbsp;headerHeading)</code>
 <div class="block">Sets the heading preceding the header section.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#hidden--">hidden</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#hidden()">hidden</a></strong>()</code>
 <div class="block">Returns whether this command should be hidden from the usage help message of the parent command.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#hidden-boolean-">hidden</a></span>(boolean&nbsp;value)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#hidden(boolean)">hidden</a></strong>(boolean&nbsp;value)</code>
 <div class="block">Set the hidden flag on this command to control whether to show or hide it in the help usage text of the parent command.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#optionListHeading--">optionListHeading</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#optionListHeading()">optionListHeading</a></strong>()</code>
 <div class="block">Returns the optional heading preceding the options list.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#optionListHeading-java.lang.String-">optionListHeading</a></span>(java.lang.String&nbsp;newValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#optionListHeading(java.lang.String)">optionListHeading</a></strong>(java.lang.String&nbsp;newValue)</code>
 <div class="block">Sets the heading preceding the options list.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#parameterListHeading--">parameterListHeading</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#parameterListHeading()">parameterListHeading</a></strong>()</code>
 <div class="block">Returns the optional heading preceding the parameter list.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#parameterListHeading-java.lang.String-">parameterListHeading</a></span>(java.lang.String&nbsp;newValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#parameterListHeading(java.lang.String)">parameterListHeading</a></strong>(java.lang.String&nbsp;newValue)</code>
 <div class="block">Sets the optional heading preceding the parameter list.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>char</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#requiredOptionMarker--">requiredOptionMarker</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#requiredOptionMarker()">requiredOptionMarker</a></strong>()</code>
 <div class="block">Returns the character used to prefix required options in the options list.</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#requiredOptionMarker-char-">requiredOptionMarker</a></span>(char&nbsp;newValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#requiredOptionMarker(char)">requiredOptionMarker</a></strong>(char&nbsp;newValue)</code>
 <div class="block">Sets the character used to prefix required options in the options list.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#showDefaultValues--">showDefaultValues</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#showDefaultValues()">showDefaultValues</a></strong>()</code>
 <div class="block">Returns whether the options list in the usage help message should show default values for all non-boolean options.</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#showDefaultValues-boolean-">showDefaultValues</a></span>(boolean&nbsp;newValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#showDefaultValues(boolean)">showDefaultValues</a></strong>(boolean&nbsp;newValue)</code>
 <div class="block">Sets whether the options list in the usage help message should show default values for all non-boolean options.</div>
 </td>
 </tr>
-<tr id="i28" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#sortOptions--">sortOptions</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#sortOptions()">sortOptions</a></strong>()</code>
 <div class="block">Returns whether the options list in the usage help message should be sorted alphabetically.</div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#sortOptions-boolean-">sortOptions</a></span>(boolean&nbsp;newValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#sortOptions(boolean)">sortOptions</a></strong>(boolean&nbsp;newValue)</code>
 <div class="block">Sets whether the options list in the usage help message should be sorted alphabetically.</div>
 </td>
 </tr>
-<tr id="i30" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#synopsisHeading--">synopsisHeading</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#synopsisHeading()">synopsisHeading</a></strong>()</code>
 <div class="block">Returns the optional heading preceding the synopsis.</div>
 </td>
 </tr>
-<tr id="i31" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#synopsisHeading-java.lang.String-">synopsisHeading</a></span>(java.lang.String&nbsp;newValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html#synopsisHeading(java.lang.String)">synopsisHeading</a></strong>(java.lang.String&nbsp;newValue)</code>
 <div class="block">Sets the optional heading preceding the synopsis.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -366,38 +351,38 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="UsageMessageSpec--">
+<a name="CommandLine.Model.UsageMessageSpec()">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>UsageMessageSpec</h4>
-<pre>public&nbsp;UsageMessageSpec()</pre>
+<h4>CommandLine.Model.UsageMessageSpec</h4>
+<pre>public&nbsp;CommandLine.Model.UsageMessageSpec()</pre>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="headerHeading--">
+<a name="headerHeading()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>headerHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;headerHeading()</pre>
-<div class="block">Returns the optional heading preceding the header section. Initialized from <a href="../picocli/CommandLine.Command.html#headerHeading--"><code>CommandLine.Command.headerHeading()</code></a>, or null.</div>
+<div class="block">Returns the optional heading preceding the header section. Initialized from <a href="../picocli/CommandLine.Command.html#headerHeading()"><code>CommandLine.Command.headerHeading()</code></a>, or null.</div>
 </li>
 </ul>
-<a name="header--">
+<a name="header()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -405,22 +390,22 @@ <h4>headerHeading</h4>
 <h4>header</h4>
 <pre>public&nbsp;java.lang.String[]&nbsp;header()</pre>
 <div class="block">Returns the optional header lines displayed at the top of the help message. For subcommands, the first header line is
- displayed in the list of commands. Values are initialized from <a href="../picocli/CommandLine.Command.html#header--"><code>CommandLine.Command.header()</code></a>
+ displayed in the list of commands. Values are initialized from <a href="../picocli/CommandLine.Command.html#header()"><code>CommandLine.Command.header()</code></a>
  if the <code>Command</code> annotation is present, otherwise this is an empty array and the help message has no
  header. Applications may programmatically set this field to create a custom help message.</div>
 </li>
 </ul>
-<a name="synopsisHeading--">
+<a name="synopsisHeading()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>synopsisHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;synopsisHeading()</pre>
-<div class="block">Returns the optional heading preceding the synopsis. Initialized from <a href="../picocli/CommandLine.Command.html#synopsisHeading--"><code>CommandLine.Command.synopsisHeading()</code></a>, <code>"Usage: "</code> by default.</div>
+<div class="block">Returns the optional heading preceding the synopsis. Initialized from <a href="../picocli/CommandLine.Command.html#synopsisHeading()"><code>CommandLine.Command.synopsisHeading()</code></a>, <code>"Usage: "</code> by default.</div>
 </li>
 </ul>
-<a name="abbreviateSynopsis--">
+<a name="abbreviateSynopsis()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -430,7 +415,7 @@ <h4>abbreviateSynopsis</h4>
 <div class="block">Returns whether the synopsis line(s) should show an abbreviated synopsis without detailed option names.</div>
 </li>
 </ul>
-<a name="customSynopsis--">
+<a name="customSynopsis()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -438,22 +423,22 @@ <h4>abbreviateSynopsis</h4>
 <h4>customSynopsis</h4>
 <pre>public&nbsp;java.lang.String[]&nbsp;customSynopsis()</pre>
 <div class="block">Returns the optional custom synopsis lines to use instead of the auto-generated synopsis.
- Initialized from <a href="../picocli/CommandLine.Command.html#customSynopsis--"><code>CommandLine.Command.customSynopsis()</code></a> if the <code>Command</code> annotation is present,
+ Initialized from <a href="../picocli/CommandLine.Command.html#customSynopsis()"><code>CommandLine.Command.customSynopsis()</code></a> if the <code>Command</code> annotation is present,
  otherwise this is an empty array and the synopsis is generated.
  Applications may programmatically set this field to create a custom help message.</div>
 </li>
 </ul>
-<a name="descriptionHeading--">
+<a name="descriptionHeading()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>descriptionHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;descriptionHeading()</pre>
-<div class="block">Returns the optional heading preceding the description section. Initialized from <a href="../picocli/CommandLine.Command.html#descriptionHeading--"><code>CommandLine.Command.descriptionHeading()</code></a>, or null.</div>
+<div class="block">Returns the optional heading preceding the description section. Initialized from <a href="../picocli/CommandLine.Command.html#descriptionHeading()"><code>CommandLine.Command.descriptionHeading()</code></a>, or null.</div>
 </li>
 </ul>
-<a name="description--">
+<a name="description()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -461,32 +446,32 @@ <h4>descriptionHeading</h4>
 <h4>description</h4>
 <pre>public&nbsp;java.lang.String[]&nbsp;description()</pre>
 <div class="block">Returns the optional text lines to use as the description of the help message, displayed between the synopsis and the
- options list. Initialized from <a href="../picocli/CommandLine.Command.html#description--"><code>CommandLine.Command.description()</code></a> if the <code>Command</code> annotation is present,
+ options list. Initialized from <a href="../picocli/CommandLine.Command.html#description()"><code>CommandLine.Command.description()</code></a> if the <code>Command</code> annotation is present,
  otherwise this is an empty array and the help message has no description.
  Applications may programmatically set this field to create a custom help message.</div>
 </li>
 </ul>
-<a name="parameterListHeading--">
+<a name="parameterListHeading()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>parameterListHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;parameterListHeading()</pre>
-<div class="block">Returns the optional heading preceding the parameter list. Initialized from <a href="../picocli/CommandLine.Command.html#parameterListHeading--"><code>CommandLine.Command.parameterListHeading()</code></a>, or null.</div>
+<div class="block">Returns the optional heading preceding the parameter list. Initialized from <a href="../picocli/CommandLine.Command.html#parameterListHeading()"><code>CommandLine.Command.parameterListHeading()</code></a>, or null.</div>
 </li>
 </ul>
-<a name="optionListHeading--">
+<a name="optionListHeading()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>optionListHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;optionListHeading()</pre>
-<div class="block">Returns the optional heading preceding the options list. Initialized from <a href="../picocli/CommandLine.Command.html#optionListHeading--"><code>CommandLine.Command.optionListHeading()</code></a>, or null.</div>
+<div class="block">Returns the optional heading preceding the options list. Initialized from <a href="../picocli/CommandLine.Command.html#optionListHeading()"><code>CommandLine.Command.optionListHeading()</code></a>, or null.</div>
 </li>
 </ul>
-<a name="sortOptions--">
+<a name="sortOptions()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -496,7 +481,7 @@ <h4>sortOptions</h4>
 <div class="block">Returns whether the options list in the usage help message should be sorted alphabetically.</div>
 </li>
 </ul>
-<a name="requiredOptionMarker--">
+<a name="requiredOptionMarker()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -506,7 +491,7 @@ <h4>requiredOptionMarker</h4>
 <div class="block">Returns the character used to prefix required options in the options list.</div>
 </li>
 </ul>
-<a name="showDefaultValues--">
+<a name="showDefaultValues()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -516,7 +501,7 @@ <h4>showDefaultValues</h4>
 <div class="block">Returns whether the options list in the usage help message should show default values for all non-boolean options.</div>
 </li>
 </ul>
-<a name="hidden--">
+<a name="hidden()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -524,33 +509,30 @@ <h4>showDefaultValues</h4>
 <h4>hidden</h4>
 <pre>public&nbsp;boolean&nbsp;hidden()</pre>
 <div class="block">Returns whether this command should be hidden from the usage help message of the parent command.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd><code>true</code> if this command should not appear in the usage help message of the parent command</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd><code>true</code> if this command should not appear in the usage help message of the parent command</dd></dl>
 </li>
 </ul>
-<a name="commandListHeading--">
+<a name="commandListHeading()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>commandListHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;commandListHeading()</pre>
-<div class="block">Returns the optional heading preceding the subcommand list. Initialized from <a href="../picocli/CommandLine.Command.html#commandListHeading--"><code>CommandLine.Command.commandListHeading()</code></a>. <code>"Commands:%n"</code> by default.</div>
+<div class="block">Returns the optional heading preceding the subcommand list. Initialized from <a href="../picocli/CommandLine.Command.html#commandListHeading()"><code>CommandLine.Command.commandListHeading()</code></a>. <code>"Commands:%n"</code> by default.</div>
 </li>
 </ul>
-<a name="footerHeading--">
+<a name="footerHeading()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>footerHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;footerHeading()</pre>
-<div class="block">Returns the optional heading preceding the footer section. Initialized from <a href="../picocli/CommandLine.Command.html#footerHeading--"><code>CommandLine.Command.footerHeading()</code></a>, or null.</div>
+<div class="block">Returns the optional heading preceding the footer section. Initialized from <a href="../picocli/CommandLine.Command.html#footerHeading()"><code>CommandLine.Command.footerHeading()</code></a>, or null.</div>
 </li>
 </ul>
-<a name="footer--">
+<a name="footer()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -558,26 +540,23 @@ <h4>footerHeading</h4>
 <h4>footer</h4>
 <pre>public&nbsp;java.lang.String[]&nbsp;footer()</pre>
 <div class="block">Returns the optional footer text lines displayed at the bottom of the help message. Initialized from
- <a href="../picocli/CommandLine.Command.html#footer--"><code>CommandLine.Command.footer()</code></a> if the <code>Command</code> annotation is present, otherwise this is an empty array and
+ <a href="../picocli/CommandLine.Command.html#footer()"><code>CommandLine.Command.footer()</code></a> if the <code>Command</code> annotation is present, otherwise this is an empty array and
  the help message has no footer.
  Applications may programmatically set this field to create a custom help message.</div>
 </li>
 </ul>
-<a name="headerHeading-java.lang.String-">
+<a name="headerHeading(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>headerHeading</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a>&nbsp;headerHeading(java.lang.String&nbsp;headerHeading)</pre>
-<div class="block">Sets the heading preceding the header section. Initialized from <a href="../picocli/CommandLine.Command.html#headerHeading--"><code>CommandLine.Command.headerHeading()</code></a>, or null.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this UsageMessageSpec for method chaining</dd>
-</dl>
+<div class="block">Sets the heading preceding the header section. Initialized from <a href="../picocli/CommandLine.Command.html#headerHeading()"><code>CommandLine.Command.headerHeading()</code></a>, or null.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this UsageMessageSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="header-java.lang.String...-">
+<a name="header(java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -586,13 +565,10 @@ <h4>header</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a>&nbsp;header(java.lang.String...&nbsp;header)</pre>
 <div class="block">Sets the optional header lines displayed at the top of the help message. For subcommands, the first header line is
  displayed in the list of commands.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this UsageMessageSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this UsageMessageSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="synopsisHeading-java.lang.String-">
+<a name="synopsisHeading(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -600,13 +576,10 @@ <h4>header</h4>
 <h4>synopsisHeading</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a>&nbsp;synopsisHeading(java.lang.String&nbsp;newValue)</pre>
 <div class="block">Sets the optional heading preceding the synopsis.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this UsageMessageSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this UsageMessageSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="abbreviateSynopsis-boolean-">
+<a name="abbreviateSynopsis(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -614,13 +587,10 @@ <h4>synopsisHeading</h4>
 <h4>abbreviateSynopsis</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a>&nbsp;abbreviateSynopsis(boolean&nbsp;newValue)</pre>
 <div class="block">Sets whether the synopsis line(s) should show an abbreviated synopsis without detailed option names.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this UsageMessageSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this UsageMessageSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="customSynopsis-java.lang.String...-">
+<a name="customSynopsis(java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -628,13 +598,10 @@ <h4>abbreviateSynopsis</h4>
 <h4>customSynopsis</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a>&nbsp;customSynopsis(java.lang.String...&nbsp;customSynopsis)</pre>
 <div class="block">Sets the optional custom synopsis lines to use instead of the auto-generated synopsis.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this UsageMessageSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this UsageMessageSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="descriptionHeading-java.lang.String-">
+<a name="descriptionHeading(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -642,13 +609,10 @@ <h4>customSynopsis</h4>
 <h4>descriptionHeading</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a>&nbsp;descriptionHeading(java.lang.String&nbsp;newValue)</pre>
 <div class="block">Sets the heading preceding the description section.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this UsageMessageSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this UsageMessageSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="description-java.lang.String...-">
+<a name="description(java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -657,13 +621,10 @@ <h4>description</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a>&nbsp;description(java.lang.String...&nbsp;description)</pre>
 <div class="block">Sets the optional text lines to use as the description of the help message, displayed between the synopsis and the
  options list.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this UsageMessageSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this UsageMessageSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="parameterListHeading-java.lang.String-">
+<a name="parameterListHeading(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -671,13 +632,10 @@ <h4>description</h4>
 <h4>parameterListHeading</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a>&nbsp;parameterListHeading(java.lang.String&nbsp;newValue)</pre>
 <div class="block">Sets the optional heading preceding the parameter list.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this UsageMessageSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this UsageMessageSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="optionListHeading-java.lang.String-">
+<a name="optionListHeading(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -685,13 +643,10 @@ <h4>parameterListHeading</h4>
 <h4>optionListHeading</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a>&nbsp;optionListHeading(java.lang.String&nbsp;newValue)</pre>
 <div class="block">Sets the heading preceding the options list.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this UsageMessageSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this UsageMessageSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="sortOptions-boolean-">
+<a name="sortOptions(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -699,13 +654,10 @@ <h4>optionListHeading</h4>
 <h4>sortOptions</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a>&nbsp;sortOptions(boolean&nbsp;newValue)</pre>
 <div class="block">Sets whether the options list in the usage help message should be sorted alphabetically.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this UsageMessageSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this UsageMessageSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="requiredOptionMarker-char-">
+<a name="requiredOptionMarker(char)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -713,13 +665,10 @@ <h4>sortOptions</h4>
 <h4>requiredOptionMarker</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a>&nbsp;requiredOptionMarker(char&nbsp;newValue)</pre>
 <div class="block">Sets the character used to prefix required options in the options list.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this UsageMessageSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this UsageMessageSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="showDefaultValues-boolean-">
+<a name="showDefaultValues(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -727,13 +676,10 @@ <h4>requiredOptionMarker</h4>
 <h4>showDefaultValues</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a>&nbsp;showDefaultValues(boolean&nbsp;newValue)</pre>
 <div class="block">Sets whether the options list in the usage help message should show default values for all non-boolean options.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this UsageMessageSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this UsageMessageSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="hidden-boolean-">
+<a name="hidden(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -741,17 +687,11 @@ <h4>showDefaultValues</h4>
 <h4>hidden</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a>&nbsp;hidden(boolean&nbsp;value)</pre>
 <div class="block">Set the hidden flag on this command to control whether to show or hide it in the help usage text of the parent command.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>value</code> - enable or disable the hidden flag</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this UsageMessageSpec for method chaining</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Command.html#hidden--"><code>CommandLine.Command.hidden()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>value</code> - enable or disable the hidden flag</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this UsageMessageSpec for method chaining</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Command.html#hidden()"><code>CommandLine.Command.hidden()</code></a></dd></dl>
 </li>
 </ul>
-<a name="commandListHeading-java.lang.String-">
+<a name="commandListHeading(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -759,13 +699,10 @@ <h4>hidden</h4>
 <h4>commandListHeading</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a>&nbsp;commandListHeading(java.lang.String&nbsp;newValue)</pre>
 <div class="block">Sets the optional heading preceding the subcommand list.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this UsageMessageSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this UsageMessageSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="footerHeading-java.lang.String-">
+<a name="footerHeading(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -773,13 +710,10 @@ <h4>commandListHeading</h4>
 <h4>footerHeading</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a>&nbsp;footerHeading(java.lang.String&nbsp;newValue)</pre>
 <div class="block">Sets the optional heading preceding the footer section.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this UsageMessageSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this UsageMessageSpec for method chaining</dd></dl>
 </li>
 </ul>
-<a name="footer-java.lang.String...-">
+<a name="footer(java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -787,10 +721,7 @@ <h4>footerHeading</h4>
 <h4>footer</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a>&nbsp;footer(java.lang.String...&nbsp;footer)</pre>
 <div class="block">Sets the optional footer text lines displayed at the bottom of the help message.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this UsageMessageSpec for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>this UsageMessageSpec for method chaining</dd></dl>
 </li>
 </ul>
 </li>
@@ -801,11 +732,9 @@ <h4>footer</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -820,15 +749,15 @@ <h4>footer</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.UsageMessageSpec.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.UsageMessageSpec.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.UsageMessageSpec.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -847,17 +776,17 @@ <h4>footer</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Model.html b/docs/apidocs/picocli/CommandLine.Model.html
index 258fde7f9..9937e0ee7 100644
--- a/docs/apidocs/picocli/CommandLine.Model.html
+++ b/docs/apidocs/picocli/CommandLine.Model.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Model (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Model (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Model (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Model (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Mixin.html" title="annotation in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Mixin.html" title="annotation in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -67,10 +60,10 @@
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#nested_class_summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+<li><a href="#methods_inherited_from_class_java.lang.Object">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
@@ -79,7 +72,7 @@
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -106,13 +99,11 @@ <h2 title="Class CommandLine.Model" class="title">Class CommandLine.Model</h2>
 </dl>
 <hr>
 <br>
-<pre>public static final class <span class="typeNameLabel">CommandLine.Model</span>
+<pre>public static final class <span class="strong">CommandLine.Model</span>
 extends java.lang.Object</pre>
 <div class="block">This class provides a namespace for classes and interfaces that model concepts and attributes of command line interfaces in picocli.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -121,11 +112,11 @@ <h2 title="Class CommandLine.Model" class="title">Class CommandLine.Model</h2>
 <li class="blockList">
 <!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="nested.class.summary">
+<li class="blockList"><a name="nested_class_summary">
 <!--   -->
 </a>
 <h3>Nested Class Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
 <caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -133,26 +124,26 @@ <h3>Nested Class Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></strong></code>
 <div class="block">Models the shared attributes of <a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>CommandLine.Model.OptionSpec</code></a> and <a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli"><code>CommandLine.Model.PositionalParamSpec</code></a>.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></strong></code>
 <div class="block">The <code>CommandSpec</code> class models a command specification, including the options, positional parameters and subcommands
  supported by the command, as well as attributes for the version help message and the usage help message of the command.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli">CommandLine.Model.IBinding</a></strong></code>
 <div class="block">Customizable binding for obtaining and modifying the current value of an option or positional parameter.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></strong></code>
 <div class="block">The <code>OptionSpec</code> class models aspects of a <em>named option</em> of a <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">command</a>, including whether
  it is required or optional, the option parameters supported (or required) by the option,
  and attributes for the usage help message describing the option.</div>
@@ -160,26 +151,26 @@ <h3>Nested Class Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></strong></code>
 <div class="block">Models parser configuration specification.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a></strong></code>
 <div class="block">The <code>PositionalParamSpec</code> class models aspects of a <em>positional parameter</em> of a <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">command</a>, including whether
  it is required or optional, and attributes for the usage help message describing the positional parameter.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a></strong></code>
 <div class="block">This class allows applications to specify a custom binding that will be invoked for unmatched arguments.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></strong></code>
 <div class="block">Models the usage help message specification.</div>
 </td>
 </tr>
@@ -188,12 +179,12 @@ <h3>Nested Class Summary</h3>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -207,11 +198,9 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -226,15 +215,15 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Mixin.html" title="annotation in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Mixin.html" title="annotation in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Model.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Model.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Model.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -251,10 +240,10 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#nested_class_summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+<li><a href="#methods_inherited_from_class_java.lang.Object">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
@@ -263,7 +252,7 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Option.html b/docs/apidocs/picocli/CommandLine.Option.html
index b2c6e0b4e..053ab27c9 100644
--- a/docs/apidocs/picocli/CommandLine.Option.html
+++ b/docs/apidocs/picocli/CommandLine.Option.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Option (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Option (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Option (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Option (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Option.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Option.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Option.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -67,17 +60,15 @@
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.required.element.summary">Required</a>&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
+<li><a href="#annotation_type_required_element_summary">Required</a>&nbsp;|&nbsp;</li>
+<li><a href="#annotation_type_optional_element_summary">Optional</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
+<li><a href="#annotation_type_element_detail">Element</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -93,8 +84,8 @@ <h2 title="Annotation Type CommandLine.Option" class="title">Annotation Type Com
 <hr>
 <br>
 <pre>@Retention(value=RUNTIME)
- @Target(value=FIELD)
-public static @interface <span class="memberNameLabel">CommandLine.Option</span></pre>
+@Target(value=FIELD)
+public static @interface <span class="strong">CommandLine.Option</span></pre>
 <div class="block"><p>
  Annotate fields in your class with <code>@Option</code> and picocli will initialize these fields when matching
  arguments are specified on the command line.
@@ -130,11 +121,11 @@ <h2 title="Annotation Type CommandLine.Option" class="title">Annotation Type Com
 <li class="blockList">
 <!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="annotation.type.required.element.summary">
+<li class="blockList"><a name="annotation_type_required_element_summary">
 <!--   -->
 </a>
 <h3>Required Element Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Required Element Summary table, listing required elements, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Required Element Summary table, listing required elements, and an explanation">
 <caption><span>Required Elements</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -142,7 +133,7 @@ <h3>Required Element Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.String[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Option.html#names--">names</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Option.html#names()">names</a></strong></code>
 <div class="block">One or more option names.</div>
 </td>
 </tr>
@@ -151,11 +142,11 @@ <h3>Required Element Summary</h3>
 </ul>
 <!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="annotation.type.optional.element.summary">
+<li class="blockList"><a name="annotation_type_optional_element_summary">
 <!--   -->
 </a>
 <h3>Optional Element Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
 <caption><span>Optional Elements</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -163,65 +154,65 @@ <h3>Optional Element Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Option.html#arity--">arity</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Option.html#arity()">arity</a></strong></code>
 <div class="block">Specifies the minimum number of required parameters and the maximum number of accepted parameters.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>java.lang.Class&lt;? extends <a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli">CommandLine.ITypeConverter</a>&lt;?&gt;&gt;[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Option.html#converter--">converter</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Option.html#converter()">converter</a></strong></code>
 <div class="block">Optionally specify one or more <a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><code>CommandLine.ITypeConverter</code></a> classes to use to convert the command line argument into
  a strongly typed value (or key-value pair for map fields).</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.String[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Option.html#description--">description</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Option.html#description()">description</a></strong></code>
 <div class="block">Description of this option, used when generating the usage documentation.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Option.html#help--">help</a></span></code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use <a href="../picocli/CommandLine.Option.html#usageHelp--"><code>usageHelp()</code></a> and <a href="../picocli/CommandLine.Option.html#versionHelp--"><code>versionHelp()</code></a> instead. See <a href="../picocli/CommandLine.html#printHelpIfRequested-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>CommandLine.printHelpIfRequested(List, PrintStream, CommandLine.Help.Ansi)</code></a></span></div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Option.html#help()">help</a></strong></code>
+<div class="block"><strong>Deprecated.</strong>&nbsp;
+<div class="block"><i>Use <a href="../picocli/CommandLine.Option.html#usageHelp()"><code>usageHelp()</code></a> and <a href="../picocli/CommandLine.Option.html#versionHelp()"><code>versionHelp()</code></a> instead. See <a href="../picocli/CommandLine.html#printHelpIfRequested(java.util.List,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>CommandLine.printHelpIfRequested(List, PrintStream, CommandLine.Help.Ansi)</code></a></i></div>
 </div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Option.html#hidden--">hidden</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Option.html#hidden()">hidden</a></strong></code>
 <div class="block">Set <code>hidden=true</code> if this option should not be included in the usage documentation.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Option.html#paramLabel--">paramLabel</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Option.html#paramLabel()">paramLabel</a></strong></code>
 <div class="block">Specify a <code>paramLabel</code> for the option parameter to be used in the usage help message.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Option.html#required--">required</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Option.html#required()">required</a></strong></code>
 <div class="block">Indicates whether this option is required.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli">CommandLine.Help.Visibility</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Option.html#showDefaultValue--">showDefaultValue</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Option.html#showDefaultValue()">showDefaultValue</a></strong></code>
 <div class="block">Use this attribute to control for a specific option whether its default value should be shown in the usage
  help message.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Option.html#split--">split</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Option.html#split()">split</a></strong></code>
 <div class="block">Specify a regular expression to use to split option parameter values before applying them to the field.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>java.lang.Class&lt;?&gt;[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Option.html#type--">type</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Option.html#type()">type</a></strong></code>
 <div class="block">
  Optionally specify a <code>type</code> to control exactly what Class the option parameter should be converted
  to.</div>
@@ -229,13 +220,13 @@ <h3>Optional Element Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Option.html#usageHelp--">usageHelp</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Option.html#usageHelp()">usageHelp</a></strong></code>
 <div class="block">Set <code>usageHelp=true</code> if this option allows the user to request usage help.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Option.html#versionHelp--">versionHelp</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Option.html#versionHelp()">versionHelp</a></strong></code>
 <div class="block">Set <code>versionHelp=true</code> if this option allows the user to request version information.</div>
 </td>
 </tr>
@@ -250,11 +241,11 @@ <h3>Optional Element Summary</h3>
 <li class="blockList">
 <!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="annotation.type.element.detail">
+<li class="blockList"><a name="annotation_type_element_detail">
 <!--   -->
 </a>
 <h3>Element Detail</h3>
-<a name="names--">
+<a name="names()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -300,17 +291,10 @@ <h4>names</h4>
  Windows PowerShell options generally are a word preceded by a single <code>'-'</code> character, e.g., <code>`-Help'</code>.
  Option parameters are separated by a space or by a <code>':'</code> character.
  </p></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>one or more option names</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>one or more option names</dd></dl>
 </li>
 </ul>
-</li>
-</ul>
-<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="required--">
+<a name="required()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -319,21 +303,15 @@ <h4>required</h4>
 <pre>public abstract&nbsp;boolean&nbsp;required</pre>
 <div class="block">Indicates whether this option is required. By default this is false.
  If an option is required, but a user invokes the program without specifying the required option,
- a <a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli"><code>CommandLine.MissingParameterException</code></a> is thrown from the <a href="../picocli/CommandLine.html#parse-java.lang.String...-"><code>CommandLine.parse(String...)</code></a> method.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>whether this option is required</dd>
-</dl>
+ a <a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli"><code>CommandLine.MissingParameterException</code></a> is thrown from the <a href="../picocli/CommandLine.html#parse(java.lang.String...)"><code>CommandLine.parse(String...)</code></a> method.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>whether this option is required</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>false</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="help--">
+<a name="help()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -341,7 +319,7 @@ <h4>required</h4>
 <h4>help</h4>
 <pre>@Deprecated
 public abstract&nbsp;boolean&nbsp;help</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../picocli/CommandLine.Option.html#usageHelp--"><code>usageHelp()</code></a> and <a href="../picocli/CommandLine.Option.html#versionHelp--"><code>versionHelp()</code></a> instead. See <a href="../picocli/CommandLine.html#printHelpIfRequested-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>CommandLine.printHelpIfRequested(List, PrintStream, CommandLine.Help.Ansi)</code></a></span></div>
+<div class="block"><span class="strong">Deprecated.</span>&nbsp;<i>Use <a href="../picocli/CommandLine.Option.html#usageHelp()"><code>usageHelp()</code></a> and <a href="../picocli/CommandLine.Option.html#versionHelp()"><code>versionHelp()</code></a> instead. See <a href="../picocli/CommandLine.html#printHelpIfRequested(java.util.List,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>CommandLine.printHelpIfRequested(List, PrintStream, CommandLine.Help.Ansi)</code></a></i></div>
 <div class="block">Set <code>help=true</code> if this option should disable validation of the remaining arguments:
  If the <code>help</code> option is specified, no error message is generated for missing required options.
  <p>
@@ -350,24 +328,18 @@ <h4>help</h4>
  <code>-Version</code> on Windows).
  </p>
  <p>
- Note that the <a href="../picocli/CommandLine.html#parse-java.lang.String...-"><code>CommandLine.parse(String...)</code></a> method will not print help documentation. It will only set
+ Note that the <a href="../picocli/CommandLine.html#parse(java.lang.String...)"><code>CommandLine.parse(String...)</code></a> method will not print help documentation. It will only set
  the value of the annotated field. It is the responsibility of the caller to inspect the annotated fields
  and take the appropriate action.
  </p></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>whether this option disables validation of the other arguments</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>whether this option disables validation of the other arguments</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>false</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="usageHelp--">
+<a name="usageHelp()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -376,31 +348,24 @@ <h4>usageHelp</h4>
 <pre>public abstract&nbsp;boolean&nbsp;usageHelp</pre>
 <div class="block">Set <code>usageHelp=true</code> if this option allows the user to request usage help. If this option is
  specified on the command line, picocli will not validate the remaining arguments (so no "missing required
- option" errors) and the <a href="../picocli/CommandLine.html#isUsageHelpRequested--"><code>CommandLine.isUsageHelpRequested()</code></a> method will return <code>true</code>.
+ option" errors) and the <a href="../picocli/CommandLine.html#isUsageHelpRequested()"><code>CommandLine.isUsageHelpRequested()</code></a> method will return <code>true</code>.
  <p>
  This attribute is useful for special options like help (<code>-h</code> and <code>--help</code> on unix,
  <code>-?</code> and <code>-Help</code> on Windows).
  </p><p>
- Note that the <a href="../picocli/CommandLine.html#parse-java.lang.String...-"><code>CommandLine.parse(String...)</code></a> method will not print usage help documentation, but only sets
- the value of the annotated field. Usage help is automatically printed when using any of the <a href="../picocli/CommandLine.html#run-R-java.io.PrintStream-java.lang.String...-"><code>CommandLine.run(Runnable, PrintStream, String...)</code></a>,
- <a href="../picocli/CommandLine.html#call-C-java.io.PrintStream-java.lang.String...-"><code>CommandLine.call(Callable, PrintStream, String...)</code></a> or <a href="../picocli/CommandLine.html#parseWithHandler-picocli.CommandLine.IParseResultHandler-java.io.PrintStream-java.lang.String...-"><code>CommandLine.parseWithHandler(IParseResultHandler, PrintStream, String...)</code></a> methods.
+ Note that the <a href="../picocli/CommandLine.html#parse(java.lang.String...)"><code>CommandLine.parse(String...)</code></a> method will not print usage help documentation, but only sets
+ the value of the annotated field. Usage help is automatically printed when using any of the <a href="../picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.lang.String...)"><code>CommandLine.run(Runnable, PrintStream, String...)</code></a>,
+ <a href="../picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.lang.String...)"><code>CommandLine.call(Callable, PrintStream, String...)</code></a> or <a href="../picocli/CommandLine.html#parseWithHandler(picocli.CommandLine.IParseResultHandler,%20java.io.PrintStream,%20java.lang.String...)"><code>CommandLine.parseWithHandler(IParseResultHandler, PrintStream, String...)</code></a> methods.
  </p></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>whether this option allows the user to request usage help</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>0.9.8</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>whether this option allows the user to request usage help</dd><dt><span class="strong">Since:</span></dt>
+  <dd>0.9.8</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>false</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="versionHelp--">
+<a name="versionHelp()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -409,31 +374,24 @@ <h4>versionHelp</h4>
 <pre>public abstract&nbsp;boolean&nbsp;versionHelp</pre>
 <div class="block">Set <code>versionHelp=true</code> if this option allows the user to request version information. If this option is
  specified on the command line, picocli will not validate the remaining arguments (so no "missing required
- option" errors) and the <a href="../picocli/CommandLine.html#isVersionHelpRequested--"><code>CommandLine.isVersionHelpRequested()</code></a> method will return <code>true</code>.
+ option" errors) and the <a href="../picocli/CommandLine.html#isVersionHelpRequested()"><code>CommandLine.isVersionHelpRequested()</code></a> method will return <code>true</code>.
  <p>
  This attribute is useful for special options like version (<code>-V</code> and <code>--version</code> on unix,
  <code>-Version</code> on Windows).
  </p><p>
- Note that the <a href="../picocli/CommandLine.html#parse-java.lang.String...-"><code>CommandLine.parse(String...)</code></a> method will not print version help information, but only sets
- the value of the annotated field. Version help is automatically printed when using any of the <a href="../picocli/CommandLine.html#run-R-java.io.PrintStream-java.lang.String...-"><code>CommandLine.run(Runnable, PrintStream, String...)</code></a>,
- <a href="../picocli/CommandLine.html#call-C-java.io.PrintStream-java.lang.String...-"><code>CommandLine.call(Callable, PrintStream, String...)</code></a> or <a href="../picocli/CommandLine.html#parseWithHandler-picocli.CommandLine.IParseResultHandler-java.io.PrintStream-java.lang.String...-"><code>CommandLine.parseWithHandler(IParseResultHandler, PrintStream, String...)</code></a> methods.
+ Note that the <a href="../picocli/CommandLine.html#parse(java.lang.String...)"><code>CommandLine.parse(String...)</code></a> method will not print version help information, but only sets
+ the value of the annotated field. Version help is automatically printed when using any of the <a href="../picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.lang.String...)"><code>CommandLine.run(Runnable, PrintStream, String...)</code></a>,
+ <a href="../picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.lang.String...)"><code>CommandLine.call(Callable, PrintStream, String...)</code></a> or <a href="../picocli/CommandLine.html#parseWithHandler(picocli.CommandLine.IParseResultHandler,%20java.io.PrintStream,%20java.lang.String...)"><code>CommandLine.parseWithHandler(IParseResultHandler, PrintStream, String...)</code></a> methods.
  </p></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>whether this option allows the user to request version information</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>0.9.8</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>whether this option allows the user to request version information</dd><dt><span class="strong">Since:</span></dt>
+  <dd>0.9.8</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>false</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="description--">
+<a name="description()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -441,20 +399,14 @@ <h4>versionHelp</h4>
 <h4>description</h4>
 <pre>public abstract&nbsp;java.lang.String[]&nbsp;description</pre>
 <div class="block">Description of this option, used when generating the usage documentation.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the description of this option</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the description of this option</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>{}</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="arity--">
+<a name="arity()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -463,7 +415,7 @@ <h4>arity</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;arity</pre>
 <div class="block">Specifies the minimum number of required parameters and the maximum number of accepted parameters.
  If an option declares a positive arity, and the user specifies an insufficient number of parameters on the
- command line, a <a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli"><code>CommandLine.MissingParameterException</code></a> is thrown by the <a href="../picocli/CommandLine.html#parse-java.lang.String...-"><code>CommandLine.parse(String...)</code></a> method.
+ command line, a <a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli"><code>CommandLine.MissingParameterException</code></a> is thrown by the <a href="../picocli/CommandLine.html#parse(java.lang.String...)"><code>CommandLine.parse(String...)</code></a> method.
  <p>
  In many cases picocli can deduce the number of required parameters from the field's type.
  By default, flags (boolean options) have arity zero,
@@ -471,7 +423,7 @@ <h4>arity</h4>
  Generally, fields with types that cannot hold multiple values can omit the <code>arity</code> attribute.
  </p><p>
  Fields used to capture options with arity two or higher should have a type that can hold multiple values,
- like arrays or Collections. See <a href="../picocli/CommandLine.Option.html#type--"><code>type()</code></a> for strongly-typed Collection fields.
+ like arrays or Collections. See <a href="../picocli/CommandLine.Option.html#type()"><code>type()</code></a> for strongly-typed Collection fields.
  </p><p>
  For example, if an option has 2 required parameters and any number of optional parameters,
  specify <code>@Option(names = "-example", arity = "2..*")</code>.
@@ -485,7 +437,7 @@ <h4>arity</h4>
  <p>
  Because this boolean field is defined with arity 1, the user must specify either <code>&lt;program&gt; -v false</code>
  or <code>&lt;program&gt; -v true</code>
- on the command line, or a <a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli"><code>CommandLine.MissingParameterException</code></a> is thrown by the <a href="../picocli/CommandLine.html#parse-java.lang.String...-"><code>CommandLine.parse(String...)</code></a>
+ on the command line, or a <a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli"><code>CommandLine.MissingParameterException</code></a> is thrown by the <a href="../picocli/CommandLine.html#parse(java.lang.String...)"><code>CommandLine.parse(String...)</code></a>
  method.
  </p><p>
  To make the boolean parameter possible but optional, define the field with <code>arity = "0..1"</code>.
@@ -497,20 +449,14 @@ <h4>arity</h4>
  -v true
  -v false
  </pre></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>how many arguments this option requires</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>how many arguments this option requires</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>""</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="paramLabel--">
+<a name="paramLabel()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -530,20 +476,14 @@ <h4>paramLabel</h4>
  -o, --output FILE       path of the output file
  -j, --jobs [&lt;maxJobs&gt;]  Allow N jobs at once; infinite jobs with no arg.
  </pre></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>name of the option parameter used in the usage help message</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>name of the option parameter used in the usage help message</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>""</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="type--">
+<a name="type()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -561,7 +501,7 @@ <h4>type</h4>
  to ensure that option parameter values are converted to <code>Short</code> before adding an element to the array.
  </p><p>
  Picocli will use the <a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><code>CommandLine.ITypeConverter</code></a> that is
- <a href="../picocli/CommandLine.html#registerConverter-java.lang.Class-picocli.CommandLine.ITypeConverter-">registered</a> for the specified type to convert
+ <a href="../picocli/CommandLine.html#registerConverter(java.lang.Class,%20picocli.CommandLine.ITypeConverter)">registered</a> for the specified type to convert
  the raw String values before modifying the field value.
  </p><p>
  Prior to 2.0, the <code>type</code> attribute was necessary for <code>Collection</code> and <code>Map</code> fields,
@@ -575,20 +515,14 @@ <h4>type</h4>
  If the field type is a raw collection or a raw map, and you want it to contain other values than Strings,
  or if the generic type's type arguments are interfaces or abstract classes, you may
  specify a <code>type</code> attribute to control the Class that the option parameter should be converted to.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the type(s) to convert the raw String values</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the type(s) to convert the raw String values</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>{}</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="converter--">
+<a name="converter()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -601,22 +535,14 @@ <h4>converter</h4>
  <p>For example, for a specific field you may want to use a converter that maps the constant names defined
  in <code>java.sql.Types</code> to the <code>int</code> value of these constants, but any other <code>int</code> fields should
  not be affected by this and should continue to use the standard int converter that parses numeric values.</p></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the type converter(s) to use to convert String values to strongly typed values for this field</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#registerConverter-java.lang.Class-picocli.CommandLine.ITypeConverter-"><code>CommandLine.registerConverter(Class, ITypeConverter)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the type converter(s) to use to convert String values to strongly typed values for this field</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#registerConverter(java.lang.Class,%20picocli.CommandLine.ITypeConverter)"><code>CommandLine.registerConverter(Class, ITypeConverter)</code></a></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>{}</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="split--">
+<a name="split()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -625,22 +551,14 @@ <h4>split</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;split</pre>
 <div class="block">Specify a regular expression to use to split option parameter values before applying them to the field.
  All elements resulting from the split are added to the array or Collection. Ignored for single-value fields.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a regular expression to split option parameter values or <code>""</code> if the value should not be split</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><code>String.split(String)</code></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a regular expression to split option parameter values or <code>""</code> if the value should not be split</dd><dt><span class="strong">See Also:</span></dt><dd><code>String.split(String)</code></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>""</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="hidden--">
+<a name="hidden()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -648,20 +566,14 @@ <h4>split</h4>
 <h4>hidden</h4>
 <pre>public abstract&nbsp;boolean&nbsp;hidden</pre>
 <div class="block">Set <code>hidden=true</code> if this option should not be included in the usage documentation.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>whether this option should be excluded from the usage message</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>whether this option should be excluded from the usage message</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>false</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="showDefaultValue--">
+<a name="showDefaultValue()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -669,13 +581,10 @@ <h4>hidden</h4>
 <h4>showDefaultValue</h4>
 <pre>public abstract&nbsp;<a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli">CommandLine.Help.Visibility</a>&nbsp;showDefaultValue</pre>
 <div class="block">Use this attribute to control for a specific option whether its default value should be shown in the usage
- help message. If not specified, the default value is only shown when the <a href="../picocli/CommandLine.Command.html#showDefaultValues--"><code>CommandLine.Command.showDefaultValues()</code></a>
+ help message. If not specified, the default value is only shown when the <a href="../picocli/CommandLine.Command.html#showDefaultValues()"><code>CommandLine.Command.showDefaultValues()</code></a>
  is set <code>true</code> on the command. Use this attribute to specify whether the default value
  for this specific option should always be shown or never be shown, regardless of the command setting.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>whether this option's default value should be shown in the usage help message</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>whether this option's default value should be shown in the usage help message</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>picocli.CommandLine.Help.Visibility.ON_DEMAND</dd>
@@ -690,11 +599,9 @@ <h4>showDefaultValue</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -709,15 +616,15 @@ <h4>showDefaultValue</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Option.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Option.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Option.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -734,17 +641,15 @@ <h4>showDefaultValue</h4>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.required.element.summary">Required</a>&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
+<li><a href="#annotation_type_required_element_summary">Required</a>&nbsp;|&nbsp;</li>
+<li><a href="#annotation_type_optional_element_summary">Optional</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
+<li><a href="#annotation_type_element_detail">Element</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.OverwrittenOptionException.html b/docs/apidocs/picocli/CommandLine.OverwrittenOptionException.html
index c94f265c2..383a046ab 100644
--- a/docs/apidocs/picocli/CommandLine.OverwrittenOptionException.html
+++ b/docs/apidocs/picocli/CommandLine.OverwrittenOptionException.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.OverwrittenOptionException (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.OverwrittenOptionException (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.OverwrittenOptionException (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.OverwrittenOptionException (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.OverwrittenOptionException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.OverwrittenOptionException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.OverwrittenOptionException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -69,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.picocli.CommandLine.ParameterException">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_picocli.CommandLine.ParameterException">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -135,13 +128,10 @@ <h2 title="Class CommandLine.OverwrittenOptionException" class="title">Class Com
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.OverwrittenOptionException</span>
+<pre>public static class <span class="strong">CommandLine.OverwrittenOptionException</span>
 extends <a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></pre>
 <div class="block">Exception indicating that an option for a single-value option field has been specified multiple times on the command line.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../serialized-form.html#picocli.CommandLine.OverwrittenOptionException">Serialized Form</a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../serialized-form.html#picocli.CommandLine.OverwrittenOptionException">Serialized Form</a></dd></dl>
 </li>
 </ul>
 </div>
@@ -150,44 +140,44 @@ <h2 title="Class CommandLine.OverwrittenOptionException" class="title">Class Com
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.OverwrittenOptionException.html#OverwrittenOptionException-picocli.CommandLine-java.lang.String-">OverwrittenOptionException</a></span>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                          java.lang.String&nbsp;msg)</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.OverwrittenOptionException.html#CommandLine.OverwrittenOptionException(picocli.CommandLine,%20java.lang.String)">CommandLine.OverwrittenOptionException</a></strong>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                                      java.lang.String&nbsp;msg)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.picocli.CommandLine.ParameterException">
+<li class="blockList"><a name="methods_inherited_from_class_picocli.CommandLine.ParameterException">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;picocli.<a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></h3>
-<code><a href="../picocli/CommandLine.ParameterException.html#getCommandLine--">getCommandLine</a></code></li>
+<code><a href="../picocli/CommandLine.ParameterException.html#getCommandLine()">getCommandLine</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Throwable">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
 <code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -203,18 +193,18 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="OverwrittenOptionException-picocli.CommandLine-java.lang.String-">
+<a name="CommandLine.OverwrittenOptionException(picocli.CommandLine, java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>OverwrittenOptionException</h4>
-<pre>public&nbsp;OverwrittenOptionException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                                  java.lang.String&nbsp;msg)</pre>
+<h4>CommandLine.OverwrittenOptionException</h4>
+<pre>public&nbsp;CommandLine.OverwrittenOptionException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                                      java.lang.String&nbsp;msg)</pre>
 </li>
 </ul>
 </li>
@@ -225,11 +215,9 @@ <h4>OverwrittenOptionException</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -244,15 +232,15 @@ <h4>OverwrittenOptionException</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.OverwrittenOptionException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.OverwrittenOptionException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.OverwrittenOptionException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -271,17 +259,17 @@ <h4>OverwrittenOptionException</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.picocli.CommandLine.ParameterException">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_picocli.CommandLine.ParameterException">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.ParameterException.html b/docs/apidocs/picocli/CommandLine.ParameterException.html
index 4df944da5..efe1ebed8 100644
--- a/docs/apidocs/picocli/CommandLine.ParameterException.html
+++ b/docs/apidocs/picocli/CommandLine.ParameterException.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.ParameterException (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.ParameterException (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.ParameterException (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.ParameterException (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.ParameterIndexGapException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParameterIndexGapException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.ParameterException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.ParameterException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.ParameterException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -75,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -140,13 +127,10 @@ <h2 title="Class CommandLine.ParameterException" class="title">Class CommandLine
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.ParameterException</span>
+<pre>public static class <span class="strong">CommandLine.ParameterException</span>
 extends <a href="../picocli/CommandLine.PicocliException.html" title="class in picocli">CommandLine.PicocliException</a></pre>
 <div class="block">Exception indicating something went wrong while parsing command line options.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../serialized-form.html#picocli.CommandLine.ParameterException">Serialized Form</a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../serialized-form.html#picocli.CommandLine.ParameterException">Serialized Form</a></dd></dl>
 </li>
 </ul>
 </div>
@@ -155,25 +139,25 @@ <h2 title="Class CommandLine.ParameterException" class="title">Class CommandLine
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParameterException.html#ParameterException-picocli.CommandLine-java.lang.String-">ParameterException</a></span>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                  java.lang.String&nbsp;msg)</code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.ParameterException.html#CommandLine.ParameterException(picocli.CommandLine,%20java.lang.String)">CommandLine.ParameterException</a></strong>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                              java.lang.String&nbsp;msg)</code>
 <div class="block">Constructs a new ParameterException with the specified CommandLine and error message.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParameterException.html#ParameterException-picocli.CommandLine-java.lang.String-java.lang.Exception-">ParameterException</a></span>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                  java.lang.String&nbsp;msg,
-                  java.lang.Exception&nbsp;ex)</code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.ParameterException.html#CommandLine.ParameterException(picocli.CommandLine,%20java.lang.String,%20java.lang.Exception)">CommandLine.ParameterException</a></strong>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                              java.lang.String&nbsp;msg,
+                              java.lang.Exception&nbsp;ex)</code>
 <div class="block">Constructs a new ParameterException with the specified CommandLine and error message.</div>
 </td>
 </tr>
@@ -182,32 +166,32 @@ <h3>Constructor Summary</h3>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParameterException.html#getCommandLine--">getCommandLine</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParameterException.html#getCommandLine()">getCommandLine</a></strong>()</code>
 <div class="block">Returns the <code>CommandLine</code> object for the (sub)command whose input could not be parsed.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Throwable">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
 <code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -223,57 +207,46 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ParameterException-picocli.CommandLine-java.lang.String-">
+<a name="CommandLine.ParameterException(picocli.CommandLine, java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>ParameterException</h4>
-<pre>public&nbsp;ParameterException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                          java.lang.String&nbsp;msg)</pre>
+<h4>CommandLine.ParameterException</h4>
+<pre>public&nbsp;CommandLine.ParameterException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                              java.lang.String&nbsp;msg)</pre>
 <div class="block">Constructs a new ParameterException with the specified CommandLine and error message.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>commandLine</code> - the command or subcommand whose input was invalid</dd>
-<dd><code>msg</code> - describes the problem</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>commandLine</code> - the command or subcommand whose input was invalid</dd><dd><code>msg</code> - describes the problem</dd><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd></dl>
 </li>
 </ul>
-<a name="ParameterException-picocli.CommandLine-java.lang.String-java.lang.Exception-">
+<a name="CommandLine.ParameterException(picocli.CommandLine, java.lang.String, java.lang.Exception)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ParameterException</h4>
-<pre>public&nbsp;ParameterException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                          java.lang.String&nbsp;msg,
-                          java.lang.Exception&nbsp;ex)</pre>
+<h4>CommandLine.ParameterException</h4>
+<pre>public&nbsp;CommandLine.ParameterException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                              java.lang.String&nbsp;msg,
+                              java.lang.Exception&nbsp;ex)</pre>
 <div class="block">Constructs a new ParameterException with the specified CommandLine and error message.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>commandLine</code> - the command or subcommand whose input was invalid</dd>
-<dd><code>msg</code> - describes the problem</dd>
-<dd><code>ex</code> - the exception that caused this ParameterException</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>commandLine</code> - the command or subcommand whose input was invalid</dd><dd><code>msg</code> - describes the problem</dd><dd><code>ex</code> - the exception that caused this ParameterException</dd><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd></dl>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="getCommandLine--">
+<a name="getCommandLine()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -281,12 +254,8 @@ <h3>Method Detail</h3>
 <h4>getCommandLine</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;getCommandLine()</pre>
 <div class="block">Returns the <code>CommandLine</code> object for the (sub)command whose input could not be parsed.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the <code>CommandLine</code> object for the (sub)command where parsing failed.</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the <code>CommandLine</code> object for the (sub)command where parsing failed.</dd><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd></dl>
 </li>
 </ul>
 </li>
@@ -297,11 +266,9 @@ <h4>getCommandLine</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -316,15 +283,15 @@ <h4>getCommandLine</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.ParameterIndexGapException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParameterIndexGapException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.ParameterException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.ParameterException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.ParameterException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -343,17 +310,17 @@ <h4>getCommandLine</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.ParameterIndexGapException.html b/docs/apidocs/picocli/CommandLine.ParameterIndexGapException.html
index 889a1f26e..a522a0ea1 100644
--- a/docs/apidocs/picocli/CommandLine.ParameterIndexGapException.html
+++ b/docs/apidocs/picocli/CommandLine.ParameterIndexGapException.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.ParameterIndexGapException (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.ParameterIndexGapException (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.ParameterIndexGapException (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.ParameterIndexGapException (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.ParameterIndexGapException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.ParameterIndexGapException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.ParameterIndexGapException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -69,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Throwable">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -135,13 +128,10 @@ <h2 title="Class CommandLine.ParameterIndexGapException" class="title">Class Com
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.ParameterIndexGapException</span>
+<pre>public static class <span class="strong">CommandLine.ParameterIndexGapException</span>
 extends <a href="../picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></pre>
 <div class="block">Exception indicating that there was a gap in the indices of the fields annotated with <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a>.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../serialized-form.html#picocli.CommandLine.ParameterIndexGapException">Serialized Form</a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../serialized-form.html#picocli.CommandLine.ParameterIndexGapException">Serialized Form</a></dd></dl>
 </li>
 </ul>
 </div>
@@ -150,36 +140,36 @@ <h2 title="Class CommandLine.ParameterIndexGapException" class="title">Class Com
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParameterIndexGapException.html#ParameterIndexGapException-java.lang.String-">ParameterIndexGapException</a></span>(java.lang.String&nbsp;msg)</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.ParameterIndexGapException.html#CommandLine.ParameterIndexGapException(java.lang.String)">CommandLine.ParameterIndexGapException</a></strong>(java.lang.String&nbsp;msg)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Throwable">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
 <code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -195,17 +185,17 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ParameterIndexGapException-java.lang.String-">
+<a name="CommandLine.ParameterIndexGapException(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ParameterIndexGapException</h4>
-<pre>public&nbsp;ParameterIndexGapException(java.lang.String&nbsp;msg)</pre>
+<h4>CommandLine.ParameterIndexGapException</h4>
+<pre>public&nbsp;CommandLine.ParameterIndexGapException(java.lang.String&nbsp;msg)</pre>
 </li>
 </ul>
 </li>
@@ -216,11 +206,9 @@ <h4>ParameterIndexGapException</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -235,15 +223,15 @@ <h4>ParameterIndexGapException</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.ParameterIndexGapException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.ParameterIndexGapException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.ParameterIndexGapException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -262,17 +250,17 @@ <h4>ParameterIndexGapException</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Throwable">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Parameters.html b/docs/apidocs/picocli/CommandLine.Parameters.html
index 672f24f6f..8b107550f 100644
--- a/docs/apidocs/picocli/CommandLine.Parameters.html
+++ b/docs/apidocs/picocli/CommandLine.Parameters.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Parameters (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Parameters (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Parameters (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Parameters (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.ParameterIndexGapException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.ParentCommand.html" title="annotation in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParameterIndexGapException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParentCommand.html" title="annotation in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Parameters.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Parameters.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Parameters.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -67,17 +60,15 @@
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
 <li>Required&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
+<li><a href="#annotation_type_optional_element_summary">Optional</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
+<li><a href="#annotation_type_element_detail">Element</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -93,11 +84,11 @@ <h2 title="Annotation Type CommandLine.Parameters" class="title">Annotation Type
 <hr>
 <br>
 <pre>@Retention(value=RUNTIME)
- @Target(value=FIELD)
-public static @interface <span class="memberNameLabel">CommandLine.Parameters</span></pre>
+@Target(value=FIELD)
+public static @interface <span class="strong">CommandLine.Parameters</span></pre>
 <div class="block"><p>
  Fields annotated with <code>@Parameters</code> will be initialized with positional parameters. By specifying the
- <a href="../picocli/CommandLine.Parameters.html#index--"><code>index()</code></a> attribute you can pick the exact position or a range of positional parameters to apply. If no
+ <a href="../picocli/CommandLine.Parameters.html#index()"><code>index()</code></a> attribute you can pick the exact position or a range of positional parameters to apply. If no
  index is specified, the field will get all positional parameters (and so it should be an array or a collection).
  </p><p>
  For example:
@@ -123,11 +114,11 @@ <h2 title="Annotation Type CommandLine.Parameters" class="title">Annotation Type
 <li class="blockList">
 <!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="annotation.type.optional.element.summary">
+<li class="blockList"><a name="annotation_type_optional_element_summary">
 <!--   -->
 </a>
 <h3>Optional Element Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
 <caption><span>Optional Elements</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -135,58 +126,58 @@ <h3>Optional Element Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Parameters.html#arity--">arity</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Parameters.html#arity()">arity</a></strong></code>
 <div class="block">Specifies the minimum number of required parameters and the maximum number of accepted parameters.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>java.lang.Class&lt;? extends <a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli">CommandLine.ITypeConverter</a>&lt;?&gt;&gt;[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Parameters.html#converter--">converter</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Parameters.html#converter()">converter</a></strong></code>
 <div class="block">Optionally specify one or more <a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><code>CommandLine.ITypeConverter</code></a> classes to use to convert the command line argument into
  a strongly typed value (or key-value pair for map fields).</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.String[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Parameters.html#description--">description</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Parameters.html#description()">description</a></strong></code>
 <div class="block">Description of the parameter(s), used when generating the usage documentation.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Parameters.html#hidden--">hidden</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Parameters.html#hidden()">hidden</a></strong></code>
 <div class="block">Set <code>hidden=true</code> if this parameter should not be included in the usage message.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Parameters.html#index--">index</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Parameters.html#index()">index</a></strong></code>
 <div class="block">Specify an index ("0", or "1", etc.) to pick which of the command line arguments should be assigned to this
  field.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Parameters.html#paramLabel--">paramLabel</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Parameters.html#paramLabel()">paramLabel</a></strong></code>
 <div class="block">Specify a <code>paramLabel</code> for the parameter to be used in the usage help message.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli">CommandLine.Help.Visibility</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Parameters.html#showDefaultValue--">showDefaultValue</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Parameters.html#showDefaultValue()">showDefaultValue</a></strong></code>
 <div class="block">Use this attribute to control for a specific positional parameter whether its default value should be shown in the usage
  help message.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Parameters.html#split--">split</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Parameters.html#split()">split</a></strong></code>
 <div class="block">Specify a regular expression to use to split positional parameter values before applying them to the field.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.Class&lt;?&gt;[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Parameters.html#type--">type</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Parameters.html#type()">type</a></strong></code>
 <div class="block">
  Optionally specify a <code>type</code> to control exactly what Class the positional parameter should be converted
  to.</div>
@@ -203,11 +194,11 @@ <h3>Optional Element Summary</h3>
 <li class="blockList">
 <!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="annotation.type.element.detail">
+<li class="blockList"><a name="annotation_type_element_detail">
 <!--   -->
 </a>
 <h3>Element Detail</h3>
-<a name="index--">
+<a name="index()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -217,20 +208,14 @@ <h4>index</h4>
 <div class="block">Specify an index ("0", or "1", etc.) to pick which of the command line arguments should be assigned to this
  field. For array or Collection fields, you can also specify an index range ("0..3", or "2..*", etc.) to assign
  a subset of the command line arguments to this field. The default is "*", meaning all command line arguments.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an index or range specifying which of the command line arguments should be assigned to this field</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>an index or range specifying which of the command line arguments should be assigned to this field</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>"*"</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="description--">
+<a name="description()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -238,20 +223,14 @@ <h4>index</h4>
 <h4>description</h4>
 <pre>public abstract&nbsp;java.lang.String[]&nbsp;description</pre>
 <div class="block">Description of the parameter(s), used when generating the usage documentation.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the description of the parameter(s)</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the description of the parameter(s)</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>{}</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="arity--">
+<a name="arity()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -260,23 +239,17 @@ <h4>arity</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;arity</pre>
 <div class="block">Specifies the minimum number of required parameters and the maximum number of accepted parameters. If a
  positive arity is declared, and the user specifies an insufficient number of parameters on the command line,
- <a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli"><code>CommandLine.MissingParameterException</code></a> is thrown by the <a href="../picocli/CommandLine.html#parse-java.lang.String...-"><code>CommandLine.parse(String...)</code></a> method.
+ <a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli"><code>CommandLine.MissingParameterException</code></a> is thrown by the <a href="../picocli/CommandLine.html#parse(java.lang.String...)"><code>CommandLine.parse(String...)</code></a> method.
  <p>The default depends on the type of the parameter: booleans require no parameters, arrays and Collections
  accept zero to any number of parameters, and any other type accepts one parameter.</p></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the range of minimum and maximum parameters accepted by this command</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the range of minimum and maximum parameters accepted by this command</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>""</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="paramLabel--">
+<a name="paramLabel()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -293,20 +266,14 @@ <h4>paramLabel</h4>
  Usage: &lt;main class&gt; [FILE...]
  [FILE...]       path of the input FILE(s)
  </pre></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>name of the positional parameter used in the usage help message</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>name of the positional parameter used in the usage help message</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>""</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="type--">
+<a name="type()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -324,7 +291,7 @@ <h4>type</h4>
  to ensure that positional parameter values are converted to <code>Short</code> before adding an element to the array.
  </p><p>
  Picocli will use the <a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><code>CommandLine.ITypeConverter</code></a> that is
- <a href="../picocli/CommandLine.html#registerConverter-java.lang.Class-picocli.CommandLine.ITypeConverter-">registered</a> for the specified type to convert
+ <a href="../picocli/CommandLine.html#registerConverter(java.lang.Class,%20picocli.CommandLine.ITypeConverter)">registered</a> for the specified type to convert
  the raw String values before modifying the field value.
  </p><p>
  Prior to 2.0, the <code>type</code> attribute was necessary for <code>Collection</code> and <code>Map</code> fields,
@@ -338,20 +305,14 @@ <h4>type</h4>
  If the field type is a raw collection or a raw map, and you want it to contain other values than Strings,
  or if the generic type's type arguments are interfaces or abstract classes, you may
  specify a <code>type</code> attribute to control the Class that the positional parameter should be converted to.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the type(s) to convert the raw String values</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the type(s) to convert the raw String values</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>{}</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="converter--">
+<a name="converter()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -364,22 +325,14 @@ <h4>converter</h4>
  <p>For example, for a specific field you may want to use a converter that maps the constant names defined
  in <code>java.sql.Types</code> to the <code>int</code> value of these constants, but any other <code>int</code> fields should
  not be affected by this and should continue to use the standard int converter that parses numeric values.</p></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the type converter(s) to use to convert String values to strongly typed values for this field</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#registerConverter-java.lang.Class-picocli.CommandLine.ITypeConverter-"><code>CommandLine.registerConverter(Class, ITypeConverter)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the type converter(s) to use to convert String values to strongly typed values for this field</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#registerConverter(java.lang.Class,%20picocli.CommandLine.ITypeConverter)"><code>CommandLine.registerConverter(Class, ITypeConverter)</code></a></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>{}</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="split--">
+<a name="split()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -388,22 +341,14 @@ <h4>split</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;split</pre>
 <div class="block">Specify a regular expression to use to split positional parameter values before applying them to the field.
  All elements resulting from the split are added to the array or Collection. Ignored for single-value fields.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a regular expression to split operand values or <code>""</code> if the value should not be split</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><code>String.split(String)</code></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a regular expression to split operand values or <code>""</code> if the value should not be split</dd><dt><span class="strong">See Also:</span></dt><dd><code>String.split(String)</code></dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>""</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="hidden--">
+<a name="hidden()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -411,20 +356,14 @@ <h4>split</h4>
 <h4>hidden</h4>
 <pre>public abstract&nbsp;boolean&nbsp;hidden</pre>
 <div class="block">Set <code>hidden=true</code> if this parameter should not be included in the usage message.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>whether this parameter should be excluded from the usage message</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>whether this parameter should be excluded from the usage message</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>false</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="showDefaultValue--">
+<a name="showDefaultValue()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -432,13 +371,10 @@ <h4>hidden</h4>
 <h4>showDefaultValue</h4>
 <pre>public abstract&nbsp;<a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli">CommandLine.Help.Visibility</a>&nbsp;showDefaultValue</pre>
 <div class="block">Use this attribute to control for a specific positional parameter whether its default value should be shown in the usage
- help message. If not specified, the default value is only shown when the <a href="../picocli/CommandLine.Command.html#showDefaultValues--"><code>CommandLine.Command.showDefaultValues()</code></a>
+ help message. If not specified, the default value is only shown when the <a href="../picocli/CommandLine.Command.html#showDefaultValues()"><code>CommandLine.Command.showDefaultValues()</code></a>
  is set <code>true</code> on the command. Use this attribute to specify whether the default value
  for this specific positional parameter should always be shown or never be shown, regardless of the command setting.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>whether this positional parameter's default value should be shown in the usage help message</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>whether this positional parameter's default value should be shown in the usage help message</dd></dl>
 <dl>
 <dt>Default:</dt>
 <dd>picocli.CommandLine.Help.Visibility.ON_DEMAND</dd>
@@ -453,11 +389,9 @@ <h4>showDefaultValue</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -472,15 +406,15 @@ <h4>showDefaultValue</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.ParameterIndexGapException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.ParentCommand.html" title="annotation in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParameterIndexGapException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParentCommand.html" title="annotation in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Parameters.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Parameters.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Parameters.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -497,17 +431,15 @@ <h4>showDefaultValue</h4>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
 <li>Required&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
+<li><a href="#annotation_type_optional_element_summary">Optional</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
+<li><a href="#annotation_type_element_detail">Element</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.ParentCommand.html b/docs/apidocs/picocli/CommandLine.ParentCommand.html
index e543d403f..4cc4adf5e 100644
--- a/docs/apidocs/picocli/CommandLine.ParentCommand.html
+++ b/docs/apidocs/picocli/CommandLine.ParentCommand.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.ParentCommand (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.ParentCommand (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.ParentCommand (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.ParentCommand (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.ParseResult.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParseResult.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.ParentCommand.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.ParentCommand.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.ParentCommand.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -67,17 +60,15 @@
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
 <li>Required&nbsp;|&nbsp;</li>
 <li>Optional</li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
 <li>Element</li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -93,8 +84,8 @@ <h2 title="Annotation Type CommandLine.ParentCommand" class="title">Annotation T
 <hr>
 <br>
 <pre>@Retention(value=RUNTIME)
- @Target(value=FIELD)
-public static @interface <span class="memberNameLabel">CommandLine.ParentCommand</span></pre>
+@Target(value=FIELD)
+public static @interface <span class="strong">CommandLine.ParentCommand</span></pre>
 <div class="block"><p>
  Fields annotated with <code>@ParentCommand</code> will be initialized with the parent command of the current subcommand.
  If the current command does not have a parent command, this annotation has no effect.
@@ -123,21 +114,17 @@ <h2 title="Annotation Type CommandLine.ParentCommand" class="title">Annotation T
      }
  }
  </pre></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.2</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>2.2</dd></dl>
 </li>
 </ul>
 </div>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -152,15 +139,15 @@ <h2 title="Annotation Type CommandLine.ParentCommand" class="title">Annotation T
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.ParseResult.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParseResult.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.ParentCommand.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.ParentCommand.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.ParentCommand.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -177,17 +164,15 @@ <h2 title="Annotation Type CommandLine.ParentCommand" class="title">Annotation T
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
 <li>Required&nbsp;|&nbsp;</li>
 <li>Optional</li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
 <li>Element</li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.ParseResult.Builder.html b/docs/apidocs/picocli/CommandLine.ParseResult.Builder.html
index 1e543b818..deaeb7c1d 100644
--- a/docs/apidocs/picocli/CommandLine.ParseResult.Builder.html
+++ b/docs/apidocs/picocli/CommandLine.ParseResult.Builder.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.ParseResult.Builder (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.ParseResult.Builder (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.ParseResult.Builder (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.ParseResult.Builder (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.ParseResult.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.PicocliException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParseResult.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.PicocliException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.ParseResult.Builder.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.ParseResult.Builder.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.ParseResult.Builder.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -76,16 +63,16 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -112,7 +99,7 @@ <h2 title="Class CommandLine.ParseResult.Builder" class="title">Class CommandLin
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.ParseResult.Builder</span>
+<pre>public static class <span class="strong">CommandLine.ParseResult.Builder</span>
 extends java.lang.Object</pre>
 <div class="block">Builds immutable <code>ParseResult</code> instances.</div>
 </li>
@@ -123,70 +110,70 @@ <h2 title="Class CommandLine.ParseResult.Builder" class="title">Class CommandLin
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.Builder.html#add-picocli.CommandLine.Model.ArgSpec-int-">add</a></span>(<a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a>&nbsp;arg,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.Builder.html#add(picocli.CommandLine.Model.ArgSpec,%20int)">add</a></strong>(<a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a>&nbsp;arg,
    int&nbsp;position)</code>
 <div class="block">Adds the specified <code>OptionSpec</code> or <code>PositionalParamSpec</code> to the list of options and parameters
  that were matched on the command line.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.Builder.html#addOption-picocli.CommandLine.Model.OptionSpec-">addOption</a></span>(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.Builder.html#addOption(picocli.CommandLine.Model.OptionSpec)">addOption</a></strong>(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option)</code>
 <div class="block">Adds the specified <code>OptionSpec</code> to the list of options that were matched on the command line.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.Builder.html#addPositionalParam-picocli.CommandLine.Model.PositionalParamSpec-int-">addPositionalParam</a></span>(<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&nbsp;positionalParam,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.Builder.html#addPositionalParam(picocli.CommandLine.Model.PositionalParamSpec,%20int)">addPositionalParam</a></strong>(<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&nbsp;positionalParam,
                   int&nbsp;position)</code>
 <div class="block">Adds the specified <code>PositionalParamSpec</code> to the list of parameters that were matched on the command line.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.Builder.html#addUnmatched-java.util.Stack-">addUnmatched</a></span>(java.util.Stack&lt;java.lang.String&gt;&nbsp;args)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.Builder.html#addUnmatched(java.util.Stack)">addUnmatched</a></strong>(java.util.Stack&lt;java.lang.String&gt;&nbsp;args)</code>
 <div class="block">Adds all elements of the specified command line arguments stack to the list of unmatched command line arguments.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.Builder.html#addUnmatched-java.lang.String-">addUnmatched</a></span>(java.lang.String&nbsp;arg)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.Builder.html#addUnmatched(java.lang.String)">addUnmatched</a></strong>(java.lang.String&nbsp;arg)</code>
 <div class="block">Adds the specified command line argument to the list of unmatched command line arguments.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.Builder.html#build--">build</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.Builder.html#build()">build</a></strong>()</code>
 <div class="block">Creates and returns a new <code>ParseResult</code> instance for this builder's configuration.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.Builder.html#originalArgs-java.lang.String:A-">originalArgs</a></span>(java.lang.String[]&nbsp;originalArgs)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.Builder.html#originalArgs(java.lang.String[])">originalArgs</a></strong>(java.lang.String[]&nbsp;originalArgs)</code>
 <div class="block">Sets the specified command line arguments that were parsed.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.Builder.html#subcommand-picocli.CommandLine.ParseResult-">subcommand</a></span>(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;subcommand)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.Builder.html#subcommand(picocli.CommandLine.ParseResult)">subcommand</a></strong>(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;subcommand)</code>
 <div class="block">Sets the specified <code>ParseResult</code> for a subcommand that was matched on the command line.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -202,11 +189,11 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="build--">
+<a name="build()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -216,26 +203,21 @@ <h4>build</h4>
 <div class="block">Creates and returns a new <code>ParseResult</code> instance for this builder's configuration.</div>
 </li>
 </ul>
-<a name="add-picocli.CommandLine.Model.ArgSpec-int-">
+<a name="add(picocli.CommandLine.Model.ArgSpec, int)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>add</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a>&nbsp;add(<a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a>&nbsp;arg,
-                                           int&nbsp;position)</pre>
+                                  int&nbsp;position)</pre>
 <div class="block">Adds the specified <code>OptionSpec</code> or <code>PositionalParamSpec</code> to the list of options and parameters
  that were matched on the command line.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>arg</code> - the matched <code>OptionSpec</code> or <code>PositionalParamSpec</code></dd>
-<dd><code>position</code> - the command line position at which the  <code>PositionalParamSpec</code> was matched. Ignored for <code>OptionSpec</code>s.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this builder for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>arg</code> - the matched <code>OptionSpec</code> or <code>PositionalParamSpec</code></dd><dd><code>position</code> - the command line position at which the  <code>PositionalParamSpec</code> was matched. Ignored for <code>OptionSpec</code>s.</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this builder for method chaining</dd></dl>
 </li>
 </ul>
-<a name="addOption-picocli.CommandLine.Model.OptionSpec-">
+<a name="addOption(picocli.CommandLine.Model.OptionSpec)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -245,25 +227,20 @@ <h4>addOption</h4>
 <div class="block">Adds the specified <code>OptionSpec</code> to the list of options that were matched on the command line.</div>
 </li>
 </ul>
-<a name="addPositionalParam-picocli.CommandLine.Model.PositionalParamSpec-int-">
+<a name="addPositionalParam(picocli.CommandLine.Model.PositionalParamSpec, int)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>addPositionalParam</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a>&nbsp;addPositionalParam(<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&nbsp;positionalParam,
-                                                          int&nbsp;position)</pre>
+                                                 int&nbsp;position)</pre>
 <div class="block">Adds the specified <code>PositionalParamSpec</code> to the list of parameters that were matched on the command line.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>positionalParam</code> - the matched <code>PositionalParamSpec</code></dd>
-<dd><code>position</code> - the command line position at which the  <code>PositionalParamSpec</code> was matched.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this builder for method chaining</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>positionalParam</code> - the matched <code>PositionalParamSpec</code></dd><dd><code>position</code> - the command line position at which the  <code>PositionalParamSpec</code> was matched.</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this builder for method chaining</dd></dl>
 </li>
 </ul>
-<a name="addUnmatched-java.lang.String-">
+<a name="addUnmatched(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -273,7 +250,7 @@ <h4>addUnmatched</h4>
 <div class="block">Adds the specified command line argument to the list of unmatched command line arguments.</div>
 </li>
 </ul>
-<a name="addUnmatched-java.util.Stack-">
+<a name="addUnmatched(java.util.Stack)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -283,7 +260,7 @@ <h4>addUnmatched</h4>
 <div class="block">Adds all elements of the specified command line arguments stack to the list of unmatched command line arguments.</div>
 </li>
 </ul>
-<a name="subcommand-picocli.CommandLine.ParseResult-">
+<a name="subcommand(picocli.CommandLine.ParseResult)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -293,7 +270,7 @@ <h4>subcommand</h4>
 <div class="block">Sets the specified <code>ParseResult</code> for a subcommand that was matched on the command line.</div>
 </li>
 </ul>
-<a name="originalArgs-java.lang.String:A-">
+<a name="originalArgs(java.lang.String[])">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -311,11 +288,9 @@ <h4>originalArgs</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -330,15 +305,15 @@ <h4>originalArgs</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.ParseResult.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.PicocliException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParseResult.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.PicocliException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.ParseResult.Builder.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.ParseResult.Builder.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.ParseResult.Builder.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -358,16 +333,16 @@ <h4>originalArgs</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.ParseResult.html b/docs/apidocs/picocli/CommandLine.ParseResult.html
index 0e4bab3c5..608f96219 100644
--- a/docs/apidocs/picocli/CommandLine.ParseResult.html
+++ b/docs/apidocs/picocli/CommandLine.ParseResult.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.ParseResult (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.ParseResult (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.ParseResult (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.ParseResult (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":9,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.ParentCommand.html" title="annotation in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParentCommand.html" title="annotation in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.ParseResult.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.ParseResult.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.ParseResult.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -73,19 +60,19 @@
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#nested_class_summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -112,13 +99,11 @@ <h2 title="Class CommandLine.ParseResult" class="title">Class CommandLine.ParseR
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.ParseResult</span>
+<pre>public static class <span class="strong">CommandLine.ParseResult</span>
 extends java.lang.Object</pre>
 <div class="block">Encapsulates the result of parsing an array of command line arguments.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -127,11 +112,11 @@ <h2 title="Class CommandLine.ParseResult" class="title">Class CommandLine.ParseR
 <li class="blockList">
 <!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="nested.class.summary">
+<li class="blockList"><a name="nested_class_summary">
 <!--   -->
 </a>
 <h3>Nested Class Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
 <caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -139,7 +124,7 @@ <h3>Nested Class Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></strong></code>
 <div class="block">Builds immutable <code>ParseResult</code> instances.</div>
 </td>
 </tr>
@@ -148,238 +133,238 @@ <h3>Nested Class Summary</h3>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#asCommandLineList--">asCommandLineList</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#asCommandLineList()">asCommandLineList</a></strong>()</code>
 <div class="block">Returns this <code>ParseResult</code> as a list of <code>CommandLine</code> objects, one for each matched command/subcommand.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#builder-picocli.CommandLine.Model.CommandSpec-">builder</a></span>(<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;commandSpec)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#builder(picocli.CommandLine.Model.CommandSpec)">builder</a></strong>(<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;commandSpec)</code>
 <div class="block">Creates and returns a new <code>ParseResult.Builder</code> for the specified command spec.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#commandSpec--">commandSpec</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#commandSpec()">commandSpec</a></strong>()</code>
 <div class="block">Returns the <code>CommandSpec</code> for the matched command.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#hasOption-char-">hasOption</a></span>(char&nbsp;shortName)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#hasOption(char)">hasOption</a></strong>(char&nbsp;shortName)</code>
 <div class="block">Returns whether an option whose aliases include the specified short name was matched on the command line.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#hasOption-picocli.CommandLine.Model.OptionSpec-">hasOption</a></span>(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#hasOption(picocli.CommandLine.Model.OptionSpec)">hasOption</a></strong>(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option)</code>
 <div class="block">Returns whether the specified option was matched on the command line.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#hasOption-java.lang.String-">hasOption</a></span>(java.lang.String&nbsp;name)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#hasOption(java.lang.String)">hasOption</a></strong>(java.lang.String&nbsp;name)</code>
 <div class="block">Returns whether an option whose aliases include the specified name was matched on the command line.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#hasPositional-picocli.CommandLine.Model.PositionalParamSpec-">hasPositional</a></span>(<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&nbsp;positional)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#hasPositional(picocli.CommandLine.Model.PositionalParamSpec)">hasPositional</a></strong>(<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&nbsp;positional)</code>
 <div class="block">Returns whether the specified positional parameter was matched on the command line.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#hasPositional-int-">hasPositional</a></span>(int&nbsp;position)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#hasPositional(int)">hasPositional</a></strong>(int&nbsp;position)</code>
 <div class="block">Returns whether a positional parameter was matched at the specified position.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#hasSubcommand--">hasSubcommand</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#hasSubcommand()">hasSubcommand</a></strong>()</code>
 <div class="block">Returns <code>true</code> if a subcommand was matched on the command line, <code>false</code> otherwise.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#isUsageHelpRequested--">isUsageHelpRequested</a></span>()</code>
-<div class="block">Returns <code>true</code> if one of the options that was matched on the command line is a <a href="../picocli/CommandLine.Model.OptionSpec.html#usageHelp--"><code>usageHelp</code></a> option.</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#isUsageHelpRequested()">isUsageHelpRequested</a></strong>()</code>
+<div class="block">Returns <code>true</code> if one of the options that was matched on the command line is a <a href="../picocli/CommandLine.Model.OptionSpec.html#usageHelp()"><code>usageHelp</code></a> option.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#isVersionHelpRequested--">isVersionHelpRequested</a></span>()</code>
-<div class="block">Returns <code>true</code> if one of the options that was matched on the command line is a <a href="../picocli/CommandLine.Model.OptionSpec.html#versionHelp--"><code>versionHelp</code></a> option.</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#isVersionHelpRequested()">isVersionHelpRequested</a></strong>()</code>
+<div class="block">Returns <code>true</code> if one of the options that was matched on the command line is a <a href="../picocli/CommandLine.Model.OptionSpec.html#versionHelp()"><code>versionHelp</code></a> option.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#option-char-">option</a></span>(char&nbsp;shortName)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#option(char)">option</a></strong>(char&nbsp;shortName)</code>
 <div class="block">Returns the option with the specified short name, or <code>null</code> if no option with that name was matched on the command one.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#option-java.lang.String-">option</a></span>(java.lang.String&nbsp;name)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#option(java.lang.String)">option</a></strong>(java.lang.String&nbsp;name)</code>
 <div class="block">Returns the option with the specified name, or <code>null</code> if no option with that name was matched on the command one.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#options--">options</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#options()">options</a></strong>()</code>
 <div class="block">Returns a list of matched options, in the order they were found on the command line.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>&lt;T&gt;&nbsp;T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#optionValue-char-T-">optionValue</a></span>(char&nbsp;shortName,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#optionValue(char,%20T)">optionValue</a></strong>(char&nbsp;shortName,
            T&nbsp;defaultValue)</code>
-<div class="block">Returns the command line argument value of the option with the specified name, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type--">type</a> of the option, or the specified default value if no option with the specified name was matched.</div>
+<div class="block">Returns the command line argument value of the option with the specified name, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type()">type</a> of the option, or the specified default value if no option with the specified name was matched.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>&lt;T&gt;&nbsp;T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#optionValue-picocli.CommandLine.Model.OptionSpec-T-">optionValue</a></span>(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#optionValue(picocli.CommandLine.Model.OptionSpec,%20T)">optionValue</a></strong>(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option,
            T&nbsp;defaultValue)</code>
-<div class="block">Returns the command line argument value of the specified option, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type--">type</a> of the option, or the specified default value if the specified option is <code>null</code>.</div>
+<div class="block">Returns the command line argument value of the specified option, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type()">type</a> of the option, or the specified default value if the specified option is <code>null</code>.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>&lt;T&gt;&nbsp;T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#optionValue-java.lang.String-T-">optionValue</a></span>(java.lang.String&nbsp;name,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#optionValue(java.lang.String,%20T)">optionValue</a></strong>(java.lang.String&nbsp;name,
            T&nbsp;defaultValue)</code>
-<div class="block">Returns the command line argument value of the option with the specified name, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type--">type</a> of the option, or the specified default value if no option with the specified name was matched.</div>
+<div class="block">Returns the command line argument value of the option with the specified name, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type()">type</a> of the option, or the specified default value if no option with the specified name was matched.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;java.lang.String&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#originalArgs--">originalArgs</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#originalArgs()">originalArgs</a></strong>()</code>
 <div class="block">Returns the command line arguments that were parsed.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#positional-int-">positional</a></span>(int&nbsp;position)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#positional(int)">positional</a></strong>(int&nbsp;position)</code>
 <div class="block">Returns the <code>PositionalParamSpec</code> that was matched at the specified position, or <code>null</code> if no positional parameters were matched at that position.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#positionalParams--">positionalParams</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#positionalParams()">positionalParams</a></strong>()</code>
 <div class="block">Returns a list of matched positional parameters.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>&lt;T&gt;&nbsp;T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#positionalValue-picocli.CommandLine.Model.PositionalParamSpec-T-">positionalValue</a></span>(<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&nbsp;positional,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#positionalValue(picocli.CommandLine.Model.PositionalParamSpec,%20T)">positionalValue</a></strong>(<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&nbsp;positional,
                T&nbsp;defaultValue)</code>
-<div class="block">Returns the command line argument value of the specified positional parameter, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type--">type</a> of the positional parameter, or the specified default value if the specified positional parameter is <code>null</code>.</div>
+<div class="block">Returns the command line argument value of the specified positional parameter, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type()">type</a> of the positional parameter, or the specified default value if the specified positional parameter is <code>null</code>.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>&lt;T&gt;&nbsp;T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#positionalValue-int-T-">positionalValue</a></span>(int&nbsp;position,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#positionalValue(int,%20T)">positionalValue</a></strong>(int&nbsp;position,
                T&nbsp;defaultValue)</code>
-<div class="block">Returns the command line argument value of the positional parameter at the specified position, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type--">type</a> of the positional parameter, or the specified default value if no positional parameter was matched at that position.</div>
+<div class="block">Returns the command line argument value of the positional parameter at the specified position, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type()">type</a> of the positional parameter, or the specified default value if no positional parameter was matched at that position.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#rawOptionValue-char-">rawOptionValue</a></span>(char&nbsp;shortName)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#rawOptionValue(char)">rawOptionValue</a></strong>(char&nbsp;shortName)</code>
 <div class="block">Returns the command line argument String value of the option with the specified name, or <code>null</code> if no option with the specified name was matched.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#rawOptionValue-char-java.lang.String-">rawOptionValue</a></span>(char&nbsp;shortName,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#rawOptionValue(char,%20java.lang.String)">rawOptionValue</a></strong>(char&nbsp;shortName,
               java.lang.String&nbsp;defaultValue)</code>
 <div class="block">Returns the command line argument String value of the option with the specified name, or the specified default value if no option with the specified name was matched.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#rawOptionValue-picocli.CommandLine.Model.OptionSpec-">rawOptionValue</a></span>(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#rawOptionValue(picocli.CommandLine.Model.OptionSpec)">rawOptionValue</a></strong>(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option)</code>
 <div class="block">Returns the command line argument String value of the specified option, or <code>null</code> if the specified option is <code>null</code>.</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#rawOptionValue-picocli.CommandLine.Model.OptionSpec-java.lang.String-">rawOptionValue</a></span>(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#rawOptionValue(picocli.CommandLine.Model.OptionSpec,%20java.lang.String)">rawOptionValue</a></strong>(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option,
               java.lang.String&nbsp;defaultValue)</code>
 <div class="block">Returns the command line argument String value of the specified option, or the specified default value if the specified option is <code>null</code>.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#rawOptionValue-java.lang.String-">rawOptionValue</a></span>(java.lang.String&nbsp;name)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#rawOptionValue(java.lang.String)">rawOptionValue</a></strong>(java.lang.String&nbsp;name)</code>
 <div class="block">Returns the command line argument String value of the option with the specified name, or <code>null</code> if no option with the specified name was matched.</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#rawOptionValue-java.lang.String-java.lang.String-">rawOptionValue</a></span>(java.lang.String&nbsp;name,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#rawOptionValue(java.lang.String,%20java.lang.String)">rawOptionValue</a></strong>(java.lang.String&nbsp;name,
               java.lang.String&nbsp;defaultValue)</code>
 <div class="block">Returns the command line argument String value of the option with the specified name, or the specified default value if no option with the specified name was matched.</div>
 </td>
 </tr>
-<tr id="i28" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.util.List&lt;java.lang.String&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#rawOptionValues-char-">rawOptionValues</a></span>(char&nbsp;shortName)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#rawOptionValues(char)">rawOptionValues</a></strong>(char&nbsp;shortName)</code>
 <div class="block">Returns all command line argument String values matched for the option with the specified name, or an empty list if no option with the specified name was matched.</div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;java.lang.String&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#rawOptionValues-picocli.CommandLine.Model.OptionSpec-">rawOptionValues</a></span>(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#rawOptionValues(picocli.CommandLine.Model.OptionSpec)">rawOptionValues</a></strong>(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option)</code>
 <div class="block">Returns all command line argument String values matched for the specified option, or an empty list if the specified option is <code>null</code>.</div>
 </td>
 </tr>
-<tr id="i30" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.util.List&lt;java.lang.String&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#rawOptionValues-java.lang.String-">rawOptionValues</a></span>(java.lang.String&nbsp;name)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#rawOptionValues(java.lang.String)">rawOptionValues</a></strong>(java.lang.String&nbsp;name)</code>
 <div class="block">Returns all command line argument String values matched for the option with the specified name, or an empty list if no option with the specified name was matched.</div>
 </td>
 </tr>
-<tr id="i31" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#rawPositionalValue-int-">rawPositionalValue</a></span>(int&nbsp;position)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#rawPositionalValue(int)">rawPositionalValue</a></strong>(int&nbsp;position)</code>
 <div class="block">Returns the command line argument String value of the positional parameter at the specified position, or <code>null</code> if no positional parameter was matched at that position.</div>
 </td>
 </tr>
-<tr id="i32" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#rawPositionalValue-int-java.lang.String-">rawPositionalValue</a></span>(int&nbsp;position,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#rawPositionalValue(int,%20java.lang.String)">rawPositionalValue</a></strong>(int&nbsp;position,
                   java.lang.String&nbsp;defaultValue)</code>
 <div class="block">Returns the command line argument String value of the positional parameter at the specified position, or the specified default value if no positional parameter was matched at that position.</div>
 </td>
 </tr>
-<tr id="i33" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#subcommand--">subcommand</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#subcommand()">subcommand</a></strong>()</code>
 <div class="block">Returns the <code>ParseResult</code> for the subcommand of this command that was matched on the command line, or <code>null</code> if no subcommand was matched.</div>
 </td>
 </tr>
-<tr id="i34" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.util.List&lt;java.lang.String&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html#unmatched--">unmatched</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html#unmatched()">unmatched</a></strong>()</code>
 <div class="block">Returns a list of command line arguments that did not match any options or positional parameters.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -395,11 +380,11 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="builder-picocli.CommandLine.Model.CommandSpec-">
+<a name="builder(picocli.CommandLine.Model.CommandSpec)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -409,7 +394,7 @@ <h4>builder</h4>
 <div class="block">Creates and returns a new <code>ParseResult.Builder</code> for the specified command spec.</div>
 </li>
 </ul>
-<a name="option-char-">
+<a name="option(char)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -419,7 +404,7 @@ <h4>option</h4>
 <div class="block">Returns the option with the specified short name, or <code>null</code> if no option with that name was matched on the command one.</div>
 </li>
 </ul>
-<a name="option-java.lang.String-">
+<a name="option(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -427,14 +412,11 @@ <h4>option</h4>
 <h4>option</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option(java.lang.String&nbsp;name)</pre>
 <div class="block">Returns the option with the specified name, or <code>null</code> if no option with that name was matched on the command one.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - used to search the matched options. May be an alias of the option name that was actually specified on the command line.
-      The specified name may include option name prefix characters or not.</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>name</code> - used to search the matched options. May be an alias of the option name that was actually specified on the command line.
+      The specified name may include option name prefix characters or not.</dd></dl>
 </li>
 </ul>
-<a name="positional-int-">
+<a name="positional(int)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -444,7 +426,7 @@ <h4>positional</h4>
 <div class="block">Returns the <code>PositionalParamSpec</code> that was matched at the specified position, or <code>null</code> if no positional parameters were matched at that position.</div>
 </li>
 </ul>
-<a name="commandSpec--">
+<a name="commandSpec()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -454,7 +436,7 @@ <h4>commandSpec</h4>
 <div class="block">Returns the <code>CommandSpec</code> for the matched command.</div>
 </li>
 </ul>
-<a name="hasOption-char-">
+<a name="hasOption(char)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -462,13 +444,10 @@ <h4>commandSpec</h4>
 <h4>hasOption</h4>
 <pre>public&nbsp;boolean&nbsp;hasOption(char&nbsp;shortName)</pre>
 <div class="block">Returns whether an option whose aliases include the specified short name was matched on the command line.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>shortName</code> - used to search the matched options. May be an alias of the option name that was actually specified on the command line.</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>shortName</code> - used to search the matched options. May be an alias of the option name that was actually specified on the command line.</dd></dl>
 </li>
 </ul>
-<a name="hasOption-java.lang.String-">
+<a name="hasOption(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -476,14 +455,11 @@ <h4>hasOption</h4>
 <h4>hasOption</h4>
 <pre>public&nbsp;boolean&nbsp;hasOption(java.lang.String&nbsp;name)</pre>
 <div class="block">Returns whether an option whose aliases include the specified name was matched on the command line.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - used to search the matched options. May be an alias of the option name that was actually specified on the command line.
-      The specified name may include option name prefix characters or not.</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>name</code> - used to search the matched options. May be an alias of the option name that was actually specified on the command line.
+      The specified name may include option name prefix characters or not.</dd></dl>
 </li>
 </ul>
-<a name="hasOption-picocli.CommandLine.Model.OptionSpec-">
+<a name="hasOption(picocli.CommandLine.Model.OptionSpec)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -493,7 +469,7 @@ <h4>hasOption</h4>
 <div class="block">Returns whether the specified option was matched on the command line.</div>
 </li>
 </ul>
-<a name="hasPositional-int-">
+<a name="hasPositional(int)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -503,7 +479,7 @@ <h4>hasPositional</h4>
 <div class="block">Returns whether a positional parameter was matched at the specified position.</div>
 </li>
 </ul>
-<a name="hasPositional-picocli.CommandLine.Model.PositionalParamSpec-">
+<a name="hasPositional(picocli.CommandLine.Model.PositionalParamSpec)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -513,7 +489,7 @@ <h4>hasPositional</h4>
 <div class="block">Returns whether the specified positional parameter was matched on the command line.</div>
 </li>
 </ul>
-<a name="options--">
+<a name="options()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -523,7 +499,7 @@ <h4>options</h4>
 <div class="block">Returns a list of matched options, in the order they were found on the command line.</div>
 </li>
 </ul>
-<a name="positionalParams--">
+<a name="positionalParams()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -533,7 +509,7 @@ <h4>positionalParams</h4>
 <div class="block">Returns a list of matched positional parameters.</div>
 </li>
 </ul>
-<a name="unmatched--">
+<a name="unmatched()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -543,7 +519,7 @@ <h4>unmatched</h4>
 <div class="block">Returns a list of command line arguments that did not match any options or positional parameters.</div>
 </li>
 </ul>
-<a name="originalArgs--">
+<a name="originalArgs()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -553,7 +529,7 @@ <h4>originalArgs</h4>
 <div class="block">Returns the command line arguments that were parsed.</div>
 </li>
 </ul>
-<a name="rawOptionValue-char-">
+<a name="rawOptionValue(char)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -563,7 +539,7 @@ <h4>rawOptionValue</h4>
 <div class="block">Returns the command line argument String value of the option with the specified name, or <code>null</code> if no option with the specified name was matched.</div>
 </li>
 </ul>
-<a name="rawOptionValue-java.lang.String-">
+<a name="rawOptionValue(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -571,14 +547,11 @@ <h4>rawOptionValue</h4>
 <h4>rawOptionValue</h4>
 <pre>public&nbsp;java.lang.String&nbsp;rawOptionValue(java.lang.String&nbsp;name)</pre>
 <div class="block">Returns the command line argument String value of the option with the specified name, or <code>null</code> if no option with the specified name was matched.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - used to search the matched options. May be an alias of the option name that was actually specified on the command line.
-      The specified name may include option name prefix characters or not.</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>name</code> - used to search the matched options. May be an alias of the option name that was actually specified on the command line.
+      The specified name may include option name prefix characters or not.</dd></dl>
 </li>
 </ul>
-<a name="rawOptionValue-picocli.CommandLine.Model.OptionSpec-">
+<a name="rawOptionValue(picocli.CommandLine.Model.OptionSpec)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -588,45 +561,42 @@ <h4>rawOptionValue</h4>
 <div class="block">Returns the command line argument String value of the specified option, or <code>null</code> if the specified option is <code>null</code>.</div>
 </li>
 </ul>
-<a name="rawOptionValue-char-java.lang.String-">
+<a name="rawOptionValue(char, java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>rawOptionValue</h4>
 <pre>public&nbsp;java.lang.String&nbsp;rawOptionValue(char&nbsp;shortName,
-                                       java.lang.String&nbsp;defaultValue)</pre>
+                              java.lang.String&nbsp;defaultValue)</pre>
 <div class="block">Returns the command line argument String value of the option with the specified name, or the specified default value if no option with the specified name was matched.</div>
 </li>
 </ul>
-<a name="rawOptionValue-java.lang.String-java.lang.String-">
+<a name="rawOptionValue(java.lang.String, java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>rawOptionValue</h4>
 <pre>public&nbsp;java.lang.String&nbsp;rawOptionValue(java.lang.String&nbsp;name,
-                                       java.lang.String&nbsp;defaultValue)</pre>
+                              java.lang.String&nbsp;defaultValue)</pre>
 <div class="block">Returns the command line argument String value of the option with the specified name, or the specified default value if no option with the specified name was matched.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - used to search the matched options. May be an alias of the option name that was actually specified on the command line.
-      The specified name may include option name prefix characters or not.</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>name</code> - used to search the matched options. May be an alias of the option name that was actually specified on the command line.
+      The specified name may include option name prefix characters or not.</dd></dl>
 </li>
 </ul>
-<a name="rawOptionValue-picocli.CommandLine.Model.OptionSpec-java.lang.String-">
+<a name="rawOptionValue(picocli.CommandLine.Model.OptionSpec, java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>rawOptionValue</h4>
 <pre>public&nbsp;java.lang.String&nbsp;rawOptionValue(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option,
-                                       java.lang.String&nbsp;defaultValue)</pre>
+                              java.lang.String&nbsp;defaultValue)</pre>
 <div class="block">Returns the command line argument String value of the specified option, or the specified default value if the specified option is <code>null</code>.</div>
 </li>
 </ul>
-<a name="rawPositionalValue-int-">
+<a name="rawPositionalValue(int)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -636,18 +606,18 @@ <h4>rawPositionalValue</h4>
 <div class="block">Returns the command line argument String value of the positional parameter at the specified position, or <code>null</code> if no positional parameter was matched at that position.</div>
 </li>
 </ul>
-<a name="rawPositionalValue-int-java.lang.String-">
+<a name="rawPositionalValue(int, java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>rawPositionalValue</h4>
 <pre>public&nbsp;java.lang.String&nbsp;rawPositionalValue(int&nbsp;position,
-                                           java.lang.String&nbsp;defaultValue)</pre>
+                                  java.lang.String&nbsp;defaultValue)</pre>
 <div class="block">Returns the command line argument String value of the positional parameter at the specified position, or the specified default value if no positional parameter was matched at that position.</div>
 </li>
 </ul>
-<a name="rawOptionValues-char-">
+<a name="rawOptionValues(char)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -657,7 +627,7 @@ <h4>rawOptionValues</h4>
 <div class="block">Returns all command line argument String values matched for the option with the specified name, or an empty list if no option with the specified name was matched.</div>
 </li>
 </ul>
-<a name="rawOptionValues-java.lang.String-">
+<a name="rawOptionValues(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -665,14 +635,11 @@ <h4>rawOptionValues</h4>
 <h4>rawOptionValues</h4>
 <pre>public&nbsp;java.util.List&lt;java.lang.String&gt;&nbsp;rawOptionValues(java.lang.String&nbsp;name)</pre>
 <div class="block">Returns all command line argument String values matched for the option with the specified name, or an empty list if no option with the specified name was matched.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - used to search the matched options. May be an alias of the option name that was actually specified on the command line.
-      The specified name may include option name prefix characters or not.</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>name</code> - used to search the matched options. May be an alias of the option name that was actually specified on the command line.
+      The specified name may include option name prefix characters or not.</dd></dl>
 </li>
 </ul>
-<a name="rawOptionValues-picocli.CommandLine.Model.OptionSpec-">
+<a name="rawOptionValues(picocli.CommandLine.Model.OptionSpec)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -682,72 +649,72 @@ <h4>rawOptionValues</h4>
 <div class="block">Returns all command line argument String values matched for the specified option, or an empty list if the specified option is <code>null</code>.</div>
 </li>
 </ul>
-<a name="optionValue-char-java.lang.Object-">
+<a name="optionValue(char,java.lang.Object)">
 <!--   -->
-</a><a name="optionValue-char-T-">
+</a><a name="optionValue(char, T)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>optionValue</h4>
 <pre>public&nbsp;&lt;T&gt;&nbsp;T&nbsp;optionValue(char&nbsp;shortName,
-                         T&nbsp;defaultValue)</pre>
-<div class="block">Returns the command line argument value of the option with the specified name, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type--">type</a> of the option, or the specified default value if no option with the specified name was matched.</div>
+                T&nbsp;defaultValue)</pre>
+<div class="block">Returns the command line argument value of the option with the specified name, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type()">type</a> of the option, or the specified default value if no option with the specified name was matched.</div>
 </li>
 </ul>
-<a name="optionValue-java.lang.String-java.lang.Object-">
+<a name="optionValue(java.lang.String,java.lang.Object)">
 <!--   -->
-</a><a name="optionValue-java.lang.String-T-">
+</a><a name="optionValue(java.lang.String, T)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>optionValue</h4>
 <pre>public&nbsp;&lt;T&gt;&nbsp;T&nbsp;optionValue(java.lang.String&nbsp;name,
-                         T&nbsp;defaultValue)</pre>
-<div class="block">Returns the command line argument value of the option with the specified name, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type--">type</a> of the option, or the specified default value if no option with the specified name was matched.</div>
+                T&nbsp;defaultValue)</pre>
+<div class="block">Returns the command line argument value of the option with the specified name, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type()">type</a> of the option, or the specified default value if no option with the specified name was matched.</div>
 </li>
 </ul>
-<a name="optionValue-picocli.CommandLine.Model.OptionSpec-java.lang.Object-">
+<a name="optionValue(picocli.CommandLine.Model.OptionSpec,java.lang.Object)">
 <!--   -->
-</a><a name="optionValue-picocli.CommandLine.Model.OptionSpec-T-">
+</a><a name="optionValue(picocli.CommandLine.Model.OptionSpec, T)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>optionValue</h4>
 <pre>public&nbsp;&lt;T&gt;&nbsp;T&nbsp;optionValue(<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a>&nbsp;option,
-                         T&nbsp;defaultValue)</pre>
-<div class="block">Returns the command line argument value of the specified option, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type--">type</a> of the option, or the specified default value if the specified option is <code>null</code>.</div>
+                T&nbsp;defaultValue)</pre>
+<div class="block">Returns the command line argument value of the specified option, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type()">type</a> of the option, or the specified default value if the specified option is <code>null</code>.</div>
 </li>
 </ul>
-<a name="positionalValue-int-java.lang.Object-">
+<a name="positionalValue(int,java.lang.Object)">
 <!--   -->
-</a><a name="positionalValue-int-T-">
+</a><a name="positionalValue(int, T)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>positionalValue</h4>
 <pre>public&nbsp;&lt;T&gt;&nbsp;T&nbsp;positionalValue(int&nbsp;position,
-                             T&nbsp;defaultValue)</pre>
-<div class="block">Returns the command line argument value of the positional parameter at the specified position, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type--">type</a> of the positional parameter, or the specified default value if no positional parameter was matched at that position.</div>
+                    T&nbsp;defaultValue)</pre>
+<div class="block">Returns the command line argument value of the positional parameter at the specified position, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type()">type</a> of the positional parameter, or the specified default value if no positional parameter was matched at that position.</div>
 </li>
 </ul>
-<a name="positionalValue-picocli.CommandLine.Model.PositionalParamSpec-java.lang.Object-">
+<a name="positionalValue(picocli.CommandLine.Model.PositionalParamSpec,java.lang.Object)">
 <!--   -->
-</a><a name="positionalValue-picocli.CommandLine.Model.PositionalParamSpec-T-">
+</a><a name="positionalValue(picocli.CommandLine.Model.PositionalParamSpec, T)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>positionalValue</h4>
 <pre>public&nbsp;&lt;T&gt;&nbsp;T&nbsp;positionalValue(<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a>&nbsp;positional,
-                             T&nbsp;defaultValue)</pre>
-<div class="block">Returns the command line argument value of the specified positional parameter, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type--">type</a> of the positional parameter, or the specified default value if the specified positional parameter is <code>null</code>.</div>
+                    T&nbsp;defaultValue)</pre>
+<div class="block">Returns the command line argument value of the specified positional parameter, converted to the <a href="../picocli/CommandLine.Model.ArgSpec.html#type()">type</a> of the positional parameter, or the specified default value if the specified positional parameter is <code>null</code>.</div>
 </li>
 </ul>
-<a name="hasSubcommand--">
+<a name="hasSubcommand()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -757,7 +724,7 @@ <h4>hasSubcommand</h4>
 <div class="block">Returns <code>true</code> if a subcommand was matched on the command line, <code>false</code> otherwise.</div>
 </li>
 </ul>
-<a name="subcommand--">
+<a name="subcommand()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -767,27 +734,27 @@ <h4>subcommand</h4>
 <div class="block">Returns the <code>ParseResult</code> for the subcommand of this command that was matched on the command line, or <code>null</code> if no subcommand was matched.</div>
 </li>
 </ul>
-<a name="isUsageHelpRequested--">
+<a name="isUsageHelpRequested()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>isUsageHelpRequested</h4>
 <pre>public&nbsp;boolean&nbsp;isUsageHelpRequested()</pre>
-<div class="block">Returns <code>true</code> if one of the options that was matched on the command line is a <a href="../picocli/CommandLine.Model.OptionSpec.html#usageHelp--"><code>usageHelp</code></a> option.</div>
+<div class="block">Returns <code>true</code> if one of the options that was matched on the command line is a <a href="../picocli/CommandLine.Model.OptionSpec.html#usageHelp()"><code>usageHelp</code></a> option.</div>
 </li>
 </ul>
-<a name="isVersionHelpRequested--">
+<a name="isVersionHelpRequested()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>isVersionHelpRequested</h4>
 <pre>public&nbsp;boolean&nbsp;isVersionHelpRequested()</pre>
-<div class="block">Returns <code>true</code> if one of the options that was matched on the command line is a <a href="../picocli/CommandLine.Model.OptionSpec.html#versionHelp--"><code>versionHelp</code></a> option.</div>
+<div class="block">Returns <code>true</code> if one of the options that was matched on the command line is a <a href="../picocli/CommandLine.Model.OptionSpec.html#versionHelp()"><code>versionHelp</code></a> option.</div>
 </li>
 </ul>
-<a name="asCommandLineList--">
+<a name="asCommandLineList()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -805,11 +772,9 @@ <h4>asCommandLineList</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -824,15 +789,15 @@ <h4>asCommandLineList</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.ParentCommand.html" title="annotation in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParentCommand.html" title="annotation in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.ParseResult.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.ParseResult.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.ParseResult.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -849,19 +814,19 @@ <h4>asCommandLineList</h4>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#nested_class_summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.PicocliException.html b/docs/apidocs/picocli/CommandLine.PicocliException.html
index cfc8f9a4a..525afed9e 100644
--- a/docs/apidocs/picocli/CommandLine.PicocliException.html
+++ b/docs/apidocs/picocli/CommandLine.PicocliException.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.PicocliException (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.PicocliException (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.PicocliException (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.PicocliException (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Range.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Range.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.PicocliException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.PicocliException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.PicocliException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -69,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Throwable">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -129,15 +122,12 @@ <h2 title="Class CommandLine.PicocliException" class="title">Class CommandLine.P
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.PicocliException</span>
+<pre>public static class <span class="strong">CommandLine.PicocliException</span>
 extends java.lang.RuntimeException</pre>
 <div class="block">Base class of all exceptions thrown by <code>picocli.CommandLine</code>.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../serialized-form.html#picocli.CommandLine.PicocliException">Serialized Form</a></dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../serialized-form.html#picocli.CommandLine.PicocliException">Serialized Form</a></dd></dl>
 </li>
 </ul>
 </div>
@@ -146,40 +136,40 @@ <h2 title="Class CommandLine.PicocliException" class="title">Class CommandLine.P
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.PicocliException.html#PicocliException-java.lang.String-">PicocliException</a></span>(java.lang.String&nbsp;msg)</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.PicocliException.html#CommandLine.PicocliException(java.lang.String)">CommandLine.PicocliException</a></strong>(java.lang.String&nbsp;msg)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.PicocliException.html#PicocliException-java.lang.String-java.lang.Exception-">PicocliException</a></span>(java.lang.String&nbsp;msg,
-                java.lang.Exception&nbsp;ex)</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.PicocliException.html#CommandLine.PicocliException(java.lang.String,%20java.lang.Exception)">CommandLine.PicocliException</a></strong>(java.lang.String&nbsp;msg,
+                            java.lang.Exception&nbsp;ex)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Throwable">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
 <code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -195,27 +185,27 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="PicocliException-java.lang.String-">
+<a name="CommandLine.PicocliException(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>PicocliException</h4>
-<pre>public&nbsp;PicocliException(java.lang.String&nbsp;msg)</pre>
+<h4>CommandLine.PicocliException</h4>
+<pre>public&nbsp;CommandLine.PicocliException(java.lang.String&nbsp;msg)</pre>
 </li>
 </ul>
-<a name="PicocliException-java.lang.String-java.lang.Exception-">
+<a name="CommandLine.PicocliException(java.lang.String, java.lang.Exception)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>PicocliException</h4>
-<pre>public&nbsp;PicocliException(java.lang.String&nbsp;msg,
-                        java.lang.Exception&nbsp;ex)</pre>
+<h4>CommandLine.PicocliException</h4>
+<pre>public&nbsp;CommandLine.PicocliException(java.lang.String&nbsp;msg,
+                            java.lang.Exception&nbsp;ex)</pre>
 </li>
 </ul>
 </li>
@@ -226,11 +216,9 @@ <h4>PicocliException</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -245,15 +233,15 @@ <h4>PicocliException</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Range.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Range.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.PicocliException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.PicocliException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.PicocliException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -272,17 +260,17 @@ <h4>PicocliException</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Throwable">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Range.html b/docs/apidocs/picocli/CommandLine.Range.html
index 8963bf548..ff496c0e1 100644
--- a/docs/apidocs/picocli/CommandLine.Range.html
+++ b/docs/apidocs/picocli/CommandLine.Range.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Range (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Range (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Range (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Range (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":41,"i3":9,"i4":10,"i5":10,"i6":10,"i7":10,"i8":9,"i9":9,"i10":9,"i11":10,"i12":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.PicocliException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.PicocliException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Range.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Range.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Range.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -74,18 +61,18 @@
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -116,14 +103,12 @@ <h2 title="Class CommandLine.Range" class="title">Class CommandLine.Range</h2>
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.Range</span>
+<pre>public static class <span class="strong">CommandLine.Range</span>
 extends java.lang.Object
 implements java.lang.Comparable&lt;<a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a>&gt;</pre>
 <div class="block">Describes the number of parameters required and accepted by an option or a positional parameter.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>0.9.7</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>0.9.7</dd></dl>
 </li>
 </ul>
 </div>
@@ -132,11 +117,11 @@ <h2 title="Class CommandLine.Range" class="title">Class CommandLine.Range</h2>
 <li class="blockList">
 <!-- =========== FIELD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.summary">
+<li class="blockList"><a name="field_summary">
 <!--   -->
 </a>
 <h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
 <caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -144,17 +129,17 @@ <h3>Field Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Range.html#isVariable">isVariable</a></span></code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Range.html#isVariable">isVariable</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Range.html#max">max</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Range.html#max">max</a></strong></code>
 <div class="block">Maximum accepted number of parameters for an option or positional parameter.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Range.html#min">min</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Range.html#min">min</a></strong></code>
 <div class="block">Required number of parameters for an option or positional parameter.</div>
 </td>
 </tr>
@@ -163,21 +148,21 @@ <h3>Field Summary</h3>
 </ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Range.html#Range-int-int-boolean-boolean-java.lang.String-">Range</a></span>(int&nbsp;min,
-     int&nbsp;max,
-     boolean&nbsp;variable,
-     boolean&nbsp;unspecified,
-     java.lang.String&nbsp;originalValue)</code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.Range.html#CommandLine.Range(int,%20int,%20boolean,%20boolean,%20java.lang.String)">CommandLine.Range</a></strong>(int&nbsp;min,
+                 int&nbsp;max,
+                 boolean&nbsp;variable,
+                 boolean&nbsp;unspecified,
+                 java.lang.String&nbsp;originalValue)</code>
 <div class="block">Constructs a new Range object with the specified parameters.</div>
 </td>
 </tr>
@@ -186,95 +171,95 @@ <h3>Constructor Summary</h3>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Range.html#compareTo-picocli.CommandLine.Range-">compareTo</a></span>(<a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a>&nbsp;other)</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Range.html#compareTo(picocli.CommandLine.Range)">compareTo</a></strong>(<a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a>&nbsp;other)</code>&nbsp;</td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Range.html#contains-int-">contains</a></span>(int&nbsp;value)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Range.html#contains(int)">contains</a></strong>(int&nbsp;value)</code>
 <div class="block">Returns <code>true</code> if this Range includes the specified value, <code>false</code> otherwise.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Range.html#defaultArity-java.lang.Class-">defaultArity</a></span>(java.lang.Class&lt;?&gt;&nbsp;type)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">use <a href="../picocli/CommandLine.Range.html#defaultArity-java.lang.reflect.Field-"><code>defaultArity(Field)</code></a> instead</span></div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Range.html#defaultArity(java.lang.Class)">defaultArity</a></strong>(java.lang.Class&lt;?&gt;&nbsp;type)</code>
+<div class="block"><strong>Deprecated.</strong>&nbsp;
+<div class="block"><i>use <a href="../picocli/CommandLine.Range.html#defaultArity(java.lang.reflect.Field)"><code>defaultArity(Field)</code></a> instead</i></div>
 </div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Range.html#defaultArity-java.lang.reflect.Field-">defaultArity</a></span>(java.lang.reflect.Field&nbsp;field)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Range.html#defaultArity(java.lang.reflect.Field)">defaultArity</a></strong>(java.lang.reflect.Field&nbsp;field)</code>
 <div class="block">Returns the default arity <code>Range</code>: for <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>options</code></a> this is 0 for booleans and 1 for
  other types, for <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>parameters</code></a> booleans have arity 0, arrays or Collections have
  arity "0..*", and other types have arity 1.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Range.html#equals-java.lang.Object-">equals</a></span>(java.lang.Object&nbsp;object)</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Range.html#equals(java.lang.Object)">equals</a></strong>(java.lang.Object&nbsp;object)</code>&nbsp;</td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Range.html#hashCode--">hashCode</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Range.html#hashCode()">hashCode</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr id="i6" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Range.html#max-int-">max</a></span>(int&nbsp;newMax)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Range.html#max(int)">max</a></strong>(int&nbsp;newMax)</code>
 <div class="block">Returns a new Range object with the <code>max</code> value replaced by the specified value.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Range.html#min-int-">min</a></span>(int&nbsp;newMin)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Range.html#min(int)">min</a></strong>(int&nbsp;newMin)</code>
 <div class="block">Returns a new Range object with the <code>min</code> value replaced by the specified value.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Range.html#optionArity-java.lang.reflect.Field-">optionArity</a></span>(java.lang.reflect.Field&nbsp;field)</code>
-<div class="block">Returns a new <code>Range</code> based on the <a href="../picocli/CommandLine.Option.html#arity--"><code>CommandLine.Option.arity()</code></a> annotation on the specified field,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Range.html#optionArity(java.lang.reflect.Field)">optionArity</a></strong>(java.lang.reflect.Field&nbsp;field)</code>
+<div class="block">Returns a new <code>Range</code> based on the <a href="../picocli/CommandLine.Option.html#arity()"><code>CommandLine.Option.arity()</code></a> annotation on the specified field,
  or the field type's default arity if no arity was specified.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Range.html#parameterArity-java.lang.reflect.Field-">parameterArity</a></span>(java.lang.reflect.Field&nbsp;field)</code>
-<div class="block">Returns a new <code>Range</code> based on the <a href="../picocli/CommandLine.Parameters.html#arity--"><code>CommandLine.Parameters.arity()</code></a> annotation on the specified field,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Range.html#parameterArity(java.lang.reflect.Field)">parameterArity</a></strong>(java.lang.reflect.Field&nbsp;field)</code>
+<div class="block">Returns a new <code>Range</code> based on the <a href="../picocli/CommandLine.Parameters.html#arity()"><code>CommandLine.Parameters.arity()</code></a> annotation on the specified field,
  or the field type's default arity if no arity was specified.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Range.html#parameterIndex-java.lang.reflect.Field-">parameterIndex</a></span>(java.lang.reflect.Field&nbsp;field)</code>
-<div class="block">Returns a new <code>Range</code> based on the <a href="../picocli/CommandLine.Parameters.html#index--"><code>CommandLine.Parameters.index()</code></a> annotation on the specified field.</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Range.html#parameterIndex(java.lang.reflect.Field)">parameterIndex</a></strong>(java.lang.reflect.Field&nbsp;field)</code>
+<div class="block">Returns a new <code>Range</code> based on the <a href="../picocli/CommandLine.Parameters.html#index()"><code>CommandLine.Parameters.index()</code></a> annotation on the specified field.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Range.html#toString--">toString</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Range.html#toString()">toString</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr id="i12" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Range.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;range)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Range.html#valueOf(java.lang.String)">valueOf</a></strong>(java.lang.String&nbsp;range)</code>
 <div class="block">Leniently parses the specified String as an <code>Range</code> value and return the result.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -290,7 +275,7 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ FIELD DETAIL =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.detail">
+<li class="blockList"><a name="field_detail">
 <!--   -->
 </a>
 <h3>Field Detail</h3>
@@ -327,91 +312,72 @@ <h4>isVariable</h4>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="Range-int-int-boolean-boolean-java.lang.String-">
+<a name="CommandLine.Range(int, int, boolean, boolean, java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>Range</h4>
-<pre>public&nbsp;Range(int&nbsp;min,
-             int&nbsp;max,
-             boolean&nbsp;variable,
-             boolean&nbsp;unspecified,
-             java.lang.String&nbsp;originalValue)</pre>
+<h4>CommandLine.Range</h4>
+<pre>public&nbsp;CommandLine.Range(int&nbsp;min,
+                 int&nbsp;max,
+                 boolean&nbsp;variable,
+                 boolean&nbsp;unspecified,
+                 java.lang.String&nbsp;originalValue)</pre>
 <div class="block">Constructs a new Range object with the specified parameters.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>min</code> - minimum number of required parameters</dd>
-<dd><code>max</code> - maximum number of allowed parameters (or Integer.MAX_VALUE if variable)</dd>
-<dd><code>variable</code> - <code>true</code> if any number or parameters is allowed, <code>false</code> otherwise</dd>
-<dd><code>unspecified</code> - <code>true</code> if no arity was specified on the option/parameter (value is based on type)</dd>
-<dd><code>originalValue</code> - the original value that was specified on the option or parameter</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>min</code> - minimum number of required parameters</dd><dd><code>max</code> - maximum number of allowed parameters (or Integer.MAX_VALUE if variable)</dd><dd><code>variable</code> - <code>true</code> if any number or parameters is allowed, <code>false</code> otherwise</dd><dd><code>unspecified</code> - <code>true</code> if no arity was specified on the option/parameter (value is based on type)</dd><dd><code>originalValue</code> - the original value that was specified on the option or parameter</dd></dl>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="optionArity-java.lang.reflect.Field-">
+<a name="optionArity(java.lang.reflect.Field)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>optionArity</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a>&nbsp;optionArity(java.lang.reflect.Field&nbsp;field)</pre>
-<div class="block">Returns a new <code>Range</code> based on the <a href="../picocli/CommandLine.Option.html#arity--"><code>CommandLine.Option.arity()</code></a> annotation on the specified field,
+<div class="block">Returns a new <code>Range</code> based on the <a href="../picocli/CommandLine.Option.html#arity()"><code>CommandLine.Option.arity()</code></a> annotation on the specified field,
  or the field type's default arity if no arity was specified.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>field</code> - the field whose Option annotation to inspect</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new <code>Range</code> based on the Option arity annotation on the specified field</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>field</code> - the field whose Option annotation to inspect</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a new <code>Range</code> based on the Option arity annotation on the specified field</dd></dl>
 </li>
 </ul>
-<a name="parameterArity-java.lang.reflect.Field-">
+<a name="parameterArity(java.lang.reflect.Field)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>parameterArity</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a>&nbsp;parameterArity(java.lang.reflect.Field&nbsp;field)</pre>
-<div class="block">Returns a new <code>Range</code> based on the <a href="../picocli/CommandLine.Parameters.html#arity--"><code>CommandLine.Parameters.arity()</code></a> annotation on the specified field,
+<div class="block">Returns a new <code>Range</code> based on the <a href="../picocli/CommandLine.Parameters.html#arity()"><code>CommandLine.Parameters.arity()</code></a> annotation on the specified field,
  or the field type's default arity if no arity was specified.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>field</code> - the field whose Parameters annotation to inspect</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new <code>Range</code> based on the Parameters arity annotation on the specified field</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>field</code> - the field whose Parameters annotation to inspect</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a new <code>Range</code> based on the Parameters arity annotation on the specified field</dd></dl>
 </li>
 </ul>
-<a name="parameterIndex-java.lang.reflect.Field-">
+<a name="parameterIndex(java.lang.reflect.Field)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>parameterIndex</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a>&nbsp;parameterIndex(java.lang.reflect.Field&nbsp;field)</pre>
-<div class="block">Returns a new <code>Range</code> based on the <a href="../picocli/CommandLine.Parameters.html#index--"><code>CommandLine.Parameters.index()</code></a> annotation on the specified field.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>field</code> - the field whose Parameters annotation to inspect</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new <code>Range</code> based on the Parameters index annotation on the specified field</dd>
-</dl>
+<div class="block">Returns a new <code>Range</code> based on the <a href="../picocli/CommandLine.Parameters.html#index()"><code>CommandLine.Parameters.index()</code></a> annotation on the specified field.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>field</code> - the field whose Parameters annotation to inspect</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a new <code>Range</code> based on the Parameters index annotation on the specified field</dd></dl>
 </li>
 </ul>
-<a name="defaultArity-java.lang.reflect.Field-">
+<a name="defaultArity(java.lang.reflect.Field)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -421,17 +387,12 @@ <h4>defaultArity</h4>
 <div class="block">Returns the default arity <code>Range</code>: for <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>options</code></a> this is 0 for booleans and 1 for
  other types, for <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>parameters</code></a> booleans have arity 0, arrays or Collections have
  arity "0..*", and other types have arity 1.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>field</code> - the field whose default arity to return</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new <code>Range</code> indicating the default arity of the specified field</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>field</code> - the field whose default arity to return</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a new <code>Range</code> indicating the default arity of the specified field</dd><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd></dl>
 </li>
 </ul>
-<a name="defaultArity-java.lang.Class-">
+<a name="defaultArity(java.lang.Class)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -439,17 +400,13 @@ <h4>defaultArity</h4>
 <h4>defaultArity</h4>
 <pre>@Deprecated
 public static&nbsp;<a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a>&nbsp;defaultArity(java.lang.Class&lt;?&gt;&nbsp;type)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">use <a href="../picocli/CommandLine.Range.html#defaultArity-java.lang.reflect.Field-"><code>defaultArity(Field)</code></a> instead</span></div>
+<div class="block"><span class="strong">Deprecated.</span>&nbsp;<i>use <a href="../picocli/CommandLine.Range.html#defaultArity(java.lang.reflect.Field)"><code>defaultArity(Field)</code></a> instead</i></div>
 <div class="block">Returns the default arity <code>Range</code> for <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>options</code></a>: booleans have arity 0, other types have arity 1.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>type</code> - the type whose default arity to return</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new <code>Range</code> indicating the default arity of the specified type</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>type</code> - the type whose default arity to return</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a new <code>Range</code> indicating the default arity of the specified type</dd></dl>
 </li>
 </ul>
-<a name="valueOf-java.lang.String-">
+<a name="valueOf(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -460,15 +417,11 @@ <h4>valueOf</h4>
  be a fixed integer value or a range of the form <code>MIN_VALUE + ".." + MAX_VALUE</code>. If the
  <code>MIN_VALUE</code> string is not numeric, the minimum is zero. If the <code>MAX_VALUE</code> is not numeric, the
  range is taken to be variable and the maximum is <code>Integer.MAX_VALUE</code>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>range</code> - the value range string to parse</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new <code>Range</code> value</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>range</code> - the value range string to parse</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a new <code>Range</code> value</dd></dl>
 </li>
 </ul>
-<a name="min-int-">
+<a name="min(int)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -477,15 +430,11 @@ <h4>min</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a>&nbsp;min(int&nbsp;newMin)</pre>
 <div class="block">Returns a new Range object with the <code>min</code> value replaced by the specified value.
  The <code>max</code> of the returned Range is guaranteed not to be less than the new <code>min</code> value.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>newMin</code> - the <code>min</code> value of the returned Range object</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new Range object with the specified <code>min</code> value</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>newMin</code> - the <code>min</code> value of the returned Range object</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a new Range object with the specified <code>min</code> value</dd></dl>
 </li>
 </ul>
-<a name="max-int-">
+<a name="max(int)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -494,15 +443,11 @@ <h4>max</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a>&nbsp;max(int&nbsp;newMax)</pre>
 <div class="block">Returns a new Range object with the <code>max</code> value replaced by the specified value.
  The <code>min</code> of the returned Range is guaranteed not to be greater than the new <code>max</code> value.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>newMax</code> - the <code>max</code> value of the returned Range object</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new Range object with the specified <code>max</code> value</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>newMax</code> - the <code>max</code> value of the returned Range object</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a new Range object with the specified <code>max</code> value</dd></dl>
 </li>
 </ul>
-<a name="contains-int-">
+<a name="contains(int)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -510,15 +455,11 @@ <h4>max</h4>
 <h4>contains</h4>
 <pre>public&nbsp;boolean&nbsp;contains(int&nbsp;value)</pre>
 <div class="block">Returns <code>true</code> if this Range includes the specified value, <code>false</code> otherwise.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>value</code> - the value to check</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd><code>true</code> if the specified value is not less than the minimum and not greater than the maximum of this Range</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>value</code> - the value to check</dd>
+<dt><span class="strong">Returns:</span></dt><dd><code>true</code> if the specified value is not less than the minimum and not greater than the maximum of this Range</dd></dl>
 </li>
 </ul>
-<a name="equals-java.lang.Object-">
+<a name="equals(java.lang.Object)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -526,12 +467,12 @@ <h4>contains</h4>
 <h4>equals</h4>
 <pre>public&nbsp;boolean&nbsp;equals(java.lang.Object&nbsp;object)</pre>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dt><strong>Overrides:</strong></dt>
 <dd><code>equals</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
 </dl>
 </li>
 </ul>
-<a name="hashCode--">
+<a name="hashCode()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -539,12 +480,12 @@ <h4>equals</h4>
 <h4>hashCode</h4>
 <pre>public&nbsp;int&nbsp;hashCode()</pre>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dt><strong>Overrides:</strong></dt>
 <dd><code>hashCode</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
 </dl>
 </li>
 </ul>
-<a name="toString--">
+<a name="toString()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -552,12 +493,12 @@ <h4>hashCode</h4>
 <h4>toString</h4>
 <pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dt><strong>Overrides:</strong></dt>
 <dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
 </dl>
 </li>
 </ul>
-<a name="compareTo-picocli.CommandLine.Range-">
+<a name="compareTo(picocli.CommandLine.Range)">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -565,7 +506,7 @@ <h4>toString</h4>
 <h4>compareTo</h4>
 <pre>public&nbsp;int&nbsp;compareTo(<a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a>&nbsp;other)</pre>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dt><strong>Specified by:</strong></dt>
 <dd><code>compareTo</code>&nbsp;in interface&nbsp;<code>java.lang.Comparable&lt;<a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a>&gt;</code></dd>
 </dl>
 </li>
@@ -578,11 +519,9 @@ <h4>compareTo</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -597,15 +536,15 @@ <h4>compareTo</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.PicocliException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.PicocliException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Range.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Range.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Range.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -623,18 +562,18 @@ <h4>compareTo</h4>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.RunAll.html b/docs/apidocs/picocli/CommandLine.RunAll.html
index 1812fcff1..b59110195 100644
--- a/docs/apidocs/picocli/CommandLine.RunAll.html
+++ b/docs/apidocs/picocli/CommandLine.RunAll.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.RunAll (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.RunAll (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.RunAll (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.RunAll (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Range.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.RunFirst.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Range.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.RunFirst.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.RunAll.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.RunAll.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.RunAll.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -75,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -126,16 +113,14 @@ <h2 title="Class CommandLine.RunAll" class="title">Class CommandLine.RunAll</h2>
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.RunAll</span>
+<pre>public static class <span class="strong">CommandLine.RunAll</span>
 extends <a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;&gt;
 implements <a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a></pre>
 <div class="block">Command line parse result handler that prints help if requested, and otherwise executes the top-level command and
  all subcommands as <code>Runnable</code> or <code>Callable</code>.
- For use in the <a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>parseWithHandler</code></a> methods.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-</dl>
+ For use in the <a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)"><code>parseWithHandler</code></a> methods.</div>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -144,72 +129,71 @@ <h2 title="Class CommandLine.RunAll" class="title">Class CommandLine.RunAll</h2>
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.RunAll.html#RunAll--">RunAll</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.RunAll.html#CommandLine.RunAll()">CommandLine.RunAll</a></strong>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected java.util.List&lt;java.lang.Object&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.RunAll.html#handle-picocli.CommandLine.ParseResult-java.util.List-">handle</a></span>(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult,
-      java.util.List&lt;java.lang.Object&gt;&nbsp;prototypeResult)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.RunAll.html#handle(picocli.CommandLine.ParseResult)">handle</a></strong>(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)</code>
 <div class="block">Executes the top-level command and all subcommands as <code>Runnable</code> or <code>Callable</code>.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;java.lang.Object&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.RunAll.html#handleParseResult-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">handleParseResult</a></span>(java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.RunAll.html#handleParseResult(java.util.List,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">handleParseResult</a></strong>(java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands,
                  java.io.PrintStream&nbsp;out,
                  <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
 <div class="block">Prints help if requested, and otherwise executes the top-level command and all subcommands as <code>Runnable</code>
  or <code>Callable</code>.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected <a href="../picocli/CommandLine.RunAll.html" title="class in picocli">CommandLine.RunAll</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.RunAll.html#self--">self</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.RunAll.html#self()">self</a></strong>()</code>
 <div class="block">Returns <code>this</code> to allow method chaining when calling the setters for a fluent API.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.picocli.CommandLine.AbstractParseResultHandler">
+<li class="blockList"><a name="methods_inherited_from_class_picocli.CommandLine.AbstractParseResultHandler">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;picocli.<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a></h3>
-<code><a href="../picocli/CommandLine.AbstractParseResultHandler.html#handleParseResult-picocli.CommandLine.ParseResult-R-">handleParseResult</a></code></li>
+<code><a href="../picocli/CommandLine.AbstractParseResultHandler.html#handleParseResult(picocli.CommandLine.ParseResult)">handleParseResult</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.picocli.CommandLine.AbstractHandler">
+<li class="blockList"><a name="methods_inherited_from_class_picocli.CommandLine.AbstractHandler">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;picocli.<a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></h3>
-<code><a href="../picocli/CommandLine.AbstractHandler.html#andExit-int-">andExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#ansi--">ansi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#err--">err</a>, <a href="../picocli/CommandLine.AbstractHandler.html#exitCode--">exitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#hasExitCode--">hasExitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#out--">out</a>, <a href="../picocli/CommandLine.AbstractHandler.html#returnResultOrExit-R-">returnResultOrExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useAnsi-picocli.CommandLine.Help.Ansi-">useAnsi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useErr-java.io.PrintStream-">useErr</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useOut-java.io.PrintStream-">useOut</a></code></li>
+<code><a href="../picocli/CommandLine.AbstractHandler.html#andExit(int)">andExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#ansi()">ansi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#err()">err</a>, <a href="../picocli/CommandLine.AbstractHandler.html#exitCode()">exitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#hasExitCode()">hasExitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#out()">out</a>, <a href="../picocli/CommandLine.AbstractHandler.html#returnResultOrExit(R)">returnResultOrExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useAnsi(picocli.CommandLine.Help.Ansi)">useAnsi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useErr(java.io.PrintStream)">useErr</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useOut(java.io.PrintStream)">useOut</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -225,102 +209,89 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="RunAll--">
+<a name="CommandLine.RunAll()">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>RunAll</h4>
-<pre>public&nbsp;RunAll()</pre>
+<h4>CommandLine.RunAll</h4>
+<pre>public&nbsp;CommandLine.RunAll()</pre>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="handleParseResult-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">
+<a name="handleParseResult(java.util.List, java.io.PrintStream, picocli.CommandLine.Help.Ansi)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>handleParseResult</h4>
 <pre>public&nbsp;java.util.List&lt;java.lang.Object&gt;&nbsp;handleParseResult(java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands,
-                                                          java.io.PrintStream&nbsp;out,
-                                                          <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
+                                                 java.io.PrintStream&nbsp;out,
+                                                 <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
 <div class="block">Prints help if requested, and otherwise executes the top-level command and all subcommands as <code>Runnable</code>
  or <code>Callable</code>. Finally, either a list of result objects is returned, or the JVM is terminated if an exit
- code <a href="../picocli/CommandLine.AbstractHandler.html#andExit-int-">was set</a>. If any of the <code>CommandLine</code> commands does not implement either
+ code <a href="../picocli/CommandLine.AbstractHandler.html#andExit(int)">was set</a>. If any of the <code>CommandLine</code> commands does not implement either
  <code>Runnable</code> or <code>Callable</code>, an <code>ExecutionException</code>
  is thrown detailing the problem and capturing the offending <code>CommandLine</code> object.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.IParseResultHandler.html#handleParseResult-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">handleParseResult</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>parsedCommands</code> - the <code>CommandLine</code> objects that resulted from successfully parsing the command line arguments</dd>
-<dd><code>out</code> - the <code>PrintStream</code> to print help to if requested</dd>
-<dd><code>ansi</code> - for printing help messages using ANSI styles and colors</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an empty list if help was requested, or a list containing the result of executing all commands:
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.IParseResultHandler.html#handleParseResult(java.util.List,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">handleParseResult</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a></code></dd>
+<dt><span class="strong">Parameters:</span></dt><dd><code>parsedCommands</code> - the <code>CommandLine</code> objects that resulted from successfully parsing the command line arguments</dd><dd><code>out</code> - the <code>PrintStream</code> to print help to if requested</dd><dd><code>ansi</code> - for printing help messages using ANSI styles and colors</dd>
+<dt><span class="strong">Returns:</span></dt><dd>an empty list if help was requested, or a list containing the result of executing all commands:
       the return values from calling the <code>Callable</code> commands, <code>null</code> elements for commands that implement <code>Runnable</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></code> - if the <a href="../picocli/CommandLine.HelpCommand.html" title="class in picocli"><code>HelpCommand</code></a> was invoked for an unknown subcommand. Any <code>ParameterExceptions</code>
       thrown from this method are treated as if this exception was thrown during parsing and passed to the <a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><code>CommandLine.IExceptionHandler</code></a></dd>
 <dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if a problem occurred while processing the parse results; use
-      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine--"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd>
-</dl>
+      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine()"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd></dl>
 </li>
 </ul>
-<a name="handle-picocli.CommandLine.ParseResult-java.util.List-">
+<a name="handle(picocli.CommandLine.ParseResult)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>handle</h4>
-<pre>protected&nbsp;java.util.List&lt;java.lang.Object&gt;&nbsp;handle(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult,
-                                                  java.util.List&lt;java.lang.Object&gt;&nbsp;prototypeResult)
+<pre>protected&nbsp;java.util.List&lt;java.lang.Object&gt;&nbsp;handle(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)
                                            throws <a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></pre>
 <div class="block">Executes the top-level command and all subcommands as <code>Runnable</code> or <code>Callable</code>.
  If any of the <code>CommandLine</code> commands does not implement either <code>Runnable</code> or <code>Callable</code>, an <code>ExecutionException</code>
  is thrown detailing the problem and capturing the offending <code>CommandLine</code> object.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.AbstractParseResultHandler.html#handle-picocli.CommandLine.ParseResult-R-">handle</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;&gt;</code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>parseResult</code> - the <code>ParseResult</code> that resulted from successfully parsing the command line arguments</dd>
-<dd><code>prototypeResult</code> - prototype return value, may be returned as is when the user requested help for example,
-                               or may be used to collect results from multiple subcommands, or may be used by the
-                               handler for internal processing and a completely different object is returned</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an empty list if help was requested, or a list containing the result of executing all commands:
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.AbstractParseResultHandler.html#handle(picocli.CommandLine.ParseResult)">handle</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;&gt;</code></dd>
+<dt><span class="strong">Parameters:</span></dt><dd><code>parseResult</code> - the <code>ParseResult</code> that resulted from successfully parsing the command line arguments</dd>
+<dt><span class="strong">Returns:</span></dt><dd>an empty list if help was requested, or a list containing the result of executing all commands:
       the return values from calling the <code>Callable</code> commands, <code>null</code> elements for commands that implement <code>Runnable</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if a problem occurred while processing the parse results; use
-      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine--"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine()"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="self--">
+<a name="self()">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>self</h4>
 <pre>protected&nbsp;<a href="../picocli/CommandLine.RunAll.html" title="class in picocli">CommandLine.RunAll</a>&nbsp;self()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../picocli/CommandLine.AbstractHandler.html#self--">CommandLine.AbstractHandler</a></code></span></div>
+<div class="block"><strong>Description copied from class:&nbsp;<code><a href="../picocli/CommandLine.AbstractHandler.html#self()">CommandLine.AbstractHandler</a></code></strong></div>
 <div class="block">Returns <code>this</code> to allow method chaining when calling the setters for a fluent API.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.AbstractHandler.html#self--">self</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;,<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;&gt;&gt;</code></dd>
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.AbstractHandler.html#self()">self</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;,<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;&gt;&gt;</code></dd>
 </dl>
 </li>
 </ul>
@@ -332,11 +303,9 @@ <h4>self</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -351,15 +320,15 @@ <h4>self</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Range.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.RunFirst.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.Range.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.RunFirst.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.RunAll.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.RunAll.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.RunAll.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -378,17 +347,17 @@ <h4>self</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.RunFirst.html b/docs/apidocs/picocli/CommandLine.RunFirst.html
index 01f7d918f..5862d71f1 100644
--- a/docs/apidocs/picocli/CommandLine.RunFirst.html
+++ b/docs/apidocs/picocli/CommandLine.RunFirst.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.RunFirst (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.RunFirst (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.RunFirst (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.RunFirst (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.RunFirst.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.RunFirst.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.RunFirst.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -75,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -126,16 +113,14 @@ <h2 title="Class CommandLine.RunFirst" class="title">Class CommandLine.RunFirst<
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.RunFirst</span>
+<pre>public static class <span class="strong">CommandLine.RunFirst</span>
 extends <a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;&gt;
 implements <a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a></pre>
 <div class="block">Command line parse result handler that prints help if requested, and otherwise executes the top-level
  <code>Runnable</code> or <code>Callable</code> command.
- For use in the <a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>parseWithHandler</code></a> methods.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-</dl>
+ For use in the <a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)"><code>parseWithHandler</code></a> methods.</div>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -144,71 +129,70 @@ <h2 title="Class CommandLine.RunFirst" class="title">Class CommandLine.RunFirst<
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.RunFirst.html#RunFirst--">RunFirst</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.RunFirst.html#CommandLine.RunFirst()">CommandLine.RunFirst</a></strong>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected java.util.List&lt;java.lang.Object&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.RunFirst.html#handle-picocli.CommandLine.ParseResult-java.util.List-">handle</a></span>(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult,
-      java.util.List&lt;java.lang.Object&gt;&nbsp;prototypeResult)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.RunFirst.html#handle(picocli.CommandLine.ParseResult)">handle</a></strong>(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)</code>
 <div class="block">Executes the top-level <code>Runnable</code> or <code>Callable</code> subcommand.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;java.lang.Object&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.RunFirst.html#handleParseResult-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">handleParseResult</a></span>(java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.RunFirst.html#handleParseResult(java.util.List,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">handleParseResult</a></strong>(java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands,
                  java.io.PrintStream&nbsp;out,
                  <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
 <div class="block">Prints help if requested, and otherwise executes the top-level <code>Runnable</code> or <code>Callable</code> command.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected <a href="../picocli/CommandLine.RunFirst.html" title="class in picocli">CommandLine.RunFirst</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.RunFirst.html#self--">self</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.RunFirst.html#self()">self</a></strong>()</code>
 <div class="block">Returns <code>this</code> to allow method chaining when calling the setters for a fluent API.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.picocli.CommandLine.AbstractParseResultHandler">
+<li class="blockList"><a name="methods_inherited_from_class_picocli.CommandLine.AbstractParseResultHandler">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;picocli.<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a></h3>
-<code><a href="../picocli/CommandLine.AbstractParseResultHandler.html#handleParseResult-picocli.CommandLine.ParseResult-R-">handleParseResult</a></code></li>
+<code><a href="../picocli/CommandLine.AbstractParseResultHandler.html#handleParseResult(picocli.CommandLine.ParseResult)">handleParseResult</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.picocli.CommandLine.AbstractHandler">
+<li class="blockList"><a name="methods_inherited_from_class_picocli.CommandLine.AbstractHandler">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;picocli.<a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></h3>
-<code><a href="../picocli/CommandLine.AbstractHandler.html#andExit-int-">andExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#ansi--">ansi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#err--">err</a>, <a href="../picocli/CommandLine.AbstractHandler.html#exitCode--">exitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#hasExitCode--">hasExitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#out--">out</a>, <a href="../picocli/CommandLine.AbstractHandler.html#returnResultOrExit-R-">returnResultOrExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useAnsi-picocli.CommandLine.Help.Ansi-">useAnsi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useErr-java.io.PrintStream-">useErr</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useOut-java.io.PrintStream-">useOut</a></code></li>
+<code><a href="../picocli/CommandLine.AbstractHandler.html#andExit(int)">andExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#ansi()">ansi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#err()">err</a>, <a href="../picocli/CommandLine.AbstractHandler.html#exitCode()">exitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#hasExitCode()">hasExitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#out()">out</a>, <a href="../picocli/CommandLine.AbstractHandler.html#returnResultOrExit(R)">returnResultOrExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useAnsi(picocli.CommandLine.Help.Ansi)">useAnsi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useErr(java.io.PrintStream)">useErr</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useOut(java.io.PrintStream)">useOut</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -224,101 +208,88 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="RunFirst--">
+<a name="CommandLine.RunFirst()">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>RunFirst</h4>
-<pre>public&nbsp;RunFirst()</pre>
+<h4>CommandLine.RunFirst</h4>
+<pre>public&nbsp;CommandLine.RunFirst()</pre>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="handleParseResult-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">
+<a name="handleParseResult(java.util.List, java.io.PrintStream, picocli.CommandLine.Help.Ansi)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>handleParseResult</h4>
 <pre>public&nbsp;java.util.List&lt;java.lang.Object&gt;&nbsp;handleParseResult(java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands,
-                                                          java.io.PrintStream&nbsp;out,
-                                                          <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
+                                                 java.io.PrintStream&nbsp;out,
+                                                 <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
 <div class="block">Prints help if requested, and otherwise executes the top-level <code>Runnable</code> or <code>Callable</code> command.
- Finally, either a list of result objects is returned, or the JVM is terminated if an exit code <a href="../picocli/CommandLine.AbstractHandler.html#andExit-int-">was set</a>.
+ Finally, either a list of result objects is returned, or the JVM is terminated if an exit code <a href="../picocli/CommandLine.AbstractHandler.html#andExit(int)">was set</a>.
  If the top-level command does not implement either <code>Runnable</code> or <code>Callable</code>, an <code>ExecutionException</code>
  is thrown detailing the problem and capturing the offending <code>CommandLine</code> object.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.IParseResultHandler.html#handleParseResult-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">handleParseResult</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>parsedCommands</code> - the <code>CommandLine</code> objects that resulted from successfully parsing the command line arguments</dd>
-<dd><code>out</code> - the <code>PrintStream</code> to print help to if requested</dd>
-<dd><code>ansi</code> - for printing help messages using ANSI styles and colors</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an empty list if help was requested, or a list containing a single element: the result of calling the
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.IParseResultHandler.html#handleParseResult(java.util.List,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">handleParseResult</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a></code></dd>
+<dt><span class="strong">Parameters:</span></dt><dd><code>parsedCommands</code> - the <code>CommandLine</code> objects that resulted from successfully parsing the command line arguments</dd><dd><code>out</code> - the <code>PrintStream</code> to print help to if requested</dd><dd><code>ansi</code> - for printing help messages using ANSI styles and colors</dd>
+<dt><span class="strong">Returns:</span></dt><dd>an empty list if help was requested, or a list containing a single element: the result of calling the
       <code>Callable</code>, or a <code>null</code> element if the top-level command was a <code>Runnable</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></code> - if the <a href="../picocli/CommandLine.HelpCommand.html" title="class in picocli"><code>HelpCommand</code></a> was invoked for an unknown subcommand. Any <code>ParameterExceptions</code>
       thrown from this method are treated as if this exception was thrown during parsing and passed to the <a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><code>CommandLine.IExceptionHandler</code></a></dd>
 <dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if a problem occurred while processing the parse results; use
-      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine--"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd>
-</dl>
+      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine()"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd></dl>
 </li>
 </ul>
-<a name="handle-picocli.CommandLine.ParseResult-java.util.List-">
+<a name="handle(picocli.CommandLine.ParseResult)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>handle</h4>
-<pre>protected&nbsp;java.util.List&lt;java.lang.Object&gt;&nbsp;handle(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult,
-                                                  java.util.List&lt;java.lang.Object&gt;&nbsp;prototypeResult)
+<pre>protected&nbsp;java.util.List&lt;java.lang.Object&gt;&nbsp;handle(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)
                                            throws <a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></pre>
 <div class="block">Executes the top-level <code>Runnable</code> or <code>Callable</code> subcommand.
  If the top-level command does not implement either <code>Runnable</code> or <code>Callable</code>, an <code>ExecutionException</code>
  is thrown detailing the problem and capturing the offending <code>CommandLine</code> object.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.AbstractParseResultHandler.html#handle-picocli.CommandLine.ParseResult-R-">handle</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;&gt;</code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>parseResult</code> - the <code>ParseResult</code> that resulted from successfully parsing the command line arguments</dd>
-<dd><code>prototypeResult</code> - prototype return value, may be returned as is when the user requested help for example,
-                               or may be used to collect results from multiple subcommands, or may be used by the
-                               handler for internal processing and a completely different object is returned</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an empty list if help was requested, or a list containing a single element: the result of calling the
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.AbstractParseResultHandler.html#handle(picocli.CommandLine.ParseResult)">handle</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;&gt;</code></dd>
+<dt><span class="strong">Parameters:</span></dt><dd><code>parseResult</code> - the <code>ParseResult</code> that resulted from successfully parsing the command line arguments</dd>
+<dt><span class="strong">Returns:</span></dt><dd>an empty list if help was requested, or a list containing a single element: the result of calling the
       <code>Callable</code>, or a <code>null</code> element if the last (sub)command was a <code>Runnable</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if a problem occurred while processing the parse results; use
-      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine--"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine()"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="self--">
+<a name="self()">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>self</h4>
 <pre>protected&nbsp;<a href="../picocli/CommandLine.RunFirst.html" title="class in picocli">CommandLine.RunFirst</a>&nbsp;self()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../picocli/CommandLine.AbstractHandler.html#self--">CommandLine.AbstractHandler</a></code></span></div>
+<div class="block"><strong>Description copied from class:&nbsp;<code><a href="../picocli/CommandLine.AbstractHandler.html#self()">CommandLine.AbstractHandler</a></code></strong></div>
 <div class="block">Returns <code>this</code> to allow method chaining when calling the setters for a fluent API.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.AbstractHandler.html#self--">self</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;,<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;&gt;&gt;</code></dd>
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.AbstractHandler.html#self()">self</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;,<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;&gt;&gt;</code></dd>
 </dl>
 </li>
 </ul>
@@ -330,11 +301,9 @@ <h4>self</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -349,15 +318,15 @@ <h4>self</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.RunFirst.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.RunFirst.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.RunFirst.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -376,17 +345,17 @@ <h4>self</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.RunLast.html b/docs/apidocs/picocli/CommandLine.RunLast.html
index af4dd18b1..0b9f96c9e 100644
--- a/docs/apidocs/picocli/CommandLine.RunLast.html
+++ b/docs/apidocs/picocli/CommandLine.RunLast.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.RunLast (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.RunLast (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.RunLast (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.RunLast (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.RunFirst.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.TypeConversionException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.RunFirst.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.TypeConversionException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.RunLast.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.RunLast.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.RunLast.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -75,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -126,16 +113,15 @@ <h2 title="Class CommandLine.RunLast" class="title">Class CommandLine.RunLast</h
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.RunLast</span>
+<pre>public static class <span class="strong">CommandLine.RunLast</span>
 extends <a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;&gt;
 implements <a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a></pre>
 <div class="block">Command line parse result handler that prints help if requested, and otherwise executes the most specific
  <code>Runnable</code> or <code>Callable</code> subcommand.
- For use in the <a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>parseWithHandler</code></a> methods.
+ For use in the <a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)"><code>parseWithHandler</code></a> methods.
  <p>
  Something like this:</p>
- <pre><code>
-     // RunLast implementation: print help if requested, otherwise execute the most specific subcommand
+ <pre><code>// RunLast implementation: print help if requested, otherwise execute the most specific subcommand
      List&lt;CommandLine&gt; parsedCommands = parseResult.asCommandLineList();
      if (CommandLine.printHelpIfRequested(parsedCommands, out(), err(), ansi())) {
          return emptyList();
@@ -162,13 +148,11 @@ <h2 title="Class CommandLine.RunLast" class="title">Class CommandLine.RunLast</h
      return Arrays.asList(result);
  </code></pre>
  <p>
- From picocli v2.0, <code>RunLast</code> is used to implement the <a href="../picocli/CommandLine.html#run-R-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>run</code></a>
- and <a href="../picocli/CommandLine.html#call-C-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>call</code></a> convenience methods.
+ From picocli v2.0, <code>RunLast</code> is used to implement the <a href="../picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>run</code></a>
+ and <a href="../picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>call</code></a> convenience methods.
  </p></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -177,71 +161,70 @@ <h2 title="Class CommandLine.RunLast" class="title">Class CommandLine.RunLast</h
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.RunLast.html#RunLast--">RunLast</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.RunLast.html#CommandLine.RunLast()">CommandLine.RunLast</a></strong>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected java.util.List&lt;java.lang.Object&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.RunLast.html#handle-picocli.CommandLine.ParseResult-java.util.List-">handle</a></span>(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult,
-      java.util.List&lt;java.lang.Object&gt;&nbsp;prototypeResult)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.RunLast.html#handle(picocli.CommandLine.ParseResult)">handle</a></strong>(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)</code>
 <div class="block">Executes the most specific <code>Runnable</code> or <code>Callable</code> subcommand.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;java.lang.Object&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.RunLast.html#handleParseResult-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">handleParseResult</a></span>(java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.RunLast.html#handleParseResult(java.util.List,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">handleParseResult</a></strong>(java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands,
                  java.io.PrintStream&nbsp;out,
                  <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
 <div class="block">Prints help if requested, and otherwise executes the most specific <code>Runnable</code> or <code>Callable</code> subcommand.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected <a href="../picocli/CommandLine.RunLast.html" title="class in picocli">CommandLine.RunLast</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.RunLast.html#self--">self</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.RunLast.html#self()">self</a></strong>()</code>
 <div class="block">Returns <code>this</code> to allow method chaining when calling the setters for a fluent API.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.picocli.CommandLine.AbstractParseResultHandler">
+<li class="blockList"><a name="methods_inherited_from_class_picocli.CommandLine.AbstractParseResultHandler">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;picocli.<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a></h3>
-<code><a href="../picocli/CommandLine.AbstractParseResultHandler.html#handleParseResult-picocli.CommandLine.ParseResult-R-">handleParseResult</a></code></li>
+<code><a href="../picocli/CommandLine.AbstractParseResultHandler.html#handleParseResult(picocli.CommandLine.ParseResult)">handleParseResult</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.picocli.CommandLine.AbstractHandler">
+<li class="blockList"><a name="methods_inherited_from_class_picocli.CommandLine.AbstractHandler">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;picocli.<a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a></h3>
-<code><a href="../picocli/CommandLine.AbstractHandler.html#andExit-int-">andExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#ansi--">ansi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#err--">err</a>, <a href="../picocli/CommandLine.AbstractHandler.html#exitCode--">exitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#hasExitCode--">hasExitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#out--">out</a>, <a href="../picocli/CommandLine.AbstractHandler.html#returnResultOrExit-R-">returnResultOrExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useAnsi-picocli.CommandLine.Help.Ansi-">useAnsi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useErr-java.io.PrintStream-">useErr</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useOut-java.io.PrintStream-">useOut</a></code></li>
+<code><a href="../picocli/CommandLine.AbstractHandler.html#andExit(int)">andExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#ansi()">ansi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#err()">err</a>, <a href="../picocli/CommandLine.AbstractHandler.html#exitCode()">exitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#hasExitCode()">hasExitCode</a>, <a href="../picocli/CommandLine.AbstractHandler.html#out()">out</a>, <a href="../picocli/CommandLine.AbstractHandler.html#returnResultOrExit(R)">returnResultOrExit</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useAnsi(picocli.CommandLine.Help.Ansi)">useAnsi</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useErr(java.io.PrintStream)">useErr</a>, <a href="../picocli/CommandLine.AbstractHandler.html#useOut(java.io.PrintStream)">useOut</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -257,101 +240,88 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="RunLast--">
+<a name="CommandLine.RunLast()">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>RunLast</h4>
-<pre>public&nbsp;RunLast()</pre>
+<h4>CommandLine.RunLast</h4>
+<pre>public&nbsp;CommandLine.RunLast()</pre>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="handleParseResult-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">
+<a name="handleParseResult(java.util.List, java.io.PrintStream, picocli.CommandLine.Help.Ansi)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>handleParseResult</h4>
 <pre>public&nbsp;java.util.List&lt;java.lang.Object&gt;&nbsp;handleParseResult(java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands,
-                                                          java.io.PrintStream&nbsp;out,
-                                                          <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
+                                                 java.io.PrintStream&nbsp;out,
+                                                 <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
 <div class="block">Prints help if requested, and otherwise executes the most specific <code>Runnable</code> or <code>Callable</code> subcommand.
- Finally, either a list of result objects is returned, or the JVM is terminated if an exit code <a href="../picocli/CommandLine.AbstractHandler.html#andExit-int-">was set</a>.
+ Finally, either a list of result objects is returned, or the JVM is terminated if an exit code <a href="../picocli/CommandLine.AbstractHandler.html#andExit(int)">was set</a>.
  If the last (sub)command does not implement either <code>Runnable</code> or <code>Callable</code>, an <code>ExecutionException</code>
  is thrown detailing the problem and capturing the offending <code>CommandLine</code> object.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.IParseResultHandler.html#handleParseResult-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">handleParseResult</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>parsedCommands</code> - the <code>CommandLine</code> objects that resulted from successfully parsing the command line arguments</dd>
-<dd><code>out</code> - the <code>PrintStream</code> to print help to if requested</dd>
-<dd><code>ansi</code> - for printing help messages using ANSI styles and colors</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an empty list if help was requested, or a list containing a single element: the result of calling the
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.IParseResultHandler.html#handleParseResult(java.util.List,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">handleParseResult</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a></code></dd>
+<dt><span class="strong">Parameters:</span></dt><dd><code>parsedCommands</code> - the <code>CommandLine</code> objects that resulted from successfully parsing the command line arguments</dd><dd><code>out</code> - the <code>PrintStream</code> to print help to if requested</dd><dd><code>ansi</code> - for printing help messages using ANSI styles and colors</dd>
+<dt><span class="strong">Returns:</span></dt><dd>an empty list if help was requested, or a list containing a single element: the result of calling the
       <code>Callable</code>, or a <code>null</code> element if the last (sub)command was a <code>Runnable</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></code> - if the <a href="../picocli/CommandLine.HelpCommand.html" title="class in picocli"><code>HelpCommand</code></a> was invoked for an unknown subcommand. Any <code>ParameterExceptions</code>
       thrown from this method are treated as if this exception was thrown during parsing and passed to the <a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><code>CommandLine.IExceptionHandler</code></a></dd>
 <dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if a problem occurred while processing the parse results; use
-      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine--"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd>
-</dl>
+      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine()"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd></dl>
 </li>
 </ul>
-<a name="handle-picocli.CommandLine.ParseResult-java.util.List-">
+<a name="handle(picocli.CommandLine.ParseResult)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>handle</h4>
-<pre>protected&nbsp;java.util.List&lt;java.lang.Object&gt;&nbsp;handle(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult,
-                                                  java.util.List&lt;java.lang.Object&gt;&nbsp;prototypeResult)
+<pre>protected&nbsp;java.util.List&lt;java.lang.Object&gt;&nbsp;handle(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)
                                            throws <a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></pre>
 <div class="block">Executes the most specific <code>Runnable</code> or <code>Callable</code> subcommand.
  If the last (sub)command does not implement either <code>Runnable</code> or <code>Callable</code>, an <code>ExecutionException</code>
  is thrown detailing the problem and capturing the offending <code>CommandLine</code> object.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.AbstractParseResultHandler.html#handle-picocli.CommandLine.ParseResult-R-">handle</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;&gt;</code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>parseResult</code> - the <code>ParseResult</code> that resulted from successfully parsing the command line arguments</dd>
-<dd><code>prototypeResult</code> - prototype return value, may be returned as is when the user requested help for example,
-                               or may be used to collect results from multiple subcommands, or may be used by the
-                               handler for internal processing and a completely different object is returned</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an empty list if help was requested, or a list containing a single element: the result of calling the
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.AbstractParseResultHandler.html#handle(picocli.CommandLine.ParseResult)">handle</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;&gt;</code></dd>
+<dt><span class="strong">Parameters:</span></dt><dd><code>parseResult</code> - the <code>ParseResult</code> that resulted from successfully parsing the command line arguments</dd>
+<dt><span class="strong">Returns:</span></dt><dd>an empty list if help was requested, or a list containing a single element: the result of calling the
       <code>Callable</code>, or a <code>null</code> element if the last (sub)command was a <code>Runnable</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if a problem occurred while processing the parse results; use
-      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine--"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+      <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine()"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="self--">
+<a name="self()">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>self</h4>
 <pre>protected&nbsp;<a href="../picocli/CommandLine.RunLast.html" title="class in picocli">CommandLine.RunLast</a>&nbsp;self()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../picocli/CommandLine.AbstractHandler.html#self--">CommandLine.AbstractHandler</a></code></span></div>
+<div class="block"><strong>Description copied from class:&nbsp;<code><a href="../picocli/CommandLine.AbstractHandler.html#self()">CommandLine.AbstractHandler</a></code></strong></div>
 <div class="block">Returns <code>this</code> to allow method chaining when calling the setters for a fluent API.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../picocli/CommandLine.AbstractHandler.html#self--">self</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;,<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;&gt;&gt;</code></dd>
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../picocli/CommandLine.AbstractHandler.html#self()">self</a></code>&nbsp;in class&nbsp;<code><a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;,<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;&gt;&gt;</code></dd>
 </dl>
 </li>
 </ul>
@@ -363,11 +333,9 @@ <h4>self</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -382,15 +350,15 @@ <h4>self</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.RunFirst.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.TypeConversionException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.RunFirst.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.TypeConversionException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.RunLast.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.RunLast.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.RunLast.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -409,17 +377,17 @@ <h4>self</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.TypeConversionException.html b/docs/apidocs/picocli/CommandLine.TypeConversionException.html
index 247fe033b..c8447ac83 100644
--- a/docs/apidocs/picocli/CommandLine.TypeConversionException.html
+++ b/docs/apidocs/picocli/CommandLine.TypeConversionException.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.TypeConversionException (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.TypeConversionException (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.TypeConversionException (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.TypeConversionException (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Unmatched.html" title="annotation in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Unmatched.html" title="annotation in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.TypeConversionException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.TypeConversionException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.TypeConversionException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -69,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Throwable">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -130,13 +123,10 @@ <h2 title="Class CommandLine.TypeConversionException" class="title">Class Comman
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.TypeConversionException</span>
+<pre>public static class <span class="strong">CommandLine.TypeConversionException</span>
 extends <a href="../picocli/CommandLine.PicocliException.html" title="class in picocli">CommandLine.PicocliException</a></pre>
 <div class="block">Exception thrown by <a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><code>CommandLine.ITypeConverter</code></a> implementations to indicate a String could not be converted.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../serialized-form.html#picocli.CommandLine.TypeConversionException">Serialized Form</a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../serialized-form.html#picocli.CommandLine.TypeConversionException">Serialized Form</a></dd></dl>
 </li>
 </ul>
 </div>
@@ -145,36 +135,36 @@ <h2 title="Class CommandLine.TypeConversionException" class="title">Class Comman
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.TypeConversionException.html#TypeConversionException-java.lang.String-">TypeConversionException</a></span>(java.lang.String&nbsp;msg)</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.TypeConversionException.html#CommandLine.TypeConversionException(java.lang.String)">CommandLine.TypeConversionException</a></strong>(java.lang.String&nbsp;msg)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Throwable">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
 <code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -190,17 +180,17 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="TypeConversionException-java.lang.String-">
+<a name="CommandLine.TypeConversionException(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>TypeConversionException</h4>
-<pre>public&nbsp;TypeConversionException(java.lang.String&nbsp;msg)</pre>
+<h4>CommandLine.TypeConversionException</h4>
+<pre>public&nbsp;CommandLine.TypeConversionException(java.lang.String&nbsp;msg)</pre>
 </li>
 </ul>
 </li>
@@ -211,11 +201,9 @@ <h4>TypeConversionException</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -230,15 +218,15 @@ <h4>TypeConversionException</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.Unmatched.html" title="annotation in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.Unmatched.html" title="annotation in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.TypeConversionException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.TypeConversionException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.TypeConversionException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -257,17 +245,17 @@ <h4>TypeConversionException</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Throwable">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.Unmatched.html b/docs/apidocs/picocli/CommandLine.Unmatched.html
index b7e0d86b5..600afa6c3 100644
--- a/docs/apidocs/picocli/CommandLine.Unmatched.html
+++ b/docs/apidocs/picocli/CommandLine.Unmatched.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.Unmatched (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.Unmatched (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Unmatched (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.Unmatched (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.TypeConversionException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.TypeConversionException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Unmatched.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Unmatched.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Unmatched.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -67,17 +60,15 @@
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
 <li>Required&nbsp;|&nbsp;</li>
 <li>Optional</li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
 <li>Element</li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -93,27 +84,22 @@ <h2 title="Annotation Type CommandLine.Unmatched" class="title">Annotation Type
 <hr>
 <br>
 <pre>@Retention(value=RUNTIME)
- @Target(value=FIELD)
-public static @interface <span class="memberNameLabel">CommandLine.Unmatched</span></pre>
+@Target(value=FIELD)
+public static @interface <span class="strong">CommandLine.Unmatched</span></pre>
 <div class="block">Fields annotated with <code>@Unmatched</code> will be initialized with the list of unmatched command line arguments, if any.
- If this annotation is found, picocli automatically sets <a href="../picocli/CommandLine.html#setUnmatchedArgumentsAllowed-boolean-">unmatchedArgumentsAllowed</a> to <code>true</code>.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#isUnmatchedArgumentsAllowed--"><code>CommandLine.isUnmatchedArgumentsAllowed()</code></a></dd>
-</dl>
+ If this annotation is found, picocli automatically sets <a href="../picocli/CommandLine.html#setUnmatchedArgumentsAllowed(boolean)">unmatchedArgumentsAllowed</a> to <code>true</code>.</div>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#isUnmatchedArgumentsAllowed()"><code>CommandLine.isUnmatchedArgumentsAllowed()</code></a></dd></dl>
 </li>
 </ul>
 </div>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -128,15 +114,15 @@ <h2 title="Annotation Type CommandLine.Unmatched" class="title">Annotation Type
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.TypeConversionException.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/CommandLine.TypeConversionException.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.Unmatched.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Unmatched.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.Unmatched.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -153,17 +139,15 @@ <h2 title="Annotation Type CommandLine.Unmatched" class="title">Annotation Type
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
 <li>Required&nbsp;|&nbsp;</li>
 <li>Optional</li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
 <li>Element</li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.UnmatchedArgumentException.html b/docs/apidocs/picocli/CommandLine.UnmatchedArgumentException.html
index febe984ad..5df674e0e 100644
--- a/docs/apidocs/picocli/CommandLine.UnmatchedArgumentException.html
+++ b/docs/apidocs/picocli/CommandLine.UnmatchedArgumentException.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine.UnmatchedArgumentException (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>CommandLine.UnmatchedArgumentException (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.UnmatchedArgumentException (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine.UnmatchedArgumentException (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Unmatched.html" title="annotation in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
+<li><a href="../picocli/CommandLine.Unmatched.html" title="annotation in picocli"><span class="strong">Prev Class</span></a></li>
+<li>Next Class</li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.UnmatchedArgumentException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.UnmatchedArgumentException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.UnmatchedArgumentException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -69,17 +62,17 @@
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.picocli.CommandLine.ParameterException">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_picocli.CommandLine.ParameterException">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -135,14 +128,11 @@ <h2 title="Class CommandLine.UnmatchedArgumentException" class="title">Class Com
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">CommandLine.UnmatchedArgumentException</span>
+<pre>public static class <span class="strong">CommandLine.UnmatchedArgumentException</span>
 extends <a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></pre>
 <div class="block">Exception indicating that a command line argument could not be mapped to any of the fields annotated with
  <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a>.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../serialized-form.html#picocli.CommandLine.UnmatchedArgumentException">Serialized Form</a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../serialized-form.html#picocli.CommandLine.UnmatchedArgumentException">Serialized Form</a></dd></dl>
 </li>
 </ul>
 </div>
@@ -151,52 +141,52 @@ <h2 title="Class CommandLine.UnmatchedArgumentException" class="title">Class Com
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.UnmatchedArgumentException.html#UnmatchedArgumentException-picocli.CommandLine-java.util.List-">UnmatchedArgumentException</a></span>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                          java.util.List&lt;java.lang.String&gt;&nbsp;args)</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.UnmatchedArgumentException.html#CommandLine.UnmatchedArgumentException(picocli.CommandLine,%20java.util.List)">CommandLine.UnmatchedArgumentException</a></strong>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                                      java.util.List&lt;java.lang.String&gt;&nbsp;args)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.UnmatchedArgumentException.html#UnmatchedArgumentException-picocli.CommandLine-java.util.Stack-">UnmatchedArgumentException</a></span>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                          java.util.Stack&lt;java.lang.String&gt;&nbsp;args)</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.UnmatchedArgumentException.html#CommandLine.UnmatchedArgumentException(picocli.CommandLine,%20java.util.Stack)">CommandLine.UnmatchedArgumentException</a></strong>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                                      java.util.Stack&lt;java.lang.String&gt;&nbsp;args)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.UnmatchedArgumentException.html#UnmatchedArgumentException-picocli.CommandLine-java.lang.String-">UnmatchedArgumentException</a></span>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                          java.lang.String&nbsp;msg)</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.UnmatchedArgumentException.html#CommandLine.UnmatchedArgumentException(picocli.CommandLine,%20java.lang.String)">CommandLine.UnmatchedArgumentException</a></strong>(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                                      java.lang.String&nbsp;msg)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.picocli.CommandLine.ParameterException">
+<li class="blockList"><a name="methods_inherited_from_class_picocli.CommandLine.ParameterException">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;picocli.<a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></h3>
-<code><a href="../picocli/CommandLine.ParameterException.html#getCommandLine--">getCommandLine</a></code></li>
+<code><a href="../picocli/CommandLine.ParameterException.html#getCommandLine()">getCommandLine</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Throwable">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
 <code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -212,38 +202,38 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="UnmatchedArgumentException-picocli.CommandLine-java.lang.String-">
+<a name="CommandLine.UnmatchedArgumentException(picocli.CommandLine, java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>UnmatchedArgumentException</h4>
-<pre>public&nbsp;UnmatchedArgumentException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                                  java.lang.String&nbsp;msg)</pre>
+<h4>CommandLine.UnmatchedArgumentException</h4>
+<pre>public&nbsp;CommandLine.UnmatchedArgumentException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                                      java.lang.String&nbsp;msg)</pre>
 </li>
 </ul>
-<a name="UnmatchedArgumentException-picocli.CommandLine-java.util.Stack-">
+<a name="CommandLine.UnmatchedArgumentException(picocli.CommandLine, java.util.Stack)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>UnmatchedArgumentException</h4>
-<pre>public&nbsp;UnmatchedArgumentException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                                  java.util.Stack&lt;java.lang.String&gt;&nbsp;args)</pre>
+<h4>CommandLine.UnmatchedArgumentException</h4>
+<pre>public&nbsp;CommandLine.UnmatchedArgumentException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                                      java.util.Stack&lt;java.lang.String&gt;&nbsp;args)</pre>
 </li>
 </ul>
-<a name="UnmatchedArgumentException-picocli.CommandLine-java.util.List-">
+<a name="CommandLine.UnmatchedArgumentException(picocli.CommandLine, java.util.List)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>UnmatchedArgumentException</h4>
-<pre>public&nbsp;UnmatchedArgumentException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                                  java.util.List&lt;java.lang.String&gt;&nbsp;args)</pre>
+<h4>CommandLine.UnmatchedArgumentException</h4>
+<pre>public&nbsp;CommandLine.UnmatchedArgumentException(<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                                      java.util.List&lt;java.lang.String&gt;&nbsp;args)</pre>
 </li>
 </ul>
 </li>
@@ -254,11 +244,9 @@ <h4>UnmatchedArgumentException</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -273,15 +261,15 @@ <h4>UnmatchedArgumentException</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/CommandLine.Unmatched.html" title="annotation in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
+<li><a href="../picocli/CommandLine.Unmatched.html" title="annotation in picocli"><span class="strong">Prev Class</span></a></li>
+<li>Next Class</li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.UnmatchedArgumentException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.UnmatchedArgumentException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.UnmatchedArgumentException.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -300,17 +288,17 @@ <h4>UnmatchedArgumentException</h4>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.picocli.CommandLine.ParameterException">Method</a></li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_picocli.CommandLine.ParameterException">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li>Method</li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/CommandLine.html b/docs/apidocs/picocli/CommandLine.html
index f14439a3b..49c2dbc7d 100644
--- a/docs/apidocs/picocli/CommandLine.html
+++ b/docs/apidocs/picocli/CommandLine.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>CommandLine (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:02 JST 2018 -->
+<title>CommandLine (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CommandLine (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":9,"i3":9,"i4":9,"i5":9,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":42,"i26":10,"i27":42,"i28":10,"i29":10,"i30":9,"i31":9,"i32":41,"i33":9,"i34":10,"i35":10,"i36":10,"i37":10,"i38":9,"i39":9,"i40":9,"i41":9,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":9,"i50":9,"i51":9,"i52":10,"i53":10,"i54":10};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/AutoComplete.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/AutoComplete.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -73,19 +60,19 @@
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#nested_class_summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -108,7 +95,7 @@ <h2 title="Class CommandLine" class="title">Class CommandLine</h2>
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">CommandLine</span>
+<pre>public class <span class="strong">CommandLine</span>
 extends java.lang.Object</pre>
 <div class="block"><p>
  CommandLine interpreter that uses reflection to initialize an annotated domain object with values obtained from the
@@ -167,11 +154,11 @@ <h2 title="Class CommandLine" class="title">Class CommandLine</h2>
 <li class="blockList">
 <!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="nested.class.summary">
+<li class="blockList"><a name="nested_class_summary">
 <!--   -->
 </a>
 <h3>Nested Class Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
 <caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -179,252 +166,246 @@ <h3>Nested Class Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a>&lt;<a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">R</a>,<a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">T</a> extends <a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a>&lt;<a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">R</a>,<a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">T</a>&gt;&gt;</span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a>&lt;<a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">R</a>,<a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">T</a> extends <a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli">CommandLine.AbstractHandler</a>&lt;<a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">R</a>,<a href="../picocli/CommandLine.AbstractHandler.html" title="type parameter in CommandLine.AbstractHandler">T</a>&gt;&gt;</strong></code>
 <div class="block">Abstract superclass for <a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><code>CommandLine.IParseResultHandler2</code></a> and <a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><code>CommandLine.IExceptionHandler2</code></a> implementations.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>&lt;<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="type parameter in CommandLine.AbstractParseResultHandler">R</a>&gt;</span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli">CommandLine.AbstractParseResultHandler</a>&lt;<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="type parameter in CommandLine.AbstractParseResultHandler">R</a>&gt;</strong></code>
 <div class="block">Command line parse result handler that returns a value.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli">CommandLine.AbstractSimpleParseResultHandler</a></span></code>
-<div class="block">Command line parse result handler that does not return a result.</div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Command.html" title="annotation in picocli">CommandLine.Command</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Command.html" title="annotation in picocli">CommandLine.Command</a></strong></code>
 <div class="block">Annotate your class with <code>@Command</code> when you want more control over the format of the generated help
  message.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a>&lt;<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>&gt;</span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a>&lt;<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="type parameter in CommandLine.DefaultExceptionHandler">R</a>&gt;</strong></code>
 <div class="block">Default exception handler that handles invalid user input by printing the exception message, followed by the usage
  message for the command or subcommand whose input was invalid.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli">CommandLine.DuplicateOptionAnnotationsException</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli">CommandLine.DuplicateOptionAnnotationsException</a></strong></code>
 <div class="block">Exception indicating that multiple fields have been annotated with the same Option name.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></strong></code>
 <div class="block">Exception indicating a problem while invoking a command or subcommand.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></strong></code>
 <div class="block">A collection of methods and inner classes that provide fine-grained control over the contents and layout of
  the usage help message to display to end users when help is requested or invalid input values were specified.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.HelpCommand.html" title="class in picocli">CommandLine.HelpCommand</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.HelpCommand.html" title="class in picocli">CommandLine.HelpCommand</a></strong></code>
 <div class="block">Help command that can be installed as a subcommand on all application commands.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli">CommandLine.IExceptionHandler</a></span></code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use <a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><code>CommandLine.IExceptionHandler2</code></a> instead.</span></div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli">CommandLine.IExceptionHandler</a></strong></code>
+<div class="block"><strong>Deprecated.</strong>&nbsp;
+<div class="block"><i>Use <a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><code>CommandLine.IExceptionHandler2</code></a> instead.</i></div>
 </div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a>&lt;<a href="../picocli/CommandLine.IExceptionHandler2.html" title="type parameter in CommandLine.IExceptionHandler2">R</a>&gt;</span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a>&lt;<a href="../picocli/CommandLine.IExceptionHandler2.html" title="type parameter in CommandLine.IExceptionHandler2">R</a>&gt;</strong></code>
 <div class="block">Classes implementing this interface know how to handle <code>ParameterExceptions</code> (usually from invalid user input)
  and <code>ExecutionExceptions</code> that occurred while executing the <code>Runnable</code> or <code>Callable</code> command.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.IFactory.html" title="interface in picocli">CommandLine.IFactory</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.IFactory.html" title="interface in picocli">CommandLine.IFactory</a></strong></code>
 <div class="block">Factory for instantiating classes that are registered declaratively with annotation attributes, like
- <a href="../picocli/CommandLine.Command.html#subcommands--"><code>CommandLine.Command.subcommands()</code></a>, <a href="../picocli/CommandLine.Option.html#converter--"><code>CommandLine.Option.converter()</code></a>, <a href="../picocli/CommandLine.Parameters.html#converter--"><code>CommandLine.Parameters.converter()</code></a> and <a href="../picocli/CommandLine.Command.html#versionProvider--"><code>CommandLine.Command.versionProvider()</code></a>.</div>
+ <a href="../picocli/CommandLine.Command.html#subcommands()"><code>CommandLine.Command.subcommands()</code></a>, <a href="../picocli/CommandLine.Option.html#converter()"><code>CommandLine.Option.converter()</code></a>, <a href="../picocli/CommandLine.Parameters.html#converter()"><code>CommandLine.Parameters.converter()</code></a> and <a href="../picocli/CommandLine.Command.html#versionProvider()"><code>CommandLine.Command.versionProvider()</code></a>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli">CommandLine.IHelpCommandInitializable</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli">CommandLine.IHelpCommandInitializable</a></strong></code>
 <div class="block">Help commands that provide usage help for other commands can implement this interface to be initialized with the information they need.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></strong></code>
 <div class="block">Exception indicating a problem during <code>CommandLine</code> initialization.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a></span></code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use <a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><code>CommandLine.IParseResultHandler2</code></a> instead.</span></div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a></strong></code>
+<div class="block"><strong>Deprecated.</strong>&nbsp;
+<div class="block"><i>Use <a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><code>CommandLine.IParseResultHandler2</code></a> instead.</i></div>
 </div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a>&lt;<a href="../picocli/CommandLine.IParseResultHandler2.html" title="type parameter in CommandLine.IParseResultHandler2">R</a>&gt;</span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a>&lt;<a href="../picocli/CommandLine.IParseResultHandler2.html" title="type parameter in CommandLine.IParseResultHandler2">R</a>&gt;</strong></code>
 <div class="block">Represents a function that can process the <code>ParseResult</code> object resulting from successfully
- <a href="../picocli/CommandLine.html#parseArgs-java.lang.String...-">parsing</a> the command line arguments.</div>
+ <a href="../picocli/CommandLine.html#parseArgs(java.lang.String...)">parsing</a> the command line arguments.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli">CommandLine.ITypeConverter</a>&lt;<a href="../picocli/CommandLine.ITypeConverter.html" title="type parameter in CommandLine.ITypeConverter">K</a>&gt;</span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli">CommandLine.ITypeConverter</a>&lt;<a href="../picocli/CommandLine.ITypeConverter.html" title="type parameter in CommandLine.ITypeConverter">K</a>&gt;</strong></code>
 <div class="block">
  When parsing command line arguments and initializing
  fields annotated with <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>@Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>@Parameters</code></a>,
  String values can be converted to any type for which a <code>ITypeConverter</code> is registered.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.IVersionProvider.html" title="interface in picocli">CommandLine.IVersionProvider</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.IVersionProvider.html" title="interface in picocli">CommandLine.IVersionProvider</a></strong></code>
 <div class="block">Provides version information for a command.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli">CommandLine.MaxValuesforFieldExceededException</a></span></code>
-<div class="block">Exception indicating that more values were specified for an option or parameter than its <a href="../picocli/CommandLine.Option.html#arity--"><code>arity</code></a> allows.</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli">CommandLine.MaxValuesforFieldExceededException</a></strong></code>
+<div class="block">Exception indicating that more values were specified for an option or parameter than its <a href="../picocli/CommandLine.Option.html#arity()"><code>arity</code></a> allows.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli">CommandLine.MissingParameterException</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli">CommandLine.MissingParameterException</a></strong></code>
 <div class="block">Exception indicating that a required parameter was not specified.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli">CommandLine.MissingTypeConverterException</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli">CommandLine.MissingTypeConverterException</a></strong></code>
 <div class="block">Exception indicating that an annotated field had a type for which no <a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><code>CommandLine.ITypeConverter</code></a> was
- <a href="../picocli/CommandLine.html#registerConverter-java.lang.Class-picocli.CommandLine.ITypeConverter-">registered</a>.</div>
+ <a href="../picocli/CommandLine.html#registerConverter(java.lang.Class,%20picocli.CommandLine.ITypeConverter)">registered</a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Mixin.html" title="annotation in picocli">CommandLine.Mixin</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Mixin.html" title="annotation in picocli">CommandLine.Mixin</a></strong></code>
 <div class="block">
  Fields annotated with <code>@Mixin</code> are "expanded" into the current command: <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>@Option</code></a> and
  <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>@Parameters</code></a> in the mixin class are added to the options and positional parameters of this command.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Model.html" title="class in picocli">CommandLine.Model</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Model.html" title="class in picocli">CommandLine.Model</a></strong></code>
 <div class="block">This class provides a namespace for classes and interfaces that model concepts and attributes of command line interfaces in picocli.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Option.html" title="annotation in picocli">CommandLine.Option</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Option.html" title="annotation in picocli">CommandLine.Option</a></strong></code>
 <div class="block">
  Annotate fields in your class with <code>@Option</code> and picocli will initialize these fields when matching
  arguments are specified on the command line.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli">CommandLine.OverwrittenOptionException</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli">CommandLine.OverwrittenOptionException</a></strong></code>
 <div class="block">Exception indicating that an option for a single-value option field has been specified multiple times on the command line.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></strong></code>
 <div class="block">Exception indicating something went wrong while parsing command line options.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParameterIndexGapException.html" title="class in picocli">CommandLine.ParameterIndexGapException</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParameterIndexGapException.html" title="class in picocli">CommandLine.ParameterIndexGapException</a></strong></code>
 <div class="block">Exception indicating that there was a gap in the indices of the fields annotated with <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli">CommandLine.Parameters</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli">CommandLine.Parameters</a></strong></code>
 <div class="block">
  Fields annotated with <code>@Parameters</code> will be initialized with positional parameters.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParentCommand.html" title="annotation in picocli">CommandLine.ParentCommand</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParentCommand.html" title="annotation in picocli">CommandLine.ParentCommand</a></strong></code>
 <div class="block">
  Fields annotated with <code>@ParentCommand</code> will be initialized with the parent command of the current subcommand.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></strong></code>
 <div class="block">Encapsulates the result of parsing an array of command line arguments.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.PicocliException.html" title="class in picocli">CommandLine.PicocliException</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.PicocliException.html" title="class in picocli">CommandLine.PicocliException</a></strong></code>
 <div class="block">Base class of all exceptions thrown by <code>picocli.CommandLine</code>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></strong></code>
 <div class="block">Describes the number of parameters required and accepted by an option or a positional parameter.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.RunAll.html" title="class in picocli">CommandLine.RunAll</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.RunAll.html" title="class in picocli">CommandLine.RunAll</a></strong></code>
 <div class="block">Command line parse result handler that prints help if requested, and otherwise executes the top-level command and
  all subcommands as <code>Runnable</code> or <code>Callable</code>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.RunFirst.html" title="class in picocli">CommandLine.RunFirst</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.RunFirst.html" title="class in picocli">CommandLine.RunFirst</a></strong></code>
 <div class="block">Command line parse result handler that prints help if requested, and otherwise executes the top-level
  <code>Runnable</code> or <code>Callable</code> command.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.RunLast.html" title="class in picocli">CommandLine.RunLast</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.RunLast.html" title="class in picocli">CommandLine.RunLast</a></strong></code>
 <div class="block">Command line parse result handler that prints help if requested, and otherwise executes the most specific
  <code>Runnable</code> or <code>Callable</code> subcommand.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.TypeConversionException.html" title="class in picocli">CommandLine.TypeConversionException</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.TypeConversionException.html" title="class in picocli">CommandLine.TypeConversionException</a></strong></code>
 <div class="block">Exception thrown by <a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><code>CommandLine.ITypeConverter</code></a> implementations to indicate a String could not be converted.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Unmatched.html" title="annotation in picocli">CommandLine.Unmatched</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.Unmatched.html" title="annotation in picocli">CommandLine.Unmatched</a></strong></code>
 <div class="block">Fields annotated with <code>@Unmatched</code> will be initialized with the list of unmatched command line arguments, if any.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli">CommandLine.UnmatchedArgumentException</a></span></code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli">CommandLine.UnmatchedArgumentException</a></strong></code>
 <div class="block">Exception indicating that a command line argument could not be mapped to any of the fields annotated with
  <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a>.</div>
 </td>
@@ -434,11 +415,11 @@ <h3>Nested Class Summary</h3>
 </ul>
 <!-- =========== FIELD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.summary">
+<li class="blockList"><a name="field_summary">
 <!--   -->
 </a>
 <h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
 <caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -446,8 +427,8 @@ <h3>Field Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#VERSION">VERSION</a></span></code>
-<div class="block">This is picocli version "3.0.0-alpha-1".</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#VERSION">VERSION</a></strong></code>
+<div class="block">This is picocli version "3.0.0-alpha-2".</div>
 </td>
 </tr>
 </table>
@@ -455,22 +436,22 @@ <h3>Field Summary</h3>
 </ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#CommandLine-java.lang.Object-">CommandLine</a></span>(java.lang.Object&nbsp;command)</code>
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.html#CommandLine(java.lang.Object)">CommandLine</a></strong>(java.lang.Object&nbsp;command)</code>
 <div class="block">Constructs a new <code>CommandLine</code> interpreter with the specified object (which may be an annotated user object or a <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><code>CommandSpec</code></a>) and a default subcommand factory.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#CommandLine-java.lang.Object-picocli.CommandLine.IFactory-">CommandLine</a></span>(java.lang.Object&nbsp;command,
+<td class="colOne"><code><strong><a href="../picocli/CommandLine.html#CommandLine(java.lang.Object,%20picocli.CommandLine.IFactory)">CommandLine</a></strong>(java.lang.Object&nbsp;command,
            <a href="../picocli/CommandLine.IFactory.html" title="interface in picocli">CommandLine.IFactory</a>&nbsp;factory)</code>
 <div class="block">Constructs a new <code>CommandLine</code> interpreter with the specified object (which may be an annotated user object or a <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><code>CommandSpec</code></a>) and object factory.</div>
 </td>
@@ -480,42 +461,42 @@ <h3>Constructor Summary</h3>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#addMixin-java.lang.String-java.lang.Object-">addMixin</a></span>(java.lang.String&nbsp;name,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#addMixin(java.lang.String,%20java.lang.Object)">addMixin</a></strong>(java.lang.String&nbsp;name,
         java.lang.Object&nbsp;mixin)</code>
 <div class="block">Adds the options and positional parameters in the specified mixin to this command.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#addSubcommand-java.lang.String-java.lang.Object-">addSubcommand</a></span>(java.lang.String&nbsp;name,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#addSubcommand(java.lang.String,%20java.lang.Object)">addSubcommand</a></strong>(java.lang.String&nbsp;name,
              java.lang.Object&nbsp;command)</code>
 <div class="block">Registers a subcommand with the specified name.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>static &lt;C extends java.util.concurrent.Callable&lt;T&gt;,T&gt;<br>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#call-C-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">call</a></span>(C&nbsp;callable,
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;C extends java.util.concurrent.Callable&lt;T&gt;,T&gt;&nbsp;<br>T</code></td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)">call</a></strong>(C&nbsp;callable,
     java.io.PrintStream&nbsp;out,
     <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
     java.lang.String...&nbsp;args)</code>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#call-C-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for diagnostic error messages.</div>
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for diagnostic error messages.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>static &lt;C extends java.util.concurrent.Callable&lt;T&gt;,T&gt;<br>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#call-C-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">call</a></span>(C&nbsp;callable,
+<tr class="rowColor">
+<td class="colFirst"><code>static &lt;C extends java.util.concurrent.Callable&lt;T&gt;,T&gt;&nbsp;<br>T</code></td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)">call</a></strong>(C&nbsp;callable,
     java.io.PrintStream&nbsp;out,
     java.io.PrintStream&nbsp;err,
     <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
@@ -523,267 +504,260 @@ <h3>Method Summary</h3>
 <div class="block">Convenience method to allow command line application authors to avoid some boilerplate code in their application.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>static &lt;C extends java.util.concurrent.Callable&lt;T&gt;,T&gt;<br>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#call-C-java.io.PrintStream-java.lang.String...-">call</a></span>(C&nbsp;callable,
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;C extends java.util.concurrent.Callable&lt;T&gt;,T&gt;&nbsp;<br>T</code></td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.lang.String...)">call</a></strong>(C&nbsp;callable,
     java.io.PrintStream&nbsp;out,
     java.lang.String...&nbsp;args)</code>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#call-C-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for
  diagnostic error messages and <a href="../picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>static &lt;C extends java.util.concurrent.Callable&lt;T&gt;,T&gt;<br>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#call-C-java.lang.String...-">call</a></span>(C&nbsp;callable,
+<tr class="rowColor">
+<td class="colFirst"><code>static &lt;C extends java.util.concurrent.Callable&lt;T&gt;,T&gt;&nbsp;<br>T</code></td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#call(C,%20java.lang.String...)">call</a></strong>(C&nbsp;callable,
     java.lang.String...&nbsp;args)</code>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#call-C-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.out</code> for
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.out</code> for
  requested usage help messages, <code>System.err</code> for diagnostic error messages, and <a href="../picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;&gt;</code></td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#defaultExceptionHandler()">defaultExceptionHandler</a></strong>()</code>
+<div class="block">Convenience method that returns <code>new DefaultExceptionHandler&lt;List&lt;Object&gt;&gt;()</code>.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>&lt;T&gt;&nbsp;T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#getCommand--">getCommand</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#getCommand()">getCommand</a></strong>()</code>
 <div class="block">Returns the annotated user object that this <code>CommandLine</code> instance was constructed with.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#getCommandName--">getCommandName</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#getCommandName()">getCommandName</a></strong>()</code>
 <div class="block">Returns the command name (also called program name) displayed in the usage help synopsis.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#getCommandSpec--">getCommandSpec</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#getCommandSpec()">getCommandSpec</a></strong>()</code>
 <div class="block">Returns the <code>CommandSpec</code> model that this <code>CommandLine</code> was constructed with.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.util.Map&lt;java.lang.String,java.lang.Object&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#getMixins--">getMixins</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#getMixins()">getMixins</a></strong>()</code>
 <div class="block">Returns a map of user objects whose options and positional parameters were added to ("mixed in" with) this command.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#getParent--">getParent</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#getParent()">getParent</a></strong>()</code>
 <div class="block">Returns the command that this is a subcommand of, or <code>null</code> if this is a top-level command.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#getParseResult--">getParseResult</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#getParseResult()">getParseResult</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr id="i12" class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#getSeparator--">getSeparator</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#getSeparator()">getSeparator</a></strong>()</code>
 <div class="block">Returns the String that separates option names from option values when parsing command line options.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.util.Map&lt;java.lang.String,<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#getSubcommands--">getSubcommands</a></span>()</code>
-<div class="block">Returns a map with the subcommands <a href="../picocli/CommandLine.html#addSubcommand-java.lang.String-java.lang.Object-">registered</a> on this instance.</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#getSubcommands()">getSubcommands</a></strong>()</code>
+<div class="block">Returns a map with the subcommands <a href="../picocli/CommandLine.html#addSubcommand(java.lang.String,%20java.lang.Object)">registered</a> on this instance.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;java.lang.String&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#getUnmatchedArguments--">getUnmatchedArguments</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#getUnmatchedArguments()">getUnmatchedArguments</a></strong>()</code>
 <div class="block">Returns the list of unmatched command line arguments, if any.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#isExpandAtFiles--">isExpandAtFiles</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#isExpandAtFiles()">isExpandAtFiles</a></strong>()</code>
 <div class="block">Returns whether arguments starting with <code>'@'</code> should be treated as the path to an argument file and its
  contents should be expanded into separate arguments for each line in the specified file.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#isOverwrittenOptionsAllowed--">isOverwrittenOptionsAllowed</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#isOverwrittenOptionsAllowed()">isOverwrittenOptionsAllowed</a></strong>()</code>
 <div class="block">Returns whether options for single-value fields can be specified multiple times on the command line.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#isStopAtPositional--">isStopAtPositional</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#isPosixClusteredShortOptionsAllowed()">isPosixClusteredShortOptionsAllowed</a></strong>()</code>
+<div class="block">Returns whether the parser accepts clustered short options.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#isStopAtPositional()">isStopAtPositional</a></strong>()</code>
 <div class="block">Returns whether the parser interprets the first positional parameter as "end of options" so the remaining
  arguments are all treated as positional parameters.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#isStopAtUnmatched--">isStopAtUnmatched</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#isStopAtUnmatched()">isStopAtUnmatched</a></strong>()</code>
 <div class="block">Returns whether the parser should stop interpreting options and positional parameters as soon as it encounters an
  unmatched option.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#isUnmatchedArgumentsAllowed--">isUnmatchedArgumentsAllowed</a></span>()</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#isUnmatchedArgumentsAllowed()">isUnmatchedArgumentsAllowed</a></strong>()</code>
 <div class="block">Returns whether the end user may specify arguments on the command line that are not matched to any option or parameter fields.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#isUsageHelpRequested--">isUsageHelpRequested</a></span>()</code>
-<div class="block">Returns <code>true</code> if an option annotated with <a href="../picocli/CommandLine.Option.html#usageHelp--"><code>CommandLine.Option.usageHelp()</code></a> was specified on the command line.</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#isUsageHelpRequested()">isUsageHelpRequested</a></strong>()</code>
+<div class="block">Returns <code>true</code> if an option annotated with <a href="../picocli/CommandLine.Option.html#usageHelp()"><code>CommandLine.Option.usageHelp()</code></a> was specified on the command line.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#isVersionHelpRequested--">isVersionHelpRequested</a></span>()</code>
-<div class="block">Returns <code>true</code> if an option annotated with <a href="../picocli/CommandLine.Option.html#versionHelp--"><code>CommandLine.Option.versionHelp()</code></a> was specified on the command line.</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#isVersionHelpRequested()">isVersionHelpRequested</a></strong>()</code>
+<div class="block">Returns <code>true</code> if an option annotated with <a href="../picocli/CommandLine.Option.html#versionHelp()"><code>CommandLine.Option.versionHelp()</code></a> was specified on the command line.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#parse-java.lang.String...-">parse</a></span>(java.lang.String...&nbsp;args)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#parse(java.lang.String...)">parse</a></strong>(java.lang.String...&nbsp;args)</code>
 <div class="block">Parses the specified command line arguments and returns a list of <code>CommandLine</code> objects representing the
  top-level command and any subcommands (if any) that were recognized and initialized during the parsing process.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#parseArgs-java.lang.String...-">parseArgs</a></span>(java.lang.String...&nbsp;args)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#parseArgs(java.lang.String...)">parseArgs</a></strong>(java.lang.String...&nbsp;args)</code>
 <div class="block">Parses the specified command line arguments and returns a list of <code>ParseResult</code> with the options, positional
  parameters, and subcommands (if any) that were recognized and initialized during the parsing process.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>&lt;R&gt;&nbsp;R</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#parseWithHandler-picocli.CommandLine.IParseResultHandler2-R-java.lang.String:A-">parseWithHandler</a></span>(<a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a>&lt;R&gt;&nbsp;handler,
-                R&nbsp;prototypeReturnValue,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#parseWithHandler(picocli.CommandLine.IParseResultHandler2,%20java.lang.String[])">parseWithHandler</a></strong>(<a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a>&lt;R&gt;&nbsp;handler,
                 java.lang.String[]&nbsp;args)</code>
-<div class="block">Returns the result of calling <a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)</code></a> with
+<div class="block">Returns the result of calling <a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)"><code>parseWithHandlers(IParseResultHandler2,  IExceptionHandler2, String...)</code></a> with
  a new <a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><code>CommandLine.DefaultExceptionHandler</code></a> in addition to the specified parse result handler and the specified command line arguments.</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;java.lang.Object&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#parseWithHandler-picocli.CommandLine.IParseResultHandler-java.io.PrintStream-java.lang.String...-">parseWithHandler</a></span>(<a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a>&nbsp;handler,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#parseWithHandler(picocli.CommandLine.IParseResultHandler,%20java.io.PrintStream,%20java.lang.String...)">parseWithHandler</a></strong>(<a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a>&nbsp;handler,
                 java.io.PrintStream&nbsp;out,
                 java.lang.String...&nbsp;args)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">use <a href="../picocli/CommandLine.html#parseWithHandler-picocli.CommandLine.IParseResultHandler2-R-java.lang.String:A-"><code>parseWithHandler(IParseResultHandler2, Object, String[])</code></a> instead</span></div>
+<div class="block"><strong>Deprecated.</strong>&nbsp;
+<div class="block"><i>use <a href="../picocli/CommandLine.html#parseWithHandler(picocli.CommandLine.IParseResultHandler2,%20java.lang.String[])"><code>parseWithHandler(IParseResultHandler2,  String[])</code></a> instead</i></div>
 </div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>&lt;R&gt;&nbsp;R</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-">parseWithHandlers</a></span>(<a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a>&lt;R&gt;&nbsp;handler,
-                 R&nbsp;prototypeReturnValue,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)">parseWithHandlers</a></strong>(<a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a>&lt;R&gt;&nbsp;handler,
                  <a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a>&lt;R&gt;&nbsp;exceptionHandler,
                  java.lang.String...&nbsp;args)</code>
-<div class="block">Tries to <a href="../picocli/CommandLine.html#parseArgs-java.lang.String...-">parse</a> the specified command line arguments, and if successful, delegates
+<div class="block">Tries to <a href="../picocli/CommandLine.html#parseArgs(java.lang.String...)">parse</a> the specified command line arguments, and if successful, delegates
  the processing of the resulting <code>ParseResult</code> object to the specified <a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">handler</a>.</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;java.lang.Object&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler-java.io.PrintStream-picocli.CommandLine.Help.Ansi-picocli.CommandLine.IExceptionHandler-java.lang.String...-">parseWithHandlers</a></span>(<a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a>&nbsp;handler,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20picocli.CommandLine.IExceptionHandler,%20java.lang.String...)">parseWithHandlers</a></strong>(<a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a>&nbsp;handler,
                  java.io.PrintStream&nbsp;out,
                  <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
                  <a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli">CommandLine.IExceptionHandler</a>&nbsp;exceptionHandler,
                  java.lang.String...&nbsp;args)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">use <a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)</code></a> instead</span></div>
+<div class="block"><strong>Deprecated.</strong>&nbsp;
+<div class="block"><i>use <a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)"><code>parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...)</code></a> instead</i></div>
 </div>
 </td>
 </tr>
-<tr id="i28" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#parseWithSimpleHandler-picocli.CommandLine.AbstractSimpleParseResultHandler-java.lang.String...-">parseWithSimpleHandler</a></span>(<a href="../picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli">CommandLine.AbstractSimpleParseResultHandler</a>&nbsp;handler,
-                      java.lang.String...&nbsp;args)</code>
-<div class="block">Calls <a href="../picocli/CommandLine.html#parseWithSimpleHandlers-picocli.CommandLine.AbstractSimpleParseResultHandler-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>parseWithSimpleHandlers(AbstractSimpleParseResultHandler, IExceptionHandler2, String...)</code></a> with
- a new <a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><code>CommandLine.DefaultExceptionHandler</code></a> in addition to the specified parse result handler and the specified command line arguments.</div>
-</td>
-</tr>
-<tr id="i29" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#parseWithSimpleHandlers-picocli.CommandLine.AbstractSimpleParseResultHandler-picocli.CommandLine.IExceptionHandler2-java.lang.String...-">parseWithSimpleHandlers</a></span>(<a href="../picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli">CommandLine.AbstractSimpleParseResultHandler</a>&nbsp;handler,
-                       <a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a>&lt;java.lang.Void&gt;&nbsp;exceptionHandler,
-                       java.lang.String...&nbsp;args)</code>
-<div class="block">Tries to <a href="../picocli/CommandLine.html#parseArgs-java.lang.String...-">parse</a> the specified command line arguments, and if successful, delegates
- the processing of the resulting <code>ParseResult</code> object to the specified <a href="../picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli">handler</a>.</div>
-</td>
-</tr>
-<tr id="i30" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static &lt;T&gt;&nbsp;T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#populateCommand-T-java.lang.String...-">populateCommand</a></span>(T&nbsp;command,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#populateCommand(T,%20java.lang.String...)">populateCommand</a></strong>(T&nbsp;command,
                java.lang.String...&nbsp;args)</code>
 <div class="block">
  Convenience method that initializes the specified annotated object from the specified command line arguments.</div>
 </td>
 </tr>
-<tr id="i31" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#printHelpIfRequested-picocli.CommandLine.ParseResult-">printHelpIfRequested</a></span>(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)</code>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#printHelpIfRequested-java.util.List-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>printHelpIfRequested(List, PrintStream, PrintStream, Help.Ansi)</code></a> with
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#printHelpIfRequested(picocli.CommandLine.ParseResult)">printHelpIfRequested</a></strong>(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)</code>
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#printHelpIfRequested(java.util.List,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>printHelpIfRequested(List, PrintStream, PrintStream, Help.Ansi)</code></a> with
  <code>parseResult.asCommandLineList(), System.out, System.err, Help.Ansi.AUTO</code>.</div>
 </td>
 </tr>
-<tr id="i32" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#printHelpIfRequested-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">printHelpIfRequested</a></span>(java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#printHelpIfRequested(java.util.List,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">printHelpIfRequested</a></strong>(java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands,
                     java.io.PrintStream&nbsp;out,
                     <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">use <a href="../picocli/CommandLine.html#printHelpIfRequested-java.util.List-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>printHelpIfRequested(List, PrintStream, PrintStream, Help.Ansi)</code></a> instead</span></div>
+<div class="block"><strong>Deprecated.</strong>&nbsp;
+<div class="block"><i>use <a href="../picocli/CommandLine.html#printHelpIfRequested(java.util.List,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>printHelpIfRequested(List, PrintStream, PrintStream, Help.Ansi)</code></a> instead</i></div>
 </div>
 </td>
 </tr>
-<tr id="i33" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#printHelpIfRequested-java.util.List-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">printHelpIfRequested</a></span>(java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#printHelpIfRequested(java.util.List,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">printHelpIfRequested</a></strong>(java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands,
                     java.io.PrintStream&nbsp;out,
                     java.io.PrintStream&nbsp;err,
                     <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
 <div class="block">Helper method that may be useful when processing the list of <code>CommandLine</code> objects that result from successfully
- <a href="../picocli/CommandLine.html#parse-java.lang.String...-">parsing</a> command line arguments.</div>
+ <a href="../picocli/CommandLine.html#parse(java.lang.String...)">parsing</a> command line arguments.</div>
 </td>
 </tr>
-<tr id="i34" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#printVersionHelp-java.io.PrintStream-">printVersionHelp</a></span>(java.io.PrintStream&nbsp;out)</code>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#printVersionHelp-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>printVersionHelp(PrintStream, Help.Ansi)</code></a> with the <a href="../picocli/CommandLine.Help.Ansi.html#AUTO">platform default</a>.</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#printVersionHelp(java.io.PrintStream)">printVersionHelp</a></strong>(java.io.PrintStream&nbsp;out)</code>
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#printVersionHelp(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>printVersionHelp(PrintStream, Help.Ansi)</code></a> with the <a href="../picocli/CommandLine.Help.Ansi.html#AUTO">platform default</a>.</div>
 </td>
 </tr>
-<tr id="i35" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#printVersionHelp-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">printVersionHelp</a></span>(java.io.PrintStream&nbsp;out,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#printVersionHelp(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">printVersionHelp</a></strong>(java.io.PrintStream&nbsp;out,
                 <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
-<div class="block">Prints version information from the <a href="../picocli/CommandLine.Command.html#version--"><code>CommandLine.Command.version()</code></a> annotation to the specified <code>PrintStream</code>.</div>
+<div class="block">Prints version information from the <a href="../picocli/CommandLine.Command.html#version()"><code>CommandLine.Command.version()</code></a> annotation to the specified <code>PrintStream</code>.</div>
 </td>
 </tr>
-<tr id="i36" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#printVersionHelp-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.Object...-">printVersionHelp</a></span>(java.io.PrintStream&nbsp;out,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#printVersionHelp(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.Object...)">printVersionHelp</a></strong>(java.io.PrintStream&nbsp;out,
                 <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
                 java.lang.Object...&nbsp;params)</code>
-<div class="block">Prints version information from the <a href="../picocli/CommandLine.Command.html#version--"><code>CommandLine.Command.version()</code></a> annotation to the specified <code>PrintStream</code>.</div>
+<div class="block">Prints version information from the <a href="../picocli/CommandLine.Command.html#version()"><code>CommandLine.Command.version()</code></a> annotation to the specified <code>PrintStream</code>.</div>
 </td>
 </tr>
-<tr id="i37" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>&lt;K&gt;&nbsp;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#registerConverter-java.lang.Class-picocli.CommandLine.ITypeConverter-">registerConverter</a></span>(java.lang.Class&lt;K&gt;&nbsp;cls,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#registerConverter(java.lang.Class,%20picocli.CommandLine.ITypeConverter)">registerConverter</a></strong>(java.lang.Class&lt;K&gt;&nbsp;cls,
                  <a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli">CommandLine.ITypeConverter</a>&lt;K&gt;&nbsp;converter)</code>
 <div class="block">Registers the specified type converter for the specified class.</div>
 </td>
 </tr>
-<tr id="i38" class="altColor">
-<td class="colFirst"><code>static &lt;R extends java.lang.Runnable&gt;<br>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#run-R-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">run</a></span>(R&nbsp;runnable,
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;R extends java.lang.Runnable&gt;&nbsp;<br>void</code></td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)">run</a></strong>(R&nbsp;runnable,
    java.io.PrintStream&nbsp;out,
    <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
    java.lang.String...&nbsp;args)</code>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#run-R-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for diagnostic error messages.</div>
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for diagnostic error messages.</div>
 </td>
 </tr>
-<tr id="i39" class="rowColor">
-<td class="colFirst"><code>static &lt;R extends java.lang.Runnable&gt;<br>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#run-R-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">run</a></span>(R&nbsp;runnable,
+<tr class="rowColor">
+<td class="colFirst"><code>static &lt;R extends java.lang.Runnable&gt;&nbsp;<br>void</code></td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)">run</a></strong>(R&nbsp;runnable,
    java.io.PrintStream&nbsp;out,
    java.io.PrintStream&nbsp;err,
    <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
@@ -791,113 +765,139 @@ <h3>Method Summary</h3>
 <div class="block">Convenience method to allow command line application authors to avoid some boilerplate code in their application.</div>
 </td>
 </tr>
-<tr id="i40" class="altColor">
-<td class="colFirst"><code>static &lt;R extends java.lang.Runnable&gt;<br>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#run-R-java.io.PrintStream-java.lang.String...-">run</a></span>(R&nbsp;runnable,
+<tr class="altColor">
+<td class="colFirst"><code>static &lt;R extends java.lang.Runnable&gt;&nbsp;<br>void</code></td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.lang.String...)">run</a></strong>(R&nbsp;runnable,
    java.io.PrintStream&nbsp;out,
    java.lang.String...&nbsp;args)</code>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#run-R-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for diagnostic error messages and <a href="../picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for diagnostic error messages and <a href="../picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
 </td>
 </tr>
-<tr id="i41" class="rowColor">
-<td class="colFirst"><code>static &lt;R extends java.lang.Runnable&gt;<br>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#run-R-java.lang.String...-">run</a></span>(R&nbsp;runnable,
+<tr class="rowColor">
+<td class="colFirst"><code>static &lt;R extends java.lang.Runnable&gt;&nbsp;<br>void</code></td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#run(R,%20java.lang.String...)">run</a></strong>(R&nbsp;runnable,
    java.lang.String...&nbsp;args)</code>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#run-R-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.out</code> for
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.out</code> for
  requested usage help messages, <code>System.err</code> for diagnostic error messages, and <a href="../picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
 </td>
 </tr>
-<tr id="i42" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#setCommandName-java.lang.String-">setCommandName</a></span>(java.lang.String&nbsp;commandName)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#setCommandName(java.lang.String)">setCommandName</a></strong>(java.lang.String&nbsp;commandName)</code>
 <div class="block">Sets the command name (also called program name) displayed in the usage help synopsis to the specified value.</div>
 </td>
 </tr>
-<tr id="i43" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#setExpandAtFiles-boolean-">setExpandAtFiles</a></span>(boolean&nbsp;expandAtFiles)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#setExpandAtFiles(boolean)">setExpandAtFiles</a></strong>(boolean&nbsp;expandAtFiles)</code>
 <div class="block">Sets whether arguments starting with <code>'@'</code> should be treated as the path to an argument file and its
  contents should be expanded into separate arguments for each line in the specified file.</div>
 </td>
 </tr>
-<tr id="i44" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#setOverwrittenOptionsAllowed-boolean-">setOverwrittenOptionsAllowed</a></span>(boolean&nbsp;newValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#setOverwrittenOptionsAllowed(boolean)">setOverwrittenOptionsAllowed</a></strong>(boolean&nbsp;newValue)</code>
 <div class="block">Sets whether options for single-value fields can be specified multiple times on the command line without a <a href="../picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli"><code>CommandLine.OverwrittenOptionException</code></a> being thrown.</div>
 </td>
 </tr>
-<tr id="i45" class="rowColor">
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#setPosixClusteredShortOptionsAllowed(boolean)">setPosixClusteredShortOptionsAllowed</a></strong>(boolean&nbsp;newValue)</code>
+<div class="block">Sets whether short options like <code>-x -v -f SomeFile</code> can be clustered together like <code>-xvfSomeFile</code>.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#setSeparator-java.lang.String-">setSeparator</a></span>(java.lang.String&nbsp;separator)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#setSeparator(java.lang.String)">setSeparator</a></strong>(java.lang.String&nbsp;separator)</code>
 <div class="block">Sets the String the parser uses to separate option names from option values to the specified value.</div>
 </td>
 </tr>
-<tr id="i46" class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#setStopAtPositional-boolean-">setStopAtPositional</a></span>(boolean&nbsp;newValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#setStopAtPositional(boolean)">setStopAtPositional</a></strong>(boolean&nbsp;newValue)</code>
 <div class="block">Sets whether the parser interprets the first positional parameter as "end of options" so the remaining
  arguments are all treated as positional parameters.</div>
 </td>
 </tr>
-<tr id="i47" class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#setStopAtUnmatched-boolean-">setStopAtUnmatched</a></span>(boolean&nbsp;newValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#setStopAtUnmatched(boolean)">setStopAtUnmatched</a></strong>(boolean&nbsp;newValue)</code>
 <div class="block">Sets whether the parser should stop interpreting options and positional parameters as soon as it encounters an
  unmatched option.</div>
 </td>
 </tr>
-<tr id="i48" class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#setUnmatchedArgumentsAllowed-boolean-">setUnmatchedArgumentsAllowed</a></span>(boolean&nbsp;newValue)</code>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#setUnmatchedArgumentsAllowed(boolean)">setUnmatchedArgumentsAllowed</a></strong>(boolean&nbsp;newValue)</code>
 <div class="block">Sets whether the end user may specify unmatched arguments on the command line without a <a href="../picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli"><code>CommandLine.UnmatchedArgumentException</code></a> being thrown.</div>
 </td>
 </tr>
-<tr id="i49" class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#usage-java.lang.Object-java.io.PrintStream-">usage</a></span>(java.lang.Object&nbsp;command,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#usage(java.lang.Object,%20java.io.PrintStream)">usage</a></strong>(java.lang.Object&nbsp;command,
      java.io.PrintStream&nbsp;out)</code>
 <div class="block">Equivalent to <code>new CommandLine(command).usage(out)</code>.</div>
 </td>
 </tr>
-<tr id="i50" class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#usage-java.lang.Object-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">usage</a></span>(java.lang.Object&nbsp;command,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#usage(java.lang.Object,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">usage</a></strong>(java.lang.Object&nbsp;command,
      java.io.PrintStream&nbsp;out,
      <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
 <div class="block">Equivalent to <code>new CommandLine(command).usage(out, ansi)</code>.</div>
 </td>
 </tr>
-<tr id="i51" class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#usage-java.lang.Object-java.io.PrintStream-picocli.CommandLine.Help.ColorScheme-">usage</a></span>(java.lang.Object&nbsp;command,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#usage(java.lang.Object,%20java.io.PrintStream,%20picocli.CommandLine.Help.ColorScheme)">usage</a></strong>(java.lang.Object&nbsp;command,
      java.io.PrintStream&nbsp;out,
      <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</code>
 <div class="block">Equivalent to <code>new CommandLine(command).usage(out, colorScheme)</code>.</div>
 </td>
 </tr>
-<tr id="i52" class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#usage-java.io.PrintStream-">usage</a></span>(java.io.PrintStream&nbsp;out)</code>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>usage(PrintStream, Help.Ansi)</code></a> with the <a href="../picocli/CommandLine.Help.Ansi.html#AUTO">platform default</a>.</div>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#usage(java.io.PrintStream)">usage</a></strong>(java.io.PrintStream&nbsp;out)</code>
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>usage(PrintStream, Help.Ansi)</code></a> with the <a href="../picocli/CommandLine.Help.Ansi.html#AUTO">platform default</a>.</div>
 </td>
 </tr>
-<tr id="i53" class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">usage</a></span>(java.io.PrintStream&nbsp;out,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">usage</a></strong>(java.io.PrintStream&nbsp;out,
      <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.ColorScheme-"><code>usage(PrintStream, Help.ColorScheme)</code></a> with the <a href="../picocli/CommandLine.Help.html#defaultColorScheme-picocli.CommandLine.Help.Ansi-">default color scheme</a>.</div>
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.ColorScheme)"><code>usage(PrintStream, Help.ColorScheme)</code></a> with the <a href="../picocli/CommandLine.Help.html#defaultColorScheme(picocli.CommandLine.Help.Ansi)">default color scheme</a>.</div>
 </td>
 </tr>
-<tr id="i54" class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.ColorScheme-">usage</a></span>(java.io.PrintStream&nbsp;out,
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.ColorScheme)">usage</a></strong>(java.io.PrintStream&nbsp;out,
      <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</code>
 <div class="block">Prints a usage help message for the annotated command class to the specified <code>PrintStream</code>.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#usage(java.io.PrintWriter)">usage</a></strong>(java.io.PrintWriter&nbsp;writer)</code>
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#usage(java.io.PrintWriter,%20picocli.CommandLine.Help.Ansi)"><code>usage(PrintWriter, Help.Ansi)</code></a> with the <a href="../picocli/CommandLine.Help.Ansi.html#AUTO">platform default</a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#usage(java.io.PrintWriter,%20picocli.CommandLine.Help.Ansi)">usage</a></strong>(java.io.PrintWriter&nbsp;writer,
+     <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</code>
+<div class="block">Similar to <a href="../picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>usage(PrintStream, Help.Ansi)</code></a> but with the specified <code>PrintWriter</code> instead of a <code>PrintStream</code>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../picocli/CommandLine.html#usage(java.io.PrintWriter,%20picocli.CommandLine.Help.ColorScheme)">usage</a></strong>(java.io.PrintWriter&nbsp;writer,
+     <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</code>
+<div class="block">Similar to <a href="../picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.ColorScheme)"><code>usage(PrintStream, Help.ColorScheme)</code></a>, but with the specified <code>PrintWriter</code> instead of a <code>PrintStream</code>.</div>
+</td>
+</tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -913,7 +913,7 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ FIELD DETAIL =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.detail">
+<li class="blockList"><a name="field_detail">
 <!--   -->
 </a>
 <h3>Field Detail</h3>
@@ -924,22 +924,19 @@ <h3>Field Detail</h3>
 <li class="blockList">
 <h4>VERSION</h4>
 <pre>public static final&nbsp;java.lang.String VERSION</pre>
-<div class="block">This is picocli version "3.0.0-alpha-1".</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#picocli.CommandLine.VERSION">Constant Field Values</a></dd>
-</dl>
+<div class="block">This is picocli version "3.0.0-alpha-2".</div>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../constant-values.html#picocli.CommandLine.VERSION">Constant Field Values</a></dd></dl>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="CommandLine-java.lang.Object-">
+<a name="CommandLine(java.lang.Object)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -951,53 +948,45 @@ <h4>CommandLine</h4>
  user object with <code>@Option</code> and <code>@Parameters</code>-annotated fields, in which case picocli automatically
  constructs a <code>CommandSpec</code> from this user object.
  </p><p>
- When the <a href="../picocli/CommandLine.html#parse-java.lang.String...-"><code>parse(String...)</code></a> method is called, the <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><code>CommandSpec</code></a> object will be
+ When the <a href="../picocli/CommandLine.html#parse(java.lang.String...)"><code>parse(String...)</code></a> method is called, the <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><code>CommandSpec</code></a> object will be
  initialized based on command line arguments. If the commandSpec is created from an annotated user object, this
  user object will be initialized based on the command line arguments.</p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>command</code> - an annotated user object or a <code>CommandSpec</code> object to initialize from the command line arguments</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></code> - if the specified command object does not have a <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>command</code> - an annotated user object or a <code>CommandSpec</code> object to initialize from the command line arguments</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></code> - if the specified command object does not have a <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation</dd></dl>
 </li>
 </ul>
-<a name="CommandLine-java.lang.Object-picocli.CommandLine.IFactory-">
+<a name="CommandLine(java.lang.Object, picocli.CommandLine.IFactory)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>CommandLine</h4>
 <pre>public&nbsp;CommandLine(java.lang.Object&nbsp;command,
-                   <a href="../picocli/CommandLine.IFactory.html" title="interface in picocli">CommandLine.IFactory</a>&nbsp;factory)</pre>
+           <a href="../picocli/CommandLine.IFactory.html" title="interface in picocli">CommandLine.IFactory</a>&nbsp;factory)</pre>
 <div class="block">Constructs a new <code>CommandLine</code> interpreter with the specified object (which may be an annotated user object or a <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><code>CommandSpec</code></a>) and object factory.
  <p>The specified object may be a <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><code>CommandSpec</code></a> object, or it may be a <code>@Command</code>-annotated
  user object with <code>@Option</code> and <code>@Parameters</code>-annotated fields, in which case picocli automatically
  constructs a <code>CommandSpec</code> from this user object.
  </p><p>
- When the <a href="../picocli/CommandLine.html#parse-java.lang.String...-"><code>parse(String...)</code></a> method is called, the <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><code>CommandSpec</code></a> object will be
+ When the <a href="../picocli/CommandLine.html#parse(java.lang.String...)"><code>parse(String...)</code></a> method is called, the <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><code>CommandSpec</code></a> object will be
  initialized based on command line arguments. If the commandSpec is created from an annotated user object, this
  user object will be initialized based on the command line arguments.</p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>command</code> - an annotated user object or a <code>CommandSpec</code> object to initialize from the command line arguments</dd>
-<dd><code>factory</code> - the factory used to create instances of <a href="../picocli/CommandLine.Command.html#subcommands--">subcommands</a>, <a href="../picocli/CommandLine.Option.html#converter--">converters</a>, etc., that are registered declaratively with annotation attributes</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></code> - if the specified command object does not have a <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.2</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>command</code> - an annotated user object or a <code>CommandSpec</code> object to initialize from the command line arguments</dd><dd><code>factory</code> - the factory used to create instances of <a href="../picocli/CommandLine.Command.html#subcommands()">subcommands</a>, <a href="../picocli/CommandLine.Option.html#converter()">converters</a>, etc., that are registered declaratively with annotation attributes</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></code> - if the specified command object does not have a <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation</dd><dt><span class="strong">Since:</span></dt>
+  <dd>2.2</dd></dl>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="getCommandSpec--">
+<a name="getCommandSpec()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1005,39 +994,29 @@ <h3>Method Detail</h3>
 <h4>getCommandSpec</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a>&nbsp;getCommandSpec()</pre>
 <div class="block">Returns the <code>CommandSpec</code> model that this <code>CommandLine</code> was constructed with.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the <code>CommandSpec</code> model</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the <code>CommandSpec</code> model</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="addMixin-java.lang.String-java.lang.Object-">
+<a name="addMixin(java.lang.String, java.lang.Object)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>addMixin</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;addMixin(java.lang.String&nbsp;name,
-                            java.lang.Object&nbsp;mixin)</pre>
+                   java.lang.Object&nbsp;mixin)</pre>
 <div class="block">Adds the options and positional parameters in the specified mixin to this command.
  <p>The specified object may be a <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><code>CommandSpec</code></a> object, or it may be a user object with
  <code>@Option</code> and <code>@Parameters</code>-annotated fields, in which case picocli automatically
  constructs a <code>CommandSpec</code> from this user object.
  </p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - the name by which the mixin object may later be retrieved</dd>
-<dd><code>mixin</code> - an annotated user object or a <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><code>CommandSpec</code></a> object whose options and positional parameters to add to this command</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this CommandLine object, to allow method chaining</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>name</code> - the name by which the mixin object may later be retrieved</dd><dd><code>mixin</code> - an annotated user object or a <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><code>CommandSpec</code></a> object whose options and positional parameters to add to this command</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this CommandLine object, to allow method chaining</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="getMixins--">
+<a name="getMixins()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1045,23 +1024,19 @@ <h4>addMixin</h4>
 <h4>getMixins</h4>
 <pre>public&nbsp;java.util.Map&lt;java.lang.String,java.lang.Object&gt;&nbsp;getMixins()</pre>
 <div class="block">Returns a map of user objects whose options and positional parameters were added to ("mixed in" with) this command.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a new Map containing the user objects mixed in with this command. If <code>CommandSpec</code> objects without
-          user objects were programmatically added, use the <a href="../picocli/CommandLine.Model.CommandSpec.html#mixins--"><code>underlying model</code></a> directly.</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a new Map containing the user objects mixed in with this command. If <code>CommandSpec</code> objects without
+          user objects were programmatically added, use the <a href="../picocli/CommandLine.Model.CommandSpec.html#mixins()"><code>underlying model</code></a> directly.</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="addSubcommand-java.lang.String-java.lang.Object-">
+<a name="addSubcommand(java.lang.String, java.lang.Object)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>addSubcommand</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;addSubcommand(java.lang.String&nbsp;name,
-                                 java.lang.Object&nbsp;command)</pre>
+                        java.lang.Object&nbsp;command)</pre>
 <div class="block">Registers a subcommand with the specified name. For example:
  <pre>
  CommandLine commandLine = new CommandLine(new Git())
@@ -1093,39 +1068,28 @@ <h4>addSubcommand</h4>
  converters are registered only with the subcommand hierarchy as it existed when the custom type was registered.
  To ensure a custom type converter is available to all subcommands, register the type converter last, after
  adding subcommands.</p>
- <p>See also the <a href="../picocli/CommandLine.Command.html#subcommands--"><code>CommandLine.Command.subcommands()</code></a> annotation to register subcommands declaratively.</p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - the string to recognize on the command line as a subcommand</dd>
-<dd><code>command</code> - the object to initialize with command line arguments following the subcommand name.
+ <p>See also the <a href="../picocli/CommandLine.Command.html#subcommands()"><code>CommandLine.Command.subcommands()</code></a> annotation to register subcommands declaratively.</p></div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>name</code> - the string to recognize on the command line as a subcommand</dd><dd><code>command</code> - the object to initialize with command line arguments following the subcommand name.
           This may be a <code>CommandLine</code> instance with its own (nested) subcommands</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this CommandLine object, to allow method chaining</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>0.9.7</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#registerConverter-java.lang.Class-picocli.CommandLine.ITypeConverter-"><code>registerConverter(Class, ITypeConverter)</code></a>, 
-<a href="../picocli/CommandLine.Command.html#subcommands--"><code>CommandLine.Command.subcommands()</code></a></dd>
-</dl>
+<dt><span class="strong">Returns:</span></dt><dd>this CommandLine object, to allow method chaining</dd><dt><span class="strong">Since:</span></dt>
+  <dd>0.9.7</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#registerConverter(java.lang.Class,%20picocli.CommandLine.ITypeConverter)"><code>registerConverter(Class, ITypeConverter)</code></a>, 
+<a href="../picocli/CommandLine.Command.html#subcommands()"><code>CommandLine.Command.subcommands()</code></a></dd></dl>
 </li>
 </ul>
-<a name="getSubcommands--">
+<a name="getSubcommands()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getSubcommands</h4>
 <pre>public&nbsp;java.util.Map&lt;java.lang.String,<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;getSubcommands()</pre>
-<div class="block">Returns a map with the subcommands <a href="../picocli/CommandLine.html#addSubcommand-java.lang.String-java.lang.Object-">registered</a> on this instance.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a map with the registered subcommands</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>0.9.7</dd>
-</dl>
+<div class="block">Returns a map with the subcommands <a href="../picocli/CommandLine.html#addSubcommand(java.lang.String,%20java.lang.Object)">registered</a> on this instance.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>a map with the registered subcommands</dd><dt><span class="strong">Since:</span></dt>
+  <dd>0.9.7</dd></dl>
 </li>
 </ul>
-<a name="getParent--">
+<a name="getParent()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1133,18 +1097,13 @@ <h4>getSubcommands</h4>
 <h4>getParent</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;getParent()</pre>
 <div class="block">Returns the command that this is a subcommand of, or <code>null</code> if this is a top-level command.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the command that this is a subcommand of, or <code>null</code> if this is a top-level command</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>0.9.8</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#addSubcommand-java.lang.String-java.lang.Object-"><code>addSubcommand(String, Object)</code></a>, 
-<a href="../picocli/CommandLine.Command.html#subcommands--"><code>CommandLine.Command.subcommands()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the command that this is a subcommand of, or <code>null</code> if this is a top-level command</dd><dt><span class="strong">Since:</span></dt>
+  <dd>0.9.8</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#addSubcommand(java.lang.String,%20java.lang.Object)"><code>addSubcommand(String, Object)</code></a>, 
+<a href="../picocli/CommandLine.Command.html#subcommands()"><code>CommandLine.Command.subcommands()</code></a></dd></dl>
 </li>
 </ul>
-<a name="getCommand--">
+<a name="getCommand()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1152,49 +1111,36 @@ <h4>getParent</h4>
 <h4>getCommand</h4>
 <pre>public&nbsp;&lt;T&gt;&nbsp;T&nbsp;getCommand()</pre>
 <div class="block">Returns the annotated user object that this <code>CommandLine</code> instance was constructed with.</div>
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>T</code> - the type of the variable that the return value is being assigned to</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the annotated object that this <code>CommandLine</code> instance was constructed with</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>0.9.7</dd>
-</dl>
+<dl><dt><span class="strong">Type Parameters:</span></dt><dd><code>T</code> - the type of the variable that the return value is being assigned to</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the annotated object that this <code>CommandLine</code> instance was constructed with</dd><dt><span class="strong">Since:</span></dt>
+  <dd>0.9.7</dd></dl>
 </li>
 </ul>
-<a name="isUsageHelpRequested--">
+<a name="isUsageHelpRequested()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>isUsageHelpRequested</h4>
 <pre>public&nbsp;boolean&nbsp;isUsageHelpRequested()</pre>
-<div class="block">Returns <code>true</code> if an option annotated with <a href="../picocli/CommandLine.Option.html#usageHelp--"><code>CommandLine.Option.usageHelp()</code></a> was specified on the command line.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>whether the parser encountered an option annotated with <a href="../picocli/CommandLine.Option.html#usageHelp--"><code>CommandLine.Option.usageHelp()</code></a>.</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>0.9.8</dd>
-</dl>
+<div class="block">Returns <code>true</code> if an option annotated with <a href="../picocli/CommandLine.Option.html#usageHelp()"><code>CommandLine.Option.usageHelp()</code></a> was specified on the command line.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>whether the parser encountered an option annotated with <a href="../picocli/CommandLine.Option.html#usageHelp()"><code>CommandLine.Option.usageHelp()</code></a>.</dd><dt><span class="strong">Since:</span></dt>
+  <dd>0.9.8</dd></dl>
 </li>
 </ul>
-<a name="isVersionHelpRequested--">
+<a name="isVersionHelpRequested()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>isVersionHelpRequested</h4>
 <pre>public&nbsp;boolean&nbsp;isVersionHelpRequested()</pre>
-<div class="block">Returns <code>true</code> if an option annotated with <a href="../picocli/CommandLine.Option.html#versionHelp--"><code>CommandLine.Option.versionHelp()</code></a> was specified on the command line.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>whether the parser encountered an option annotated with <a href="../picocli/CommandLine.Option.html#versionHelp--"><code>CommandLine.Option.versionHelp()</code></a>.</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>0.9.8</dd>
-</dl>
+<div class="block">Returns <code>true</code> if an option annotated with <a href="../picocli/CommandLine.Option.html#versionHelp()"><code>CommandLine.Option.versionHelp()</code></a> was specified on the command line.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>whether the parser encountered an option annotated with <a href="../picocli/CommandLine.Option.html#versionHelp()"><code>CommandLine.Option.versionHelp()</code></a>.</dd><dt><span class="strong">Since:</span></dt>
+  <dd>0.9.8</dd></dl>
 </li>
 </ul>
-<a name="isOverwrittenOptionsAllowed--">
+<a name="isOverwrittenOptionsAllowed()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1204,15 +1150,11 @@ <h4>isOverwrittenOptionsAllowed</h4>
 <div class="block">Returns whether options for single-value fields can be specified multiple times on the command line.
  The default is <code>false</code> and a <a href="../picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli"><code>CommandLine.OverwrittenOptionException</code></a> is thrown if this happens.
  When <code>true</code>, the last specified value is retained.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd><code>true</code> if options for single-value fields can be specified multiple times on the command line, <code>false</code> otherwise</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>0.9.7</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd><code>true</code> if options for single-value fields can be specified multiple times on the command line, <code>false</code> otherwise</dd><dt><span class="strong">Since:</span></dt>
+  <dd>0.9.7</dd></dl>
 </li>
 </ul>
-<a name="setOverwrittenOptionsAllowed-boolean-">
+<a name="setOverwrittenOptionsAllowed(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1224,17 +1166,41 @@ <h4>setOverwrittenOptionsAllowed</h4>
  subcommands and nested sub-subcommands <em>at the moment this method is called</em>. Subcommands added
  later will have the default setting. To ensure a setting is applied to all
  subcommands, call the setter last, after adding subcommands.</p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>newValue</code> - the new setting</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this <code>CommandLine</code> object, to allow method chaining</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>0.9.7</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>newValue</code> - the new setting</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this <code>CommandLine</code> object, to allow method chaining</dd><dt><span class="strong">Since:</span></dt>
+  <dd>0.9.7</dd></dl>
+</li>
+</ul>
+<a name="isPosixClusteredShortOptionsAllowed()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isPosixClusteredShortOptionsAllowed</h4>
+<pre>public&nbsp;boolean&nbsp;isPosixClusteredShortOptionsAllowed()</pre>
+<div class="block">Returns whether the parser accepts clustered short options. The default is <code>true</code>.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd><code>true</code> if short options like <code>-x -v -f SomeFile</code> can be clustered together like <code>-xvfSomeFile</code>, <code>false</code> otherwise</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
+</li>
+</ul>
+<a name="setPosixClusteredShortOptionsAllowed(boolean)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPosixClusteredShortOptionsAllowed</h4>
+<pre>public&nbsp;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;setPosixClusteredShortOptionsAllowed(boolean&nbsp;newValue)</pre>
+<div class="block">Sets whether short options like <code>-x -v -f SomeFile</code> can be clustered together like <code>-xvfSomeFile</code>.
+ <p>The specified setting will be registered with this <code>CommandLine</code> and the full hierarchy of its
+ subcommands and nested sub-subcommands <em>at the moment this method is called</em>. Subcommands added
+ later will have the default setting. To ensure a setting is applied to all
+ subcommands, call the setter last, after adding subcommands.</p></div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>newValue</code> - the new setting</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this <code>CommandLine</code> object, to allow method chaining</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="isStopAtPositional--">
+<a name="isStopAtPositional()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1243,15 +1209,11 @@ <h4>isStopAtPositional</h4>
 <pre>public&nbsp;boolean&nbsp;isStopAtPositional()</pre>
 <div class="block">Returns whether the parser interprets the first positional parameter as "end of options" so the remaining
  arguments are all treated as positional parameters. The default is <code>false</code>.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd><code>true</code> if all values following the first positional parameter should be treated as positional parameters, <code>false</code> otherwise</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.3</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd><code>true</code> if all values following the first positional parameter should be treated as positional parameters, <code>false</code> otherwise</dd><dt><span class="strong">Since:</span></dt>
+  <dd>2.3</dd></dl>
 </li>
 </ul>
-<a name="setStopAtPositional-boolean-">
+<a name="setStopAtPositional(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1264,17 +1226,12 @@ <h4>setStopAtPositional</h4>
  subcommands and nested sub-subcommands <em>at the moment this method is called</em>. Subcommands added
  later will have the default setting. To ensure a setting is applied to all
  subcommands, call the setter last, after adding subcommands.</p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>newValue</code> - <code>true</code> if all values following the first positional parameter should be treated as positional parameters, <code>false</code> otherwise</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this <code>CommandLine</code> object, to allow method chaining</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.3</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>newValue</code> - <code>true</code> if all values following the first positional parameter should be treated as positional parameters, <code>false</code> otherwise</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this <code>CommandLine</code> object, to allow method chaining</dd><dt><span class="strong">Since:</span></dt>
+  <dd>2.3</dd></dl>
 </li>
 </ul>
-<a name="isStopAtUnmatched--">
+<a name="isStopAtUnmatched()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1285,17 +1242,13 @@ <h4>isStopAtUnmatched</h4>
  unmatched option. Unmatched options are arguments that look like an option but are not one of the known options, or
  positional arguments for which there is no available slots (the command has no positional parameters or their size is limited).
  The default is <code>false</code>.
- <p>Setting this flag to <code>true</code> automatically sets the <a href="../picocli/CommandLine.html#isUnmatchedArgumentsAllowed--">unmatchedArgumentsAllowed</a> flag to <code>true</code> also.</p></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd><code>true</code> when an unmatched option should result in the remaining command line arguments to be added to the
-      <a href="../picocli/CommandLine.html#getUnmatchedArguments--">unmatchedArguments list</a></dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.3</dd>
-</dl>
+ <p>Setting this flag to <code>true</code> automatically sets the <a href="../picocli/CommandLine.html#isUnmatchedArgumentsAllowed()">unmatchedArgumentsAllowed</a> flag to <code>true</code> also.</p></div>
+<dl><dt><span class="strong">Returns:</span></dt><dd><code>true</code> when an unmatched option should result in the remaining command line arguments to be added to the
+      <a href="../picocli/CommandLine.html#getUnmatchedArguments()">unmatchedArguments list</a></dd><dt><span class="strong">Since:</span></dt>
+  <dd>2.3</dd></dl>
 </li>
 </ul>
-<a name="setStopAtUnmatched-boolean-">
+<a name="setStopAtUnmatched(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1306,23 +1259,18 @@ <h4>setStopAtUnmatched</h4>
  unmatched option. Unmatched options are arguments that look like an option but are not one of the known options, or
  positional arguments for which there is no available slots (the command has no positional parameters or their size is limited).
  The default is <code>false</code>.
- <p>Setting this flag to <code>true</code> automatically sets the <a href="../picocli/CommandLine.html#setUnmatchedArgumentsAllowed-boolean-">unmatchedArgumentsAllowed</a> flag to <code>true</code> also.</p>
+ <p>Setting this flag to <code>true</code> automatically sets the <a href="../picocli/CommandLine.html#setUnmatchedArgumentsAllowed(boolean)">unmatchedArgumentsAllowed</a> flag to <code>true</code> also.</p>
  <p>The specified setting will be registered with this <code>CommandLine</code> and the full hierarchy of its
  subcommands and nested sub-subcommands <em>at the moment this method is called</em>. Subcommands added
  later will have the default setting. To ensure a setting is applied to all
  subcommands, call the setter last, after adding subcommands.</p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>newValue</code> - <code>true</code> when an unmatched option should result in the remaining command line arguments to be added to the
-      <a href="../picocli/CommandLine.html#getUnmatchedArguments--">unmatchedArguments list</a></dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this <code>CommandLine</code> object, to allow method chaining</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.3</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>newValue</code> - <code>true</code> when an unmatched option should result in the remaining command line arguments to be added to the
+      <a href="../picocli/CommandLine.html#getUnmatchedArguments()">unmatchedArguments list</a></dd>
+<dt><span class="strong">Returns:</span></dt><dd>this <code>CommandLine</code> object, to allow method chaining</dd><dt><span class="strong">Since:</span></dt>
+  <dd>2.3</dd></dl>
 </li>
 </ul>
-<a name="isUnmatchedArgumentsAllowed--">
+<a name="isUnmatchedArgumentsAllowed()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1331,18 +1279,13 @@ <h4>isUnmatchedArgumentsAllowed</h4>
 <pre>public&nbsp;boolean&nbsp;isUnmatchedArgumentsAllowed()</pre>
 <div class="block">Returns whether the end user may specify arguments on the command line that are not matched to any option or parameter fields.
  The default is <code>false</code> and a <a href="../picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli"><code>CommandLine.UnmatchedArgumentException</code></a> is thrown if this happens.
- When <code>true</code>, the last unmatched arguments are available via the <a href="../picocli/CommandLine.html#getUnmatchedArguments--"><code>getUnmatchedArguments()</code></a> method.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd><code>true</code> if the end use may specify unmatched arguments on the command line, <code>false</code> otherwise</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>0.9.7</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#getUnmatchedArguments--"><code>getUnmatchedArguments()</code></a></dd>
-</dl>
+ When <code>true</code>, the last unmatched arguments are available via the <a href="../picocli/CommandLine.html#getUnmatchedArguments()"><code>getUnmatchedArguments()</code></a> method.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd><code>true</code> if the end use may specify unmatched arguments on the command line, <code>false</code> otherwise</dd><dt><span class="strong">Since:</span></dt>
+  <dd>0.9.7</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#getUnmatchedArguments()"><code>getUnmatchedArguments()</code></a></dd></dl>
 </li>
 </ul>
-<a name="setUnmatchedArgumentsAllowed-boolean-">
+<a name="setUnmatchedArgumentsAllowed(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1354,19 +1297,13 @@ <h4>setUnmatchedArgumentsAllowed</h4>
  subcommands and nested sub-subcommands <em>at the moment this method is called</em>. Subcommands added
  later will have the default setting. To ensure a setting is applied to all
  subcommands, call the setter last, after adding subcommands.</p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>newValue</code> - the new setting. When <code>true</code>, the last unmatched arguments are available via the <a href="../picocli/CommandLine.html#getUnmatchedArguments--"><code>getUnmatchedArguments()</code></a> method.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this <code>CommandLine</code> object, to allow method chaining</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>0.9.7</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#getUnmatchedArguments--"><code>getUnmatchedArguments()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>newValue</code> - the new setting. When <code>true</code>, the last unmatched arguments are available via the <a href="../picocli/CommandLine.html#getUnmatchedArguments()"><code>getUnmatchedArguments()</code></a> method.</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this <code>CommandLine</code> object, to allow method chaining</dd><dt><span class="strong">Since:</span></dt>
+  <dd>0.9.7</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#getUnmatchedArguments()"><code>getUnmatchedArguments()</code></a></dd></dl>
 </li>
 </ul>
-<a name="getUnmatchedArguments--">
+<a name="getUnmatchedArguments()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1374,26 +1311,21 @@ <h4>setUnmatchedArgumentsAllowed</h4>
 <h4>getUnmatchedArguments</h4>
 <pre>public&nbsp;java.util.List&lt;java.lang.String&gt;&nbsp;getUnmatchedArguments()</pre>
 <div class="block">Returns the list of unmatched command line arguments, if any.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the list of unmatched command line arguments or an empty list</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>0.9.7</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#isUnmatchedArgumentsAllowed--"><code>isUnmatchedArgumentsAllowed()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the list of unmatched command line arguments or an empty list</dd><dt><span class="strong">Since:</span></dt>
+  <dd>0.9.7</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#isUnmatchedArgumentsAllowed()"><code>isUnmatchedArgumentsAllowed()</code></a></dd></dl>
 </li>
 </ul>
-<a name="populateCommand-java.lang.Object-java.lang.String:A-">
+<a name="populateCommand(java.lang.Object,java.lang.String[])">
 <!--   -->
-</a><a name="populateCommand-T-java.lang.String...-">
+</a><a name="populateCommand(T, java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>populateCommand</h4>
 <pre>public static&nbsp;&lt;T&gt;&nbsp;T&nbsp;populateCommand(T&nbsp;command,
-                                    java.lang.String...&nbsp;args)</pre>
+                    java.lang.String...&nbsp;args)</pre>
 <div class="block"><p>
  Convenience method that initializes the specified annotated object from the specified command line arguments.
  </p><p>
@@ -1403,24 +1335,16 @@ <h4>populateCommand</h4>
  cli.parse(args);
  return command;
  </pre></div>
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>T</code> - the type of the annotated object</dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>command</code> - the object to initialize. This object contains fields annotated with
-          <code>@Option</code> or <code>@Parameters</code>.</dd>
-<dd><code>args</code> - the command line arguments to parse</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the specified annotated object</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dl><dt><span class="strong">Type Parameters:</span></dt><dd><code>T</code> - the type of the annotated object</dd><dt><span class="strong">Parameters:</span></dt><dd><code>command</code> - the object to initialize. This object contains fields annotated with
+          <code>@Option</code> or <code>@Parameters</code>.</dd><dd><code>args</code> - the command line arguments to parse</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the specified annotated object</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></code> - if the specified command object does not have a <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation</dd>
-<dd><code><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></code> - if the specified command line arguments are invalid</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>0.9.7</dd>
-</dl>
+<dd><code><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></code> - if the specified command line arguments are invalid</dd><dt><span class="strong">Since:</span></dt>
+  <dd>0.9.7</dd></dl>
 </li>
 </ul>
-<a name="parse-java.lang.String...-">
+<a name="parse(java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1431,22 +1355,18 @@ <h4>parse</h4>
  top-level command and any subcommands (if any) that were recognized and initialized during the parsing process.
  <p>
  If parsing succeeds, the first element in the returned list is always <code>this CommandLine</code> object. The
- returned list may contain more elements if subcommands were <a href="../picocli/CommandLine.html#addSubcommand-java.lang.String-java.lang.Object-">registered</a>
+ returned list may contain more elements if subcommands were <a href="../picocli/CommandLine.html#addSubcommand(java.lang.String,%20java.lang.Object)">registered</a>
  and these subcommands were initialized by matching command line arguments. If parsing fails, a
  <a href="../picocli/CommandLine.ParameterException.html" title="class in picocli"><code>CommandLine.ParameterException</code></a> is thrown.
  </p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>args</code> - the command line arguments to parse</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a list with the top-level command and any subcommands initialized by this method</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>args</code> - the command line arguments to parse</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a list with the top-level command and any subcommands initialized by this method</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></code> - if the specified command line arguments are invalid; use
-      <a href="../picocli/CommandLine.ParameterException.html#getCommandLine--"><code>CommandLine.ParameterException.getCommandLine()</code></a> to get the command or subcommand whose user input was invalid</dd>
-</dl>
+      <a href="../picocli/CommandLine.ParameterException.html#getCommandLine()"><code>CommandLine.ParameterException.getCommandLine()</code></a> to get the command or subcommand whose user input was invalid</dd></dl>
 </li>
 </ul>
-<a name="parseArgs-java.lang.String...-">
+<a name="parseArgs(java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1456,18 +1376,14 @@ <h4>parseArgs</h4>
 <div class="block">Parses the specified command line arguments and returns a list of <code>ParseResult</code> with the options, positional
  parameters, and subcommands (if any) that were recognized and initialized during the parsing process.
  <p>If parsing fails, a <a href="../picocli/CommandLine.ParameterException.html" title="class in picocli"><code>CommandLine.ParameterException</code></a> is thrown.</p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>args</code> - the command line arguments to parse</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a list with the top-level command and any subcommands initialized by this method</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>args</code> - the command line arguments to parse</dd>
+<dt><span class="strong">Returns:</span></dt><dd>a list with the top-level command and any subcommands initialized by this method</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a></code> - if the specified command line arguments are invalid; use
-      <a href="../picocli/CommandLine.ParameterException.html#getCommandLine--"><code>CommandLine.ParameterException.getCommandLine()</code></a> to get the command or subcommand whose user input was invalid</dd>
-</dl>
+      <a href="../picocli/CommandLine.ParameterException.html#getCommandLine()"><code>CommandLine.ParameterException.getCommandLine()</code></a> to get the command or subcommand whose user input was invalid</dd></dl>
 </li>
 </ul>
-<a name="getParseResult--">
+<a name="getParseResult()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1476,7 +1392,17 @@ <h4>getParseResult</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;getParseResult()</pre>
 </li>
 </ul>
-<a name="printHelpIfRequested-java.util.List-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">
+<a name="defaultExceptionHandler()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>defaultExceptionHandler</h4>
+<pre>public static&nbsp;<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a>&lt;java.util.List&lt;java.lang.Object&gt;&gt;&nbsp;defaultExceptionHandler()</pre>
+<div class="block">Convenience method that returns <code>new DefaultExceptionHandler&lt;List&lt;Object&gt;&gt;()</code>.</div>
+</li>
+</ul>
+<a name="printHelpIfRequested(java.util.List, java.io.PrintStream, picocli.CommandLine.Help.Ansi)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1484,71 +1410,58 @@ <h4>getParseResult</h4>
 <h4>printHelpIfRequested</h4>
 <pre>@Deprecated
 public static&nbsp;boolean&nbsp;printHelpIfRequested(java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands,
-                                                        java.io.PrintStream&nbsp;out,
-                                                        <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">use <a href="../picocli/CommandLine.html#printHelpIfRequested-java.util.List-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>printHelpIfRequested(List, PrintStream, PrintStream, Help.Ansi)</code></a> instead</span></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-</dl>
+                                      java.io.PrintStream&nbsp;out,
+                                      <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
+<div class="block"><span class="strong">Deprecated.</span>&nbsp;<i>use <a href="../picocli/CommandLine.html#printHelpIfRequested(java.util.List,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>printHelpIfRequested(List, PrintStream, PrintStream, Help.Ansi)</code></a> instead</i></div>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd></dl>
 </li>
 </ul>
-<a name="printHelpIfRequested-picocli.CommandLine.ParseResult-">
+<a name="printHelpIfRequested(picocli.CommandLine.ParseResult)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>printHelpIfRequested</h4>
 <pre>public static&nbsp;boolean&nbsp;printHelpIfRequested(<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a>&nbsp;parseResult)</pre>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#printHelpIfRequested-java.util.List-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>printHelpIfRequested(List, PrintStream, PrintStream, Help.Ansi)</code></a> with
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#printHelpIfRequested(java.util.List,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>printHelpIfRequested(List, PrintStream, PrintStream, Help.Ansi)</code></a> with
  <code>parseResult.asCommandLineList(), System.out, System.err, Help.Ansi.AUTO</code>.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="printHelpIfRequested-java.util.List-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">
+<a name="printHelpIfRequested(java.util.List, java.io.PrintStream, java.io.PrintStream, picocli.CommandLine.Help.Ansi)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>printHelpIfRequested</h4>
 <pre>public static&nbsp;boolean&nbsp;printHelpIfRequested(java.util.List&lt;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands,
-                                           java.io.PrintStream&nbsp;out,
-                                           java.io.PrintStream&nbsp;err,
-                                           <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
+                           java.io.PrintStream&nbsp;out,
+                           java.io.PrintStream&nbsp;err,
+                           <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
 <div class="block">Helper method that may be useful when processing the list of <code>CommandLine</code> objects that result from successfully
- <a href="../picocli/CommandLine.html#parse-java.lang.String...-">parsing</a> command line arguments. This method prints out
- <a href="../picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">usage help</a> if <a href="../picocli/CommandLine.html#isUsageHelpRequested--">requested</a>
- or <a href="../picocli/CommandLine.html#printVersionHelp-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">version help</a> if <a href="../picocli/CommandLine.html#isVersionHelpRequested--">requested</a>
- and returns <code>true</code>. If the command is a <a href="../picocli/CommandLine.Command.html#helpCommand--"><code>CommandLine.Command.helpCommand()</code></a> and <code>runnable</code> or <code>callable</code>,
+ <a href="../picocli/CommandLine.html#parse(java.lang.String...)">parsing</a> command line arguments. This method prints out
+ <a href="../picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">usage help</a> if <a href="../picocli/CommandLine.html#isUsageHelpRequested()">requested</a>
+ or <a href="../picocli/CommandLine.html#printVersionHelp(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">version help</a> if <a href="../picocli/CommandLine.html#isVersionHelpRequested()">requested</a>
+ and returns <code>true</code>. If the command is a <a href="../picocli/CommandLine.Command.html#helpCommand()"><code>CommandLine.Command.helpCommand()</code></a> and <code>runnable</code> or <code>callable</code>,
  that command is executed and this method returns <code>true</code>.
  Otherwise, if none of the specified <code>CommandLine</code> objects have help requested,
  this method returns <code>false</code>.<p>
- Note that this method <em>only</em> looks at the <a href="../picocli/CommandLine.Option.html#usageHelp--"><code>usageHelp</code></a> and
- <a href="../picocli/CommandLine.Option.html#versionHelp--"><code>versionHelp</code></a> attributes. The <a href="../picocli/CommandLine.Option.html#help--"><code>help</code></a> attribute is ignored.
+ Note that this method <em>only</em> looks at the <a href="../picocli/CommandLine.Option.html#usageHelp()"><code>usageHelp</code></a> and
+ <a href="../picocli/CommandLine.Option.html#versionHelp()"><code>versionHelp</code></a> attributes. The <a href="../picocli/CommandLine.Option.html#help()"><code>help</code></a> attribute is ignored.
  </p><p><b>Implementation note:</b></p><p>
  When an error occurs while processing the help request, it is recommended custom Help commands throw a
  <a href="../picocli/CommandLine.ParameterException.html" title="class in picocli"><code>CommandLine.ParameterException</code></a> with a reference to the parent command. This will print the error message and the
  usage for the parent command, and will use the exit code of the exception handler if one was set.
  </p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>parsedCommands</code> - the list of <code>CommandLine</code> objects to check if help was requested</dd>
-<dd><code>out</code> - the <code>PrintStream</code> to print help to if requested</dd>
-<dd><code>err</code> - the error string to print diagnostic messages to, in addition to the output from the exception handler</dd>
-<dd><code>ansi</code> - for printing help messages using ANSI styles and colors</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd><code>true</code> if help was printed, <code>false</code> otherwise</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli"><code>CommandLine.IHelpCommandInitializable</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>parsedCommands</code> - the list of <code>CommandLine</code> objects to check if help was requested</dd><dd><code>out</code> - the <code>PrintStream</code> to print help to if requested</dd><dd><code>err</code> - the error string to print diagnostic messages to, in addition to the output from the exception handler</dd><dd><code>ansi</code> - for printing help messages using ANSI styles and colors</dd>
+<dt><span class="strong">Returns:</span></dt><dd><code>true</code> if help was printed, <code>false</code> otherwise</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli"><code>CommandLine.IHelpCommandInitializable</code></a></dd></dl>
 </li>
 </ul>
-<a name="parseWithHandler-picocli.CommandLine.IParseResultHandler-java.io.PrintStream-java.lang.String...-">
+<a name="parseWithHandler(picocli.CommandLine.IParseResultHandler, java.io.PrintStream, java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1556,40 +1469,34 @@ <h4>printHelpIfRequested</h4>
 <h4>parseWithHandler</h4>
 <pre>@Deprecated
 public&nbsp;java.util.List&lt;java.lang.Object&gt;&nbsp;parseWithHandler(<a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a>&nbsp;handler,
-                                                                      java.io.PrintStream&nbsp;out,
-                                                                      java.lang.String...&nbsp;args)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">use <a href="../picocli/CommandLine.html#parseWithHandler-picocli.CommandLine.IParseResultHandler2-R-java.lang.String:A-"><code>parseWithHandler(IParseResultHandler2, Object, String[])</code></a> instead</span></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-</dl>
+                                                           java.io.PrintStream&nbsp;out,
+                                                           java.lang.String...&nbsp;args)</pre>
+<div class="block"><span class="strong">Deprecated.</span>&nbsp;<i>use <a href="../picocli/CommandLine.html#parseWithHandler(picocli.CommandLine.IParseResultHandler2,%20java.lang.String[])"><code>parseWithHandler(IParseResultHandler2,  String[])</code></a> instead</i></div>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd></dl>
 </li>
 </ul>
-<a name="parseWithHandler-picocli.CommandLine.IParseResultHandler2-java.lang.Object-java.lang.String:A-">
-<!--   -->
-</a><a name="parseWithHandler-picocli.CommandLine.IParseResultHandler2-R-java.lang.String:A-">
+<a name="parseWithHandler(picocli.CommandLine.IParseResultHandler2, java.lang.String[])">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>parseWithHandler</h4>
 <pre>public&nbsp;&lt;R&gt;&nbsp;R&nbsp;parseWithHandler(<a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a>&lt;R&gt;&nbsp;handler,
-                              R&nbsp;prototypeReturnValue,
-                              java.lang.String[]&nbsp;args)</pre>
-<div class="block">Returns the result of calling <a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)</code></a> with
+                     java.lang.String[]&nbsp;args)</pre>
+<div class="block">Returns the result of calling <a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)"><code>parseWithHandlers(IParseResultHandler2,  IExceptionHandler2, String...)</code></a> with
  a new <a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><code>CommandLine.DefaultExceptionHandler</code></a> in addition to the specified parse result handler and the specified command line arguments.
  <p>
- This is a convenience method intended to offer the same ease of use as the <a href="../picocli/CommandLine.html#run-R-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>run</code></a>
- and <a href="../picocli/CommandLine.html#call-C-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>call</code></a> methods, but with more flexibility and better
+ This is a convenience method intended to offer the same ease of use as the <a href="../picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>run</code></a>
+ and <a href="../picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>call</code></a> methods, but with more flexibility and better
  support for nested subcommands.
  </p>
  <p>Calling this method roughly expands to:</p>
- <pre><code>
- try {
+ <pre><code>try {
      ParseResult parseResult = parseArgs(args);
-     return handler.handleParseResult(parseResult, prototypeReturnValue);
+     return handler.handleParseResult(parseResult);
  } catch (ParameterException ex) {
-     return new DefaultExceptionHandler&lt;R&gt;().handleParseException(ex, prototypeReturnValue, args);
+     return new DefaultExceptionHandler&lt;R&gt;().handleParseException(ex, args);
  }
  </code></pre>
  <p>
@@ -1602,60 +1509,17 @@ <h4>parseWithHandler</h4>
    <li><a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><code>CommandLine.RunAll</code></a> handler prints help if requested, and otherwise executes all recognized commands and subcommands as <code>Runnable</code> or <code>Callable</code> tasks.</li>
    <li><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><code>CommandLine.DefaultExceptionHandler</code></a> prints the error message followed by usage help</li>
  </ul></div>
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>R</code> - the return type of this handler</dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>handler</code> - the function that will handle the result of successfully parsing the command line arguments</dd>
-<dd><code>prototypeReturnValue</code> - prototype return value, may be returned as is when the user requested help for example,
-                               or may be used to collect results from multiple subcommands, or may be used by the
-                               handler for internal processing and a completely different object is returned</dd>
-<dd><code>args</code> - the command line arguments</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an object resulting from handling the parse result or the exception that occurred while parsing the input</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the command line arguments were parsed successfully but a problem occurred while processing the
-      parse results; use <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine--"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a>, 
-<a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><code>CommandLine.RunAll</code></a></dd>
-</dl>
-</li>
-</ul>
-<a name="parseWithSimpleHandler-picocli.CommandLine.AbstractSimpleParseResultHandler-java.lang.String...-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>parseWithSimpleHandler</h4>
-<pre>public&nbsp;void&nbsp;parseWithSimpleHandler(<a href="../picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli">CommandLine.AbstractSimpleParseResultHandler</a>&nbsp;handler,
-                                   java.lang.String...&nbsp;args)</pre>
-<div class="block">Calls <a href="../picocli/CommandLine.html#parseWithSimpleHandlers-picocli.CommandLine.AbstractSimpleParseResultHandler-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>parseWithSimpleHandlers(AbstractSimpleParseResultHandler, IExceptionHandler2, String...)</code></a> with
- a new <a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><code>CommandLine.DefaultExceptionHandler</code></a> in addition to the specified parse result handler and the specified command line arguments.
- <p>Calling this method roughly expands to:</p>
- <pre><code>
- try {
-     ParseResult parseResult = parseArgs(args);
-     handler.handleParseResult(parseResult);
- } catch (ParameterException ex) {
-     new DefaultExceptionHandler&lt;Void&gt;().handleParseException(ex, null, (String[]) args);
- }
- </code></pre></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>handler</code> - the function that will handle the result of successfully parsing the command line arguments</dd>
-<dd><code>args</code> - the command line arguments</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dl><dt><span class="strong">Type Parameters:</span></dt><dd><code>R</code> - the return type of this handler</dd><dt><span class="strong">Parameters:</span></dt><dd><code>handler</code> - the function that will handle the result of successfully parsing the command line arguments</dd><dd><code>args</code> - the command line arguments</dd>
+<dt><span class="strong">Returns:</span></dt><dd>an object resulting from handling the parse result or the exception that occurred while parsing the input</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the command line arguments were parsed successfully but a problem occurred while processing the
-      parse results; use <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine--"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-</dl>
+      parse results; use <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine()"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a>, 
+<a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><code>CommandLine.RunAll</code></a></dd></dl>
 </li>
 </ul>
-<a name="parseWithHandlers-picocli.CommandLine.IParseResultHandler-java.io.PrintStream-picocli.CommandLine.Help.Ansi-picocli.CommandLine.IExceptionHandler-java.lang.String...-">
+<a name="parseWithHandlers(picocli.CommandLine.IParseResultHandler, java.io.PrintStream, picocli.CommandLine.Help.Ansi, picocli.CommandLine.IExceptionHandler, java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -1663,36 +1527,31 @@ <h4>parseWithSimpleHandler</h4>
 <h4>parseWithHandlers</h4>
 <pre>@Deprecated
 public&nbsp;java.util.List&lt;java.lang.Object&gt;&nbsp;parseWithHandlers(<a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a>&nbsp;handler,
-                                                                       java.io.PrintStream&nbsp;out,
-                                                                       <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
-                                                                       <a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli">CommandLine.IExceptionHandler</a>&nbsp;exceptionHandler,
-                                                                       java.lang.String...&nbsp;args)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">use <a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)</code></a> instead</span></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-</dl>
+                                                            java.io.PrintStream&nbsp;out,
+                                                            <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
+                                                            <a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli">CommandLine.IExceptionHandler</a>&nbsp;exceptionHandler,
+                                                            java.lang.String...&nbsp;args)</pre>
+<div class="block"><span class="strong">Deprecated.</span>&nbsp;<i>use <a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)"><code>parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...)</code></a> instead</i></div>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd></dl>
 </li>
 </ul>
-<a name="parseWithHandlers-picocli.CommandLine.IParseResultHandler2-java.lang.Object-picocli.CommandLine.IExceptionHandler2-java.lang.String:A-">
-<!--   -->
-</a><a name="parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-">
+<a name="parseWithHandlers(picocli.CommandLine.IParseResultHandler2, picocli.CommandLine.IExceptionHandler2, java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>parseWithHandlers</h4>
 <pre>public&nbsp;&lt;R&gt;&nbsp;R&nbsp;parseWithHandlers(<a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a>&lt;R&gt;&nbsp;handler,
-                               R&nbsp;prototypeReturnValue,
-                               <a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a>&lt;R&gt;&nbsp;exceptionHandler,
-                               java.lang.String...&nbsp;args)</pre>
-<div class="block">Tries to <a href="../picocli/CommandLine.html#parseArgs-java.lang.String...-">parse</a> the specified command line arguments, and if successful, delegates
+                      <a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a>&lt;R&gt;&nbsp;exceptionHandler,
+                      java.lang.String...&nbsp;args)</pre>
+<div class="block">Tries to <a href="../picocli/CommandLine.html#parseArgs(java.lang.String...)">parse</a> the specified command line arguments, and if successful, delegates
  the processing of the resulting <code>ParseResult</code> object to the specified <a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">handler</a>.
  If the command line arguments were invalid, the <code>ParameterException</code> thrown from the <code>parse</code> method
  is caught and passed to the specified <a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><code>CommandLine.IExceptionHandler2</code></a>.
  <p>
- This is a convenience method intended to offer the same ease of use as the <a href="../picocli/CommandLine.html#run-R-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>run</code></a>
- and <a href="../picocli/CommandLine.html#call-C-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>call</code></a> methods, but with more flexibility and better
+ This is a convenience method intended to offer the same ease of use as the <a href="../picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>run</code></a>
+ and <a href="../picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>call</code></a> methods, but with more flexibility and better
  support for nested subcommands.
  </p>
  <p>Calling this method roughly expands to:</p>
@@ -1717,172 +1576,120 @@ <h4>parseWithHandlers</h4>
    <li><a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><code>CommandLine.RunAll</code></a> handler prints help if requested, and otherwise executes all recognized commands and subcommands as <code>Runnable</code> or <code>Callable</code> tasks.</li>
    <li><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><code>CommandLine.DefaultExceptionHandler</code></a> prints the error message followed by usage help</li>
  </ul></div>
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>R</code> - the return type of the result handler and exception handler</dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>handler</code> - the function that will handle the result of successfully parsing the command line arguments</dd>
-<dd><code>prototypeReturnValue</code> - prototype return value, may be returned as is when the user requested help for example,
-                               or may be used to collect results from multiple subcommands, or may be used by the
-                               handler for internal processing and a completely different object is returned</dd>
-<dd><code>exceptionHandler</code> - the function that can handle the <code>ParameterException</code> thrown when the command line arguments are invalid</dd>
-<dd><code>args</code> - the command line arguments</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an object resulting from handling the parse result or the exception that occurred while parsing the input</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dl><dt><span class="strong">Type Parameters:</span></dt><dd><code>R</code> - the return type of the result handler and exception handler</dd><dt><span class="strong">Parameters:</span></dt><dd><code>handler</code> - the function that will handle the result of successfully parsing the command line arguments</dd><dd><code>exceptionHandler</code> - the function that can handle the <code>ParameterException</code> thrown when the command line arguments are invalid</dd><dd><code>args</code> - the command line arguments</dd>
+<dt><span class="strong">Returns:</span></dt><dd>an object resulting from handling the parse result or the exception that occurred while parsing the input</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the command line arguments were parsed successfully but a problem occurred while processing the parse
-      result <code>ParseResult</code> object; use <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine--"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a>, 
+      result <code>ParseResult</code> object; use <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine()"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a>, 
 <a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><code>CommandLine.RunAll</code></a>, 
-<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><code>CommandLine.DefaultExceptionHandler</code></a></dd>
-</dl>
+<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><code>CommandLine.DefaultExceptionHandler</code></a></dd></dl>
 </li>
 </ul>
-<a name="parseWithSimpleHandlers-picocli.CommandLine.AbstractSimpleParseResultHandler-picocli.CommandLine.IExceptionHandler2-java.lang.String...-">
+<a name="usage(java.lang.Object, java.io.PrintStream)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>parseWithSimpleHandlers</h4>
-<pre>public&nbsp;void&nbsp;parseWithSimpleHandlers(<a href="../picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli">CommandLine.AbstractSimpleParseResultHandler</a>&nbsp;handler,
-                                    <a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a>&lt;java.lang.Void&gt;&nbsp;exceptionHandler,
-                                    java.lang.String...&nbsp;args)</pre>
-<div class="block">Tries to <a href="../picocli/CommandLine.html#parseArgs-java.lang.String...-">parse</a> the specified command line arguments, and if successful, delegates
- the processing of the resulting <code>ParseResult</code> object to the specified <a href="../picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli">handler</a>.
- If the command line arguments were invalid, the <code>ParameterException</code> thrown from the <code>parse</code> method
- is caught and passed to the specified <a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><code>CommandLine.IExceptionHandler2</code></a>.
- <p>Calling this method roughly expands to:</p>
- <pre>
- ParseResult parseResult = null;
- try {
-     parseResult = parseArgs(args);
-     handleParseResult(parseResult);
- } catch (ParameterException ex) {
-     exceptionHandler.handleParseException(ex, null, (String[]) args);
- } catch (ExecutionException ex) {
-     exceptionHandler.handleExecutionException(ex, null, parseResult);
- }
- </pre></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>handler</code> - the function that will handle the result of successfully parsing the command line arguments</dd>
-<dd><code>exceptionHandler</code> - the function that can handle the <code>ParameterException</code> thrown when the command line arguments are invalid</dd>
-<dd><code>args</code> - the command line arguments</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the command line arguments were parsed successfully but a problem occurred while processing the parse
-      result <code>ParseResult</code> object; use <a href="../picocli/CommandLine.ExecutionException.html#getCommandLine--"><code>CommandLine.ExecutionException.getCommandLine()</code></a> to get the command or subcommand where processing failed</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><code>CommandLine.DefaultExceptionHandler</code></a></dd>
-</dl>
+<h4>usage</h4>
+<pre>public static&nbsp;void&nbsp;usage(java.lang.Object&nbsp;command,
+         java.io.PrintStream&nbsp;out)</pre>
+<div class="block">Equivalent to <code>new CommandLine(command).usage(out)</code>. See <a href="../picocli/CommandLine.html#usage(java.io.PrintStream)"><code>usage(PrintStream)</code></a> for details.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>command</code> - the object annotated with <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> and <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a></dd><dd><code>out</code> - the print stream to print the help message to</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code>java.lang.IllegalArgumentException</code> - if the specified command object does not have a <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation</dd></dl>
 </li>
 </ul>
-<a name="usage-java.lang.Object-java.io.PrintStream-">
+<a name="usage(java.lang.Object, java.io.PrintStream, picocli.CommandLine.Help.Ansi)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>usage</h4>
 <pre>public static&nbsp;void&nbsp;usage(java.lang.Object&nbsp;command,
-                         java.io.PrintStream&nbsp;out)</pre>
-<div class="block">Equivalent to <code>new CommandLine(command).usage(out)</code>. See <a href="../picocli/CommandLine.html#usage-java.io.PrintStream-"><code>usage(PrintStream)</code></a> for details.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>command</code> - the object annotated with <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> and <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a></dd>
-<dd><code>out</code> - the print stream to print the help message to</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.IllegalArgumentException</code> - if the specified command object does not have a <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation</dd>
-</dl>
+         java.io.PrintStream&nbsp;out,
+         <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
+<div class="block">Equivalent to <code>new CommandLine(command).usage(out, ansi)</code>.
+ See <a href="../picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>usage(PrintStream, Help.Ansi)</code></a> for details.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>command</code> - the object annotated with <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> and <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a></dd><dd><code>out</code> - the print stream to print the help message to</dd><dd><code>ansi</code> - whether the usage message should contain ANSI escape codes or not</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code>java.lang.IllegalArgumentException</code> - if the specified command object does not have a <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation</dd></dl>
 </li>
 </ul>
-<a name="usage-java.lang.Object-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">
+<a name="usage(java.lang.Object, java.io.PrintStream, picocli.CommandLine.Help.ColorScheme)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>usage</h4>
 <pre>public static&nbsp;void&nbsp;usage(java.lang.Object&nbsp;command,
-                         java.io.PrintStream&nbsp;out,
-                         <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
-<div class="block">Equivalent to <code>new CommandLine(command).usage(out, ansi)</code>.
- See <a href="../picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>usage(PrintStream, Help.Ansi)</code></a> for details.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>command</code> - the object annotated with <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> and <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a></dd>
-<dd><code>out</code> - the print stream to print the help message to</dd>
-<dd><code>ansi</code> - whether the usage message should contain ANSI escape codes or not</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.IllegalArgumentException</code> - if the specified command object does not have a <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation</dd>
-</dl>
+         java.io.PrintStream&nbsp;out,
+         <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</pre>
+<div class="block">Equivalent to <code>new CommandLine(command).usage(out, colorScheme)</code>.
+ See <a href="../picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.ColorScheme)"><code>usage(PrintStream, Help.ColorScheme)</code></a> for details.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>command</code> - the object annotated with <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> and <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a></dd><dd><code>out</code> - the print stream to print the help message to</dd><dd><code>colorScheme</code> - the <code>ColorScheme</code> defining the styles for options, parameters and commands when ANSI is enabled</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code>java.lang.IllegalArgumentException</code> - if the specified command object does not have a <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation</dd></dl>
 </li>
 </ul>
-<a name="usage-java.lang.Object-java.io.PrintStream-picocli.CommandLine.Help.ColorScheme-">
+<a name="usage(java.io.PrintStream)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>usage</h4>
-<pre>public static&nbsp;void&nbsp;usage(java.lang.Object&nbsp;command,
-                         java.io.PrintStream&nbsp;out,
-                         <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</pre>
-<div class="block">Equivalent to <code>new CommandLine(command).usage(out, colorScheme)</code>.
- See <a href="../picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.ColorScheme-"><code>usage(PrintStream, Help.ColorScheme)</code></a> for details.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>command</code> - the object annotated with <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> and <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a></dd>
-<dd><code>out</code> - the print stream to print the help message to</dd>
-<dd><code>colorScheme</code> - the <code>ColorScheme</code> defining the styles for options, parameters and commands when ANSI is enabled</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.IllegalArgumentException</code> - if the specified command object does not have a <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation</dd>
-</dl>
+<pre>public&nbsp;void&nbsp;usage(java.io.PrintStream&nbsp;out)</pre>
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>usage(PrintStream, Help.Ansi)</code></a> with the <a href="../picocli/CommandLine.Help.Ansi.html#AUTO">platform default</a>.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>out</code> - the printStream to print to</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.ColorScheme)"><code>usage(PrintStream, Help.ColorScheme)</code></a></dd></dl>
 </li>
 </ul>
-<a name="usage-java.io.PrintStream-">
+<a name="usage(java.io.PrintWriter)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>usage</h4>
-<pre>public&nbsp;void&nbsp;usage(java.io.PrintStream&nbsp;out)</pre>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>usage(PrintStream, Help.Ansi)</code></a> with the <a href="../picocli/CommandLine.Help.Ansi.html#AUTO">platform default</a>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>out</code> - the printStream to print to</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.ColorScheme-"><code>usage(PrintStream, Help.ColorScheme)</code></a></dd>
-</dl>
+<pre>public&nbsp;void&nbsp;usage(java.io.PrintWriter&nbsp;writer)</pre>
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#usage(java.io.PrintWriter,%20picocli.CommandLine.Help.Ansi)"><code>usage(PrintWriter, Help.Ansi)</code></a> with the <a href="../picocli/CommandLine.Help.Ansi.html#AUTO">platform default</a>.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>writer</code> - the PrintWriter to print to</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#usage(java.io.PrintWriter,%20picocli.CommandLine.Help.ColorScheme)"><code>usage(PrintWriter, Help.ColorScheme)</code></a></dd></dl>
 </li>
 </ul>
-<a name="usage-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">
+<a name="usage(java.io.PrintStream, picocli.CommandLine.Help.Ansi)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>usage</h4>
 <pre>public&nbsp;void&nbsp;usage(java.io.PrintStream&nbsp;out,
-                  <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.ColorScheme-"><code>usage(PrintStream, Help.ColorScheme)</code></a> with the <a href="../picocli/CommandLine.Help.html#defaultColorScheme-picocli.CommandLine.Help.Ansi-">default color scheme</a>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>out</code> - the printStream to print to</dd>
-<dd><code>ansi</code> - whether the usage message should include ANSI escape codes or not</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.ColorScheme-"><code>usage(PrintStream, Help.ColorScheme)</code></a></dd>
-</dl>
+         <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.ColorScheme)"><code>usage(PrintStream, Help.ColorScheme)</code></a> with the <a href="../picocli/CommandLine.Help.html#defaultColorScheme(picocli.CommandLine.Help.Ansi)">default color scheme</a>.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>out</code> - the printStream to print to</dd><dd><code>ansi</code> - whether the usage message should include ANSI escape codes or not</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.ColorScheme)"><code>usage(PrintStream, Help.ColorScheme)</code></a></dd></dl>
 </li>
 </ul>
-<a name="usage-java.io.PrintStream-picocli.CommandLine.Help.ColorScheme-">
+<a name="usage(java.io.PrintWriter, picocli.CommandLine.Help.Ansi)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>usage</h4>
+<pre>public&nbsp;void&nbsp;usage(java.io.PrintWriter&nbsp;writer,
+         <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
+<div class="block">Similar to <a href="../picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>usage(PrintStream, Help.Ansi)</code></a> but with the specified <code>PrintWriter</code> instead of a <code>PrintStream</code>.</div>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
+</li>
+</ul>
+<a name="usage(java.io.PrintStream, picocli.CommandLine.Help.ColorScheme)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>usage</h4>
 <pre>public&nbsp;void&nbsp;usage(java.io.PrintStream&nbsp;out,
-                  <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</pre>
+         <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</pre>
 <div class="block">Prints a usage help message for the annotated command class to the specified <code>PrintStream</code>.
  Delegates construction of the usage help message to the <a href="../picocli/CommandLine.Help.html" title="class in picocli"><code>CommandLine.Help</code></a> inner class and is equivalent to:
  <pre>
@@ -1911,198 +1718,155 @@ <h4>usage</h4>
  instantiate a <a href="../picocli/CommandLine.Help.html" title="class in picocli"><code>CommandLine.Help</code></a> object and use a <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><code>CommandLine.Help.TextTable</code></a> with more of fewer columns, a custom
  <a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli">layout</a>, and/or a custom option <a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">renderer</a>
  for ultimate control over which aspects of an Option or Field are displayed where.</p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>out</code> - the <code>PrintStream</code> to print the usage help message to</dd>
-<dd><code>colorScheme</code> - the <code>ColorScheme</code> defining the styles for options, parameters and commands when ANSI is enabled</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>out</code> - the <code>PrintStream</code> to print the usage help message to</dd><dd><code>colorScheme</code> - the <code>ColorScheme</code> defining the styles for options, parameters and commands when ANSI is enabled</dd></dl>
+</li>
+</ul>
+<a name="usage(java.io.PrintWriter, picocli.CommandLine.Help.ColorScheme)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>usage</h4>
+<pre>public&nbsp;void&nbsp;usage(java.io.PrintWriter&nbsp;writer,
+         <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</pre>
+<div class="block">Similar to <a href="../picocli/CommandLine.html#usage(java.io.PrintStream,%20picocli.CommandLine.Help.ColorScheme)"><code>usage(PrintStream, Help.ColorScheme)</code></a>, but with the specified <code>PrintWriter</code> instead of a <code>PrintStream</code>.</div>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="printVersionHelp-java.io.PrintStream-">
+<a name="printVersionHelp(java.io.PrintStream)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>printVersionHelp</h4>
 <pre>public&nbsp;void&nbsp;printVersionHelp(java.io.PrintStream&nbsp;out)</pre>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#printVersionHelp-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>printVersionHelp(PrintStream, Help.Ansi)</code></a> with the <a href="../picocli/CommandLine.Help.Ansi.html#AUTO">platform default</a>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>out</code> - the printStream to print to</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>0.9.8</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#printVersionHelp-java.io.PrintStream-picocli.CommandLine.Help.Ansi-"><code>printVersionHelp(PrintStream, Help.Ansi)</code></a></dd>
-</dl>
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#printVersionHelp(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>printVersionHelp(PrintStream, Help.Ansi)</code></a> with the <a href="../picocli/CommandLine.Help.Ansi.html#AUTO">platform default</a>.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>out</code> - the printStream to print to</dd><dt><span class="strong">Since:</span></dt>
+  <dd>0.9.8</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#printVersionHelp(java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)"><code>printVersionHelp(PrintStream, Help.Ansi)</code></a></dd></dl>
 </li>
 </ul>
-<a name="printVersionHelp-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">
+<a name="printVersionHelp(java.io.PrintStream, picocli.CommandLine.Help.Ansi)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>printVersionHelp</h4>
 <pre>public&nbsp;void&nbsp;printVersionHelp(java.io.PrintStream&nbsp;out,
-                             <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
-<div class="block">Prints version information from the <a href="../picocli/CommandLine.Command.html#version--"><code>CommandLine.Command.version()</code></a> annotation to the specified <code>PrintStream</code>.
+                    <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi)</pre>
+<div class="block">Prints version information from the <a href="../picocli/CommandLine.Command.html#version()"><code>CommandLine.Command.version()</code></a> annotation to the specified <code>PrintStream</code>.
  Each element of the array of version strings is printed on a separate line. Version strings may contain
  <a href="http://picocli.info/#_usage_help_with_styles_and_colors">markup for colors and style</a>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>out</code> - the printStream to print to</dd>
-<dd><code>ansi</code> - whether the usage message should include ANSI escape codes or not</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>0.9.8</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Command.html#version--"><code>CommandLine.Command.version()</code></a>, 
-<a href="../picocli/CommandLine.Option.html#versionHelp--"><code>CommandLine.Option.versionHelp()</code></a>, 
-<a href="../picocli/CommandLine.html#isVersionHelpRequested--"><code>isVersionHelpRequested()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>out</code> - the printStream to print to</dd><dd><code>ansi</code> - whether the usage message should include ANSI escape codes or not</dd><dt><span class="strong">Since:</span></dt>
+  <dd>0.9.8</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Command.html#version()"><code>CommandLine.Command.version()</code></a>, 
+<a href="../picocli/CommandLine.Option.html#versionHelp()"><code>CommandLine.Option.versionHelp()</code></a>, 
+<a href="../picocli/CommandLine.html#isVersionHelpRequested()"><code>isVersionHelpRequested()</code></a></dd></dl>
 </li>
 </ul>
-<a name="printVersionHelp-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.Object...-">
+<a name="printVersionHelp(java.io.PrintStream, picocli.CommandLine.Help.Ansi, java.lang.Object...)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>printVersionHelp</h4>
 <pre>public&nbsp;void&nbsp;printVersionHelp(java.io.PrintStream&nbsp;out,
-                             <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
-                             java.lang.Object...&nbsp;params)</pre>
-<div class="block">Prints version information from the <a href="../picocli/CommandLine.Command.html#version--"><code>CommandLine.Command.version()</code></a> annotation to the specified <code>PrintStream</code>.
+                    <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
+                    java.lang.Object...&nbsp;params)</pre>
+<div class="block">Prints version information from the <a href="../picocli/CommandLine.Command.html#version()"><code>CommandLine.Command.version()</code></a> annotation to the specified <code>PrintStream</code>.
  Each element of the array of version strings is formatted with the
  specified parameters, and printed on a separate line. Both version strings and parameters may contain
  <a href="http://picocli.info/#_usage_help_with_styles_and_colors">markup for colors and style</a>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>out</code> - the printStream to print to</dd>
-<dd><code>ansi</code> - whether the usage message should include ANSI escape codes or not</dd>
-<dd><code>params</code> - Arguments referenced by the format specifiers in the version strings</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>1.0.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Command.html#version--"><code>CommandLine.Command.version()</code></a>, 
-<a href="../picocli/CommandLine.Option.html#versionHelp--"><code>CommandLine.Option.versionHelp()</code></a>, 
-<a href="../picocli/CommandLine.html#isVersionHelpRequested--"><code>isVersionHelpRequested()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>out</code> - the printStream to print to</dd><dd><code>ansi</code> - whether the usage message should include ANSI escape codes or not</dd><dd><code>params</code> - Arguments referenced by the format specifiers in the version strings</dd><dt><span class="strong">Since:</span></dt>
+  <dd>1.0.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Command.html#version()"><code>CommandLine.Command.version()</code></a>, 
+<a href="../picocli/CommandLine.Option.html#versionHelp()"><code>CommandLine.Option.versionHelp()</code></a>, 
+<a href="../picocli/CommandLine.html#isVersionHelpRequested()"><code>isVersionHelpRequested()</code></a></dd></dl>
 </li>
 </ul>
-<a name="call-java.util.concurrent.Callable-java.lang.String:A-">
+<a name="call(java.util.concurrent.Callable,java.lang.String[])">
 <!--   -->
-</a><a name="call-C-java.lang.String...-">
+</a><a name="call(C, java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>call</h4>
 <pre>public static&nbsp;&lt;C extends java.util.concurrent.Callable&lt;T&gt;,T&gt;&nbsp;T&nbsp;call(C&nbsp;callable,
-                                                                    java.lang.String...&nbsp;args)</pre>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#call-C-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.out</code> for
+                                                    java.lang.String...&nbsp;args)</pre>
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.out</code> for
  requested usage help messages, <code>System.err</code> for diagnostic error messages, and <a href="../picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>C</code> - the annotated object must implement Callable</dd>
-<dd><code>T</code> - the return type of the most specific command (must implement <code>Callable</code>)</dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>callable</code> - the command to call when <a href="../picocli/CommandLine.html#parseArgs-java.lang.String...-">parsing</a> succeeds.</dd>
-<dd><code>args</code> - the command line arguments to parse</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd><code>null</code> if an error occurred while parsing the command line options, otherwise returns the result of calling the Callable</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dl><dt><span class="strong">Type Parameters:</span></dt><dd><code>C</code> - the annotated object must implement Callable</dd><dd><code>T</code> - the return type of the most specific command (must implement <code>Callable</code>)</dd><dt><span class="strong">Parameters:</span></dt><dd><code>callable</code> - the command to call when <a href="../picocli/CommandLine.html#parseArgs(java.lang.String...)">parsing</a> succeeds.</dd><dd><code>args</code> - the command line arguments to parse</dd>
+<dt><span class="strong">Returns:</span></dt><dd><code>null</code> if an error occurred while parsing the command line options, otherwise returns the result of calling the Callable</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></code> - if the specified command object does not have a <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation</dd>
-<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the Callable throws an exception</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#call-C-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a>, 
-<a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)</code></a></dd>
-</dl>
+<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the Callable throws an exception</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a>, 
+<a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)"><code>parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...)</code></a></dd></dl>
 </li>
 </ul>
-<a name="call-java.util.concurrent.Callable-java.io.PrintStream-java.lang.String:A-">
+<a name="call(java.util.concurrent.Callable,java.io.PrintStream,java.lang.String[])">
 <!--   -->
-</a><a name="call-C-java.io.PrintStream-java.lang.String...-">
+</a><a name="call(C, java.io.PrintStream, java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>call</h4>
 <pre>public static&nbsp;&lt;C extends java.util.concurrent.Callable&lt;T&gt;,T&gt;&nbsp;T&nbsp;call(C&nbsp;callable,
-                                                                    java.io.PrintStream&nbsp;out,
-                                                                    java.lang.String...&nbsp;args)</pre>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#call-C-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for
+                                                    java.io.PrintStream&nbsp;out,
+                                                    java.lang.String...&nbsp;args)</pre>
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for
  diagnostic error messages and <a href="../picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>C</code> - the annotated object must implement Callable</dd>
-<dd><code>T</code> - the return type of the most specific command (must implement <code>Callable</code>)</dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>callable</code> - the command to call when <a href="../picocli/CommandLine.html#parseArgs-java.lang.String...-">parsing</a> succeeds.</dd>
-<dd><code>out</code> - the printStream to print the usage help message to when the user requested help</dd>
-<dd><code>args</code> - the command line arguments to parse</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd><code>null</code> if an error occurred while parsing the command line options, otherwise returns the result of calling the Callable</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dl><dt><span class="strong">Type Parameters:</span></dt><dd><code>C</code> - the annotated object must implement Callable</dd><dd><code>T</code> - the return type of the most specific command (must implement <code>Callable</code>)</dd><dt><span class="strong">Parameters:</span></dt><dd><code>callable</code> - the command to call when <a href="../picocli/CommandLine.html#parseArgs(java.lang.String...)">parsing</a> succeeds.</dd><dd><code>out</code> - the printStream to print the usage help message to when the user requested help</dd><dd><code>args</code> - the command line arguments to parse</dd>
+<dt><span class="strong">Returns:</span></dt><dd><code>null</code> if an error occurred while parsing the command line options, otherwise returns the result of calling the Callable</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></code> - if the specified command object does not have a <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation</dd>
-<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the Callable throws an exception</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#call-C-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a>, 
-<a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)</code></a>, 
-<a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a></dd>
-</dl>
+<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the Callable throws an exception</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a>, 
+<a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)"><code>parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...)</code></a>, 
+<a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a></dd></dl>
 </li>
 </ul>
-<a name="call-java.util.concurrent.Callable-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String:A-">
+<a name="call(java.util.concurrent.Callable,java.io.PrintStream,picocli.CommandLine.Help.Ansi,java.lang.String[])">
 <!--   -->
-</a><a name="call-C-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">
+</a><a name="call(C, java.io.PrintStream, picocli.CommandLine.Help.Ansi, java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>call</h4>
 <pre>public static&nbsp;&lt;C extends java.util.concurrent.Callable&lt;T&gt;,T&gt;&nbsp;T&nbsp;call(C&nbsp;callable,
-                                                                    java.io.PrintStream&nbsp;out,
-                                                                    <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
-                                                                    java.lang.String...&nbsp;args)</pre>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#call-C-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for diagnostic error messages.</div>
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>C</code> - the annotated object must implement Callable</dd>
-<dd><code>T</code> - the return type of the most specific command (must implement <code>Callable</code>)</dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>callable</code> - the command to call when <a href="../picocli/CommandLine.html#parseArgs-java.lang.String...-">parsing</a> succeeds.</dd>
-<dd><code>out</code> - the printStream to print the usage help message to when the user requested help</dd>
-<dd><code>ansi</code> - the ANSI style to use</dd>
-<dd><code>args</code> - the command line arguments to parse</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd><code>null</code> if an error occurred while parsing the command line options, otherwise returns the result of calling the Callable</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+                                                    java.io.PrintStream&nbsp;out,
+                                                    <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
+                                                    java.lang.String...&nbsp;args)</pre>
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for diagnostic error messages.</div>
+<dl><dt><span class="strong">Type Parameters:</span></dt><dd><code>C</code> - the annotated object must implement Callable</dd><dd><code>T</code> - the return type of the most specific command (must implement <code>Callable</code>)</dd><dt><span class="strong">Parameters:</span></dt><dd><code>callable</code> - the command to call when <a href="../picocli/CommandLine.html#parseArgs(java.lang.String...)">parsing</a> succeeds.</dd><dd><code>out</code> - the printStream to print the usage help message to when the user requested help</dd><dd><code>ansi</code> - the ANSI style to use</dd><dd><code>args</code> - the command line arguments to parse</dd>
+<dt><span class="strong">Returns:</span></dt><dd><code>null</code> if an error occurred while parsing the command line options, otherwise returns the result of calling the Callable</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></code> - if the specified command object does not have a <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation</dd>
-<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the Callable throws an exception</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#call-C-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a>, 
-<a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)</code></a>, 
-<a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a></dd>
-</dl>
+<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the Callable throws an exception</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#call(C,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>call(Callable, PrintStream, PrintStream, Help.Ansi, String...)</code></a>, 
+<a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)"><code>parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...)</code></a>, 
+<a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a></dd></dl>
 </li>
 </ul>
-<a name="call-java.util.concurrent.Callable-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String:A-">
+<a name="call(java.util.concurrent.Callable,java.io.PrintStream,java.io.PrintStream,picocli.CommandLine.Help.Ansi,java.lang.String[])">
 <!--   -->
-</a><a name="call-C-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">
+</a><a name="call(C, java.io.PrintStream, java.io.PrintStream, picocli.CommandLine.Help.Ansi, java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>call</h4>
 <pre>public static&nbsp;&lt;C extends java.util.concurrent.Callable&lt;T&gt;,T&gt;&nbsp;T&nbsp;call(C&nbsp;callable,
-                                                                    java.io.PrintStream&nbsp;out,
-                                                                    java.io.PrintStream&nbsp;err,
-                                                                    <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
-                                                                    java.lang.String...&nbsp;args)</pre>
+                                                    java.io.PrintStream&nbsp;out,
+                                                    java.io.PrintStream&nbsp;err,
+                                                    <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
+                                                    java.lang.String...&nbsp;args)</pre>
 <div class="block">Convenience method to allow command line application authors to avoid some boilerplate code in their application.
  The annotated object needs to implement <code>Callable</code>. Calling this method is equivalent to:
- <pre><code>
- CommandLine cmd = new CommandLine(callable);
+ <pre><code>CommandLine cmd = new CommandLine(callable);
  List&lt;Object&gt; results = cmd.parseWithHandlers(new RunLast().useOut(out).useAnsi(ansi),
                                               new DefaultExceptionHandler().useErr(err).useAnsi(ansi),
                                               args);
@@ -2112,139 +1876,98 @@ <h4>call</h4>
  <p>
  If the specified Callable command has subcommands, the <a href="../picocli/CommandLine.RunLast.html" title="class in picocli">last</a> subcommand specified on the
  command line is executed.
- Commands with subcommands may be interested in calling the <a href="../picocli/CommandLine.html#parseWithHandler-picocli.CommandLine.IParseResultHandler2-R-java.lang.String:A-"><code>parseWithHandler</code></a>
+ Commands with subcommands may be interested in calling the <a href="../picocli/CommandLine.html#parseWithHandler(picocli.CommandLine.IParseResultHandler2,%20java.lang.String[])"><code>parseWithHandler</code></a>
  method with the <a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><code>CommandLine.RunAll</code></a> handler or a custom handler.
  </p></div>
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>C</code> - the annotated object must implement Callable</dd>
-<dd><code>T</code> - the return type of the specified <code>Callable</code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>callable</code> - the command to call when <a href="../picocli/CommandLine.html#parse-java.lang.String...-">parsing</a> succeeds.</dd>
-<dd><code>out</code> - the printStream to print the usage help message to when the user requested help</dd>
-<dd><code>err</code> - the printStream to print diagnostic messages to</dd>
-<dd><code>ansi</code> - whether the usage message should include ANSI escape codes or not</dd>
-<dd><code>args</code> - the command line arguments to parse</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd><code>null</code> if an error occurred while parsing the command line options, or if help was requested and printed. Otherwise returns the result of calling the Callable</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dl><dt><span class="strong">Type Parameters:</span></dt><dd><code>C</code> - the annotated object must implement Callable</dd><dd><code>T</code> - the return type of the specified <code>Callable</code></dd><dt><span class="strong">Parameters:</span></dt><dd><code>callable</code> - the command to call when <a href="../picocli/CommandLine.html#parse(java.lang.String...)">parsing</a> succeeds.</dd><dd><code>out</code> - the printStream to print the usage help message to when the user requested help</dd><dd><code>err</code> - the printStream to print diagnostic messages to</dd><dd><code>ansi</code> - whether the usage message should include ANSI escape codes or not</dd><dd><code>args</code> - the command line arguments to parse</dd>
+<dt><span class="strong">Returns:</span></dt><dd><code>null</code> if an error occurred while parsing the command line options, or if help was requested and printed. Otherwise returns the result of calling the Callable</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></code> - if the specified command object does not have a <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation</dd>
-<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the Callable throws an exception</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)</code></a>, 
-<a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a></dd>
-</dl>
+<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the Callable throws an exception</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)"><code>parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...)</code></a>, 
+<a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a></dd></dl>
 </li>
 </ul>
-<a name="run-java.lang.Runnable-java.lang.String:A-">
+<a name="run(java.lang.Runnable,java.lang.String[])">
 <!--   -->
-</a><a name="run-R-java.lang.String...-">
+</a><a name="run(R, java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
 <pre>public static&nbsp;&lt;R extends java.lang.Runnable&gt;&nbsp;void&nbsp;run(R&nbsp;runnable,
-                                                      java.lang.String...&nbsp;args)</pre>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#run-R-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.out</code> for
+                                      java.lang.String...&nbsp;args)</pre>
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.out</code> for
  requested usage help messages, <code>System.err</code> for diagnostic error messages, and <a href="../picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>R</code> - the annotated object must implement Runnable</dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>runnable</code> - the command to run when <a href="../picocli/CommandLine.html#parseArgs-java.lang.String...-">parsing</a> succeeds.</dd>
-<dd><code>args</code> - the command line arguments to parse</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dl><dt><span class="strong">Type Parameters:</span></dt><dd><code>R</code> - the annotated object must implement Runnable</dd><dt><span class="strong">Parameters:</span></dt><dd><code>runnable</code> - the command to run when <a href="../picocli/CommandLine.html#parseArgs(java.lang.String...)">parsing</a> succeeds.</dd><dd><code>args</code> - the command line arguments to parse</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></code> - if the specified command object does not have a <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation</dd>
-<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the Runnable throws an exception</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#run-R-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a>, 
-<a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)</code></a>, 
-<a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a></dd>
-</dl>
+<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the Runnable throws an exception</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a>, 
+<a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)"><code>parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...)</code></a>, 
+<a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a></dd></dl>
 </li>
 </ul>
-<a name="run-java.lang.Runnable-java.io.PrintStream-java.lang.String:A-">
+<a name="run(java.lang.Runnable,java.io.PrintStream,java.lang.String[])">
 <!--   -->
-</a><a name="run-R-java.io.PrintStream-java.lang.String...-">
+</a><a name="run(R, java.io.PrintStream, java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
 <pre>public static&nbsp;&lt;R extends java.lang.Runnable&gt;&nbsp;void&nbsp;run(R&nbsp;runnable,
-                                                      java.io.PrintStream&nbsp;out,
-                                                      java.lang.String...&nbsp;args)</pre>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#run-R-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for diagnostic error messages and <a href="../picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>R</code> - the annotated object must implement Runnable</dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>runnable</code> - the command to run when <a href="../picocli/CommandLine.html#parseArgs-java.lang.String...-">parsing</a> succeeds.</dd>
-<dd><code>out</code> - the printStream to print the usage help message to when the user requested help</dd>
-<dd><code>args</code> - the command line arguments to parse</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+                                      java.io.PrintStream&nbsp;out,
+                                      java.lang.String...&nbsp;args)</pre>
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for diagnostic error messages and <a href="../picocli/CommandLine.Help.Ansi.html#AUTO"><code>CommandLine.Help.Ansi.AUTO</code></a>.</div>
+<dl><dt><span class="strong">Type Parameters:</span></dt><dd><code>R</code> - the annotated object must implement Runnable</dd><dt><span class="strong">Parameters:</span></dt><dd><code>runnable</code> - the command to run when <a href="../picocli/CommandLine.html#parseArgs(java.lang.String...)">parsing</a> succeeds.</dd><dd><code>out</code> - the printStream to print the usage help message to when the user requested help</dd><dd><code>args</code> - the command line arguments to parse</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></code> - if the specified command object does not have a <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation</dd>
-<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the Runnable throws an exception</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#run-R-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a>, 
-<a href="../picocli/CommandLine.html#parseWithHandler-picocli.CommandLine.IParseResultHandler2-R-java.lang.String:A-"><code>parseWithHandler(IParseResultHandler2, Object, String[])</code></a>, 
-<a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a></dd>
-</dl>
+<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the Runnable throws an exception</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a>, 
+<a href="../picocli/CommandLine.html#parseWithHandler(picocli.CommandLine.IParseResultHandler2,%20java.lang.String[])"><code>parseWithHandler(IParseResultHandler2, String[])</code></a>, 
+<a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a></dd></dl>
 </li>
 </ul>
-<a name="run-java.lang.Runnable-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String:A-">
+<a name="run(java.lang.Runnable,java.io.PrintStream,picocli.CommandLine.Help.Ansi,java.lang.String[])">
 <!--   -->
-</a><a name="run-R-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">
+</a><a name="run(R, java.io.PrintStream, picocli.CommandLine.Help.Ansi, java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
 <pre>public static&nbsp;&lt;R extends java.lang.Runnable&gt;&nbsp;void&nbsp;run(R&nbsp;runnable,
-                                                      java.io.PrintStream&nbsp;out,
-                                                      <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
-                                                      java.lang.String...&nbsp;args)</pre>
-<div class="block">Delegates to <a href="../picocli/CommandLine.html#run-R-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for diagnostic error messages.</div>
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>R</code> - the annotated object must implement Runnable</dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>runnable</code> - the command to run when <a href="../picocli/CommandLine.html#parseArgs-java.lang.String...-">parsing</a> succeeds.</dd>
-<dd><code>out</code> - the printStream to print the usage help message to when the user requested help</dd>
-<dd><code>ansi</code> - whether the usage message should include ANSI escape codes or not</dd>
-<dd><code>args</code> - the command line arguments to parse</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+                                      java.io.PrintStream&nbsp;out,
+                                      <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
+                                      java.lang.String...&nbsp;args)</pre>
+<div class="block">Delegates to <a href="../picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a> with <code>System.err</code> for diagnostic error messages.</div>
+<dl><dt><span class="strong">Type Parameters:</span></dt><dd><code>R</code> - the annotated object must implement Runnable</dd><dt><span class="strong">Parameters:</span></dt><dd><code>runnable</code> - the command to run when <a href="../picocli/CommandLine.html#parseArgs(java.lang.String...)">parsing</a> succeeds.</dd><dd><code>out</code> - the printStream to print the usage help message to when the user requested help</dd><dd><code>ansi</code> - whether the usage message should include ANSI escape codes or not</dd><dd><code>args</code> - the command line arguments to parse</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></code> - if the specified command object does not have a <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation</dd>
-<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the Runnable throws an exception</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#run-R-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-"><code>run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a>, 
-<a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)</code></a>, 
-<a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a></dd>
-</dl>
+<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the Runnable throws an exception</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#run(R,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi,%20java.lang.String...)"><code>run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)</code></a>, 
+<a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)"><code>parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...)</code></a>, 
+<a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a></dd></dl>
 </li>
 </ul>
-<a name="run-java.lang.Runnable-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String:A-">
+<a name="run(java.lang.Runnable,java.io.PrintStream,java.io.PrintStream,picocli.CommandLine.Help.Ansi,java.lang.String[])">
 <!--   -->
-</a><a name="run-R-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-java.lang.String...-">
+</a><a name="run(R, java.io.PrintStream, java.io.PrintStream, picocli.CommandLine.Help.Ansi, java.lang.String...)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
 <pre>public static&nbsp;&lt;R extends java.lang.Runnable&gt;&nbsp;void&nbsp;run(R&nbsp;runnable,
-                                                      java.io.PrintStream&nbsp;out,
-                                                      java.io.PrintStream&nbsp;err,
-                                                      <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
-                                                      java.lang.String...&nbsp;args)</pre>
+                                      java.io.PrintStream&nbsp;out,
+                                      java.io.PrintStream&nbsp;err,
+                                      <a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli">CommandLine.Help.Ansi</a>&nbsp;ansi,
+                                      java.lang.String...&nbsp;args)</pre>
 <div class="block">Convenience method to allow command line application authors to avoid some boilerplate code in their application.
  The annotated object needs to implement <code>Runnable</code>. Calling this method is equivalent to:
- <pre><code>
- CommandLine cmd = new CommandLine(runnable);
+ <pre><code>CommandLine cmd = new CommandLine(runnable);
  cmd.parseWithHandlers(new RunLast().useOut(out).useAnsi(ansi),
                        new DefaultExceptionHandler().useErr(err).useAnsi(ansi),
                        args);
@@ -2252,40 +1975,29 @@ <h4>run</h4>
  <p>
  If the specified Runnable command has subcommands, the <a href="../picocli/CommandLine.RunLast.html" title="class in picocli">last</a> subcommand specified on the
  command line is executed.
- Commands with subcommands may be interested in calling the <a href="../picocli/CommandLine.html#parseWithHandler-picocli.CommandLine.IParseResultHandler2-R-java.lang.String:A-"><code>parseWithHandler</code></a>
+ Commands with subcommands may be interested in calling the <a href="../picocli/CommandLine.html#parseWithHandler(picocli.CommandLine.IParseResultHandler2,%20java.lang.String[])"><code>parseWithHandler</code></a>
  method with the <a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><code>CommandLine.RunAll</code></a> handler or a custom handler.
  </p><p>
- From picocli v2.0, this method prints usage help or version help if <a href="../picocli/CommandLine.html#printHelpIfRequested-java.util.List-java.io.PrintStream-java.io.PrintStream-picocli.CommandLine.Help.Ansi-">requested</a>,
+ From picocli v2.0, this method prints usage help or version help if <a href="../picocli/CommandLine.html#printHelpIfRequested(java.util.List,%20java.io.PrintStream,%20java.io.PrintStream,%20picocli.CommandLine.Help.Ansi)">requested</a>,
  and any exceptions thrown by the <code>Runnable</code> are caught and rethrown wrapped in an <code>ExecutionException</code>.
  </p></div>
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>R</code> - the annotated object must implement Runnable</dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>runnable</code> - the command to run when <a href="../picocli/CommandLine.html#parse-java.lang.String...-">parsing</a> succeeds.</dd>
-<dd><code>out</code> - the printStream to print the usage help message to when the user requested help</dd>
-<dd><code>err</code> - the printStream to print diagnostic messages to</dd>
-<dd><code>ansi</code> - whether the usage message should include ANSI escape codes or not</dd>
-<dd><code>args</code> - the command line arguments to parse</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
+<dl><dt><span class="strong">Type Parameters:</span></dt><dd><code>R</code> - the annotated object must implement Runnable</dd><dt><span class="strong">Parameters:</span></dt><dd><code>runnable</code> - the command to run when <a href="../picocli/CommandLine.html#parse(java.lang.String...)">parsing</a> succeeds.</dd><dd><code>out</code> - the printStream to print the usage help message to when the user requested help</dd><dd><code>err</code> - the printStream to print diagnostic messages to</dd><dd><code>ansi</code> - whether the usage message should include ANSI escape codes or not</dd><dd><code>args</code> - the command line arguments to parse</dd>
+<dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../picocli/CommandLine.InitializationException.html" title="class in picocli">CommandLine.InitializationException</a></code> - if the specified command object does not have a <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a>, <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> annotation</dd>
-<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the Runnable throws an exception</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>3.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#parseWithHandlers-picocli.CommandLine.IParseResultHandler2-R-picocli.CommandLine.IExceptionHandler2-java.lang.String...-"><code>parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)</code></a>, 
-<a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a></dd>
-</dl>
+<dd><code><a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - if the Runnable throws an exception</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#parseWithHandlers(picocli.CommandLine.IParseResultHandler2,%20picocli.CommandLine.IExceptionHandler2,%20java.lang.String...)"><code>parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...)</code></a>, 
+<a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><code>CommandLine.RunLast</code></a></dd></dl>
 </li>
 </ul>
-<a name="registerConverter-java.lang.Class-picocli.CommandLine.ITypeConverter-">
+<a name="registerConverter(java.lang.Class, picocli.CommandLine.ITypeConverter)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>registerConverter</h4>
 <pre>public&nbsp;&lt;K&gt;&nbsp;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;registerConverter(java.lang.Class&lt;K&gt;&nbsp;cls,
-                                         <a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli">CommandLine.ITypeConverter</a>&lt;K&gt;&nbsp;converter)</pre>
+                                <a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli">CommandLine.ITypeConverter</a>&lt;K&gt;&nbsp;converter)</pre>
 <div class="block">Registers the specified type converter for the specified class. When initializing fields annotated with
  <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a>, the field's type is used as a lookup key to find the associated type converter, and this
  type converter converts the original command line argument string value to the correct type.
@@ -2321,20 +2033,11 @@ <h4>registerConverter</h4>
  subcommands and nested sub-subcommands <em>at the moment the converter is registered</em>. Subcommands added
  later will not have this converter added automatically. To ensure a custom type converter is available to all
  subcommands, register the type converter last, after adding subcommands.</p></div>
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>K</code> - the target type</dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>cls</code> - the target class to convert parameter string values to</dd>
-<dd><code>converter</code> - the class capable of converting string values to the specified target type</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this CommandLine object, to allow method chaining</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.html#addSubcommand-java.lang.String-java.lang.Object-"><code>addSubcommand(String, Object)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Type Parameters:</span></dt><dd><code>K</code> - the target type</dd><dt><span class="strong">Parameters:</span></dt><dd><code>cls</code> - the target class to convert parameter string values to</dd><dd><code>converter</code> - the class capable of converting string values to the specified target type</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this CommandLine object, to allow method chaining</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.html#addSubcommand(java.lang.String,%20java.lang.Object)"><code>addSubcommand(String, Object)</code></a></dd></dl>
 </li>
 </ul>
-<a name="getSeparator--">
+<a name="getSeparator()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -2342,15 +2045,10 @@ <h4>registerConverter</h4>
 <h4>getSeparator</h4>
 <pre>public&nbsp;java.lang.String&nbsp;getSeparator()</pre>
 <div class="block">Returns the String that separates option names from option values when parsing command line options.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the String the parser uses to separate option names from option values</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Model.ParserSpec.html#separator--"><code>CommandLine.Model.ParserSpec.separator()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the String the parser uses to separate option names from option values</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Model.ParserSpec.html#separator()"><code>CommandLine.Model.ParserSpec.separator()</code></a></dd></dl>
 </li>
 </ul>
-<a name="setSeparator-java.lang.String-">
+<a name="setSeparator(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -2358,22 +2056,16 @@ <h4>getSeparator</h4>
 <h4>setSeparator</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;setSeparator(java.lang.String&nbsp;separator)</pre>
 <div class="block">Sets the String the parser uses to separate option names from option values to the specified value.
- The separator may also be set declaratively with the <a href="../picocli/CommandLine.Command.html#separator--"><code>CommandLine.Command.separator()</code></a> annotation attribute.
+ The separator may also be set declaratively with the <a href="../picocli/CommandLine.Command.html#separator()"><code>CommandLine.Command.separator()</code></a> annotation attribute.
  <p>The specified setting will be registered with this <code>CommandLine</code> and the full hierarchy of its
  subcommands and nested sub-subcommands <em>at the moment this method is called</em>. Subcommands added
  later will have the default setting. To ensure a setting is applied to all
  subcommands, call the setter last, after adding subcommands.</p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>separator</code> - the String that separates option names from option values</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this <code>CommandLine</code> object, to allow method chaining</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Model.ParserSpec.html#separator-java.lang.String-"><code>CommandLine.Model.ParserSpec.separator(String)</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>separator</code> - the String that separates option names from option values</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this <code>CommandLine</code> object, to allow method chaining</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Model.ParserSpec.html#separator(java.lang.String)"><code>CommandLine.Model.ParserSpec.separator(String)</code></a></dd></dl>
 </li>
 </ul>
-<a name="getCommandName--">
+<a name="getCommandName()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -2381,17 +2073,12 @@ <h4>setSeparator</h4>
 <h4>getCommandName</h4>
 <pre>public&nbsp;java.lang.String&nbsp;getCommandName()</pre>
 <div class="block">Returns the command name (also called program name) displayed in the usage help synopsis.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the command name (also called program name) displayed in the usage</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Model.CommandSpec.html#name--"><code>CommandLine.Model.CommandSpec.name()</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the command name (also called program name) displayed in the usage</dd><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Model.CommandSpec.html#name()"><code>CommandLine.Model.CommandSpec.name()</code></a></dd></dl>
 </li>
 </ul>
-<a name="setCommandName-java.lang.String-">
+<a name="setCommandName(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -2400,20 +2087,14 @@ <h4>setCommandName</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;setCommandName(java.lang.String&nbsp;commandName)</pre>
 <div class="block">Sets the command name (also called program name) displayed in the usage help synopsis to the specified value.
  Note that this method only modifies the usage help message, it does not impact parsing behaviour.
- The command name may also be set declaratively with the <a href="../picocli/CommandLine.Command.html#name--"><code>CommandLine.Command.name()</code></a> annotation attribute.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>commandName</code> - command name (also called program name) displayed in the usage help synopsis</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this <code>CommandLine</code> object, to allow method chaining</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Model.CommandSpec.html#name-java.lang.String-"><code>CommandLine.Model.CommandSpec.name(String)</code></a></dd>
-</dl>
+ The command name may also be set declaratively with the <a href="../picocli/CommandLine.Command.html#name()"><code>CommandLine.Command.name()</code></a> annotation attribute.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>commandName</code> - command name (also called program name) displayed in the usage help synopsis</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this <code>CommandLine</code> object, to allow method chaining</dd><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../picocli/CommandLine.Model.CommandSpec.html#name(java.lang.String)"><code>CommandLine.Model.CommandSpec.name(String)</code></a></dd></dl>
 </li>
 </ul>
-<a name="isExpandAtFiles--">
+<a name="isExpandAtFiles()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -2423,15 +2104,11 @@ <h4>isExpandAtFiles</h4>
 <div class="block">Returns whether arguments starting with <code>'@'</code> should be treated as the path to an argument file and its
  contents should be expanded into separate arguments for each line in the specified file.
  This property is <code>true</code> by default.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>whether "argument files" or <code>@files</code> should be expanded into their content</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.1</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>whether "argument files" or <code>@files</code> should be expanded into their content</dd><dt><span class="strong">Since:</span></dt>
+  <dd>2.1</dd></dl>
 </li>
 </ul>
-<a name="setExpandAtFiles-boolean-">
+<a name="setExpandAtFiles(boolean)">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -2440,14 +2117,9 @@ <h4>setExpandAtFiles</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;setExpandAtFiles(boolean&nbsp;expandAtFiles)</pre>
 <div class="block">Sets whether arguments starting with <code>'@'</code> should be treated as the path to an argument file and its
  contents should be expanded into separate arguments for each line in the specified file. (<code>true</code> by default.)</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>expandAtFiles</code> - whether "argument files" or <code>@files</code> should be expanded into their content</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>this <code>CommandLine</code> object, to allow method chaining</dd>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.1</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>expandAtFiles</code> - whether "argument files" or <code>@files</code> should be expanded into their content</dd>
+<dt><span class="strong">Returns:</span></dt><dd>this <code>CommandLine</code> object, to allow method chaining</dd><dt><span class="strong">Since:</span></dt>
+  <dd>2.1</dd></dl>
 </li>
 </ul>
 </li>
@@ -2458,11 +2130,9 @@ <h4>setExpandAtFiles</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -2477,15 +2147,15 @@ <h4>setExpandAtFiles</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../picocli/AutoComplete.html" title="class in picocli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../picocli/AutoComplete.html" title="class in picocli"><span class="strong">Prev Class</span></a></li>
+<li><a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/CommandLine.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="CommandLine.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -2502,19 +2172,19 @@ <h4>setExpandAtFiles</h4>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#nested_class_summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/groovy/PicocliBaseScript.html b/docs/apidocs/picocli/groovy/PicocliBaseScript.html
index 87f6323e6..2a7b82c8c 100644
--- a/docs/apidocs/picocli/groovy/PicocliBaseScript.html
+++ b/docs/apidocs/picocli/groovy/PicocliBaseScript.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>PicocliBaseScript (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:02 JST 2018 -->
+<title>PicocliBaseScript (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="PicocliBaseScript (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="PicocliBaseScript (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../../picocli/groovy/PicocliScript.html" title="annotation in picocli.groovy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li>Prev Class</li>
+<li><a href="../../picocli/groovy/PicocliScript.html" title="annotation in picocli.groovy"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?picocli/groovy/PicocliBaseScript.html" target="_top">Frames</a></li>
-<li><a href="PicocliBaseScript.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="PicocliBaseScript.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -74,18 +61,18 @@
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -122,7 +109,7 @@ <h2 title="Class PicocliBaseScript" class="title">Class PicocliBaseScript</h2>
 </dl>
 <hr>
 <br>
-<pre>public abstract class <span class="typeNameLabel">PicocliBaseScript</span>
+<pre>public abstract class <span class="strong">PicocliBaseScript</span>
 extends groovy.lang.Script</pre>
 <div class="block"><p>
  Base script class that provides picocli declarative (annotation-based) command line argument processing for Groovy scripts.
@@ -145,13 +132,11 @@ <h2 title="Class PicocliBaseScript" class="title">Class PicocliBaseScript</h2>
  annotated with <code>@Option</code> or <code>@Parameters</code>.
  It also takes care of error handling and common use cases like requests for usage help.
  </p><p>
- See the <a href="../../picocli/groovy/PicocliBaseScript.html#run--"><code>run()</code></a> method for a detailed break-down of the steps the base class takes
+ See the <a href="../../picocli/groovy/PicocliBaseScript.html#run()"><code>run()</code></a> method for a detailed break-down of the steps the base class takes
  before the statements in the script body are executed.
  </p></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -160,11 +145,11 @@ <h2 title="Class PicocliBaseScript" class="title">Class PicocliBaseScript</h2>
 <li class="blockList">
 <!-- =========== FIELD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.summary">
+<li class="blockList"><a name="field_summary">
 <!--   -->
 </a>
 <h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
 <caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -172,7 +157,7 @@ <h3>Field Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/groovy/PicocliBaseScript.html#COMMAND_LINE">COMMAND_LINE</a></span></code>
+<td class="colLast"><code><strong><a href="../../picocli/groovy/PicocliBaseScript.html#COMMAND_LINE">COMMAND_LINE</a></strong></code>
 <div class="block">Name of the property that holds the CommandLine instance for this script ("commandLine").</div>
 </td>
 </tr>
@@ -181,131 +166,138 @@ <h3>Field Summary</h3>
 </ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../picocli/groovy/PicocliBaseScript.html#PicocliBaseScript--">PicocliBaseScript</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../../picocli/groovy/PicocliBaseScript.html#PicocliBaseScript()">PicocliBaseScript</a></strong>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/groovy/PicocliBaseScript.html#createCommandLine--">createCommandLine</a></span>()</code>
+<td class="colLast"><code><strong><a href="../../picocli/groovy/PicocliBaseScript.html#createCommandLine()">createCommandLine</a></strong>()</code>
 <div class="block">Create and returns a new CommandLine instance.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>protected <a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/groovy/PicocliBaseScript.html#getOrCreateCommandLine--">getOrCreateCommandLine</a></span>()</code>
+<td class="colLast"><code><strong><a href="../../picocli/groovy/PicocliBaseScript.html#getOrCreateCommandLine()">getOrCreateCommandLine</a></strong>()</code>
 <div class="block">Return the CommandLine for this script.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.String[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/groovy/PicocliBaseScript.html#getScriptArguments--">getScriptArguments</a></span>()</code>
+<td class="colLast"><code><strong><a href="../../picocli/groovy/PicocliBaseScript.html#getScriptArguments()">getScriptArguments</a></strong>()</code>
 <div class="block">Return the script arguments as an array of strings.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.Object</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/groovy/PicocliBaseScript.html#handleExecutionException-picocli.CommandLine-java.lang.String:A-java.lang.Exception-">handleExecutionException</a></span>(<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+<td class="colLast"><code><strong><a href="../../picocli/groovy/PicocliBaseScript.html#handleExecutionException(picocli.CommandLine,%20java.lang.String[],%20java.lang.Exception)">handleExecutionException</a></strong>(<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
                         java.lang.String[]&nbsp;args,
                         java.lang.Exception&nbsp;ex)</code>
-<div class="block">If an Exception occurs during <a href="../../picocli/groovy/PicocliBaseScript.html#runRunnableSubcommand-java.util.List-"><code>runRunnableSubcommand(List)</code></a>, or <a href="../../picocli/groovy/PicocliBaseScript.html#runScriptBody--"><code>runScriptBody()</code></a>
+<div class="block">If an Exception occurs during <a href="../../picocli/groovy/PicocliBaseScript.html#runRunnableSubcommand(java.util.List)"><code>runRunnableSubcommand(List)</code></a>, or <a href="../../picocli/groovy/PicocliBaseScript.html#runScriptBody()"><code>runScriptBody()</code></a>
  then this gets called to report the problem.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.Object</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/groovy/PicocliBaseScript.html#handleParameterException-picocli.CommandLine.ParameterException-java.lang.String:A-">handleParameterException</a></span>(<a href="../../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a>&nbsp;pe,
+<td class="colLast"><code><strong><a href="../../picocli/groovy/PicocliBaseScript.html#handleParameterException(picocli.CommandLine.ParameterException,%20java.lang.String[])">handleParameterException</a></strong>(<a href="../../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a>&nbsp;pe,
                         java.lang.String[]&nbsp;args)</code>
-<div class="block">If a ParameterException occurs during <a href="../../picocli/groovy/PicocliBaseScript.html#parseScriptArguments-picocli.CommandLine-java.lang.String:A-"><code>parseScriptArguments(CommandLine, String[])</code></a>
+<div class="block">If a ParameterException occurs during <a href="../../picocli/groovy/PicocliBaseScript.html#parseScriptArguments(picocli.CommandLine,%20java.lang.String[])"><code>parseScriptArguments(CommandLine, String[])</code></a>
  then this method gets called to report the problem.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/groovy/PicocliBaseScript.html#parseScriptArguments-picocli.CommandLine-java.lang.String:A-">parseScriptArguments</a></span>(<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+<td class="colLast"><code><strong><a href="../../picocli/groovy/PicocliBaseScript.html#parseScriptArguments(picocli.CommandLine,%20java.lang.String[])">parseScriptArguments</a></strong>(<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
                     java.lang.String[]&nbsp;args)</code>
-<div class="block">Returns the result of calling <a href="../../picocli/CommandLine.html#parse-java.lang.String...-"><code>CommandLine.parse(String...)</code></a> with the given arguments.</div>
+<div class="block">Returns the result of calling <a href="../../picocli/CommandLine.html#parse(java.lang.String...)"><code>CommandLine.parse(String...)</code></a> with the given arguments.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/groovy/PicocliBaseScript.html#printErrorMessage-java.lang.String-">printErrorMessage</a></span>(java.lang.String&nbsp;message)</code>
+<td class="colLast"><code><strong><a href="../../picocli/groovy/PicocliBaseScript.html#printErrorMessage(java.lang.String)">printErrorMessage</a></strong>(java.lang.String&nbsp;message)</code>
 <div class="block">Error messages that arise from command line processing call this.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr class="rowColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><strong><a href="../../picocli/groovy/PicocliBaseScript.html#printHelpMessage(picocli.CommandLine)">printHelpMessage</a></strong>(<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine)</code>
+<div class="block">If an &#064;Option whose <code>usageHelp</code> attribute is annotated as true appears in the arguments.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.Object</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/groovy/PicocliBaseScript.html#printHelpMessage-picocli.CommandLine-">printHelpMessage</a></span>(<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine)</code>
+<td class="colLast"><code><strong><a href="../../picocli/groovy/PicocliBaseScript.html#printHelpMessage(picocli.CommandLine,%20java.io.PrintStream)">printHelpMessage</a></strong>(<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                java.io.PrintStream&nbsp;stream)</code>
 <div class="block">If an &#064;Option whose <code>usageHelp</code> attribute is annotated as true appears in the arguments.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>java.lang.Object</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/groovy/PicocliBaseScript.html#printVersionHelpMessage-picocli.CommandLine-">printVersionHelpMessage</a></span>(<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine)</code>
+<td class="colLast"><code><strong><a href="../../picocli/groovy/PicocliBaseScript.html#printVersionHelpMessage(picocli.CommandLine)">printVersionHelpMessage</a></strong>(<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine)</code>
 <div class="block">If an &#064;Option whose <code>versionHelp</code> attribute is annotated as true appears in the arguments.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>java.lang.Object</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/groovy/PicocliBaseScript.html#run--">run</a></span>()</code>
+<td class="colLast"><code><strong><a href="../../picocli/groovy/PicocliBaseScript.html#run()">run</a></strong>()</code>
 <div class="block">
  Parses the command line and initializes <code>@Field</code> variables
  annotated with <code>@Option</code> or <code>@Parameters</code> before executing the script body.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/groovy/PicocliBaseScript.html#runRunnableSubcommand-java.util.List-">runRunnableSubcommand</a></span>(java.util.List&lt;<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands)</code>
+<td class="colLast"><code><strong><a href="../../picocli/groovy/PicocliBaseScript.html#runRunnableSubcommand(java.util.List)">runRunnableSubcommand</a></strong>(java.util.List&lt;<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parsedCommands)</code>
 <div class="block">If the most specific subcommand (the last <code>CommandLine</code> object in the list) implements Runnable or Callable,
  then run it.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected abstract java.lang.Object</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/groovy/PicocliBaseScript.html#runScriptBody--">runScriptBody</a></span>()</code>
+<td class="colLast"><code><strong><a href="../../picocli/groovy/PicocliBaseScript.html#runScriptBody()">runScriptBody</a></strong>()</code>
 <div class="block">The script body.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.groovy.lang.Script">
+<li class="blockList"><a name="methods_inherited_from_class_groovy.lang.Script">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;groovy.lang.Script</h3>
 <code>evaluate, evaluate, getBinding, getProperty, invokeMethod, print, printf, printf, println, println, run, setBinding, setProperty</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.groovy.lang.GroovyObjectSupport">
+<li class="blockList"><a name="methods_inherited_from_class_groovy.lang.GroovyObjectSupport">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;groovy.lang.GroovyObjectSupport</h3>
 <code>getMetaClass, setMetaClass</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -321,7 +313,7 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ============ FIELD DETAIL =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.detail">
+<li class="blockList"><a name="field_detail">
 <!--   -->
 </a>
 <h3>Field Detail</h3>
@@ -333,21 +325,18 @@ <h3>Field Detail</h3>
 <h4>COMMAND_LINE</h4>
 <pre>public static final&nbsp;java.lang.String COMMAND_LINE</pre>
 <div class="block">Name of the property that holds the CommandLine instance for this script ("commandLine").</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../constant-values.html#picocli.groovy.PicocliBaseScript.COMMAND_LINE">Constant Field Values</a></dd>
-</dl>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../constant-values.html#picocli.groovy.PicocliBaseScript.COMMAND_LINE">Constant Field Values</a></dd></dl>
 </li>
 </ul>
 </li>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="PicocliBaseScript--">
+<a name="PicocliBaseScript()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -360,11 +349,11 @@ <h4>PicocliBaseScript</h4>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="runScriptBody--">
+<a name="runScriptBody()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -372,13 +361,10 @@ <h3>Method Detail</h3>
 <h4>runScriptBody</h4>
 <pre>protected abstract&nbsp;java.lang.Object&nbsp;runScriptBody()</pre>
 <div class="block">The script body.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The result of the script evaluation.</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>The result of the script evaluation.</dd></dl>
 </li>
 </ul>
-<a name="run--">
+<a name="run()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -397,30 +383,28 @@ <h4>run</h4>
      The <code>CommandLine</code> instance is cached in the <code>commandLine</code> property
      (so it can be referred to in script code with
      <code>this.commandLine</code>). <code>CommandLine</code> creation and initialization may be
-     customized by overriding <a href="../../picocli/groovy/PicocliBaseScript.html#createCommandLine--"><code>createCommandLine()</code></a>.</li>
-   <li>The <a href="../../picocli/groovy/PicocliBaseScript.html#parseScriptArguments-picocli.CommandLine-java.lang.String:A-"><code>parseScriptArguments(CommandLine, String[])</code></a> method is called with the script arguments.
+     customized by overriding <a href="../../picocli/groovy/PicocliBaseScript.html#createCommandLine()"><code>createCommandLine()</code></a>.</li>
+   <li>The <a href="../../picocli/groovy/PicocliBaseScript.html#parseScriptArguments(picocli.CommandLine,%20java.lang.String[])"><code>parseScriptArguments(CommandLine, String[])</code></a> method is called with the script arguments.
      This initialises all <code>@Field</code> variables annotated with <code>CommandLine.Option</code> or
      <code>CommandLine.Parameters</code>, unless the user input was invalid.</li>
    <li>If the user input was invalid, an error message and the usage message are printed to standard err and the
      script exits. This may be customized by overriding
-     <a href="../../picocli/groovy/PicocliBaseScript.html#handleParameterException-picocli.CommandLine.ParameterException-java.lang.String:A-"><code>handleParameterException(CommandLine.ParameterException, String[])</code></a>.</li>
+     <a href="../../picocli/groovy/PicocliBaseScript.html#handleParameterException(picocli.CommandLine.ParameterException,%20java.lang.String[])"><code>handleParameterException(CommandLine.ParameterException, String[])</code></a>.</li>
    <li>Otherwise, if the user input requested version help or usage help, the version string or usage help message is
      printed to standard err and the script exits.</li>
    <li>If the script implements <code>Runnable</code> or <code>Callable</code>, its <code>run</code> (or <code>call</code>) method
      is called. The script may support subcommands. In that case only the last specified subcommand is run or called
      if it implements <code>Runnable</code> or <code>Callable</code>. This may be customized by overriding
-     <a href="../../picocli/groovy/PicocliBaseScript.html#runRunnableSubcommand-java.util.List-"><code>runRunnableSubcommand(List)</code></a>.</li>
+     <a href="../../picocli/groovy/PicocliBaseScript.html#runRunnableSubcommand(java.util.List)"><code>runRunnableSubcommand(List)</code></a>.</li>
    <li>Finally, the script body is executed.</li>
  </ol></div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dt><strong>Specified by:</strong></dt>
 <dd><code>run</code>&nbsp;in class&nbsp;<code>groovy.lang.Script</code></dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The result of the script evaluation.</dd>
-</dl>
+<dt><span class="strong">Returns:</span></dt><dd>The result of the script evaluation.</dd></dl>
 </li>
 </ul>
-<a name="getScriptArguments--">
+<a name="getScriptArguments()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -429,13 +413,10 @@ <h4>getScriptArguments</h4>
 <pre>public&nbsp;java.lang.String[]&nbsp;getScriptArguments()</pre>
 <div class="block">Return the script arguments as an array of strings.
  The default implementation is to get the "args" property.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the script arguments as an array of strings.</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the script arguments as an array of strings.</dd></dl>
 </li>
 </ul>
-<a name="getOrCreateCommandLine--">
+<a name="getOrCreateCommandLine()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -443,14 +424,11 @@ <h4>getScriptArguments</h4>
 <h4>getOrCreateCommandLine</h4>
 <pre>protected&nbsp;<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;getOrCreateCommandLine()</pre>
 <div class="block">Return the CommandLine for this script.
- If there isn't one already, then create it using <a href="../../picocli/groovy/PicocliBaseScript.html#createCommandLine--"><code>createCommandLine()</code></a>.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the CommandLine for this script.</dd>
-</dl>
+ If there isn't one already, then create it using <a href="../../picocli/groovy/PicocliBaseScript.html#createCommandLine()"><code>createCommandLine()</code></a>.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the CommandLine for this script.</dd></dl>
 </li>
 </ul>
-<a name="createCommandLine--">
+<a name="createCommandLine()">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -463,34 +441,26 @@ <h4>createCommandLine</h4>
  <p>
  Subclasses may override to register custom type converters or programmatically add subcommands.
  </p></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>A CommandLine instance.</dd>
-</dl>
+<dl><dt><span class="strong">Returns:</span></dt><dd>A CommandLine instance.</dd></dl>
 </li>
 </ul>
-<a name="parseScriptArguments-picocli.CommandLine-java.lang.String:A-">
+<a name="parseScriptArguments(picocli.CommandLine, java.lang.String[])">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>parseScriptArguments</h4>
 <pre>public&nbsp;java.util.List&lt;<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&gt;&nbsp;parseScriptArguments(<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                                                        java.lang.String[]&nbsp;args)</pre>
-<div class="block">Returns the result of calling <a href="../../picocli/CommandLine.html#parse-java.lang.String...-"><code>CommandLine.parse(String...)</code></a> with the given arguments.
+                                               java.lang.String[]&nbsp;args)</pre>
+<div class="block">Returns the result of calling <a href="../../picocli/CommandLine.html#parse(java.lang.String...)"><code>CommandLine.parse(String...)</code></a> with the given arguments.
  <p>
  Subclasses may override if any action should be taken immediately before or after parsing.
  </p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>commandLine</code> - The CommandLine instance for this script instance.</dd>
-<dd><code>args</code> - The argument array.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the list of <code>CommandLine</code> objects that result from parsing the user input</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>commandLine</code> - The CommandLine instance for this script instance.</dd><dd><code>args</code> - The argument array.</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the list of <code>CommandLine</code> objects that result from parsing the user input</dd></dl>
 </li>
 </ul>
-<a name="runRunnableSubcommand-java.util.List-">
+<a name="runRunnableSubcommand(java.util.List)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -500,16 +470,13 @@ <h4>runRunnableSubcommand</h4>
                            throws java.lang.Exception</pre>
 <div class="block">If the most specific subcommand (the last <code>CommandLine</code> object in the list) implements Runnable or Callable,
  then run it.
- This method will not run the main script <a href="../../picocli/groovy/PicocliBaseScript.html#runScriptBody--"><code>runScriptBody()</code></a> method; that will be called from <code>{@link #run()}</code>.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>parsedCommands</code> - the list of <code>CommandLine</code> objects returns from the <code>CommandLine.parse</code> method</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.Exception</code> - if the Callable throws an exception</dd>
-</dl>
+ This method will not run the main script <a href="../../picocli/groovy/PicocliBaseScript.html#runScriptBody()"><code>runScriptBody()</code></a> method; that will be called from <code>{@link #run()}</code>.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>parsedCommands</code> - the list of <code>CommandLine</code> objects returns from the <code>CommandLine.parse</code> method</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code>java.lang.Exception</code> - if the Callable throws an exception</dd></dl>
 </li>
 </ul>
-<a name="printErrorMessage-java.lang.String-">
+<a name="printErrorMessage(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -519,60 +486,46 @@ <h4>printErrorMessage</h4>
 <div class="block">Error messages that arise from command line processing call this.
  The default is to print to System.err.
  If you want to use System.out, a logger, or something else, this is the method to override.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>message</code> - the error message to print</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>message</code> - the error message to print</dd></dl>
 </li>
 </ul>
-<a name="handleParameterException-picocli.CommandLine.ParameterException-java.lang.String:A-">
+<a name="handleParameterException(picocli.CommandLine.ParameterException, java.lang.String[])">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>handleParameterException</h4>
 <pre>public&nbsp;java.lang.Object&nbsp;handleParameterException(<a href="../../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a>&nbsp;pe,
-                                                 java.lang.String[]&nbsp;args)</pre>
-<div class="block">If a ParameterException occurs during <a href="../../picocli/groovy/PicocliBaseScript.html#parseScriptArguments-picocli.CommandLine-java.lang.String:A-"><code>parseScriptArguments(CommandLine, String[])</code></a>
+                                        java.lang.String[]&nbsp;args)</pre>
+<div class="block">If a ParameterException occurs during <a href="../../picocli/groovy/PicocliBaseScript.html#parseScriptArguments(picocli.CommandLine,%20java.lang.String[])"><code>parseScriptArguments(CommandLine, String[])</code></a>
  then this method gets called to report the problem.
- The default behavior is to show the exception message using <a href="../../picocli/groovy/PicocliBaseScript.html#printErrorMessage-java.lang.String-"><code>printErrorMessage(String)</code></a>,
- then call <a href="../../picocli/groovy/PicocliBaseScript.html#printHelpMessage-picocli.CommandLine-"><code>printHelpMessage(CommandLine)</code></a>.
+ The default behavior is to show the exception message using <a href="../../picocli/groovy/PicocliBaseScript.html#printErrorMessage(java.lang.String)"><code>printErrorMessage(String)</code></a>,
+ then call <a href="../../picocli/groovy/PicocliBaseScript.html#printHelpMessage(picocli.CommandLine)"><code>printHelpMessage(CommandLine)</code></a>.
  The return value becomes the return value for the Script.run which will be the exit code
  if we've been called from the command line.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>pe</code> - The ParameterException that occurred</dd>
-<dd><code>args</code> - The argument array</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The value that Script.run should return. This implementation returns 1, subclasses may override.</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>pe</code> - The ParameterException that occurred</dd><dd><code>args</code> - The argument array</dd>
+<dt><span class="strong">Returns:</span></dt><dd>The value that Script.run should return. This implementation returns 1, subclasses may override.</dd></dl>
 </li>
 </ul>
-<a name="handleExecutionException-picocli.CommandLine-java.lang.String:A-java.lang.Exception-">
+<a name="handleExecutionException(picocli.CommandLine, java.lang.String[], java.lang.Exception)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>handleExecutionException</h4>
 <pre>public&nbsp;java.lang.Object&nbsp;handleExecutionException(<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
-                                                 java.lang.String[]&nbsp;args,
-                                                 java.lang.Exception&nbsp;ex)</pre>
-<div class="block">If an Exception occurs during <a href="../../picocli/groovy/PicocliBaseScript.html#runRunnableSubcommand-java.util.List-"><code>runRunnableSubcommand(List)</code></a>, or <a href="../../picocli/groovy/PicocliBaseScript.html#runScriptBody--"><code>runScriptBody()</code></a>
+                                        java.lang.String[]&nbsp;args,
+                                        java.lang.Exception&nbsp;ex)</pre>
+<div class="block">If an Exception occurs during <a href="../../picocli/groovy/PicocliBaseScript.html#runRunnableSubcommand(java.util.List)"><code>runRunnableSubcommand(List)</code></a>, or <a href="../../picocli/groovy/PicocliBaseScript.html#runScriptBody()"><code>runScriptBody()</code></a>
  then this gets called to report the problem.
  The default behavior is to throw a new <code>ExecutionException</code> wrapping the specified exception.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>commandLine</code> - The CommandLine instance</dd>
-<dd><code>args</code> - The argument array</dd>
-<dd><code>ex</code> - The Exception that occurred</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The value that Script.run should return when overriding this method</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - wrapping the specified exception by default</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>commandLine</code> - The CommandLine instance</dd><dd><code>args</code> - The argument array</dd><dd><code>ex</code> - The Exception that occurred</dd>
+<dt><span class="strong">Returns:</span></dt><dd>The value that Script.run should return when overriding this method</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code><a href="../../picocli/CommandLine.ExecutionException.html" title="class in picocli">CommandLine.ExecutionException</a></code> - wrapping the specified exception by default</dd></dl>
 </li>
 </ul>
-<a name="printHelpMessage-picocli.CommandLine-">
+<a name="printHelpMessage(picocli.CommandLine)">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -581,18 +534,32 @@ <h4>printHelpMessage</h4>
 <pre>public&nbsp;java.lang.Object&nbsp;printHelpMessage(<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine)</pre>
 <div class="block">If an &#064;Option whose <code>usageHelp</code> attribute is annotated as true appears in the arguments.
  then the script body is not run and this <code>printHelpMessage</code> method is called instead.
- The default behavior is to print the <a href="../../picocli/CommandLine.html#usage-java.io.PrintStream-"><code>CommandLine.usage(PrintStream)</code></a> to <code>System.err</code>.
+ The default behavior is to print the <a href="../../picocli/CommandLine.html#usage(java.io.PrintStream)"><code>CommandLine.usage(PrintStream)</code></a> to <code>System.err</code>.
  The return value becomes the return value for the Script.run which will be the exit code
  if we've been called from the command line.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>commandLine</code> - The CommandLine instance</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The value that Script.run should return (<code>null</code> by default).</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>commandLine</code> - The CommandLine instance</dd>
+<dt><span class="strong">Returns:</span></dt><dd>The value that Script.run should return (<code>null</code> by default).</dd></dl>
+</li>
+</ul>
+<a name="printHelpMessage(picocli.CommandLine, java.io.PrintStream)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>printHelpMessage</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;printHelpMessage(<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine,
+                                java.io.PrintStream&nbsp;stream)</pre>
+<div class="block">If an &#064;Option whose <code>usageHelp</code> attribute is annotated as true appears in the arguments.
+ then the script body is not run and this <code>printHelpMessage</code> method is called instead.
+ The default behavior is to print the <a href="../../picocli/CommandLine.html#usage(java.io.PrintStream)"><code>CommandLine.usage(PrintStream)</code></a> to the specified stream.
+ The return value becomes the return value for the Script.run which will be the exit code
+ if we've been called from the command line.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>commandLine</code> - The CommandLine instance</dd><dd><code>stream</code> - the stream to print the usage help message to</dd>
+<dt><span class="strong">Returns:</span></dt><dd>The value that Script.run should return (<code>null</code> by default).</dd><dt><span class="strong">Since:</span></dt>
+  <dd>3.0</dd></dl>
 </li>
 </ul>
-<a name="printVersionHelpMessage-picocli.CommandLine-">
+<a name="printVersionHelpMessage(picocli.CommandLine)">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -601,15 +568,11 @@ <h4>printVersionHelpMessage</h4>
 <pre>public&nbsp;java.lang.Object&nbsp;printVersionHelpMessage(<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a>&nbsp;commandLine)</pre>
 <div class="block">If an &#064;Option whose <code>versionHelp</code> attribute is annotated as true appears in the arguments.
  then the script body is not run and this printVersionHelpMessage method is called instead.
- The default behavior is to print the <a href="../../picocli/CommandLine.html#printVersionHelp-java.io.PrintStream-"><code>CommandLine.printVersionHelp(PrintStream)</code></a> to <code>System.err</code>.
+ The default behavior is to print the <a href="../../picocli/CommandLine.html#printVersionHelp(java.io.PrintStream)"><code>CommandLine.printVersionHelp(PrintStream)</code></a> to <code>System.out</code>.
  The return value becomes the return value for the Script.run which will be the exit code
  if we've been called from the command line.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>commandLine</code> - The CommandLine instance</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The value that Script.run should return (<code>null</code> by default).</dd>
-</dl>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>commandLine</code> - The CommandLine instance</dd>
+<dt><span class="strong">Returns:</span></dt><dd>The value that Script.run should return (<code>null</code> by default).</dd></dl>
 </li>
 </ul>
 </li>
@@ -620,11 +583,9 @@ <h4>printVersionHelpMessage</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -639,15 +600,15 @@ <h4>printVersionHelpMessage</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../../picocli/groovy/PicocliScript.html" title="annotation in picocli.groovy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li>Prev Class</li>
+<li><a href="../../picocli/groovy/PicocliScript.html" title="annotation in picocli.groovy"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?picocli/groovy/PicocliBaseScript.html" target="_top">Frames</a></li>
-<li><a href="PicocliBaseScript.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="PicocliBaseScript.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -665,18 +626,18 @@ <h4>printVersionHelpMessage</h4>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/groovy/PicocliScript.html b/docs/apidocs/picocli/groovy/PicocliScript.html
index a3b18be10..02df502cd 100644
--- a/docs/apidocs/picocli/groovy/PicocliScript.html
+++ b/docs/apidocs/picocli/groovy/PicocliScript.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>PicocliScript (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:02 JST 2018 -->
+<title>PicocliScript (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="PicocliScript (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="PicocliScript (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../picocli/groovy/PicocliScriptASTTransformation.html" title="class in picocli.groovy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy"><span class="strong">Prev Class</span></a></li>
+<li><a href="../../picocli/groovy/PicocliScriptASTTransformation.html" title="class in picocli.groovy"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?picocli/groovy/PicocliScript.html" target="_top">Frames</a></li>
-<li><a href="PicocliScript.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="PicocliScript.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -67,17 +60,15 @@
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
 <li>Required&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
+<li><a href="#annotation_type_optional_element_summary">Optional</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
+<li><a href="#annotation_type_element_detail">Element</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -93,9 +84,9 @@ <h2 title="Annotation Type PicocliScript" class="title">Annotation Type PicocliS
 <hr>
 <br>
 <pre>@Documented
- @Retention(value=SOURCE)
- @Target(value={LOCAL_VARIABLE,PACKAGE,TYPE})
-public @interface <span class="memberNameLabel">PicocliScript</span></pre>
+@Retention(value=SOURCE)
+@Target(value={LOCAL_VARIABLE,PACKAGE,TYPE})
+public @interface <span class="strong">PicocliScript</span></pre>
 <div class="block"><p>
  Annotation to give Groovy scripts convenient access to picocli functionality.
  Scripts may annotate the package statement, an import statement or a local variable with
@@ -130,7 +121,7 @@ <h2 title="Annotation Type PicocliScript" class="title">Annotation Type PicocliS
  assert this.commandLine.commandName == "myCommand"
  </pre>
  <p>
- Otherwise, this annotation works similar to the Groovy built-in <code>BaseScript</code>.
+ Otherwise, this annotation works similar to the Groovy built-in <code>groovy.transform.BaseScript</code>.
  Using this annotation will override the base script set by Groovy compiler or
  <code>CompilerConfiguration</code> of <code>GroovyShell</code>.
  </p><p>
@@ -149,12 +140,9 @@ <h2 title="Annotation Type PicocliScript" class="title">Annotation Type PicocliS
  import com.mycompany.MyScriptBaseClass
  &#64;PicocliScript MyScriptBaseClass theScript;
  </pre></div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../picocli/groovy/PicocliScriptASTTransformation.html" title="class in picocli.groovy"><code>PicocliScriptASTTransformation</code></a></dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../../picocli/groovy/PicocliScriptASTTransformation.html" title="class in picocli.groovy"><code>PicocliScriptASTTransformation</code></a></dd></dl>
 </li>
 </ul>
 </div>
@@ -163,11 +151,11 @@ <h2 title="Annotation Type PicocliScript" class="title">Annotation Type PicocliS
 <li class="blockList">
 <!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="annotation.type.optional.element.summary">
+<li class="blockList"><a name="annotation_type_optional_element_summary">
 <!--   -->
 </a>
 <h3>Optional Element Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
 <caption><span>Optional Elements</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -175,7 +163,7 @@ <h3>Optional Element Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.Class&lt;?&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/groovy/PicocliScript.html#value--">value</a></span></code>&nbsp;</td>
+<td class="colLast"><code><strong><a href="../../picocli/groovy/PicocliScript.html#value()">value</a></strong></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -188,11 +176,11 @@ <h3>Optional Element Summary</h3>
 <li class="blockList">
 <!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="annotation.type.element.detail">
+<li class="blockList"><a name="annotation_type_element_detail">
 <!--   -->
 </a>
 <h3>Element Detail</h3>
-<a name="value--">
+<a name="value()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -213,11 +201,9 @@ <h4>value</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -232,15 +218,15 @@ <h4>value</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../picocli/groovy/PicocliScriptASTTransformation.html" title="class in picocli.groovy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy"><span class="strong">Prev Class</span></a></li>
+<li><a href="../../picocli/groovy/PicocliScriptASTTransformation.html" title="class in picocli.groovy"><span class="strong">Next Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?picocli/groovy/PicocliScript.html" target="_top">Frames</a></li>
-<li><a href="PicocliScript.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="PicocliScript.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -257,17 +243,15 @@ <h4>value</h4>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
 <li>Required&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
+<li><a href="#annotation_type_optional_element_summary">Optional</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
+<li><a href="#annotation_type_element_detail">Element</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/groovy/PicocliScriptASTTransformation.html b/docs/apidocs/picocli/groovy/PicocliScriptASTTransformation.html
index 12c554341..abd648e27 100644
--- a/docs/apidocs/picocli/groovy/PicocliScriptASTTransformation.html
+++ b/docs/apidocs/picocli/groovy/PicocliScriptASTTransformation.html
@@ -2,38 +2,25 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>PicocliScriptASTTransformation (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:02 JST 2018 -->
+<title>PicocliScriptASTTransformation (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="PicocliScriptASTTransformation (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="PicocliScriptASTTransformation (picocli 3.0.0-alpha-2 API)";
     }
 //-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -48,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../picocli/groovy/PicocliScript.html" title="annotation in picocli.groovy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
+<li><a href="../../picocli/groovy/PicocliScript.html" title="annotation in picocli.groovy"><span class="strong">Prev Class</span></a></li>
+<li>Next Class</li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?picocli/groovy/PicocliScriptASTTransformation.html" target="_top">Frames</a></li>
-<li><a href="PicocliScriptASTTransformation.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="PicocliScriptASTTransformation.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -74,18 +61,18 @@
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#fields.inherited.from.class.org.codehaus.groovy.transform.AbstractASTTransformation">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#fields_inherited_from_class_org.codehaus.groovy.transform.AbstractASTTransformation">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -117,7 +104,7 @@ <h2 title="Class PicocliScriptASTTransformation" class="title">Class PicocliScri
 </dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">PicocliScriptASTTransformation</span>
+<pre>public class <span class="strong">PicocliScriptASTTransformation</span>
 extends org.codehaus.groovy.transform.AbstractASTTransformation</pre>
 <div class="block">Ensures that Groovy scripts annotated with <a href="../../picocli/groovy/PicocliScript.html" title="annotation in picocli.groovy"><code>PicocliScript</code></a> are transformed into a class that
  extends <a href="../../picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy"><code>PicocliBaseScript</code></a>.
@@ -125,10 +112,8 @@ <h2 title="Class PicocliScriptASTTransformation" class="title">Class PicocliScri
  and in addition moves <a href="../../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a> annotations to the generated script class.
  The <code>@Command</code> annotation must be on the same <code>import</code> or local variable as the <code>PicocliScript</code>
  annotation.</div>
-<dl>
-<dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.0</dd>
-</dl>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>2.0</dd></dl>
 </li>
 </ul>
 </div>
@@ -137,19 +122,19 @@ <h2 title="Class PicocliScriptASTTransformation" class="title">Class PicocliScri
 <li class="blockList">
 <!-- =========== FIELD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="field.summary">
+<li class="blockList"><a name="field_summary">
 <!--   -->
 </a>
 <h3>Field Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="fields.inherited.from.class.org.codehaus.groovy.transform.AbstractASTTransformation">
+<li class="blockList"><a name="fields_inherited_from_class_org.codehaus.groovy.transform.AbstractASTTransformation">
 <!--   -->
 </a>
 <h3>Fields inherited from class&nbsp;org.codehaus.groovy.transform.AbstractASTTransformation</h3>
 <code>RETENTION_CLASSNODE, sourceUnit</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="fields.inherited.from.class.groovyjarjarasm.asm.Opcodes">
+<li class="blockList"><a name="fields_inherited_from_class_groovyjarjarasm.asm.Opcodes">
 <!--   -->
 </a>
 <h3>Fields inherited from interface&nbsp;groovyjarjarasm.asm.Opcodes</h3>
@@ -159,48 +144,48 @@ <h3>Fields inherited from interface&nbsp;groovyjarjarasm.asm.Opcodes</h3>
 </ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="constructor_summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../picocli/groovy/PicocliScriptASTTransformation.html#PicocliScriptASTTransformation--">PicocliScriptASTTransformation</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><strong><a href="../../picocli/groovy/PicocliScriptASTTransformation.html#PicocliScriptASTTransformation()">PicocliScriptASTTransformation</a></strong>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a name="method_summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
-<tr id="i0" class="altColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/groovy/PicocliScriptASTTransformation.html#visit-org.codehaus.groovy.ast.ASTNode:A-org.codehaus.groovy.control.SourceUnit-">visit</a></span>(org.codehaus.groovy.ast.ASTNode[]&nbsp;nodes,
+<td class="colLast"><code><strong><a href="../../picocli/groovy/PicocliScriptASTTransformation.html#visit(org.codehaus.groovy.ast.ASTNode[],%20org.codehaus.groovy.control.SourceUnit)">visit</a></strong>(org.codehaus.groovy.ast.ASTNode[]&nbsp;nodes,
      org.codehaus.groovy.control.SourceUnit&nbsp;source)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.codehaus.groovy.transform.AbstractASTTransformation">
+<li class="blockList"><a name="methods_inherited_from_class_org.codehaus.groovy.transform.AbstractASTTransformation">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.codehaus.groovy.transform.AbstractASTTransformation</h3>
 <code>addError, checkIncludeExclude, checkIncludeExclude, checkNotInterface, copyAnnotatedNodeAnnotations, deemedInternalName, getClassList, getMemberClassValue, getMemberClassValue, getMemberIntValue, getMemberList, getMemberStringValue, getMemberStringValue, getMemberValue, hasAnnotation, init, memberHasValue, nonGeneric, shouldSkip, shouldSkipOnDescriptor, tokenize</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
@@ -216,11 +201,11 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="constructor_detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="PicocliScriptASTTransformation--">
+<a name="PicocliScriptASTTransformation()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -233,18 +218,18 @@ <h4>PicocliScriptASTTransformation</h4>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a name="method_detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="visit-org.codehaus.groovy.ast.ASTNode:A-org.codehaus.groovy.control.SourceUnit-">
+<a name="visit(org.codehaus.groovy.ast.ASTNode[], org.codehaus.groovy.control.SourceUnit)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>visit</h4>
 <pre>public&nbsp;void&nbsp;visit(org.codehaus.groovy.ast.ASTNode[]&nbsp;nodes,
-                  org.codehaus.groovy.control.SourceUnit&nbsp;source)</pre>
+         org.codehaus.groovy.control.SourceUnit&nbsp;source)</pre>
 </li>
 </ul>
 </li>
@@ -255,11 +240,9 @@ <h4>visit</h4>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -274,15 +257,15 @@ <h4>visit</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../picocli/groovy/PicocliScript.html" title="annotation in picocli.groovy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
+<li><a href="../../picocli/groovy/PicocliScript.html" title="annotation in picocli.groovy"><span class="strong">Prev Class</span></a></li>
+<li>Next Class</li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?picocli/groovy/PicocliScriptASTTransformation.html" target="_top">Frames</a></li>
-<li><a href="PicocliScriptASTTransformation.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="PicocliScriptASTTransformation.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -300,18 +283,18 @@ <h4>visit</h4>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#fields.inherited.from.class.org.codehaus.groovy.transform.AbstractASTTransformation">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#fields_inherited_from_class_org.codehaus.groovy.transform.AbstractASTTransformation">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
 </ul>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/groovy/package-frame.html b/docs/apidocs/picocli/groovy/package-frame.html
index bec39bbc5..ff050e226 100644
--- a/docs/apidocs/picocli/groovy/package-frame.html
+++ b/docs/apidocs/picocli/groovy/package-frame.html
@@ -2,11 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>picocli.groovy (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>picocli.groovy (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
 </head>
 <body>
 <h1 class="bar"><a href="../../picocli/groovy/package-summary.html" target="classFrame">picocli.groovy</a></h1>
diff --git a/docs/apidocs/picocli/groovy/package-summary.html b/docs/apidocs/picocli/groovy/package-summary.html
index 43baa84a0..8eb80227b 100644
--- a/docs/apidocs/picocli/groovy/package-summary.html
+++ b/docs/apidocs/picocli/groovy/package-summary.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>picocli.groovy (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>picocli.groovy (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="picocli.groovy (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="picocli.groovy (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../picocli/package-summary.html">Prev&nbsp;Package</a></li>
-<li>Next&nbsp;Package</li>
+<li><a href="../../picocli/package-summary.html">Prev Package</a></li>
+<li>Next Package</li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?picocli/groovy/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="package-summary.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -64,7 +57,7 @@
   //-->
 </script>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -73,12 +66,12 @@ <h1 title="Package" class="title">Package&nbsp;picocli.groovy</h1>
 <div class="docSummary">
 <div class="block">Provides classes and annotations to give Groovy scripts convenient access to picocli functionality.</div>
 </div>
-<p>See:&nbsp;<a href="#package.description">Description</a></p>
+<p>See:&nbsp;<a href="#package_description">Description</a></p>
 </div>
 <div class="contentContainer">
 <ul class="blockList">
 <li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<table class="packageSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
 <caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Class</th>
@@ -103,7 +96,7 @@ <h1 title="Package" class="title">Package&nbsp;picocli.groovy</h1>
 </table>
 </li>
 <li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Annotation Types Summary table, listing annotation types, and an explanation">
+<table class="packageSummary" border="0" cellpadding="3" cellspacing="0" summary="Annotation Types Summary table, listing annotation types, and an explanation">
 <caption><span>Annotation Types Summary</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Annotation Type</th>
@@ -121,18 +114,16 @@ <h1 title="Package" class="title">Package&nbsp;picocli.groovy</h1>
 </table>
 </li>
 </ul>
-<a name="package.description">
+<a name="package_description">
 <!--   -->
 </a>
 <h2 title="Package picocli.groovy Description">Package picocli.groovy Description</h2>
 <div class="block">Provides classes and annotations to give Groovy scripts convenient access to picocli functionality.</div>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -147,15 +138,15 @@ <h2 title="Package picocli.groovy Description">Package picocli.groovy Descriptio
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../picocli/package-summary.html">Prev&nbsp;Package</a></li>
-<li>Next&nbsp;Package</li>
+<li><a href="../../picocli/package-summary.html">Prev Package</a></li>
+<li>Next Package</li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?picocli/groovy/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="package-summary.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -169,7 +160,7 @@ <h2 title="Package picocli.groovy Description">Package picocli.groovy Descriptio
   //-->
 </script>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/groovy/package-tree.html b/docs/apidocs/picocli/groovy/package-tree.html
index 48df7e8c7..642bfe507 100644
--- a/docs/apidocs/picocli/groovy/package-tree.html
+++ b/docs/apidocs/picocli/groovy/package-tree.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>picocli.groovy Class Hierarchy (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>picocli.groovy Class Hierarchy (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="picocli.groovy Class Hierarchy (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="picocli.groovy Class Hierarchy (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -47,10 +40,10 @@
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?picocli/groovy/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="package-tree.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -64,13 +57,13 @@
   //-->
 </script>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
 <h1 class="title">Hierarchy For Package picocli.groovy</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<span class="strong">Package Hierarchies:</span>
 <ul class="horizontal">
 <li><a href="../../overview-tree.html">All Packages</a></li>
 </ul>
@@ -82,14 +75,14 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li type="circle">org.codehaus.groovy.transform.AbstractASTTransformation (implements org.codehaus.groovy.transform.ASTTransformation, groovyjarjarasm.asm.Opcodes)
 <ul>
-<li type="circle">picocli.groovy.<a href="../../picocli/groovy/PicocliScriptASTTransformation.html" title="class in picocli.groovy"><span class="typeNameLink">PicocliScriptASTTransformation</span></a></li>
+<li type="circle">picocli.groovy.<a href="../../picocli/groovy/PicocliScriptASTTransformation.html" title="class in picocli.groovy"><span class="strong">PicocliScriptASTTransformation</span></a></li>
 </ul>
 </li>
 <li type="circle">groovy.lang.GroovyObjectSupport (implements groovy.lang.GroovyObject)
 <ul>
 <li type="circle">groovy.lang.Script
 <ul>
-<li type="circle">picocli.groovy.<a href="../../picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy"><span class="typeNameLink">PicocliBaseScript</span></a></li>
+<li type="circle">picocli.groovy.<a href="../../picocli/groovy/PicocliBaseScript.html" title="class in picocli.groovy"><span class="strong">PicocliBaseScript</span></a></li>
 </ul>
 </li>
 </ul>
@@ -99,15 +92,13 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 </ul>
 <h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>
 <ul>
-<li type="circle">picocli.groovy.<a href="../../picocli/groovy/PicocliScript.html" title="annotation in picocli.groovy"><span class="typeNameLink">PicocliScript</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">picocli.groovy.<a href="../../picocli/groovy/PicocliScript.html" title="annotation in picocli.groovy"><span class="strong">PicocliScript</span></a> (implements java.lang.annotation.Annotation)</li>
 </ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -127,10 +118,10 @@ <h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?picocli/groovy/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="package-tree.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -144,7 +135,7 @@ <h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>
   //-->
 </script>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/package-frame.html b/docs/apidocs/picocli/package-frame.html
index 7ceddfda6..ab6ed0f2f 100644
--- a/docs/apidocs/picocli/package-frame.html
+++ b/docs/apidocs/picocli/package-frame.html
@@ -2,30 +2,29 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>picocli (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>picocli (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <h1 class="bar"><a href="../picocli/package-summary.html" target="classFrame">picocli</a></h1>
 <div class="indexContainer">
 <h2 title="Interfaces">Interfaces</h2>
 <ul title="Interfaces">
-<li><a href="CommandLine.Help.Ansi.IStyle.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.Help.Ansi.IStyle</span></a></li>
-<li><a href="CommandLine.Help.IOptionRenderer.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.Help.IOptionRenderer</span></a></li>
-<li><a href="CommandLine.Help.IParameterRenderer.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.Help.IParameterRenderer</span></a></li>
-<li><a href="CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.Help.IParamLabelRenderer</span></a></li>
-<li><a href="CommandLine.IExceptionHandler.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.IExceptionHandler</span></a></li>
-<li><a href="CommandLine.IExceptionHandler2.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.IExceptionHandler2</span></a></li>
-<li><a href="CommandLine.IFactory.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.IFactory</span></a></li>
-<li><a href="CommandLine.IHelpCommandInitializable.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.IHelpCommandInitializable</span></a></li>
-<li><a href="CommandLine.IParseResultHandler.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.IParseResultHandler</span></a></li>
-<li><a href="CommandLine.IParseResultHandler2.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.IParseResultHandler2</span></a></li>
-<li><a href="CommandLine.ITypeConverter.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.ITypeConverter</span></a></li>
-<li><a href="CommandLine.IVersionProvider.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.IVersionProvider</span></a></li>
-<li><a href="CommandLine.Model.IBinding.html" title="interface in picocli" target="classFrame"><span class="interfaceName">CommandLine.Model.IBinding</span></a></li>
+<li><a href="CommandLine.Help.Ansi.IStyle.html" title="interface in picocli" target="classFrame"><i>CommandLine.Help.Ansi.IStyle</i></a></li>
+<li><a href="CommandLine.Help.IOptionRenderer.html" title="interface in picocli" target="classFrame"><i>CommandLine.Help.IOptionRenderer</i></a></li>
+<li><a href="CommandLine.Help.IParameterRenderer.html" title="interface in picocli" target="classFrame"><i>CommandLine.Help.IParameterRenderer</i></a></li>
+<li><a href="CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli" target="classFrame"><i>CommandLine.Help.IParamLabelRenderer</i></a></li>
+<li><a href="CommandLine.IExceptionHandler.html" title="interface in picocli" target="classFrame"><i>CommandLine.IExceptionHandler</i></a></li>
+<li><a href="CommandLine.IExceptionHandler2.html" title="interface in picocli" target="classFrame"><i>CommandLine.IExceptionHandler2</i></a></li>
+<li><a href="CommandLine.IFactory.html" title="interface in picocli" target="classFrame"><i>CommandLine.IFactory</i></a></li>
+<li><a href="CommandLine.IHelpCommandInitializable.html" title="interface in picocli" target="classFrame"><i>CommandLine.IHelpCommandInitializable</i></a></li>
+<li><a href="CommandLine.IParseResultHandler.html" title="interface in picocli" target="classFrame"><i>CommandLine.IParseResultHandler</i></a></li>
+<li><a href="CommandLine.IParseResultHandler2.html" title="interface in picocli" target="classFrame"><i>CommandLine.IParseResultHandler2</i></a></li>
+<li><a href="CommandLine.ITypeConverter.html" title="interface in picocli" target="classFrame"><i>CommandLine.ITypeConverter</i></a></li>
+<li><a href="CommandLine.IVersionProvider.html" title="interface in picocli" target="classFrame"><i>CommandLine.IVersionProvider</i></a></li>
+<li><a href="CommandLine.Model.IBinding.html" title="interface in picocli" target="classFrame"><i>CommandLine.Model.IBinding</i></a></li>
 </ul>
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
@@ -33,7 +32,6 @@ <h2 title="Classes">Classes</h2>
 <li><a href="CommandLine.html" title="class in picocli" target="classFrame">CommandLine</a></li>
 <li><a href="CommandLine.AbstractHandler.html" title="class in picocli" target="classFrame">CommandLine.AbstractHandler</a></li>
 <li><a href="CommandLine.AbstractParseResultHandler.html" title="class in picocli" target="classFrame">CommandLine.AbstractParseResultHandler</a></li>
-<li><a href="CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli" target="classFrame">CommandLine.AbstractSimpleParseResultHandler</a></li>
 <li><a href="CommandLine.DefaultExceptionHandler.html" title="class in picocli" target="classFrame">CommandLine.DefaultExceptionHandler</a></li>
 <li><a href="CommandLine.Help.html" title="class in picocli" target="classFrame">CommandLine.Help</a></li>
 <li><a href="CommandLine.Help.ColorScheme.html" title="class in picocli" target="classFrame">CommandLine.Help.ColorScheme</a></li>
diff --git a/docs/apidocs/picocli/package-summary.html b/docs/apidocs/picocli/package-summary.html
index a25f7d390..dae48aa65 100644
--- a/docs/apidocs/picocli/package-summary.html
+++ b/docs/apidocs/picocli/package-summary.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>picocli (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>picocli (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="picocli (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="picocli (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -42,15 +35,15 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li>Prev&nbsp;Package</li>
-<li><a href="../picocli/groovy/package-summary.html">Next&nbsp;Package</a></li>
+<li>Prev Package</li>
+<li><a href="../picocli/groovy/package-summary.html">Next Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="package-summary.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -64,7 +57,7 @@
   //-->
 </script>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -74,12 +67,12 @@ <h1 title="Package" class="title">Package&nbsp;picocli</h1>
 <div class="block">Provides classes and interfaces for the main picocli <a href="../picocli/CommandLine.html" title="class in picocli">command line parsing</a> and
  <a href="../picocli/AutoComplete.html" title="class in picocli"><code>autocompletion</code></a> functionality.</div>
 </div>
-<p>See:&nbsp;<a href="#package.description">Description</a></p>
+<p>See:&nbsp;<a href="#package_description">Description</a></p>
 </div>
 <div class="contentContainer">
 <ul class="blockList">
 <li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Interface Summary table, listing interfaces, and an explanation">
+<table class="packageSummary" border="0" cellpadding="3" cellspacing="0" summary="Interface Summary table, listing interfaces, and an explanation">
 <caption><span>Interface Summary</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Interface</th>
@@ -118,7 +111,7 @@ <h1 title="Package" class="title">Package&nbsp;picocli</h1>
 <tr class="altColor">
 <td class="colFirst"><a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli">CommandLine.IExceptionHandler</a></td>
 <td class="colLast">Deprecated
-<div class="block"><span class="deprecationComment">Use <a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><code>CommandLine.IExceptionHandler2</code></a> instead.</span></div>
+<div class="block"><i>Use <a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><code>CommandLine.IExceptionHandler2</code></a> instead.</i></div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -132,7 +125,7 @@ <h1 title="Package" class="title">Package&nbsp;picocli</h1>
 <td class="colFirst"><a href="../picocli/CommandLine.IFactory.html" title="interface in picocli">CommandLine.IFactory</a></td>
 <td class="colLast">
 <div class="block">Factory for instantiating classes that are registered declaratively with annotation attributes, like
- <a href="../picocli/CommandLine.Command.html#subcommands--"><code>CommandLine.Command.subcommands()</code></a>, <a href="../picocli/CommandLine.Option.html#converter--"><code>CommandLine.Option.converter()</code></a>, <a href="../picocli/CommandLine.Parameters.html#converter--"><code>CommandLine.Parameters.converter()</code></a> and <a href="../picocli/CommandLine.Command.html#versionProvider--"><code>CommandLine.Command.versionProvider()</code></a>.</div>
+ <a href="../picocli/CommandLine.Command.html#subcommands()"><code>CommandLine.Command.subcommands()</code></a>, <a href="../picocli/CommandLine.Option.html#converter()"><code>CommandLine.Option.converter()</code></a>, <a href="../picocli/CommandLine.Parameters.html#converter()"><code>CommandLine.Parameters.converter()</code></a> and <a href="../picocli/CommandLine.Command.html#versionProvider()"><code>CommandLine.Command.versionProvider()</code></a>.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -144,14 +137,14 @@ <h1 title="Package" class="title">Package&nbsp;picocli</h1>
 <tr class="altColor">
 <td class="colFirst"><a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a></td>
 <td class="colLast">Deprecated
-<div class="block"><span class="deprecationComment">Use <a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><code>CommandLine.IParseResultHandler2</code></a> instead.</span></div>
+<div class="block"><i>Use <a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><code>CommandLine.IParseResultHandler2</code></a> instead.</i></div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a>&lt;R&gt;</td>
 <td class="colLast">
 <div class="block">Represents a function that can process the <code>ParseResult</code> object resulting from successfully
- <a href="../picocli/CommandLine.html#parseArgs-java.lang.String...-">parsing</a> the command line arguments.</div>
+ <a href="../picocli/CommandLine.html#parseArgs(java.lang.String...)">parsing</a> the command line arguments.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -179,7 +172,7 @@ <h1 title="Package" class="title">Package&nbsp;picocli</h1>
 </table>
 </li>
 <li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<table class="packageSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
 <caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Class</th>
@@ -213,84 +206,78 @@ <h1 title="Package" class="title">Package&nbsp;picocli</h1>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="../picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli">CommandLine.AbstractSimpleParseResultHandler</a></td>
-<td class="colLast">
-<div class="block">Command line parse result handler that does not return a result.</div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli">CommandLine.DefaultExceptionHandler</a>&lt;R&gt;</td>
 <td class="colLast">
 <div class="block">Default exception handler that handles invalid user input by printing the exception message, followed by the usage
  message for the command or subcommand whose input was invalid.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></td>
 <td class="colLast">
 <div class="block">A collection of methods and inner classes that provide fine-grained control over the contents and layout of
  the usage help message to display to end users when help is requested or invalid input values were specified.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></td>
 <td class="colLast">
 <div class="block">All usage help message are generated with a color scheme that assigns certain styles and colors to common
  parts of a usage message: the command name, options, positional parameters and option parameters.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a></td>
 <td class="colLast">
 <div class="block">Columns define the width, indent (leading number of spaces in a column before the value) and
  <a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">Overflow</a> policy of a column in a <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">TextTable</a>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></td>
 <td class="colLast">
 <div class="block">Use a Layout to format usage help text for options and parameters in tabular format.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></td>
 <td class="colLast">
 <div class="block">Responsible for spacing out <a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><code>CommandLine.Help.Ansi.Text</code></a> values according to the <a href="../picocli/CommandLine.Help.Column.html" title="class in picocli"><code>CommandLine.Help.Column</code></a> definitions the table was
  created with.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli">CommandLine.Help.TextTable.Cell</a></td>
 <td class="colLast">
 <div class="block">Helper class to index positions in a <code>Help.TextTable</code>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../picocli/CommandLine.HelpCommand.html" title="class in picocli">CommandLine.HelpCommand</a></td>
 <td class="colLast">
 <div class="block">Help command that can be installed as a subcommand on all application commands.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../picocli/CommandLine.Model.html" title="class in picocli">CommandLine.Model</a></td>
 <td class="colLast">
 <div class="block">This class provides a namespace for classes and interfaces that model concepts and attributes of command line interfaces in picocli.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli">CommandLine.Model.ArgSpec</a></td>
 <td class="colLast">
 <div class="block">Models the shared attributes of <a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><code>CommandLine.Model.OptionSpec</code></a> and <a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli"><code>CommandLine.Model.PositionalParamSpec</code></a>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">CommandLine.Model.CommandSpec</a></td>
 <td class="colLast">
 <div class="block">The <code>CommandSpec</code> class models a command specification, including the options, positional parameters and subcommands
  supported by the command, as well as attributes for the version help message and the usage help message of the command.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli">CommandLine.Model.OptionSpec</a></td>
 <td class="colLast">
 <div class="block">The <code>OptionSpec</code> class models aspects of a <em>named option</em> of a <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">command</a>, including whether
@@ -298,76 +285,76 @@ <h1 title="Package" class="title">Package&nbsp;picocli</h1>
  and attributes for the usage help message describing the option.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli">CommandLine.Model.OptionSpec.Builder</a></td>
 <td class="colLast">
 <div class="block">Builder responsible for creating valid <code>OptionSpec</code> objects.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli">CommandLine.Model.ParserSpec</a></td>
 <td class="colLast">
 <div class="block">Models parser configuration specification.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli">CommandLine.Model.PositionalParamSpec</a></td>
 <td class="colLast">
 <div class="block">The <code>PositionalParamSpec</code> class models aspects of a <em>positional parameter</em> of a <a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli">command</a>, including whether
  it is required or optional, and attributes for the usage help message describing the positional parameter.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli">CommandLine.Model.PositionalParamSpec.Builder</a></td>
 <td class="colLast">
 <div class="block">Builder responsible for creating valid <code>PositionalParamSpec</code> objects.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli">CommandLine.Model.UnmatchedArgsBinding</a></td>
 <td class="colLast">
 <div class="block">This class allows applications to specify a custom binding that will be invoked for unmatched arguments.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli">CommandLine.Model.UsageMessageSpec</a></td>
 <td class="colLast">
 <div class="block">Models the usage help message specification.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../picocli/CommandLine.ParseResult.html" title="class in picocli">CommandLine.ParseResult</a></td>
 <td class="colLast">
 <div class="block">Encapsulates the result of parsing an array of command line arguments.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli">CommandLine.ParseResult.Builder</a></td>
 <td class="colLast">
 <div class="block">Builds immutable <code>ParseResult</code> instances.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../picocli/CommandLine.Range.html" title="class in picocli">CommandLine.Range</a></td>
 <td class="colLast">
 <div class="block">Describes the number of parameters required and accepted by an option or a positional parameter.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../picocli/CommandLine.RunAll.html" title="class in picocli">CommandLine.RunAll</a></td>
 <td class="colLast">
 <div class="block">Command line parse result handler that prints help if requested, and otherwise executes the top-level command and
  all subcommands as <code>Runnable</code> or <code>Callable</code>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../picocli/CommandLine.RunFirst.html" title="class in picocli">CommandLine.RunFirst</a></td>
 <td class="colLast">
 <div class="block">Command line parse result handler that prints help if requested, and otherwise executes the top-level
  <code>Runnable</code> or <code>Callable</code> command.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../picocli/CommandLine.RunLast.html" title="class in picocli">CommandLine.RunLast</a></td>
 <td class="colLast">
 <div class="block">Command line parse result handler that prints help if requested, and otherwise executes the most specific
@@ -378,7 +365,7 @@ <h1 title="Package" class="title">Package&nbsp;picocli</h1>
 </table>
 </li>
 <li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Summary table, listing enums, and an explanation">
+<table class="packageSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Summary table, listing enums, and an explanation">
 <caption><span>Enum Summary</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Enum</th>
@@ -416,7 +403,7 @@ <h1 title="Package" class="title">Package&nbsp;picocli</h1>
 </table>
 </li>
 <li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Exception Summary table, listing exceptions, and an explanation">
+<table class="packageSummary" border="0" cellpadding="3" cellspacing="0" summary="Exception Summary table, listing exceptions, and an explanation">
 <caption><span>Exception Summary</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Exception</th>
@@ -444,7 +431,7 @@ <h1 title="Package" class="title">Package&nbsp;picocli</h1>
 <tr class="rowColor">
 <td class="colFirst"><a href="../picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli">CommandLine.MaxValuesforFieldExceededException</a></td>
 <td class="colLast">
-<div class="block">Exception indicating that more values were specified for an option or parameter than its <a href="../picocli/CommandLine.Option.html#arity--"><code>arity</code></a> allows.</div>
+<div class="block">Exception indicating that more values were specified for an option or parameter than its <a href="../picocli/CommandLine.Option.html#arity()"><code>arity</code></a> allows.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -457,7 +444,7 @@ <h1 title="Package" class="title">Package&nbsp;picocli</h1>
 <td class="colFirst"><a href="../picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli">CommandLine.MissingTypeConverterException</a></td>
 <td class="colLast">
 <div class="block">Exception indicating that an annotated field had a type for which no <a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><code>CommandLine.ITypeConverter</code></a> was
- <a href="../picocli/CommandLine.html#registerConverter-java.lang.Class-picocli.CommandLine.ITypeConverter-">registered</a>.</div>
+ <a href="../picocli/CommandLine.html#registerConverter(java.lang.Class,%20picocli.CommandLine.ITypeConverter)">registered</a>.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -501,7 +488,7 @@ <h1 title="Package" class="title">Package&nbsp;picocli</h1>
 </table>
 </li>
 <li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Annotation Types Summary table, listing annotation types, and an explanation">
+<table class="packageSummary" border="0" cellpadding="3" cellspacing="0" summary="Annotation Types Summary table, listing annotation types, and an explanation">
 <caption><span>Annotation Types Summary</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Annotation Type</th>
@@ -555,7 +542,7 @@ <h1 title="Package" class="title">Package&nbsp;picocli</h1>
 </table>
 </li>
 </ul>
-<a name="package.description">
+<a name="package_description">
 <!--   -->
 </a>
 <h2 title="Package picocli Description">Package picocli Description</h2>
@@ -570,11 +557,9 @@ <h2 title="Package picocli Description">Package picocli Description</h2>
  </p></div>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -589,15 +574,15 @@ <h2 title="Package picocli Description">Package picocli Description</h2>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li>Prev&nbsp;Package</li>
-<li><a href="../picocli/groovy/package-summary.html">Next&nbsp;Package</a></li>
+<li>Prev Package</li>
+<li><a href="../picocli/groovy/package-summary.html">Next Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="package-summary.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -611,7 +596,7 @@ <h2 title="Package picocli Description">Package picocli Description</h2>
   //-->
 </script>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/picocli/package-tree.html b/docs/apidocs/picocli/package-tree.html
index dd43a52a4..9859610b8 100644
--- a/docs/apidocs/picocli/package-tree.html
+++ b/docs/apidocs/picocli/package-tree.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:28 JST 2018 -->
-<title>picocli Class Hierarchy (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>picocli Class Hierarchy (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="picocli Class Hierarchy (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="picocli Class Hierarchy (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -47,10 +40,10 @@
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="package-tree.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -64,13 +57,13 @@
   //-->
 </script>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
 <h1 class="title">Hierarchy For Package picocli</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<span class="strong">Package Hierarchies:</span>
 <ul class="horizontal">
 <li><a href="../overview-tree.html">All Packages</a></li>
 </ul>
@@ -80,70 +73,69 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li type="circle">java.lang.Object
 <ul>
-<li type="circle">picocli.<a href="../picocli/AutoComplete.html" title="class in picocli"><span class="typeNameLink">AutoComplete</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.html" title="class in picocli"><span class="typeNameLink">CommandLine</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli"><span class="typeNameLink">CommandLine.AbstractHandler</span></a>&lt;R,T&gt;
+<li type="circle">picocli.<a href="../picocli/AutoComplete.html" title="class in picocli"><span class="strong">AutoComplete</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.html" title="class in picocli"><span class="strong">CommandLine</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.AbstractHandler.html" title="class in picocli"><span class="strong">CommandLine.AbstractHandler</span></a>&lt;R,T&gt;
 <ul>
-<li type="circle">picocli.<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli"><span class="typeNameLink">CommandLine.AbstractParseResultHandler</span></a>&lt;R&gt; (implements picocli.<a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a>&lt;R&gt;)
+<li type="circle">picocli.<a href="../picocli/CommandLine.AbstractParseResultHandler.html" title="class in picocli"><span class="strong">CommandLine.AbstractParseResultHandler</span></a>&lt;R&gt; (implements picocli.<a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a>&lt;R&gt;)
 <ul>
-<li type="circle">picocli.<a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><span class="typeNameLink">CommandLine.RunAll</span></a> (implements picocli.<a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a>)</li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.RunFirst.html" title="class in picocli"><span class="typeNameLink">CommandLine.RunFirst</span></a> (implements picocli.<a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a>)</li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><span class="typeNameLink">CommandLine.RunLast</span></a> (implements picocli.<a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a>)</li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.RunAll.html" title="class in picocli"><span class="strong">CommandLine.RunAll</span></a> (implements picocli.<a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a>)</li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.RunFirst.html" title="class in picocli"><span class="strong">CommandLine.RunFirst</span></a> (implements picocli.<a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a>)</li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.RunLast.html" title="class in picocli"><span class="strong">CommandLine.RunLast</span></a> (implements picocli.<a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli">CommandLine.IParseResultHandler</a>)</li>
 </ul>
 </li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.AbstractSimpleParseResultHandler.html" title="class in picocli"><span class="typeNameLink">CommandLine.AbstractSimpleParseResultHandler</span></a> (implements picocli.<a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli">CommandLine.IParseResultHandler2</a>&lt;R&gt;)</li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><span class="typeNameLink">CommandLine.DefaultExceptionHandler</span></a>&lt;R&gt; (implements picocli.<a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli">CommandLine.IExceptionHandler</a>, picocli.<a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a>&lt;R&gt;)</li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.DefaultExceptionHandler.html" title="class in picocli"><span class="strong">CommandLine.DefaultExceptionHandler</span></a>&lt;R&gt; (implements picocli.<a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli">CommandLine.IExceptionHandler</a>, picocli.<a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli">CommandLine.IExceptionHandler2</a>&lt;R&gt;)</li>
 </ul>
 </li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Help.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help.Ansi.Text</span></a> (implements java.lang.Cloneable)</li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help.ColorScheme</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Help.Column.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help.Column</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help.Layout</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help.TextTable</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli"><span class="typeNameLink">CommandLine.Help.TextTable.Cell</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.HelpCommand.html" title="class in picocli"><span class="typeNameLink">CommandLine.HelpCommand</span></a> (implements picocli.<a href="../picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli">CommandLine.IHelpCommandInitializable</a>, java.lang.Runnable)</li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Model.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.ArgSpec</span></a>
-<ul>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.OptionSpec</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.PositionalParamSpec</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Help.html" title="class in picocli"><span class="strong">CommandLine.Help</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><span class="strong">CommandLine.Help.Ansi.Text</span></a> (implements java.lang.Cloneable)</li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli"><span class="strong">CommandLine.Help.ColorScheme</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Help.Column.html" title="class in picocli"><span class="strong">CommandLine.Help.Column</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli"><span class="strong">CommandLine.Help.Layout</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><span class="strong">CommandLine.Help.TextTable</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Help.TextTable.Cell.html" title="class in picocli"><span class="strong">CommandLine.Help.TextTable.Cell</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.HelpCommand.html" title="class in picocli"><span class="strong">CommandLine.HelpCommand</span></a> (implements picocli.<a href="../picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli">CommandLine.IHelpCommandInitializable</a>, java.lang.Runnable)</li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Model.html" title="class in picocli"><span class="strong">CommandLine.Model</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Model.ArgSpec.html" title="class in picocli"><span class="strong">CommandLine.Model.ArgSpec</span></a>
+<ul>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Model.OptionSpec.html" title="class in picocli"><span class="strong">CommandLine.Model.OptionSpec</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Model.PositionalParamSpec.html" title="class in picocli"><span class="strong">CommandLine.Model.PositionalParamSpec</span></a></li>
 </ul>
 </li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.CommandSpec</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.OptionSpec.Builder</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.ParserSpec</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.PositionalParamSpec.Builder</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.UnmatchedArgsBinding</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli"><span class="typeNameLink">CommandLine.Model.UsageMessageSpec</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli"><span class="typeNameLink">CommandLine.ParseResult</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli"><span class="typeNameLink">CommandLine.ParseResult.Builder</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Range.html" title="class in picocli"><span class="typeNameLink">CommandLine.Range</span></a> (implements java.lang.Comparable&lt;T&gt;)</li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Model.CommandSpec.html" title="class in picocli"><span class="strong">CommandLine.Model.CommandSpec</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Model.OptionSpec.Builder.html" title="class in picocli"><span class="strong">CommandLine.Model.OptionSpec.Builder</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Model.ParserSpec.html" title="class in picocli"><span class="strong">CommandLine.Model.ParserSpec</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Model.PositionalParamSpec.Builder.html" title="class in picocli"><span class="strong">CommandLine.Model.PositionalParamSpec.Builder</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Model.UnmatchedArgsBinding.html" title="class in picocli"><span class="strong">CommandLine.Model.UnmatchedArgsBinding</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Model.UsageMessageSpec.html" title="class in picocli"><span class="strong">CommandLine.Model.UsageMessageSpec</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.ParseResult.html" title="class in picocli"><span class="strong">CommandLine.ParseResult</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.ParseResult.Builder.html" title="class in picocli"><span class="strong">CommandLine.ParseResult.Builder</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Range.html" title="class in picocli"><span class="strong">CommandLine.Range</span></a> (implements java.lang.Comparable&lt;T&gt;)</li>
 <li type="circle">java.lang.Throwable (implements java.io.Serializable)
 <ul>
 <li type="circle">java.lang.Exception
 <ul>
 <li type="circle">java.lang.RuntimeException
 <ul>
-<li type="circle">picocli.<a href="../picocli/CommandLine.PicocliException.html" title="class in picocli"><span class="typeNameLink">CommandLine.PicocliException</span></a>
+<li type="circle">picocli.<a href="../picocli/CommandLine.PicocliException.html" title="class in picocli"><span class="strong">CommandLine.PicocliException</span></a>
 <ul>
-<li type="circle">picocli.<a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli"><span class="typeNameLink">CommandLine.ExecutionException</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.InitializationException.html" title="class in picocli"><span class="typeNameLink">CommandLine.InitializationException</span></a>
+<li type="circle">picocli.<a href="../picocli/CommandLine.ExecutionException.html" title="class in picocli"><span class="strong">CommandLine.ExecutionException</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.InitializationException.html" title="class in picocli"><span class="strong">CommandLine.InitializationException</span></a>
 <ul>
-<li type="circle">picocli.<a href="../picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli"><span class="typeNameLink">CommandLine.DuplicateOptionAnnotationsException</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.ParameterIndexGapException.html" title="class in picocli"><span class="typeNameLink">CommandLine.ParameterIndexGapException</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli"><span class="strong">CommandLine.DuplicateOptionAnnotationsException</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.ParameterIndexGapException.html" title="class in picocli"><span class="strong">CommandLine.ParameterIndexGapException</span></a></li>
 </ul>
 </li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.ParameterException.html" title="class in picocli"><span class="typeNameLink">CommandLine.ParameterException</span></a>
+<li type="circle">picocli.<a href="../picocli/CommandLine.ParameterException.html" title="class in picocli"><span class="strong">CommandLine.ParameterException</span></a>
 <ul>
-<li type="circle">picocli.<a href="../picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli"><span class="typeNameLink">CommandLine.MaxValuesforFieldExceededException</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli"><span class="typeNameLink">CommandLine.MissingParameterException</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli"><span class="typeNameLink">CommandLine.MissingTypeConverterException</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli"><span class="typeNameLink">CommandLine.OverwrittenOptionException</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli"><span class="typeNameLink">CommandLine.UnmatchedArgumentException</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.MaxValuesforFieldExceededException.html" title="class in picocli"><span class="strong">CommandLine.MaxValuesforFieldExceededException</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.MissingParameterException.html" title="class in picocli"><span class="strong">CommandLine.MissingParameterException</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli"><span class="strong">CommandLine.MissingTypeConverterException</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.OverwrittenOptionException.html" title="class in picocli"><span class="strong">CommandLine.OverwrittenOptionException</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.UnmatchedArgumentException.html" title="class in picocli"><span class="strong">CommandLine.UnmatchedArgumentException</span></a></li>
 </ul>
 </li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.TypeConversionException.html" title="class in picocli"><span class="typeNameLink">CommandLine.TypeConversionException</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.TypeConversionException.html" title="class in picocli"><span class="strong">CommandLine.TypeConversionException</span></a></li>
 </ul>
 </li>
 </ul>
@@ -157,28 +149,28 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 </ul>
 <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli"><span class="typeNameLink">CommandLine.Help.Ansi.IStyle</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli"><span class="typeNameLink">CommandLine.Help.IOptionRenderer</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli"><span class="typeNameLink">CommandLine.Help.IParameterRenderer</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli"><span class="typeNameLink">CommandLine.Help.IParamLabelRenderer</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IExceptionHandler</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IExceptionHandler2</span></a>&lt;R&gt;</li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.IFactory.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IFactory</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IHelpCommandInitializable</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IParseResultHandler</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IParseResultHandler2</span></a>&lt;R&gt;</li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><span class="typeNameLink">CommandLine.ITypeConverter</span></a>&lt;K&gt;</li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.IVersionProvider.html" title="interface in picocli"><span class="typeNameLink">CommandLine.IVersionProvider</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><span class="typeNameLink">CommandLine.Model.IBinding</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli"><span class="strong">CommandLine.Help.Ansi.IStyle</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli"><span class="strong">CommandLine.Help.IOptionRenderer</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli"><span class="strong">CommandLine.Help.IParameterRenderer</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli"><span class="strong">CommandLine.Help.IParamLabelRenderer</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.IExceptionHandler.html" title="interface in picocli"><span class="strong">CommandLine.IExceptionHandler</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.IExceptionHandler2.html" title="interface in picocli"><span class="strong">CommandLine.IExceptionHandler2</span></a>&lt;R&gt;</li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.IFactory.html" title="interface in picocli"><span class="strong">CommandLine.IFactory</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.IHelpCommandInitializable.html" title="interface in picocli"><span class="strong">CommandLine.IHelpCommandInitializable</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.IParseResultHandler.html" title="interface in picocli"><span class="strong">CommandLine.IParseResultHandler</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.IParseResultHandler2.html" title="interface in picocli"><span class="strong">CommandLine.IParseResultHandler2</span></a>&lt;R&gt;</li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><span class="strong">CommandLine.ITypeConverter</span></a>&lt;K&gt;</li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.IVersionProvider.html" title="interface in picocli"><span class="strong">CommandLine.IVersionProvider</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Model.IBinding.html" title="interface in picocli"><span class="strong">CommandLine.Model.IBinding</span></a></li>
 </ul>
 <h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>
 <ul>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><span class="typeNameLink">CommandLine.Command</span></a> (implements java.lang.annotation.Annotation)</li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><span class="typeNameLink">CommandLine.Parameters</span></a> (implements java.lang.annotation.Annotation)</li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><span class="typeNameLink">CommandLine.Option</span></a> (implements java.lang.annotation.Annotation)</li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Unmatched.html" title="annotation in picocli"><span class="typeNameLink">CommandLine.Unmatched</span></a> (implements java.lang.annotation.Annotation)</li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.ParentCommand.html" title="annotation in picocli"><span class="typeNameLink">CommandLine.ParentCommand</span></a> (implements java.lang.annotation.Annotation)</li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Mixin.html" title="annotation in picocli"><span class="typeNameLink">CommandLine.Mixin</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><span class="strong">CommandLine.Command</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><span class="strong">CommandLine.Option</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.ParentCommand.html" title="annotation in picocli"><span class="strong">CommandLine.ParentCommand</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Unmatched.html" title="annotation in picocli"><span class="strong">CommandLine.Unmatched</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Mixin.html" title="annotation in picocli"><span class="strong">CommandLine.Mixin</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><span class="strong">CommandLine.Parameters</span></a> (implements java.lang.annotation.Annotation)</li>
 </ul>
 <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
 <ul>
@@ -186,10 +178,10 @@ <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
 <ul>
 <li type="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
 <ul>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli"><span class="typeNameLink">CommandLine.Help.Column.Overflow</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli"><span class="typeNameLink">CommandLine.Help.Ansi</span></a></li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli"><span class="typeNameLink">CommandLine.Help.Ansi.Style</span></a> (implements picocli.<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>)</li>
-<li type="circle">picocli.<a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli"><span class="typeNameLink">CommandLine.Help.Visibility</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli"><span class="strong">CommandLine.Help.Ansi.Style</span></a> (implements picocli.<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>)</li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Help.Ansi.html" title="enum in picocli"><span class="strong">CommandLine.Help.Ansi</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli"><span class="strong">CommandLine.Help.Column.Overflow</span></a></li>
+<li type="circle">picocli.<a href="../picocli/CommandLine.Help.Visibility.html" title="enum in picocli"><span class="strong">CommandLine.Help.Visibility</span></a></li>
 </ul>
 </li>
 </ul>
@@ -197,11 +189,9 @@ <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
 </ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -221,10 +211,10 @@ <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
 </ul>
 <ul class="navList">
 <li><a href="../index.html?picocli/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="package-tree.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -238,7 +228,7 @@ <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
   //-->
 </script>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/serialized-form.html b/docs/apidocs/serialized-form.html
index 663d488f7..2f10a6a1d 100644
--- a/docs/apidocs/serialized-form.html
+++ b/docs/apidocs/serialized-form.html
@@ -2,20 +2,15 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_161) on Wed Mar 21 01:35:29 JST 2018 -->
-<title>Serialized Form (picocli 3.0.0-alpha-1 API)</title>
-<meta name="date" content="2018-03-21">
+<!-- Generated by javadoc (version 1.7.0_80) on Tue Mar 27 21:44:03 JST 2018 -->
+<title>Serialized Form (picocli 3.0.0-alpha-2 API)</title>
+<meta name="date" content="2018-03-27">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Serialized Form (picocli 3.0.0-alpha-1 API)";
-        }
-    }
-    catch(err) {
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Serialized Form (picocli 3.0.0-alpha-2 API)";
     }
 //-->
 </script>
@@ -23,11 +18,9 @@
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
+<div class="topNav"><a name="navbar_top">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -47,10 +40,10 @@
 </ul>
 <ul class="navList">
 <li><a href="index.html?serialized-form.html" target="_top">Frames</a></li>
-<li><a href="serialized-form.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="serialized-form.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -64,7 +57,7 @@
   //-->
 </script>
 </div>
-<a name="skip.navbar.top">
+<a name="skip-navbar_top">
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -94,7 +87,9 @@ <h3>Class <a href="picocli/CommandLine.ExecutionException.html" title="class in
 <dd>7764539594267007998L</dd>
 </dl>
 <ul class="blockList">
-<li class="blockList">
+<li class="blockList"><a name="serializedForm">
+<!--   -->
+</a>
 <h3>Serialized Fields</h3>
 <ul class="blockList">
 <li class="blockListLast">
@@ -159,7 +154,9 @@ <h3>Class <a href="picocli/CommandLine.ParameterException.html" title="class in
 <dd>1477112829129763139L</dd>
 </dl>
 <ul class="blockList">
-<li class="blockList">
+<li class="blockList"><a name="serializedForm">
+<!--   -->
+</a>
 <h3>Serialized Fields</h3>
 <ul class="blockList">
 <li class="blockListLast">
@@ -211,11 +208,9 @@ <h3>Class <a href="picocli/CommandLine.UnmatchedArgumentException.html" title="c
 </ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
+<div class="bottomNav"><a name="navbar_bottom">
 <!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
@@ -235,10 +230,10 @@ <h3>Class <a href="picocli/CommandLine.UnmatchedArgumentException.html" title="c
 </ul>
 <ul class="navList">
 <li><a href="index.html?serialized-form.html" target="_top">Frames</a></li>
-<li><a href="serialized-form.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="serialized-form.html" target="_top">No Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="allclasses-noframe.html">All Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -252,7 +247,7 @@ <h3>Class <a href="picocli/CommandLine.UnmatchedArgumentException.html" title="c
   //-->
 </script>
 </div>
-<a name="skip.navbar.bottom">
+<a name="skip-navbar_bottom">
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
diff --git a/docs/apidocs/stylesheet.css b/docs/apidocs/stylesheet.css
index 98055b22d..0aeaa97fe 100644
--- a/docs/apidocs/stylesheet.css
+++ b/docs/apidocs/stylesheet.css
@@ -2,19 +2,16 @@
 /*
 Overall document style
 */
-
-@import url('resources/fonts/dejavu.css');
-
 body {
     background-color:#ffffff;
     color:#353833;
-    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
-    font-size:14px;
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:76%;
     margin:0;
 }
 a:link, a:visited {
     text-decoration:none;
-    color:#4A6782;
+    color:#4c6b87;
 }
 a:hover, a:focus {
     text-decoration:none;
@@ -22,7 +19,7 @@ a:hover, a:focus {
 }
 a:active {
     text-decoration:none;
-    color:#4A6782;
+    color:#4c6b87;
 }
 a[name] {
     color:#353833;
@@ -32,51 +29,41 @@ a[name]:hover {
     color:#353833;
 }
 pre {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
+    font-size:1.3em;
 }
 h1 {
-    font-size:20px;
+    font-size:1.8em;
 }
 h2 {
-    font-size:18px;
+    font-size:1.5em;
 }
 h3 {
-    font-size:16px;
-    font-style:italic;
+    font-size:1.4em;
 }
 h4 {
-    font-size:13px;
+    font-size:1.3em;
 }
 h5 {
-    font-size:12px;
+    font-size:1.2em;
 }
 h6 {
-    font-size:11px;
+    font-size:1.1em;
 }
 ul {
     list-style-type:disc;
 }
 code, tt {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
-    padding-top:4px;
-    margin-top:8px;
-    line-height:1.4em;
+    font-size:1.2em;
 }
 dt code {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
-    padding-top:4px;
+    font-size:1.2em;
 }
 table tr td dt code {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
+    font-size:1.2em;
     vertical-align:top;
-    padding-top:4px;
 }
 sup {
-    font-size:8px;
+    font-size:.6em;
 }
 /*
 Document title and Copyright styles
@@ -89,9 +76,9 @@ Document title and Copyright styles
 .aboutLanguage {
     float:right;
     padding:0px 21px;
-    font-size:11px;
+    font-size:.8em;
     z-index:200;
-    margin-top:-9px;
+    margin-top:-7px;
 }
 .legalCopy {
     margin-left:.5em;
@@ -105,6 +92,9 @@ Document title and Copyright styles
 }
 .tab {
     background-color:#0066FF;
+    background-image:url(resources/titlebar.gif);
+    background-position:left top;
+    background-repeat:no-repeat;
     color:#ffffff;
     padding:8px;
     width:5em;
@@ -114,15 +104,17 @@ Document title and Copyright styles
 Navigation bar styles
 */
 .bar {
-    background-color:#4D7A97;
+    background-image:url(resources/background.gif);
+    background-repeat:repeat-x;
     color:#FFFFFF;
     padding:.8em .5em .4em .8em;
     height:auto;/*height:1.8em;*/
-    font-size:11px;
+    font-size:1em;
     margin:0;
 }
 .topNav {
-    background-color:#4D7A97;
+    background-image:url(resources/background.gif);
+    background-repeat:repeat-x;
     color:#FFFFFF;
     float:left;
     padding:0;
@@ -131,11 +123,11 @@ Navigation bar styles
     height:2.8em;
     padding-top:10px;
     overflow:hidden;
-    font-size:12px; 
 }
 .bottomNav {
     margin-top:10px;
-    background-color:#4D7A97;
+    background-image:url(resources/background.gif);
+    background-repeat:repeat-x;
     color:#FFFFFF;
     float:left;
     padding:0;
@@ -144,20 +136,18 @@ Navigation bar styles
     height:2.8em;
     padding-top:10px;
     overflow:hidden;
-    font-size:12px;
 }
 .subNav {
     background-color:#dee3e9;
+    border-bottom:1px solid #9eadc0;
     float:left;
     width:100%;
     overflow:hidden;
-    font-size:12px;
 }
 .subNav div {
     clear:left;
     float:left;
     padding:0 0 5px 6px;
-    text-transform:uppercase;
 }
 ul.navList, ul.subNavList {
     float:left;
@@ -167,33 +157,27 @@ ul.navList, ul.subNavList {
 ul.navList li{
     list-style:none;
     float:left;
-    padding: 5px 6px;
-    text-transform:uppercase;
+    padding:3px 6px;
 }
 ul.subNavList li{
     list-style:none;
     float:left;
+    font-size:90%;
 }
 .topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
     color:#FFFFFF;
     text-decoration:none;
-    text-transform:uppercase;
 }
 .topNav a:hover, .bottomNav a:hover {
     text-decoration:none;
     color:#bb7a2a;
-    text-transform:uppercase;
 }
 .navBarCell1Rev {
-    background-color:#F8981D;
-    color:#253441;
+    background-image:url(resources/tab.gif);
+    background-color:#a88834;
+    color:#FFFFFF;
     margin: auto 5px;
-}
-.skipNav {
-    position:absolute;
-    top:auto;
-    left:-9999px;
-    overflow:hidden;
+    border:1px solid #c9aa44;
 }
 /*
 Page header and footer styles
@@ -207,11 +191,8 @@ Page header and footer styles
     margin:10px;
     position:relative;
 }
-.indexHeader span{
-    margin-right:15px;
-}
 .indexHeader h1 {
-    font-size:13px;
+    font-size:1.3em;
 }
 .title {
     color:#2c4557;
@@ -221,7 +202,7 @@ Page header and footer styles
     margin:5px 0 0 0;
 }
 .header ul {
-    margin:0 0 15px 0;
+    margin:0 0 25px 0;
     padding:0;
 }
 .footer ul {
@@ -229,22 +210,24 @@ Page header and footer styles
 }
 .header ul li, .footer ul li {
     list-style:none;
-    font-size:13px;
+    font-size:1.2em;
 }
 /*
 Heading styles
 */
 div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
     background-color:#dee3e9;
-    border:1px solid #d0d9e0;
+    border-top:1px solid #9eadc0;
+    border-bottom:1px solid #9eadc0;
     margin:0 0 6px -8px;
-    padding:7px 5px;
+    padding:2px 5px;
 }
 ul.blockList ul.blockList ul.blockList li.blockList h3 {
     background-color:#dee3e9;
-    border:1px solid #d0d9e0;
+    border-top:1px solid #9eadc0;
+    border-bottom:1px solid #9eadc0;
     margin:0 0 6px -8px;
-    padding:7px 5px;
+    padding:2px 5px;
 }
 ul.blockList ul.blockList li.blockList h3 {
     padding:0;
@@ -264,10 +247,10 @@ Page layout container styles
 .indexContainer {
     margin:10px;
     position:relative;
-    font-size:12px;
+    font-size:1.0em;
 }
 .indexContainer h2 {
-    font-size:13px;
+    font-size:1.1em;
     padding:0 0 3px 0;
 }
 .indexContainer ul {
@@ -276,18 +259,15 @@ Page layout container styles
 }
 .indexContainer ul li {
     list-style:none;
-    padding-top:2px;
 }
 .contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
-    font-size:12px;
+    font-size:1.1em;
     font-weight:bold;
     margin:10px 0 0 0;
     color:#4E4E4E;
 }
 .contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
-    margin:5px 0 10px 0px;
-    font-size:14px;
-    font-family:'DejaVu Sans Mono',monospace;
+    margin:10px 0 10px 20px;
 }
 .serializedFormContainer dl.nameValue dt {
     margin-left:1px;
@@ -326,24 +306,25 @@ ul.blockList, ul.blockListLast {
 }
 ul.blockList li.blockList, ul.blockListLast li.blockList {
     list-style:none;
-    margin-bottom:15px;
-    line-height:1.4;
+    margin-bottom:25px;
 }
 ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
     padding:0px 20px 5px 10px;
-    border:1px solid #ededed; 
-    background-color:#f8f8f8;
+    border:1px solid #9eadc0;
+    background-color:#f9f9f9;
 }
 ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
     padding:0 0 5px 8px;
     background-color:#ffffff;
-    border:none;
+    border:1px solid #9eadc0;
+    border-top:none;
 }
 ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
     margin-left:0;
     padding-left:0;
     padding-bottom:15px;
     border:none;
+    border-bottom:1px solid #9eadc0;
 }
 ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
     list-style:none;
@@ -357,155 +338,107 @@ table tr td dl, table tr td dl dt, table tr td dl dd {
 /*
 Table styles
 */
-.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
+.contentContainer table, .classUseContainer table, .constantValuesContainer table {
+    border-bottom:1px solid #9eadc0;
     width:100%;
-    border-left:1px solid #EEE; 
-    border-right:1px solid #EEE; 
-    border-bottom:1px solid #EEE; 
 }
-.overviewSummary, .memberSummary  {
-    padding:0px;
+.contentContainer ul li table, .classUseContainer ul li table, .constantValuesContainer ul li table {
+    width:100%;
+}
+.contentContainer .description table, .contentContainer .details table {
+    border-bottom:none;
+}
+.contentContainer ul li table th.colOne, .contentContainer ul li table th.colFirst, .contentContainer ul li table th.colLast, .classUseContainer ul li table th, .constantValuesContainer ul li table th, .contentContainer ul li table td.colOne, .contentContainer ul li table td.colFirst, .contentContainer ul li table td.colLast, .classUseContainer ul li table td, .constantValuesContainer ul li table td{
+    vertical-align:top;
+    padding-right:20px;
+}
+.contentContainer ul li table th.colLast, .classUseContainer ul li table th.colLast,.constantValuesContainer ul li table th.colLast,
+.contentContainer ul li table td.colLast, .classUseContainer ul li table td.colLast,.constantValuesContainer ul li table td.colLast,
+.contentContainer ul li table th.colOne, .classUseContainer ul li table th.colOne,
+.contentContainer ul li table td.colOne, .classUseContainer ul li table td.colOne {
+    padding-right:3px;
 }
-.overviewSummary caption, .memberSummary caption, .typeSummary caption,
-.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
+.overviewSummary caption, .packageSummary caption, .contentContainer ul.blockList li.blockList caption, .summary caption, .classUseContainer caption, .constantValuesContainer caption {
     position:relative;
     text-align:left;
     background-repeat:no-repeat;
-    color:#253441;
+    color:#FFFFFF;
     font-weight:bold;
     clear:none;
     overflow:hidden;
     padding:0px;
-    padding-top:10px;
-    padding-left:1px;
     margin:0px;
-    white-space:pre;
-}
-.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
-.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
-.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
-.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
-.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
-.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
-.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
-.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
+}
+caption a:link, caption a:hover, caption a:active, caption a:visited {
     color:#FFFFFF;
 }
-.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
-.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
+.overviewSummary caption span, .packageSummary caption span, .contentContainer ul.blockList li.blockList caption span, .summary caption span, .classUseContainer caption span, .constantValuesContainer caption span {
     white-space:nowrap;
-    padding-top:5px;
-    padding-left:12px;
-    padding-right:12px;
-    padding-bottom:7px;
-    display:inline-block;
+    padding-top:8px;
+    padding-left:8px;
+    display:block;
     float:left;
-    background-color:#F8981D;
-    border: none;
-    height:16px;
+    background-image:url(resources/titlebar.gif);
+    height:18px;
 }
-.memberSummary caption span.activeTableTab span {
-    white-space:nowrap;
-    padding-top:5px;
-    padding-left:12px;
-    padding-right:12px;
-    margin-right:3px;
-    display:inline-block;
+.overviewSummary .tabEnd, .packageSummary .tabEnd, .contentContainer ul.blockList li.blockList .tabEnd, .summary .tabEnd, .classUseContainer .tabEnd, .constantValuesContainer .tabEnd {
+    width:10px;
+    background-image:url(resources/titlebar_end.gif);
+    background-repeat:no-repeat;
+    background-position:top right;
+    position:relative;
     float:left;
-    background-color:#F8981D;
-    height:16px;
 }
-.memberSummary caption span.tableTab span {
-    white-space:nowrap;
-    padding-top:5px;
-    padding-left:12px;
-    padding-right:12px;
-    margin-right:3px;
-    display:inline-block;
-    float:left;
-    background-color:#4D7A97;
-    height:16px;
-}
-.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
-    padding-top:0px;
-    padding-left:0px;
-    padding-right:0px;
-    background-image:none;
-    float:none;
-    display:inline;
+ul.blockList ul.blockList li.blockList table {
+    margin:0 0 12px 0px;
+    width:100%;
 }
-.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
-.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
-    display:none;
-    width:5px;
-    position:relative;
-    float:left;
-    background-color:#F8981D;
+.tableSubHeadingColor {
+    background-color: #EEEEFF;
 }
-.memberSummary .activeTableTab .tabEnd {
-    display:none;
-    width:5px;
-    margin-right:3px;
-    position:relative; 
-    float:left;
-    background-color:#F8981D;
+.altColor {
+    background-color:#eeeeef;
 }
-.memberSummary .tableTab .tabEnd {
-    display:none;
-    width:5px;
-    margin-right:3px;
-    position:relative;
-    background-color:#4D7A97;
-    float:left;
-
+.rowColor {
+    background-color:#ffffff;
 }
-.overviewSummary td, .memberSummary td, .typeSummary td,
-.useSummary td, .constantsSummary td, .deprecatedSummary td {
+.overviewSummary td, .packageSummary td, .contentContainer ul.blockList li.blockList td, .summary td, .classUseContainer td, .constantValuesContainer td {
     text-align:left;
-    padding:0px 0px 12px 10px;
-}
-th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
-td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
-    vertical-align:top;
-    padding-right:0px;
-    padding-top:8px;
-    padding-bottom:3px;
+    padding:3px 3px 3px 7px;
 }
-th.colFirst, th.colLast, th.colOne, .constantsSummary th {
+th.colFirst, th.colLast, th.colOne, .constantValuesContainer th {
     background:#dee3e9;
+    border-top:1px solid #9eadc0;
+    border-bottom:1px solid #9eadc0;
     text-align:left;
-    padding:8px 3px 3px 7px;
+    padding:3px 3px 3px 7px;
+}
+td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
+    font-weight:bold;
 }
 td.colFirst, th.colFirst {
+    border-left:1px solid #9eadc0;
     white-space:nowrap;
-    font-size:13px;
 }
 td.colLast, th.colLast {
-    font-size:13px;
+    border-right:1px solid #9eadc0;
 }
 td.colOne, th.colOne {
-    font-size:13px;
-}
-.overviewSummary td.colFirst, .overviewSummary th.colFirst,
-.useSummary td.colFirst, .useSummary th.colFirst,
-.overviewSummary td.colOne, .overviewSummary th.colOne,
-.memberSummary td.colFirst, .memberSummary th.colFirst,
-.memberSummary td.colOne, .memberSummary th.colOne,
-.typeSummary td.colFirst{
-    width:25%;
-    vertical-align:top;
+    border-right:1px solid #9eadc0;
+    border-left:1px solid #9eadc0;
 }
-td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
-    font-weight:bold;
-}
-.tableSubHeadingColor {
-    background-color:#EEEEFF;
+table.overviewSummary  {
+    padding:0px;
+    margin-left:0px;
 }
-.altColor {
-    background-color:#FFFFFF;
+table.overviewSummary td.colFirst, table.overviewSummary th.colFirst,
+table.overviewSummary td.colOne, table.overviewSummary th.colOne {
+    width:25%;
+    vertical-align:middle;
 }
-.rowColor {
-    background-color:#EEEEEF;
+table.packageSummary td.colFirst, table.overviewSummary th.colFirst {
+    width:25%;
+    vertical-align:middle;
 }
 /*
 Content styles
@@ -520,24 +453,6 @@ Content styles
 .docSummary {
     padding:0;
 }
-
-ul.blockList ul.blockList ul.blockList li.blockList h3 {
-    font-style:normal;
-}
-
-div.block {
-    font-size:14px;
-    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
-}
-
-td.colLast div {
-    padding-top:0px;
-}
-
-
-td.colLast a {
-    padding-bottom:3px;
-}
 /*
 Formatting effect styles
 */
@@ -548,27 +463,12 @@ Formatting effect styles
 h1.hidden {
     visibility:hidden;
     overflow:hidden;
-    font-size:10px;
+    font-size:.9em;
 }
 .block {
     display:block;
-    margin:3px 10px 2px 0px;
-    color:#474747;
+    margin:3px 0 0 0;
 }
-.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
-.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
-.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
+.strong {
     font-weight:bold;
 }
-.deprecationComment, .emphasizedPhrase, .interfaceName {
-    font-style:italic;
-}
-
-div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
-div.block div.block span.interfaceName {
-    font-style:normal;
-}
-
-div.contentContainer ul.blockList li.blockList h2{
-    padding-bottom:0px;
-}
diff --git a/docs/autocomplete.adoc b/docs/autocomplete.adoc
index 4c1c585f4..e60a002bd 100644
--- a/docs/autocomplete.adoc
+++ b/docs/autocomplete.adoc
@@ -1,8 +1,8 @@
 = Autocomplete for Java Command Line Applications
 //:author: Remko Popma
 //:email: rpopma@apache.org
-:revnumber: 3.0.0-alpha-2-SNAPSHOT
-:revdate: 2018-03-21
+:revnumber: 3.0.0-alpha-2
+:revdate: 2018-03-27
 :toc: left
 :numbered:
 :toclevels: 3
diff --git a/docs/autocomplete.html b/docs/autocomplete.html
index 9976d7c68..7ef082f9a 100644
--- a/docs/autocomplete.html
+++ b/docs/autocomplete.html
@@ -513,8 +513,8 @@
 <div id="header">
 <h1>Autocomplete for Java Command Line Applications</h1>
 <div class="details">
-<span id="revnumber">version 3.0.0-alpha-1,</span>
-<span id="revdate">2018-03-21</span>
+<span id="revnumber">version 3.0.0-alpha-2,</span>
+<span id="revdate">2018-03-27</span>
 </div>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
@@ -1076,8 +1076,8 @@ <h2 id="_releases">12. Releases</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Version 3.0.0-alpha-1<br>
-Last updated 2018-03-21 01:12:29 +09:00
+Version 3.0.0-alpha-2<br>
+Last updated 2018-03-27 21:42:52 JST
 </div>
 </div>
 </body>
diff --git a/docs/index.adoc b/docs/index.adoc
index d8f7d9002..439f3b058 100644
--- a/docs/index.adoc
+++ b/docs/index.adoc
@@ -1,8 +1,8 @@
 = picocli - a mighty tiny command line interface
 //:author: Remko Popma
 //:email: rpopma@apache.org
-:revnumber: 3.0.0-alpha-2-SNAPSHOT
-:revdate: 2018-03-21
+:revnumber: 3.0.0-alpha-2
+:revdate: 2018-03-27
 :toc: left
 :numbered:
 :toclevels: 2
@@ -2493,7 +2493,7 @@ The script body is executed if the user input was valid and did not request usag
 
 [source,groovy]
 ----
-@Grab('info.picocli:picocli:3.0.0-alpha-2-SNAPSHOT')
+@Grab('info.picocli:picocli:3.0.0-alpha-2')
 @Command(name = "myCommand",
   description = "@|bold Groovy script|@ @|underline picocli|@ example")
 @picocli.groovy.PicocliScript
@@ -2522,7 +2522,7 @@ CAUTION: When using a Groovy version older than 2.4.7, use this workaround for t
 
 [source,groovy]
 ----
-@Grab('info.picocli:picocli:3.0.0-alpha-2-SNAPSHOT')
+@Grab('info.picocli:picocli:3.0.0-alpha-2')
 @GrabExclude('org.codehaus.groovy:groovy-all') // work around GROOVY-7613
 ...
 ----
@@ -2654,7 +2654,7 @@ See the <<Source,source code>> below. Copy and paste it into a file called `Comm
 
 === Gradle
 ----
-compile 'info.picocli:picocli:3.0.0-alpha-2-SNAPSHOT'
+compile 'info.picocli:picocli:3.0.0-alpha-2'
 ----
 
 === Maven
@@ -2662,19 +2662,19 @@ compile 'info.picocli:picocli:3.0.0-alpha-2-SNAPSHOT'
 <dependency>
   <groupId>info.picocli</groupId>
   <artifactId>picocli</artifactId>
-  <version>3.0.0-alpha-2-SNAPSHOT</version>
+  <version>3.0.0-alpha-2</version>
 </dependency>
 ----
 
 === Scala SBT
 ----
-libraryDependencies += "info.picocli" % "picocli" % "3.0.0-alpha-2-SNAPSHOT"
+libraryDependencies += "info.picocli" % "picocli" % "3.0.0-alpha-2"
 ----
 
 === Ivy
 
 ----
-<dependency org="info.picocli" name="picocli" rev="3.0.0-alpha-2-SNAPSHOT" />
+<dependency org="info.picocli" name="picocli" rev="3.0.0-alpha-2" />
 ----
 
 === Source
diff --git a/docs/index.html b/docs/index.html
index 6bc5a2795..b3d6a0744 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -513,8 +513,8 @@
 <div id="header">
 <h1>picocli - a mighty tiny command line interface</h1>
 <div class="details">
-<span id="revnumber">version 3.0.0-alpha-1,</span>
-<span id="revdate">2018-03-21</span>
+<span id="revnumber">version 3.0.0-alpha-2,</span>
+<span id="revdate">2018-03-27</span>
 </div>
 <div id="toc" class="toc2">
 <div id="toctitle">Features</div>
@@ -562,6 +562,7 @@ <h1>picocli - a mighty tiny command line interface</h1>
 <li><a href="#__code_unmatched_code_annotation">6.4. <code>@Unmatched</code> annotation</a></li>
 <li><a href="#_unknown_options">6.5. Unknown Options</a></li>
 <li><a href="#_stop_at_unmatched">6.6. Stop At Unmatched</a></li>
+<li><a href="#_disallowing_posix_clustered_short_options">6.7. Disallowing POSIX Clustered Short Options</a></li>
 </ul>
 </li>
 <li><a href="#_help">7. Help</a>
@@ -1957,6 +1958,13 @@ <h3 id="_stop_at_unmatched">6.6. Stop At Unmatched</h3>
 unmatched arguments list returned by <code>CommandLine.getUnmatchedArguments()</code>.</p>
 </div>
 </div>
+<div class="sect2">
+<h3 id="_disallowing_posix_clustered_short_options">6.7. Disallowing POSIX Clustered Short Options</h3>
+<div class="paragraph">
+<p>By default, the picocli parser allows POSIX clustered short options, so short options like <code>-x -v -f SomeFile</code> can be clustered together like <code>-xvfSomeFile</code>.
+From picocli 3.0, applications can call <code>CommandLine.setPosixClusteredShortOptionsAllowed(false)</code> to enforce that options must be separated with whitespace on the command line.</p>
+</div>
+</div>
 </div>
 </div>
 <div class="sect1">
@@ -3784,7 +3792,7 @@ <h3 id="_stdout_or_stderr">14.3. Stdout or Stderr</h3>
 
         cmd.parseWithHandlers(
                 <span class="keyword">new</span> RunLast().useOut(myOut).useAnsi(Help.Ansi.ON),
-                <span class="keyword">new</span> DefaultExceptionHandler().useErr(myErr).useAnsi(Help.Ansi.OFF),
+                CommandLine.defaultExceptionHandler().useErr(myErr).useAnsi(Help.Ansi.OFF),
                 args);
     }
 }</code></pre>
@@ -3807,7 +3815,7 @@ <h3 id="_exit_code">14.4. Exit Code</h3>
         CommandLine cmd = <span class="keyword">new</span> CommandLine(<span class="keyword">new</span> ExitCodeDemo());
         cmd.parseWithHandlers(
                 <span class="keyword">new</span> RunLast().andExit(<span class="integer">123</span>),
-                <span class="keyword">new</span> DefaultExceptionHandler().andExit(<span class="integer">456</span>),
+                CommandLine.defaultExceptionHandler().andExit(<span class="integer">456</span>),
                 args);
     }
 }</code></pre>
@@ -4133,7 +4141,7 @@ <h3 id="_groovy">17.1. Groovy</h3>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="groovy"><span class="annotation">@Grab</span>(<span class="string"><span class="delimiter">'</span><span class="content">info.picocli:picocli:3.0.0-alpha-1</span><span class="delimiter">'</span></span>)
+<pre class="CodeRay highlight"><code data-lang="groovy"><span class="annotation">@Grab</span>(<span class="string"><span class="delimiter">'</span><span class="content">info.picocli:picocli:3.0.0-alpha-2</span><span class="delimiter">'</span></span>)
 <span class="annotation">@Command</span>(name = <span class="string"><span class="delimiter">&quot;</span><span class="content">myCommand</span><span class="delimiter">&quot;</span></span>,
   description = <span class="string"><span class="delimiter">&quot;</span><span class="content">@|bold Groovy script|@ @|underline picocli|@ example</span><span class="delimiter">&quot;</span></span>)
 <span class="annotation">@picocli</span>.groovy.PicocliScript
@@ -4172,7 +4180,7 @@ <h3 id="_groovy">17.1. Groovy</h3>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="groovy"><span class="annotation">@Grab</span>(<span class="string"><span class="delimiter">'</span><span class="content">info.picocli:picocli:3.0.0-alpha-1</span><span class="delimiter">'</span></span>)
+<pre class="CodeRay highlight"><code data-lang="groovy"><span class="annotation">@Grab</span>(<span class="string"><span class="delimiter">'</span><span class="content">info.picocli:picocli:3.0.0-alpha-2</span><span class="delimiter">'</span></span>)
 <span class="annotation">@GrabExclude</span>(<span class="string"><span class="delimiter">'</span><span class="content">org.codehaus.groovy:groovy-all</span><span class="delimiter">'</span></span>) <span class="comment">// work around GROOVY-7613</span>
 ...</code></pre>
 </div>
@@ -4344,7 +4352,7 @@ <h2 id="_download">23. Download</h2>
 <h3 id="_gradle">23.1. Gradle</h3>
 <div class="listingblock">
 <div class="content">
-<pre>compile 'info.picocli:picocli:3.0.0-alpha-1'</pre>
+<pre>compile 'info.picocli:picocli:3.0.0-alpha-2'</pre>
 </div>
 </div>
 </div>
@@ -4355,7 +4363,7 @@ <h3 id="_maven">23.2. Maven</h3>
 <pre>&lt;dependency&gt;
   &lt;groupId&gt;info.picocli&lt;/groupId&gt;
   &lt;artifactId&gt;picocli&lt;/artifactId&gt;
-  &lt;version&gt;3.0.0-alpha-1&lt;/version&gt;
+  &lt;version&gt;3.0.0-alpha-2&lt;/version&gt;
 &lt;/dependency&gt;</pre>
 </div>
 </div>
@@ -4364,7 +4372,7 @@ <h3 id="_maven">23.2. Maven</h3>
 <h3 id="_scala_sbt">23.3. Scala SBT</h3>
 <div class="listingblock">
 <div class="content">
-<pre>libraryDependencies += "info.picocli" % "picocli" % "3.0.0-alpha-1"</pre>
+<pre>libraryDependencies += "info.picocli" % "picocli" % "3.0.0-alpha-2"</pre>
 </div>
 </div>
 </div>
@@ -4372,7 +4380,7 @@ <h3 id="_scala_sbt">23.3. Scala SBT</h3>
 <h3 id="_ivy">23.4. Ivy</h3>
 <div class="listingblock">
 <div class="content">
-<pre>&lt;dependency org="info.picocli" name="picocli" rev="3.0.0-alpha-1" /&gt;</pre>
+<pre>&lt;dependency org="info.picocli" name="picocli" rev="3.0.0-alpha-2" /&gt;</pre>
 </div>
 </div>
 </div>
@@ -4397,11 +4405,7 @@ <h3 id="_source">23.5. Source</h3>
  */</span>
 <span class="keyword">package</span> <span class="namespace">picocli</span>;
 
-<span class="keyword">import</span> <span class="include">java.io.File</span>;
-<span class="keyword">import</span> <span class="include">java.io.FileReader</span>;
-<span class="keyword">import</span> <span class="include">java.io.LineNumberReader</span>;
-<span class="keyword">import</span> <span class="include">java.io.PrintStream</span>;
-<span class="keyword">import</span> <span class="include">java.io.StreamTokenizer</span>;
+<span class="keyword">import</span> <span class="include">java.io</span>.*;
 <span class="keyword">import</span> <span class="include">java.lang.annotation.ElementType</span>;
 <span class="keyword">import</span> <span class="include">java.lang.annotation.Retention</span>;
 <span class="keyword">import</span> <span class="include">java.lang.annotation.RetentionPolicy</span>;
@@ -4520,7 +4524,7 @@ <h3 id="_source">23.5. Source</h3>
  */</span>
 <span class="directive">public</span> <span class="type">class</span> <span class="class">CommandLine</span> {
     <span class="comment">/** This is picocli version {@value}. */</span>
-    <span class="directive">public</span> <span class="directive">static</span> <span class="directive">final</span> <span class="predefined-type">String</span> VERSION = <span class="string"><span class="delimiter">&quot;</span><span class="content">3.0.0-alpha-1</span><span class="delimiter">&quot;</span></span>;
+    <span class="directive">public</span> <span class="directive">static</span> <span class="directive">final</span> <span class="predefined-type">String</span> VERSION = <span class="string"><span class="delimiter">&quot;</span><span class="content">3.0.0-alpha-2</span><span class="delimiter">&quot;</span></span>;
 
     <span class="directive">private</span> <span class="directive">final</span> Tracer tracer = <span class="keyword">new</span> Tracer();
     <span class="directive">private</span> <span class="directive">final</span> CommandSpec commandSpec;
@@ -4710,6 +4714,28 @@ <h3 id="_source">23.5. Source</h3>
         <span class="keyword">return</span> <span class="local-variable">this</span>;
     }
 
+    <span class="comment">/** Returns whether the parser accepts clustered short options. The default is {@code true}.
+     * @return {@code true} if short options like {@code -x -v -f SomeFile} can be clustered together like {@code -xvfSomeFile}, {@code false} otherwise
+     * @since 3.0 */</span>
+    <span class="directive">public</span> <span class="type">boolean</span> isPosixClusteredShortOptionsAllowed() { <span class="keyword">return</span> getCommandSpec().parser().posixClusteredShortOptionsAllowed(); }
+
+    <span class="comment">/** Sets whether short options like {@code -x -v -f SomeFile} can be clustered together like {@code -xvfSomeFile}.
+     * &lt;p&gt;The specified setting will be registered with this {@code CommandLine} and the full hierarchy of its
+     * subcommands and nested sub-subcommands &lt;em&gt;at the moment this method is called&lt;/em&gt;. Subcommands added
+     * later will have the default setting. To ensure a setting is applied to all
+     * subcommands, call the setter last, after adding subcommands.&lt;/p&gt;
+     * @param newValue the new setting
+     * @return this {@code CommandLine} object, to allow method chaining
+     * @since 3.0
+     */</span>
+    <span class="directive">public</span> CommandLine setPosixClusteredShortOptionsAllowed(<span class="type">boolean</span> newValue) {
+        getCommandSpec().parser().posixClusteredShortOptionsAllowed(newValue);
+        <span class="keyword">for</span> (CommandLine command : getCommandSpec().subcommands().values()) {
+            command.setPosixClusteredShortOptionsAllowed(newValue);
+        }
+        <span class="keyword">return</span> <span class="local-variable">this</span>;
+    }
+
     <span class="comment">/** Returns whether the parser interprets the first positional parameter as &quot;end of options&quot; so the remaining
      * arguments are all treated as positional parameters. The default is {@code false}.
      * @return {@code true} if all values following the first positional parameter should be treated as positional parameters, {@code false} otherwise
@@ -4901,9 +4927,9 @@ <h3 id="_source">23.5. Source</h3>
      * Represents a function that can process the {@code ParseResult} object resulting from successfully
      * {@linkplain #parseArgs(String...) parsing} the command line arguments. This is a
      * &lt;a href=&quot;https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html&quot;&gt;functional interface&lt;/a&gt;
-     * whose functional method is {@link IParseResultHandler2#handleParseResult(CommandLine.ParseResult, Object)}.
+     * whose functional method is {@link IParseResultHandler2#handleParseResult(CommandLine.ParseResult)}.
      * &lt;p&gt;
-     * Implementations of this function can be passed to the {@link #parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...) CommandLine::parseWithHandlers}
+     * Implementations of this function can be passed to the {@link #parseWithHandlers(IParseResultHandler2,  IExceptionHandler2, String...) CommandLine::parseWithHandlers}
      * methods to take some next step after the command line was successfully parsed.
      * &lt;/p&gt;&lt;p&gt;
      * This interface replaces the {@link IParseResultHandler} interface; it takes the parse result as a {@code ParseResult}
@@ -4919,16 +4945,12 @@ <h3 id="_source">23.5. Source</h3>
         <span class="comment">/** Processes the {@code ParseResult} object resulting from successfully
          * {@linkplain CommandLine#parseArgs(String...) parsing} the command line arguments and returns a return value.
          * @param parseResult the {@code ParseResult} that resulted from successfully parsing the command line arguments
-         * @param prototypeReturnValue prototype return value, may be returned as is when the user requested help for example,
-         *                               or may be used to collect results from multiple subcommands, or may be used by the
-         *                               handler for internal processing and a completely different object is returned
-         * @return an object resulting from handling the parse result
          * @throws ParameterException if a help command was invoked for an unknown subcommand. Any {@code ParameterExceptions}
          *      thrown from this method are treated as if this exception was thrown during parsing and passed to the {@link IExceptionHandler2}
          * @throws ExecutionException if a problem occurred while processing the parse results; use
          *      {@link ExecutionException#getCommandLine()} to get the command or subcommand where processing failed
          */</span>
-        R handleParseResult(ParseResult parseResult, R prototypeReturnValue) <span class="directive">throws</span> <span class="exception">ExecutionException</span>;
+        R handleParseResult(ParseResult parseResult) <span class="directive">throws</span> <span class="exception">ExecutionException</span>;
     }
     <span class="comment">/**
      * Represents a function that can handle a {@code ParameterException} that occurred while
@@ -4959,7 +4981,7 @@ <h3 id="_source">23.5. Source</h3>
      * and {@code ExecutionExceptions} that occurred while executing the {@code Runnable} or {@code Callable} command.
      * &lt;p&gt;
      * Implementations of this interface can be passed to the
-     * {@link #parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...) CommandLine::parseWithHandlers} method.
+     * {@link #parseWithHandlers(IParseResultHandler2,  IExceptionHandler2, String...) CommandLine::parseWithHandlers} method.
      * &lt;/p&gt;&lt;p&gt;
      * This interface replaces the {@link IParseResultHandler} interface.
      * &lt;/p&gt;
@@ -4971,22 +4993,18 @@ <h3 id="_source">23.5. Source</h3>
          * line arguments and optionally returns a list of results.
          * @param ex the ParameterException describing the problem that occurred while parsing the command line arguments,
          *           and the CommandLine representing the command or subcommand whose input was invalid
-         * @param prototypeReturnValue prototype return value, may be returned as is or may be used by the
-         *                               handler for internal processing and a completely different object is returned
          * @param args the command line arguments that could not be parsed
          * @return an object resulting from handling the exception
          */</span>
-        R handleParseException(ParameterException ex, R prototypeReturnValue, <span class="predefined-type">String</span><span class="type">[]</span> args);
+        R handleParseException(ParameterException ex, <span class="predefined-type">String</span><span class="type">[]</span> args);
         <span class="comment">/** Handles a {@code ExecutionException} that occurred while executing the {@code Runnable} or
          * {@code Callable} command and optionally returns a list of results.
          * @param ex the ExecutionException describing the problem that occurred while executing the {@code Runnable} or
          *          {@code Callable} command, and the CommandLine representing the command or subcommand that was being executed
-         * @param prototypeReturnValue prototype return value, may be returned as is or may be used by the
-         *                               handler for internal processing and a completely different object is returned
          * @param parseResult the result of parsing the command line arguments
          * @return an object resulting from handling the exception
          */</span>
-        R handleExecutionException(<span class="exception">ExecutionException</span> ex, R prototypeReturnValue, ParseResult parseResult);
+        R handleExecutionException(<span class="exception">ExecutionException</span> ex, ParseResult parseResult);
     }
 
     <span class="comment">/** Abstract superclass for {@link IParseResultHandler2} and {@link IExceptionHandler2} implementations.
@@ -5073,12 +5091,11 @@ <h3 id="_source">23.5. Source</h3>
          * whose input was invalid, to the stream returned by {@link #err()}.
          * @param ex the ParameterException describing the problem that occurred while parsing the command line arguments,
          *           and the CommandLine representing the command or subcommand whose input was invalid
-         * @param prototypeReturnValue prototype return value, returned as is unless an exit code is set
          * @param args the command line arguments that could not be parsed
          * @return the empty list
          * @since 3.0 */</span>
-        <span class="directive">public</span> R handleParseException(ParameterException ex, R prototypeReturnValue, <span class="predefined-type">String</span><span class="type">[]</span> args) {
-            internalHandleParseException(ex, err(), ansi(), args); <span class="keyword">return</span> returnResultOrExit(prototypeReturnValue); }
+        <span class="directive">public</span> R handleParseException(ParameterException ex, <span class="predefined-type">String</span><span class="type">[]</span> args) {
+            internalHandleParseException(ex, err(), ansi(), args); <span class="keyword">return</span> returnResultOrExit(<span class="predefined-constant">null</span>); }
 
         <span class="directive">private</span> <span class="type">void</span> internalHandleParseException(ParameterException ex, <span class="predefined-type">PrintStream</span> out, Help.Ansi ansi, <span class="predefined-type">String</span><span class="type">[]</span> args) {
             out.println(ex.getMessage());
@@ -5087,14 +5104,15 @@ <h3 id="_source">23.5. Source</h3>
 
         <span class="comment">/** This implementation always simply rethrows the specified exception.
          * @param ex the ExecutionException describing the problem that occurred while executing the {@code Runnable} or {@code Callable} command
-         * @param prototypeReturnValue ignored
          * @param parseResult the result of parsing the command line arguments
          * @return nothing: this method always rethrows the specified exception
          * @throws ExecutionException always rethrows the specified exception
          * @since 3.0 */</span>
-        <span class="directive">public</span> R handleExecutionException(<span class="exception">ExecutionException</span> ex, R prototypeReturnValue, ParseResult parseResult) { <span class="keyword">throw</span> ex; }
+        <span class="directive">public</span> R handleExecutionException(<span class="exception">ExecutionException</span> ex, ParseResult parseResult) { <span class="keyword">throw</span> ex; }
         <span class="annotation">@Override</span> <span class="directive">protected</span> DefaultExceptionHandler&lt;R&gt; self() { <span class="keyword">return</span> <span class="local-variable">this</span>; }
     }
+    <span class="comment">/** Convenience method that returns {@code new DefaultExceptionHandler&lt;List&lt;Object&gt;&gt;()}. */</span>
+    <span class="directive">public</span> <span class="directive">static</span> DefaultExceptionHandler&lt;<span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt;&gt; defaultExceptionHandler() { <span class="keyword">return</span> <span class="keyword">new</span> DefaultExceptionHandler&lt;<span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt;&gt;(); }
 
     <span class="comment">/** @deprecated use {@link #printHelpIfRequested(List, PrintStream, PrintStream, Help.Ansi)} instead
      * @since 2.0 */</span>
@@ -5180,7 +5198,7 @@ <h3 id="_source">23.5. Source</h3>
         <span class="keyword">throw</span> <span class="keyword">new</span> <span class="exception">ExecutionException</span>(parsed, <span class="string"><span class="delimiter">&quot;</span><span class="content">Parsed command (</span><span class="delimiter">&quot;</span></span> + command + <span class="string"><span class="delimiter">&quot;</span><span class="content">) is not Runnable or Callable</span><span class="delimiter">&quot;</span></span>);
     }
     <span class="comment">/** Command line parse result handler that returns a value. This handler prints help if requested, and otherwise calls
-     * {@link #handle(CommandLine.ParseResult, Object)} with the parse result. Facilitates implementation of the {@link IParseResultHandler2} interface.
+     * {@link #handle(CommandLine.ParseResult)} with the parse result. Facilitates implementation of the {@link IParseResultHandler2} interface.
      * &lt;p&gt;Note that {@code AbstractParseResultHandler} is a generic type. This, along with the abstract {@code self} method,
      * allows method chaining to work properly in subclasses, without the need for casts. An example subclass can look like this:&lt;/p&gt;
      * &lt;pre&gt;{@code
@@ -5193,24 +5211,21 @@ <h3 id="_source">23.5. Source</h3>
      * }&lt;/pre&gt;
      * @since 3.0 */</span>
     <span class="directive">public</span> <span class="directive">abstract</span> <span class="directive">static</span> <span class="type">class</span> <span class="class">AbstractParseResultHandler</span>&lt;R&gt; <span class="directive">extends</span> AbstractHandler&lt;R, AbstractParseResultHandler&lt;R&gt;&gt; <span class="directive">implements</span> IParseResultHandler2&lt;R&gt; {
-        <span class="comment">/** Prints help if requested, and otherwise calls {@link #handle(CommandLine.ParseResult, Object)}.
+        <span class="comment">/** Prints help if requested, and otherwise calls {@link #handle(CommandLine.ParseResult)}.
          * Finally, either a list of result objects is returned, or the JVM is terminated if an exit code {@linkplain #andExit(int) was set}.
          *
          * @param parseResult the {@code ParseResult} that resulted from successfully parsing the command line arguments
-         * @param prototypeReturnValue prototype return value, may be returned as is when the user requested help for example,
-         *                               or may be used to collect results from multiple subcommands, or may be used by the
-         *                               handler for internal processing and a completely different object is returned
          * @return the result of processing parse results, may be the specified prototype or some other object
          * @throws ParameterException if the {@link HelpCommand HelpCommand} was invoked for an unknown subcommand. Any {@code ParameterExceptions}
          *      thrown from this method are treated as if this exception was thrown during parsing and passed to the {@link IExceptionHandler2}
          * @throws ExecutionException if a problem occurred while processing the parse results; client code can use
          *      {@link ExecutionException#getCommandLine()} to get the command or subcommand where processing failed
          */</span>
-        <span class="directive">public</span> R handleParseResult(ParseResult parseResult, R prototypeReturnValue) <span class="directive">throws</span> <span class="exception">ExecutionException</span> {
+        <span class="directive">public</span> R handleParseResult(ParseResult parseResult) <span class="directive">throws</span> <span class="exception">ExecutionException</span> {
             <span class="keyword">if</span> (printHelpIfRequested(parseResult.asCommandLineList(), out(), err(), ansi())) {
-                <span class="keyword">return</span> returnResultOrExit(prototypeReturnValue);
+                <span class="keyword">return</span> returnResultOrExit(<span class="predefined-constant">null</span>);
             }
-            <span class="keyword">return</span> returnResultOrExit(handle(parseResult, prototypeReturnValue));
+            <span class="keyword">return</span> returnResultOrExit(handle(parseResult));
         }
 
         <span class="comment">/** Processes the specified {@code ParseResult} and returns the result as a list of objects.
@@ -5218,59 +5233,16 @@ <h3 id="_source">23.5. Source</h3>
          * rethrowing an {@code ExecutionException} that details the problem and captures the offending {@code CommandLine} object.
          *
          * @param parseResult the {@code ParseResult} that resulted from successfully parsing the command line arguments
-         * @param prototypeReturnValue prototype return value, may be returned as is when the user requested help for example,
-         *                               or may be used to collect results from multiple subcommands, or may be used by the
-         *                               handler for internal processing and a completely different object is returned
          * @return the result of processing parse results, may be the specified prototype or some other object
          * @throws ExecutionException if a problem occurred while processing the parse results; client code can use
          *      {@link ExecutionException#getCommandLine()} to get the command or subcommand where processing failed
          */</span>
-        <span class="directive">protected</span> <span class="directive">abstract</span> R handle(ParseResult parseResult, R prototypeReturnValue) <span class="directive">throws</span> <span class="exception">ExecutionException</span>;
+        <span class="directive">protected</span> <span class="directive">abstract</span> R handle(ParseResult parseResult) <span class="directive">throws</span> <span class="exception">ExecutionException</span>;
     }
-    <span class="comment">/** Command line parse result handler that does not return a result. Prints help if requested, and otherwise calls
-     * {@link #handle(CommandLine.ParseResult)} with the parse result. Facilitates implementation of the {@link IParseResultHandler2} interface.
-     * &lt;p&gt;An example subclass can look like this:&lt;/p&gt;
-     * &lt;pre&gt;{@code
-     * class MyResultHandler extends AbstractSimpleParseResultHandler {
-     *     protected void handle(ParseResult parseResult) throws ExecutionException { ... }
-     * }
-     * }&lt;/pre&gt;
-     * @since 3.0 */</span>
-    <span class="directive">public</span> <span class="directive">abstract</span> <span class="directive">static</span> <span class="type">class</span> <span class="class">AbstractSimpleParseResultHandler</span> <span class="directive">extends</span> AbstractHandler&lt;<span class="predefined-type">Void</span>, AbstractSimpleParseResultHandler&gt; <span class="directive">implements</span> IParseResultHandler2&lt;<span class="predefined-type">Void</span>&gt; {
-        <span class="comment">/** Prints help if requested, and otherwise calls {@link #handle(CommandLine.ParseResult)}.
-         * Finally, either a list of result objects is returned, or the JVM is terminated if an exit code {@linkplain #andExit(int) was set}.
-         *
-         * @param parseResult the {@code ParseResult} that resulted from successfully parsing the command line arguments
-         * @param ignored value returned as is
-         * @return the specified return value
-         * @throws ParameterException if the {@link HelpCommand HelpCommand} was invoked for an unknown subcommand. Any {@code ParameterExceptions}
-         *      thrown from this method are treated as if this exception was thrown during parsing and passed to the {@link IExceptionHandler2}
-         * @throws ExecutionException if a problem occurred while processing the parse results; client code can use
-         *      {@link ExecutionException#getCommandLine()} to get the command or subcommand where processing failed
-         */</span>
-        <span class="directive">public</span> <span class="predefined-type">Void</span> handleParseResult(ParseResult parseResult, <span class="predefined-type">Void</span> ignored) <span class="directive">throws</span> <span class="exception">ExecutionException</span> {
-            <span class="keyword">if</span> (printHelpIfRequested(parseResult.asCommandLineList(), out(), err(), ansi())) {
-                <span class="keyword">return</span> returnResultOrExit(ignored);
-            }
-            handle(parseResult);
-            <span class="keyword">return</span> returnResultOrExit(ignored);
-        }
-        <span class="comment">/** Processes the specified {@code ParseResult}.
-         * Implementations are responsible for catching any exceptions thrown in the {@code handle} method, and
-         * rethrowing an {@code ExecutionException} that details the problem and captures the offending {@code CommandLine} object.
-         *
-         * @param parseResult the {@code ParseResult} that resulted from successfully parsing the command line arguments
-         * @throws ExecutionException if a problem occurred while processing the parse results; client code can use
-         *      {@link ExecutionException#getCommandLine()} to get the command or subcommand where processing failed
-         */</span>
-        <span class="directive">protected</span> <span class="directive">abstract</span> <span class="type">void</span> handle(ParseResult parseResult) <span class="directive">throws</span> <span class="exception">ExecutionException</span>;
-        <span class="annotation">@Override</span> <span class="directive">protected</span> AbstractSimpleParseResultHandler self() { <span class="keyword">return</span> <span class="local-variable">this</span>; }
-    }
-
     <span class="comment">/**
      * Command line parse result handler that prints help if requested, and otherwise executes the top-level
      * {@code Runnable} or {@code Callable} command.
-     * For use in the {@link #parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...) parseWithHandler} methods.
+     * For use in the {@link #parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...) parseWithHandler} methods.
      * @since 2.0 */</span>
     <span class="directive">public</span> <span class="directive">static</span> <span class="type">class</span> <span class="class">RunFirst</span> <span class="directive">extends</span> AbstractParseResultHandler&lt;<span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt;&gt; <span class="directive">implements</span> IParseResultHandler {
         <span class="comment">/** Prints help if requested, and otherwise executes the top-level {@code Runnable} or {@code Callable} command.
@@ -5302,7 +5274,7 @@ <h3 id="_source">23.5. Source</h3>
          * @throws ExecutionException if a problem occurred while processing the parse results; use
          *      {@link ExecutionException#getCommandLine()} to get the command or subcommand where processing failed
          * @since 3.0 */</span>
-        <span class="directive">protected</span> <span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt; handle(ParseResult parseResult, <span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt; prototypeResult) <span class="directive">throws</span> <span class="exception">ExecutionException</span> {
+        <span class="directive">protected</span> <span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt; handle(ParseResult parseResult) <span class="directive">throws</span> <span class="exception">ExecutionException</span> {
             <span class="keyword">return</span> execute(parseResult.commandSpec().commandLine(), <span class="keyword">new</span> <span class="predefined-type">ArrayList</span>&lt;<span class="predefined-type">Object</span>&gt;()); <span class="comment">// first</span>
         }
         <span class="annotation">@Override</span> <span class="directive">protected</span> RunFirst self() { <span class="keyword">return</span> <span class="local-variable">this</span>; }
@@ -5310,7 +5282,7 @@ <h3 id="_source">23.5. Source</h3>
     <span class="comment">/**
      * Command line parse result handler that prints help if requested, and otherwise executes the most specific
      * {@code Runnable} or {@code Callable} subcommand.
-     * For use in the {@link #parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...) parseWithHandler} methods.
+     * For use in the {@link #parseWithHandlers(IParseResultHandler2,  IExceptionHandler2, String...) parseWithHandler} methods.
      * &lt;p&gt;
      * Something like this:&lt;/p&gt;
      * &lt;pre&gt;{@code
@@ -5375,16 +5347,16 @@ <h3 id="_source">23.5. Source</h3>
          * @throws ExecutionException if a problem occurred while processing the parse results; use
          *      {@link ExecutionException#getCommandLine()} to get the command or subcommand where processing failed
          * @since 3.0 */</span>
-        <span class="directive">protected</span> <span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt; handle(ParseResult parseResult, <span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt; prototypeResult) <span class="directive">throws</span> <span class="exception">ExecutionException</span> {
+        <span class="directive">protected</span> <span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt; handle(ParseResult parseResult) <span class="directive">throws</span> <span class="exception">ExecutionException</span> {
             <span class="predefined-type">List</span>&lt;CommandLine&gt; parsedCommands = parseResult.asCommandLineList();
-            <span class="keyword">return</span> execute(parsedCommands.get(parsedCommands.size() - <span class="integer">1</span>), prototypeResult);
+            <span class="keyword">return</span> execute(parsedCommands.get(parsedCommands.size() - <span class="integer">1</span>), <span class="keyword">new</span> <span class="predefined-type">ArrayList</span>&lt;<span class="predefined-type">Object</span>&gt;());
         }
         <span class="annotation">@Override</span> <span class="directive">protected</span> RunLast self() { <span class="keyword">return</span> <span class="local-variable">this</span>; }
     }
     <span class="comment">/**
      * Command line parse result handler that prints help if requested, and otherwise executes the top-level command and
      * all subcommands as {@code Runnable} or {@code Callable}.
-     * For use in the {@link #parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...) parseWithHandler} methods.
+     * For use in the {@link #parseWithHandlers(IParseResultHandler2,  IExceptionHandler2, String...) parseWithHandler} methods.
      * @since 2.0 */</span>
     <span class="directive">public</span> <span class="directive">static</span> <span class="type">class</span> <span class="class">RunAll</span> <span class="directive">extends</span> AbstractParseResultHandler&lt;<span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt;&gt; <span class="directive">implements</span> IParseResultHandler {
         <span class="comment">/** Prints help if requested, and otherwise executes the top-level command and all subcommands as {@code Runnable}
@@ -5421,7 +5393,8 @@ <h3 id="_source">23.5. Source</h3>
          * @throws ExecutionException if a problem occurred while processing the parse results; use
          *      {@link ExecutionException#getCommandLine()} to get the command or subcommand where processing failed
          * @since 3.0 */</span>
-        <span class="directive">protected</span> <span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt; handle(ParseResult parseResult, <span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt; prototypeResult) <span class="directive">throws</span> <span class="exception">ExecutionException</span> {
+        <span class="directive">protected</span> <span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt; handle(ParseResult parseResult) <span class="directive">throws</span> <span class="exception">ExecutionException</span> {
+            <span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt; prototypeResult = <span class="keyword">new</span> <span class="predefined-type">ArrayList</span>&lt;<span class="predefined-type">Object</span>&gt;();
             execute(parseResult.commandSpec().commandLine(), prototypeResult);
             <span class="keyword">while</span> (parseResult.hasSubcommand()) {
                 parseResult = parseResult.subcommand();
@@ -5432,13 +5405,13 @@ <h3 id="_source">23.5. Source</h3>
         <span class="annotation">@Override</span> <span class="directive">protected</span> RunAll self() { <span class="keyword">return</span> <span class="local-variable">this</span>; }
     }
 
-    <span class="comment">/** @deprecated use {@link #parseWithHandler(IParseResultHandler2, Object, String[])} instead
+    <span class="comment">/** @deprecated use {@link #parseWithHandler(IParseResultHandler2,  String[])} instead
      * @since 2.0 */</span>
     <span class="annotation">@Deprecated</span> <span class="directive">public</span> <span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt; parseWithHandler(IParseResultHandler handler, <span class="predefined-type">PrintStream</span> out, <span class="predefined-type">String</span>... args) {
         <span class="keyword">return</span> parseWithHandlers(handler, out, Help.Ansi.AUTO, <span class="keyword">new</span> DefaultExceptionHandler(), args);
     }
     <span class="comment">/**
-     * Returns the result of calling {@link #parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)} with
+     * Returns the result of calling {@link #parseWithHandlers(IParseResultHandler2,  IExceptionHandler2, String...)} with
      * a new {@link DefaultExceptionHandler} in addition to the specified parse result handler and the specified command line arguments.
      * &lt;p&gt;
      * This is a convenience method intended to offer the same ease of use as the {@link #run(Runnable, PrintStream, PrintStream, Help.Ansi, String...) run}
@@ -5449,9 +5422,9 @@ <h3 id="_source">23.5. Source</h3>
      * &lt;pre&gt;{@code
      * try {
      *     ParseResult parseResult = parseArgs(args);
-     *     return handler.handleParseResult(parseResult, prototypeReturnValue);
+     *     return handler.handleParseResult(parseResult);
      * } catch (ParameterException ex) {
-     *     return new DefaultExceptionHandler&lt;R&gt;().handleParseException(ex, prototypeReturnValue, args);
+     *     return new DefaultExceptionHandler&lt;R&gt;().handleParseException(ex, args);
      * }
      * }&lt;/pre&gt;
      * &lt;p&gt;
@@ -5466,9 +5439,6 @@ <h3 id="_source">23.5. Source</h3>
      * &lt;/ul&gt;
      * @param &lt;R&gt; the return type of this handler
      * @param handler the function that will handle the result of successfully parsing the command line arguments
-     * @param prototypeReturnValue prototype return value, may be returned as is when the user requested help for example,
-     *                               or may be used to collect results from multiple subcommands, or may be used by the
-     *                               handler for internal processing and a completely different object is returned
      * @param args the command line arguments
      * @return an object resulting from handling the parse result or the exception that occurred while parsing the input
      * @throws ExecutionException if the command line arguments were parsed successfully but a problem occurred while processing the
@@ -5476,31 +5446,11 @@ <h3 id="_source">23.5. Source</h3>
      * @see RunLast
      * @see RunAll
      * @since 3.0 */</span>
-    <span class="directive">public</span> &lt;R&gt; R parseWithHandler(IParseResultHandler2&lt;R&gt; handler, R prototypeReturnValue, <span class="predefined-type">String</span><span class="type">[]</span> args) {
-        <span class="keyword">return</span> parseWithHandlers(handler, prototypeReturnValue, <span class="keyword">new</span> DefaultExceptionHandler&lt;R&gt;(), args);
-    }
-    <span class="comment">/**
-     * Calls {@link #parseWithSimpleHandlers(AbstractSimpleParseResultHandler, IExceptionHandler2, String...)} with
-     * a new {@link DefaultExceptionHandler} in addition to the specified parse result handler and the specified command line arguments.
-     * &lt;p&gt;Calling this method roughly expands to:&lt;/p&gt;
-     * &lt;pre&gt;{@code
-     * try {
-     *     ParseResult parseResult = parseArgs(args);
-     *     handler.handleParseResult(parseResult);
-     * } catch (ParameterException ex) {
-     *     new DefaultExceptionHandler&lt;Void&gt;().handleParseException(ex, null, (String[]) args);
-     * }
-     * }&lt;/pre&gt;
-     * @param handler the function that will handle the result of successfully parsing the command line arguments
-     * @param args the command line arguments
-     * @throws ExecutionException if the command line arguments were parsed successfully but a problem occurred while processing the
-     *      parse results; use {@link ExecutionException#getCommandLine()} to get the command or subcommand where processing failed
-     * @since 3.0 */</span>
-    <span class="directive">public</span> <span class="type">void</span> parseWithSimpleHandler(AbstractSimpleParseResultHandler handler, <span class="predefined-type">String</span>... args) {
-        parseWithSimpleHandlers(handler, <span class="keyword">new</span> DefaultExceptionHandler&lt;<span class="predefined-type">Void</span>&gt;(), args);
+    <span class="directive">public</span> &lt;R&gt; R parseWithHandler(IParseResultHandler2&lt;R&gt; handler, <span class="predefined-type">String</span><span class="type">[]</span> args) {
+        <span class="keyword">return</span> parseWithHandlers(handler, <span class="keyword">new</span> DefaultExceptionHandler&lt;R&gt;(), args);
     }
 
-    <span class="comment">/** @deprecated use {@link #parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)} instead
+    <span class="comment">/** @deprecated use {@link #parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...)} instead
      * @since 2.0 */</span>
     <span class="annotation">@Deprecated</span> <span class="directive">public</span> <span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt; parseWithHandlers(IParseResultHandler handler, <span class="predefined-type">PrintStream</span> out, Help.Ansi ansi, IExceptionHandler exceptionHandler, <span class="predefined-type">String</span>... args) {
         <span class="keyword">try</span> {
@@ -5544,9 +5494,6 @@ <h3 id="_source">23.5. Source</h3>
      * &lt;/ul&gt;
      *
      * @param handler the function that will handle the result of successfully parsing the command line arguments
-     * @param prototypeReturnValue prototype return value, may be returned as is when the user requested help for example,
-     *                               or may be used to collect results from multiple subcommands, or may be used by the
-     *                               handler for internal processing and a completely different object is returned
      * @param exceptionHandler the function that can handle the {@code ParameterException} thrown when the command line arguments are invalid
      * @param args the command line arguments
      * @return an object resulting from handling the parse result or the exception that occurred while parsing the input
@@ -5557,51 +5504,15 @@ <h3 id="_source">23.5. Source</h3>
      * @see RunAll
      * @see DefaultExceptionHandler
      * @since 3.0 */</span>
-    <span class="directive">public</span> &lt;R&gt; R parseWithHandlers(IParseResultHandler2&lt;R&gt; handler, R prototypeReturnValue, IExceptionHandler2&lt;R&gt; exceptionHandler, <span class="predefined-type">String</span>... args) {
+    <span class="directive">public</span> &lt;R&gt; R parseWithHandlers(IParseResultHandler2&lt;R&gt; handler, IExceptionHandler2&lt;R&gt; exceptionHandler, <span class="predefined-type">String</span>... args) {
         ParseResult parseResult = <span class="predefined-constant">null</span>;
         <span class="keyword">try</span> {
             parseResult = parseArgs(args);
-            <span class="keyword">return</span> handler.handleParseResult(parseResult, prototypeReturnValue);
+            <span class="keyword">return</span> handler.handleParseResult(parseResult);
         } <span class="keyword">catch</span> (ParameterException ex) {
-            <span class="keyword">return</span> exceptionHandler.handleParseException(ex, prototypeReturnValue, (<span class="predefined-type">String</span><span class="type">[]</span>) args);
+            <span class="keyword">return</span> exceptionHandler.handleParseException(ex, (<span class="predefined-type">String</span><span class="type">[]</span>) args);
         } <span class="keyword">catch</span> (<span class="exception">ExecutionException</span> ex) {
-            <span class="keyword">return</span> exceptionHandler.handleExecutionException(ex, prototypeReturnValue, parseResult);
-        }
-    }
-    <span class="comment">/**
-     * Tries to {@linkplain #parseArgs(String...) parse} the specified command line arguments, and if successful, delegates
-     * the processing of the resulting {@code ParseResult} object to the specified {@linkplain AbstractSimpleParseResultHandler handler}.
-     * If the command line arguments were invalid, the {@code ParameterException} thrown from the {@code parse} method
-     * is caught and passed to the specified {@link IExceptionHandler2}.
-     * &lt;p&gt;Calling this method roughly expands to:&lt;/p&gt;
-     * &lt;pre&gt;
-     * ParseResult parseResult = null;
-     * try {
-     *     parseResult = parseArgs(args);
-     *     handleParseResult(parseResult);
-     * } catch (ParameterException ex) {
-     *     exceptionHandler.handleParseException(ex, null, (String[]) args);
-     * } catch (ExecutionException ex) {
-     *     exceptionHandler.handleExecutionException(ex, null, parseResult);
-     * }
-     * &lt;/pre&gt;
-     *
-     * @param handler the function that will handle the result of successfully parsing the command line arguments
-     * @param exceptionHandler the function that can handle the {@code ParameterException} thrown when the command line arguments are invalid
-     * @param args the command line arguments
-     * @throws ExecutionException if the command line arguments were parsed successfully but a problem occurred while processing the parse
-     *      result {@code ParseResult} object; use {@link ExecutionException#getCommandLine()} to get the command or subcommand where processing failed
-     * @see DefaultExceptionHandler
-     * @since 3.0 */</span>
-    <span class="directive">public</span> <span class="type">void</span> parseWithSimpleHandlers(AbstractSimpleParseResultHandler handler, IExceptionHandler2&lt;<span class="predefined-type">Void</span>&gt; exceptionHandler, <span class="predefined-type">String</span>... args) {
-        ParseResult parseResult = <span class="predefined-constant">null</span>;
-        <span class="keyword">try</span> {
-            parseResult = parseArgs(args);
-            handler.handleParseResult(parseResult, <span class="predefined-constant">null</span>);
-        } <span class="keyword">catch</span> (ParameterException ex) {
-            exceptionHandler.handleParseException(ex, <span class="predefined-constant">null</span>, (<span class="predefined-type">String</span><span class="type">[]</span>) args);
-        } <span class="keyword">catch</span> (<span class="exception">ExecutionException</span> ex) {
-            exceptionHandler.handleExecutionException(ex, <span class="predefined-constant">null</span>, parseResult);
+            <span class="keyword">return</span> exceptionHandler.handleExecutionException(ex, parseResult);
         }
     }
     <span class="comment">/**
@@ -5643,9 +5554,13 @@ <h3 id="_source">23.5. Source</h3>
      * @param out the printStream to print to
      * @see #usage(PrintStream, Help.ColorScheme)
      */</span>
-    <span class="directive">public</span> <span class="type">void</span> usage(<span class="predefined-type">PrintStream</span> out) {
-        usage(out, Help.Ansi.AUTO);
-    }
+    <span class="directive">public</span> <span class="type">void</span> usage(<span class="predefined-type">PrintStream</span> out) { usage(out, Help.Ansi.AUTO); }
+    <span class="comment">/**
+     * Delegates to {@link #usage(PrintWriter, Help.Ansi)} with the {@linkplain Help.Ansi#AUTO platform default}.
+     * @param writer the PrintWriter to print to
+     * @see #usage(PrintWriter, Help.ColorScheme)
+     * @since 3.0 */</span>
+    <span class="directive">public</span> <span class="type">void</span> usage(<span class="predefined-type">PrintWriter</span> writer) { usage(writer, Help.Ansi.AUTO); }
 
     <span class="comment">/**
      * Delegates to {@link #usage(PrintStream, Help.ColorScheme)} with the {@linkplain Help#defaultColorScheme(CommandLine.Help.Ansi) default color scheme}.
@@ -5653,9 +5568,11 @@ <h3 id="_source">23.5. Source</h3>
      * @param ansi whether the usage message should include ANSI escape codes or not
      * @see #usage(PrintStream, Help.ColorScheme)
      */</span>
-    <span class="directive">public</span> <span class="type">void</span> usage(<span class="predefined-type">PrintStream</span> out, Help.Ansi ansi) {
-        usage(out, Help.defaultColorScheme(ansi));
-    }
+    <span class="directive">public</span> <span class="type">void</span> usage(<span class="predefined-type">PrintStream</span> out, Help.Ansi ansi) { usage(out, Help.defaultColorScheme(ansi)); }
+    <span class="comment">/** Similar to {@link #usage(PrintStream, Help.Ansi)} but with the specified {@code PrintWriter} instead of a {@code PrintStream}.
+     * @since 3.0 */</span>
+    <span class="directive">public</span> <span class="type">void</span> usage(<span class="predefined-type">PrintWriter</span> writer, Help.Ansi ansi) { usage(writer, Help.defaultColorScheme(ansi)); }
+
     <span class="comment">/**
      * Prints a usage help message for the annotated command class to the specified {@code PrintStream}.
      * Delegates construction of the usage help message to the {@link Help} inner class and is equivalent to:
@@ -5689,9 +5606,15 @@ <h3 id="_source">23.5. Source</h3>
      * @param colorScheme the {@code ColorScheme} defining the styles for options, parameters and commands when ANSI is enabled
      */</span>
     <span class="directive">public</span> <span class="type">void</span> usage(<span class="predefined-type">PrintStream</span> out, Help.ColorScheme colorScheme) {
-        Help help = <span class="keyword">new</span> Help(getCommandSpec(), colorScheme);
-        <span class="predefined-type">StringBuilder</span> sb = <span class="keyword">new</span> <span class="predefined-type">StringBuilder</span>()
-                .append(help.headerHeading())
+        out.print(usage(<span class="keyword">new</span> <span class="predefined-type">StringBuilder</span>(), <span class="keyword">new</span> Help(getCommandSpec(), colorScheme)));
+    }
+    <span class="comment">/** Similar to {@link #usage(PrintStream, Help.ColorScheme)}, but with the specified {@code PrintWriter} instead of a {@code PrintStream}.
+     * @since 3.0 */</span>
+    <span class="directive">public</span> <span class="type">void</span> usage(<span class="predefined-type">PrintWriter</span> writer, Help.ColorScheme colorScheme) {
+        writer.print(usage(<span class="keyword">new</span> <span class="predefined-type">StringBuilder</span>(), <span class="keyword">new</span> Help(getCommandSpec(), colorScheme)));
+    }
+    <span class="directive">private</span> <span class="directive">static</span> <span class="predefined-type">StringBuilder</span> usage(<span class="predefined-type">StringBuilder</span> sb, Help help) {
+        <span class="keyword">return</span> sb.append(help.headerHeading())
                 .append(help.header())
                 .append(help.synopsisHeading())      <span class="comment">//e.g. Usage:</span>
                 .append(help.synopsis(help.synopsisHeadingLength())) <span class="comment">//e.g. &amp;lt;main class&amp;gt; [OPTIONS] &amp;lt;command&amp;gt; [COMMAND-OPTIONS] [ARGUMENTS]</span>
@@ -5705,7 +5628,6 @@ <h3 id="_source">23.5. Source</h3>
                 .append(help.commandList())          <span class="comment">//e.g.    add       adds the frup to the frooble</span>
                 .append(help.footerHeading())
                 .append(help.footer());
-        out.print(sb);
     }
 
     <span class="comment">/**
@@ -5762,7 +5684,7 @@ <h3 id="_source">23.5. Source</h3>
      * @throws InitializationException if the specified command object does not have a {@link Command}, {@link Option} or {@link Parameters} annotation
      * @throws ExecutionException if the Callable throws an exception
      * @return {@code null} if an error occurred while parsing the command line options, otherwise returns the result of calling the Callable
-     * @see #parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)
+     * @see #parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...)
      * @since 3.0
      */</span>
     <span class="directive">public</span> <span class="directive">static</span> &lt;C <span class="directive">extends</span> <span class="predefined-type">Callable</span>&lt;T&gt;, T&gt; T call(C callable, <span class="predefined-type">String</span>... args) {
@@ -5781,7 +5703,7 @@ <h3 id="_source">23.5. Source</h3>
      * @throws InitializationException if the specified command object does not have a {@link Command}, {@link Option} or {@link Parameters} annotation
      * @throws ExecutionException if the Callable throws an exception
      * @return {@code null} if an error occurred while parsing the command line options, otherwise returns the result of calling the Callable
-     * @see #parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)
+     * @see #parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...)
      * @see RunLast
      */</span>
     <span class="directive">public</span> <span class="directive">static</span> &lt;C <span class="directive">extends</span> <span class="predefined-type">Callable</span>&lt;T&gt;, T&gt; T call(C callable, <span class="predefined-type">PrintStream</span> out, <span class="predefined-type">String</span>... args) {
@@ -5799,7 +5721,7 @@ <h3 id="_source">23.5. Source</h3>
      * @throws InitializationException if the specified command object does not have a {@link Command}, {@link Option} or {@link Parameters} annotation
      * @throws ExecutionException if the Callable throws an exception
      * @return {@code null} if an error occurred while parsing the command line options, otherwise returns the result of calling the Callable
-     * @see #parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)
+     * @see #parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...)
      * @see RunLast
      */</span>
     <span class="directive">public</span> <span class="directive">static</span> &lt;C <span class="directive">extends</span> <span class="predefined-type">Callable</span>&lt;T&gt;, T&gt; T call(C callable, <span class="predefined-type">PrintStream</span> out, Help.Ansi ansi, <span class="predefined-type">String</span>... args) {
@@ -5819,7 +5741,7 @@ <h3 id="_source">23.5. Source</h3>
      * &lt;p&gt;
      * If the specified Callable command has subcommands, the {@linkplain RunLast last} subcommand specified on the
      * command line is executed.
-     * Commands with subcommands may be interested in calling the {@link #parseWithHandler(IParseResultHandler2, Object, String[]) parseWithHandler}
+     * Commands with subcommands may be interested in calling the {@link #parseWithHandler(IParseResultHandler2, String[]) parseWithHandler}
      * method with the {@link RunAll} handler or a custom handler.
      * &lt;/p&gt;
      * @param callable the command to call when {@linkplain #parse(String...) parsing} succeeds.
@@ -5832,13 +5754,13 @@ <h3 id="_source">23.5. Source</h3>
      * @throws InitializationException if the specified command object does not have a {@link Command}, {@link Option} or {@link Parameters} annotation
      * @throws ExecutionException if the Callable throws an exception
      * @return {@code null} if an error occurred while parsing the command line options, or if help was requested and printed. Otherwise returns the result of calling the Callable
-     * @see #parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)
+     * @see #parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...)
      * @see RunLast
      * @since 3.0
      */</span>
     <span class="directive">public</span> <span class="directive">static</span> &lt;C <span class="directive">extends</span> <span class="predefined-type">Callable</span>&lt;T&gt;, T&gt; T call(C callable, <span class="predefined-type">PrintStream</span> out, <span class="predefined-type">PrintStream</span> err, Help.Ansi ansi, <span class="predefined-type">String</span>... args) {
         CommandLine cmd = <span class="keyword">new</span> CommandLine(callable);
-        <span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt; results = cmd.parseWithHandlers(<span class="keyword">new</span> RunLast().useOut(out).useAnsi(ansi), <span class="keyword">new</span> <span class="predefined-type">ArrayList</span>&lt;<span class="predefined-type">Object</span>&gt;(), <span class="keyword">new</span> DefaultExceptionHandler&lt;<span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt;&gt;().useErr(err).useAnsi(ansi), args);
+        <span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt; results = cmd.parseWithHandlers(<span class="keyword">new</span> RunLast().useOut(out).useAnsi(ansi), <span class="keyword">new</span> DefaultExceptionHandler&lt;<span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt;&gt;().useErr(err).useAnsi(ansi), args);
         <span class="annotation">@SuppressWarnings</span>(<span class="string"><span class="delimiter">&quot;</span><span class="content">unchecked</span><span class="delimiter">&quot;</span></span>) T result = results == <span class="predefined-constant">null</span> || results.isEmpty() ? <span class="predefined-constant">null</span> : (T) results.get(<span class="integer">0</span>);
         <span class="keyword">return</span> result;
     }
@@ -5852,7 +5774,7 @@ <h3 id="_source">23.5. Source</h3>
      * @see #run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)
      * @throws InitializationException if the specified command object does not have a {@link Command}, {@link Option} or {@link Parameters} annotation
      * @throws ExecutionException if the Runnable throws an exception
-     * @see #parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)
+     * @see #parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...)
      * @see RunLast
      * @since 3.0
      */</span>
@@ -5869,7 +5791,7 @@ <h3 id="_source">23.5. Source</h3>
      * @see #run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)
      * @throws InitializationException if the specified command object does not have a {@link Command}, {@link Option} or {@link Parameters} annotation
      * @throws ExecutionException if the Runnable throws an exception
-     * @see #parseWithHandler(IParseResultHandler2, Object, String[])
+     * @see #parseWithHandler(IParseResultHandler2, String[])
      * @see RunLast
      */</span>
     <span class="directive">public</span> <span class="directive">static</span> &lt;R <span class="directive">extends</span> <span class="predefined-type">Runnable</span>&gt; <span class="type">void</span> run(R runnable, <span class="predefined-type">PrintStream</span> out, <span class="predefined-type">String</span>... args) {
@@ -5885,7 +5807,7 @@ <h3 id="_source">23.5. Source</h3>
      * @see #run(Runnable, PrintStream, PrintStream, Help.Ansi, String...)
      * @throws InitializationException if the specified command object does not have a {@link Command}, {@link Option} or {@link Parameters} annotation
      * @throws ExecutionException if the Runnable throws an exception
-     * @see #parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)
+     * @see #parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...)
      * @see RunLast
      */</span>
     <span class="directive">public</span> <span class="directive">static</span> &lt;R <span class="directive">extends</span> <span class="predefined-type">Runnable</span>&gt; <span class="type">void</span> run(R runnable, <span class="predefined-type">PrintStream</span> out, Help.Ansi ansi, <span class="predefined-type">String</span>... args) {
@@ -5903,7 +5825,7 @@ <h3 id="_source">23.5. Source</h3>
      * &lt;p&gt;
      * If the specified Runnable command has subcommands, the {@linkplain RunLast last} subcommand specified on the
      * command line is executed.
-     * Commands with subcommands may be interested in calling the {@link #parseWithHandler(IParseResultHandler2, Object, String[]) parseWithHandler}
+     * Commands with subcommands may be interested in calling the {@link #parseWithHandler(IParseResultHandler2, String[]) parseWithHandler}
      * method with the {@link RunAll} handler or a custom handler.
      * &lt;/p&gt;&lt;p&gt;
      * From picocli v2.0, this method prints usage help or version help if {@linkplain #printHelpIfRequested(List, PrintStream, PrintStream, Help.Ansi) requested},
@@ -5917,13 +5839,13 @@ <h3 id="_source">23.5. Source</h3>
      * @param &lt;R&gt; the annotated object must implement Runnable
      * @throws InitializationException if the specified command object does not have a {@link Command}, {@link Option} or {@link Parameters} annotation
      * @throws ExecutionException if the Runnable throws an exception
-     * @see #parseWithHandlers(IParseResultHandler2, Object, IExceptionHandler2, String...)
+     * @see #parseWithHandlers(IParseResultHandler2, IExceptionHandler2, String...)
      * @see RunLast
      * @since 3.0
      */</span>
     <span class="directive">public</span> <span class="directive">static</span> &lt;R <span class="directive">extends</span> <span class="predefined-type">Runnable</span>&gt; <span class="type">void</span> run(R runnable, <span class="predefined-type">PrintStream</span> out, <span class="predefined-type">PrintStream</span> err, Help.Ansi ansi, <span class="predefined-type">String</span>... args) {
         CommandLine cmd = <span class="keyword">new</span> CommandLine(runnable);
-        cmd.parseWithHandlers(<span class="keyword">new</span> RunLast().useOut(out).useAnsi(ansi), <span class="keyword">new</span> <span class="predefined-type">ArrayList</span>&lt;<span class="predefined-type">Object</span>&gt;(), <span class="keyword">new</span> DefaultExceptionHandler&lt;<span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt;&gt;().useErr(err).useAnsi(ansi), args);
+        cmd.parseWithHandlers(<span class="keyword">new</span> RunLast().useOut(out).useAnsi(ansi), <span class="keyword">new</span> DefaultExceptionHandler&lt;<span class="predefined-type">List</span>&lt;<span class="predefined-type">Object</span>&gt;&gt;().useErr(err).useAnsi(ansi), args);
     }
 
     <span class="comment">/**
@@ -7554,16 +7476,18 @@ <h3 id="_source">23.5. Source</h3>
             <span class="directive">private</span> <span class="type">boolean</span> overwrittenOptionsAllowed = <span class="predefined-constant">false</span>;
             <span class="directive">private</span> <span class="type">boolean</span> unmatchedArgumentsAllowed = <span class="predefined-constant">false</span>;
             <span class="directive">private</span> <span class="type">boolean</span> expandAtFiles = <span class="predefined-constant">true</span>;
+            <span class="directive">private</span> <span class="type">boolean</span> posixClusteredShortOptionsAllowed = <span class="predefined-constant">true</span>;
 
             <span class="comment">/** Returns the String to use as the separator between options and option parameters. {@code &quot;=&quot;} by default,
              * initialized from {@link Command#separator()} if defined.*/</span>
             <span class="directive">public</span> <span class="predefined-type">String</span> separator() { <span class="keyword">return</span> (separator == <span class="predefined-constant">null</span>) ? DEFAULT_SEPARATOR : separator; }
 
-            <span class="directive">public</span> <span class="type">boolean</span> stopAtUnmatched()           { <span class="keyword">return</span> stopAtUnmatched; }
-            <span class="directive">public</span> <span class="type">boolean</span> stopAtPositional()          { <span class="keyword">return</span> stopAtPositional; }
-            <span class="directive">public</span> <span class="type">boolean</span> overwrittenOptionsAllowed() { <span class="keyword">return</span> overwrittenOptionsAllowed; }
-            <span class="directive">public</span> <span class="type">boolean</span> unmatchedArgumentsAllowed() { <span class="keyword">return</span> unmatchedArgumentsAllowed; }
-            <span class="directive">public</span> <span class="type">boolean</span> expandAtFiles()             { <span class="keyword">return</span> expandAtFiles; }
+            <span class="directive">public</span> <span class="type">boolean</span> stopAtUnmatched()                   { <span class="keyword">return</span> stopAtUnmatched; }
+            <span class="directive">public</span> <span class="type">boolean</span> stopAtPositional()                  { <span class="keyword">return</span> stopAtPositional; }
+            <span class="directive">public</span> <span class="type">boolean</span> overwrittenOptionsAllowed()         { <span class="keyword">return</span> overwrittenOptionsAllowed; }
+            <span class="directive">public</span> <span class="type">boolean</span> unmatchedArgumentsAllowed()         { <span class="keyword">return</span> unmatchedArgumentsAllowed; }
+            <span class="directive">public</span> <span class="type">boolean</span> expandAtFiles()                     { <span class="keyword">return</span> expandAtFiles; }
+            <span class="directive">public</span> <span class="type">boolean</span> posixClusteredShortOptionsAllowed() { <span class="keyword">return</span> posixClusteredShortOptionsAllowed; }
 
             <span class="comment">/** Sets the String to use as the separator between options and option parameters.
              * @return this ParserSpec for method chaining */</span>
@@ -7573,7 +7497,12 @@ <h3 id="_source">23.5. Source</h3>
             <span class="directive">public</span> ParserSpec overwrittenOptionsAllowed(<span class="type">boolean</span> overwrittenOptionsAllowed) { <span class="local-variable">this</span>.overwrittenOptionsAllowed = overwrittenOptionsAllowed; <span class="keyword">return</span> <span class="local-variable">this</span>; }
             <span class="directive">public</span> ParserSpec unmatchedArgumentsAllowed(<span class="type">boolean</span> unmatchedArgumentsAllowed) { <span class="local-variable">this</span>.unmatchedArgumentsAllowed = unmatchedArgumentsAllowed; <span class="keyword">return</span> <span class="local-variable">this</span>; }
             <span class="directive">public</span> ParserSpec expandAtFiles(<span class="type">boolean</span> expandAtFiles)                         { <span class="local-variable">this</span>.expandAtFiles = expandAtFiles; <span class="keyword">return</span> <span class="local-variable">this</span>; }
-            <span class="type">void</span> initSeparator(<span class="predefined-type">String</span> value)            { <span class="keyword">if</span> (initializable(separator, value, DEFAULT_SEPARATOR))                         {separator = value;} }
+            <span class="directive">public</span> ParserSpec posixClusteredShortOptionsAllowed(<span class="type">boolean</span> posixClusteredShortOptionsAllowed) { <span class="local-variable">this</span>.posixClusteredShortOptionsAllowed = posixClusteredShortOptionsAllowed; <span class="keyword">return</span> <span class="local-variable">this</span>; }
+            <span class="type">void</span> initSeparator(<span class="predefined-type">String</span> value) { <span class="keyword">if</span> (initializable(separator, value, DEFAULT_SEPARATOR)) {separator = value;} }
+            <span class="directive">public</span> <span class="predefined-type">String</span> toString() {
+                <span class="keyword">return</span> <span class="predefined-type">String</span>.format(<span class="string"><span class="delimiter">&quot;</span><span class="content">posixClusteredShortOptionsAllowed=%s, stopAtPositional=%s, stopAtUnmatched=%s, separator=%s, overwrittenOptionsAllowed=%s, unmatchedArgumentsAllowed=%s, expandAtFiles=%s</span><span class="delimiter">&quot;</span></span>,
+                        posixClusteredShortOptionsAllowed, stopAtPositional, stopAtUnmatched, separator, overwrittenOptionsAllowed, unmatchedArgumentsAllowed, expandAtFiles);
+            }
         }
         <span class="comment">/** Models the shared attributes of {@link OptionSpec} and {@link PositionalParamSpec}.
          * @since 3.0 */</span>
@@ -8735,6 +8664,7 @@ <h3 id="_source">23.5. Source</h3>
         <span class="predefined-type">List</span>&lt;CommandLine&gt; parse(<span class="predefined-type">String</span>... args) {
             Assert.notNull(args, <span class="string"><span class="delimiter">&quot;</span><span class="content">argument array</span><span class="delimiter">&quot;</span></span>);
             <span class="keyword">if</span> (tracer.isInfo()) {tracer.info(<span class="string"><span class="delimiter">&quot;</span><span class="content">Parsing %d command line args %s%n</span><span class="delimiter">&quot;</span></span>, args.length, <span class="predefined-type">Arrays</span>.toString(args));}
+            <span class="keyword">if</span> (tracer.isDebug()){tracer.debug(<span class="string"><span class="delimiter">&quot;</span><span class="content">Parser configuration: %s%n</span><span class="delimiter">&quot;</span></span>, config());}
             <span class="predefined-type">List</span>&lt;<span class="predefined-type">String</span>&gt; expanded = <span class="keyword">new</span> <span class="predefined-type">ArrayList</span>&lt;<span class="predefined-type">String</span>&gt;();
             <span class="keyword">for</span> (<span class="predefined-type">String</span> arg : args) { addOrExpand(arg, expanded, <span class="keyword">new</span> <span class="predefined-type">LinkedHashSet</span>&lt;<span class="predefined-type">String</span>&gt;()); }
             <span class="predefined-type">Stack</span>&lt;<span class="predefined-type">String</span>&gt; arguments = <span class="keyword">new</span> <span class="predefined-type">Stack</span>&lt;<span class="predefined-type">String</span>&gt;();
@@ -8906,7 +8836,7 @@ <h3 id="_source">23.5. Source</h3>
                 }
                 <span class="comment">// Compact (single-letter) options can be grouped with other options or with an argument.</span>
                 <span class="comment">// only single-letter options can be combined with other options or with an argument</span>
-                <span class="keyword">else</span> <span class="keyword">if</span> (arg.length() &gt; <span class="integer">2</span> &amp;&amp; arg.startsWith(<span class="string"><span class="delimiter">&quot;</span><span class="content">-</span><span class="delimiter">&quot;</span></span>)) {
+                <span class="keyword">else</span> <span class="keyword">if</span> (config().posixClusteredShortOptionsAllowed() &amp;&amp; arg.length() &gt; <span class="integer">2</span> &amp;&amp; arg.startsWith(<span class="string"><span class="delimiter">&quot;</span><span class="content">-</span><span class="delimiter">&quot;</span></span>)) {
                     <span class="keyword">if</span> (tracer.isDebug()) {tracer.debug(<span class="string"><span class="delimiter">&quot;</span><span class="content">Trying to process '%s' as clustered short options%n</span><span class="delimiter">&quot;</span></span>, arg, args);}
                     processClusteredShortOptions(required, initialized, arg, args);
                 }
@@ -11685,8 +11615,8 @@ <h3 id="_source">23.5. Source</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Version 3.0.0-alpha-1<br>
-Last updated 2018-03-21 01:12:32 +09:00
+Version 3.0.0-alpha-2<br>
+Last updated 2018-03-27 21:42:52 JST
 </div>
 </div>
 </body>
diff --git a/docs/picocli-2.0-do-more-with-less.html b/docs/picocli-2.0-do-more-with-less.html
index ec18688c8..707cc41a5 100644
--- a/docs/picocli-2.0-do-more-with-less.html
+++ b/docs/picocli-2.0-do-more-with-less.html
@@ -899,7 +899,7 @@ <h2 id="_conclusion">Conclusion</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2017-12-28 22:53:34 +09:00
+Last updated 2017-12-28 22:53:34 JST
 </div>
 </div>
 </body>
diff --git a/docs/picocli-2.0-groovy-scripts-on-steroids.html b/docs/picocli-2.0-groovy-scripts-on-steroids.html
index 94c434b21..d24897efa 100644
--- a/docs/picocli-2.0-groovy-scripts-on-steroids.html
+++ b/docs/picocli-2.0-groovy-scripts-on-steroids.html
@@ -789,7 +789,7 @@ <h2 id="_conclusion">Conclusion</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2017-12-28 22:53:34 +09:00
+Last updated 2017-12-28 22:53:34 JST
 </div>
 </div>
 </body>
diff --git a/docs/picocli-3.0-programmatic-api.html b/docs/picocli-3.0-programmatic-api.html
index fcf74c3bd..b1344846b 100644
--- a/docs/picocli-3.0-programmatic-api.html
+++ b/docs/picocli-3.0-programmatic-api.html
@@ -1043,7 +1043,7 @@ <h4 id="_handlers_with_return_value">4.2.2. Handlers with Return Value</h4>
 <div id="footer">
 <div id="footer-text">
 Version 3.0.0-alpha-1-SNAPSHOT<br>
-Last updated 2018-03-18 11:51:22 +09:00
+Last updated 2018-03-18 11:51:22 JST
 </div>
 </div>
 </body>
diff --git a/src/main/java/picocli/CommandLine.java b/src/main/java/picocli/CommandLine.java
index 5cd371553..476142b40 100644
--- a/src/main/java/picocli/CommandLine.java
+++ b/src/main/java/picocli/CommandLine.java
@@ -134,7 +134,7 @@
  */
 public class CommandLine {
     /** This is picocli version {@value}. */
-    public static final String VERSION = "3.0.0-alpha-2-SNAPSHOT";
+    public static final String VERSION = "3.0.0-alpha-2";
 
     private final Tracer tracer = new Tracer();
     private final CommandSpec commandSpec;
diff --git a/src/test/java/picocli/AutoCompleteTest.java b/src/test/java/picocli/AutoCompleteTest.java
index d0d168e78..3ff8d1fb8 100644
--- a/src/test/java/picocli/AutoCompleteTest.java
+++ b/src/test/java/picocli/AutoCompleteTest.java
@@ -303,7 +303,7 @@ public void testAutoCompleteAppBothScriptFilesForceOverwrite() throws Exception
                 "# =======================\n" +
                 "#\n" +
                 "# Bash completion support for the `picocli.AutoComplete` command,\n" +
-                "# generated by [picocli](http://picocli.info/) version 3.0.0-alpha-2-SNAPSHOT.\n" +
+                "# generated by [picocli](http://picocli.info/) version 3.0.0-alpha-2.\n" +
                 "#\n" +
                 "# Installation\n" +
                 "# ------------\n" +
diff --git a/src/test/java/picocli/CommandLineTest.java b/src/test/java/picocli/CommandLineTest.java
index 84f4281af..10d333aae 100644
--- a/src/test/java/picocli/CommandLineTest.java
+++ b/src/test/java/picocli/CommandLineTest.java
@@ -154,7 +154,7 @@ class App { }
     }
     @Test
     public void testVersion() {
-        assertEquals("3.0.0-alpha-2-SNAPSHOT", CommandLine.VERSION);
+        assertEquals("3.0.0-alpha-2", CommandLine.VERSION);
     }
     @Test
     public void testArrayPositionalParametersAreAppendedNotReplaced() {