Reorganize .cli files, add man/xhtml page generation (via script for now)

23 files changed, 65 insertions, 65 deletions

diff --git a/bpkg/bpkg-options.cli b/bpkg/bpkg.cli
index 97fb8b8..e9611ff 100644
--- a/bpkg/bpkg-options.cli
+++ b/bpkg/bpkg.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/bpkg-options.cli
+// file      : bpkg/bpkg.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/common-options.cli>;
+include <bpkg/common.cli>;
 
 "\section=1"
 "\name=bpkg"
diff --git a/bpkg/buildfile b/bpkg/buildfile
index c33a8ce..9f4d904 100644
--- a/bpkg/buildfile
+++ b/bpkg/buildfile
@@ -60,41 +60,41 @@ if! $cli.loaded
   cli{*}: extension = cli
 }
 
-{hxx ixx cxx}{common-options}:        cli{common-options}
-{hxx ixx cxx}{configuration-options}: cli{configuration-options}
-{hxx ixx cxx}{bpkg-options}:          cli{bpkg-options}
+{hxx ixx cxx}{common-options}:        cli{common}
+{hxx ixx cxx}{configuration-options}: cli{configuration}
+{hxx ixx cxx}{bpkg-options}:          cli{bpkg}
 
 # Help command.
 #
-{hxx ixx cxx}{help-options}:  cli{help-options}
+{hxx ixx cxx}{help-options}: cli{help}
 
 # pkg-* command.
 #
 
-{hxx ixx cxx}{pkg-build-options}:     cli{pkg-build-options}
-{hxx ixx cxx}{pkg-clean-options}:     cli{pkg-clean-options}
-{hxx ixx cxx}{pkg-configure-options}: cli{pkg-configure-options}
-{hxx ixx cxx}{pkg-disfigure-options}: cli{pkg-disfigure-options}
-{hxx ixx cxx}{pkg-drop-options}:      cli{pkg-drop-options}
-{hxx ixx cxx}{pkg-fetch-options}:     cli{pkg-fetch-options}
-{hxx ixx cxx}{pkg-install-options}:   cli{pkg-install-options}
-{hxx ixx cxx}{pkg-purge-options}:     cli{pkg-purge-options}
-{hxx ixx cxx}{pkg-status-options}:    cli{pkg-status-options}
-{hxx ixx cxx}{pkg-uninstall-options}: cli{pkg-uninstall-options}
-{hxx ixx cxx}{pkg-unpack-options}:    cli{pkg-unpack-options}
-{hxx ixx cxx}{pkg-update-options}:    cli{pkg-update-options}
-{hxx ixx cxx}{pkg-verify-options}:    cli{pkg-verify-options}
+{hxx ixx cxx}{pkg-build-options}:     cli{pkg-build}
+{hxx ixx cxx}{pkg-clean-options}:     cli{pkg-clean}
+{hxx ixx cxx}{pkg-configure-options}: cli{pkg-configure}
+{hxx ixx cxx}{pkg-disfigure-options}: cli{pkg-disfigure}
+{hxx ixx cxx}{pkg-drop-options}:      cli{pkg-drop}
+{hxx ixx cxx}{pkg-fetch-options}:     cli{pkg-fetch}
+{hxx ixx cxx}{pkg-install-options}:   cli{pkg-install}
+{hxx ixx cxx}{pkg-purge-options}:     cli{pkg-purge}
+{hxx ixx cxx}{pkg-status-options}:    cli{pkg-status}
+{hxx ixx cxx}{pkg-uninstall-options}: cli{pkg-uninstall}
+{hxx ixx cxx}{pkg-unpack-options}:    cli{pkg-unpack}
+{hxx ixx cxx}{pkg-update-options}:    cli{pkg-update}
+{hxx ixx cxx}{pkg-verify-options}:    cli{pkg-verify}
 
 # cfg-* command.
 #
-{hxx ixx cxx}{cfg-create-options}: cli{cfg-create-options}
+{hxx ixx cxx}{cfg-create-options}: cli{cfg-create}
 
 # rep-* command.
 #
-{hxx ixx cxx}{cfg-add-options}:    cli{cfg-add-options}
-{hxx ixx cxx}{cfg-fetch-options}:  cli{cfg-fetch-options}
-{hxx ixx cxx}{rep-info-options}:   cli{rep-info-options}
-{hxx ixx cxx}{rep-create-options}: cli{rep-create-options}
+{hxx ixx cxx}{cfg-add-options}:    cli{cfg-add}
+{hxx ixx cxx}{cfg-fetch-options}:  cli{cfg-fetch}
+{hxx ixx cxx}{rep-info-options}:   cli{rep-info}
+{hxx ixx cxx}{rep-create-options}: cli{rep-create}
 
 # Option length must be the same to get commands/topics/options aligned.
 #
diff --git a/bpkg/cfg-add-options.cli b/bpkg/cfg-add.cli
index 9c81e4f..34909e9 100644
--- a/bpkg/cfg-add-options.cli
+++ b/bpkg/cfg-add.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/cfg-add-options.cli
+// file      : bpkg/cfg-add.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/configuration-options.cli>;
+include <bpkg/configuration.cli>;
 
 "\section=1"
 "\name=bpkg-cfg-add"
diff --git a/bpkg/cfg-create-options.cli b/bpkg/cfg-create.cli
index b073fdf..e28778e 100644
--- a/bpkg/cfg-create-options.cli
+++ b/bpkg/cfg-create.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/cfg-create-options.cli
+// file      : bpkg/cfg-create.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/common-options.cli>;
+include <bpkg/common.cli>;
 
 "\section=1"
 "\name=bpkg-cfg-create"
diff --git a/bpkg/cfg-fetch-options.cli b/bpkg/cfg-fetch.cli
index 6d420a6..6b889cc 100644
--- a/bpkg/cfg-fetch-options.cli
+++ b/bpkg/cfg-fetch.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/cfg-fetch-options.cli
+// file      : bpkg/cfg-fetch.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/configuration-options.cli>;
+include <bpkg/configuration.cli>;
 
 "\section=1"
 "\name=bpkg-cfg-fetch"
diff --git a/bpkg/common-options.cli b/bpkg/common.cli
index d811238..17ee1a6 100644
--- a/bpkg/common-options.cli
+++ b/bpkg/common.cli
@@ -1,4 +1,4 @@
-// file      : bpkg/common-options.cli
+// file      : bpkg/common.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/bpkg/configuration-options.cli b/bpkg/configuration.cli
index b9c6dbc..5b174b9 100644
--- a/bpkg/configuration-options.cli
+++ b/bpkg/configuration.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/configuration-options.cli
+// file      : bpkg/configuration.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/common-options.cli>;
+include <bpkg/common.cli>;
 
 "\name=configuration" // Not a man page.
 
diff --git a/bpkg/help-options.cli b/bpkg/help.cli
index 4be6f10..69e818c 100644
--- a/bpkg/help-options.cli
+++ b/bpkg/help.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/help-options.cli
+// file      : bpkg/help.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/common-options.cli>;
+include <bpkg/common.cli>;
 
 "\section=1"
 "\name=bpkg-help"
diff --git a/bpkg/pkg-build-options.cli b/bpkg/pkg-build.cli
index 39b96f1..54e0252 100644
--- a/bpkg/pkg-build-options.cli
+++ b/bpkg/pkg-build.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/pkg-build-options.cli
+// file      : bpkg/pkg-build.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/configuration-options.cli>;
+include <bpkg/configuration.cli>;
 
 "\section=1"
 "\name=bpkg-pkg-build"
diff --git a/bpkg/pkg-clean-options.cli b/bpkg/pkg-clean.cli
index 0d10d5e..9452291 100644
--- a/bpkg/pkg-clean-options.cli
+++ b/bpkg/pkg-clean.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/pkg-clean-options.cli
+// file      : bpkg/pkg-clean.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/configuration-options.cli>;
+include <bpkg/configuration.cli>;
 
 "\section=1"
 "\name=bpkg-pkg-clean"
diff --git a/bpkg/pkg-configure-options.cli b/bpkg/pkg-configure.cli
index 0f4084f..4ef9707 100644
--- a/bpkg/pkg-configure-options.cli
+++ b/bpkg/pkg-configure.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/pkg-configure-options.cli
+// file      : bpkg/pkg-configure.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/configuration-options.cli>;
+include <bpkg/configuration.cli>;
 
 "\section=1"
 "\name=bpkg-pkg-configure"
diff --git a/bpkg/pkg-disfigure-options.cli b/bpkg/pkg-disfigure.cli
index 31bf1b8..6f5c80b 100644
--- a/bpkg/pkg-disfigure-options.cli
+++ b/bpkg/pkg-disfigure.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/pkg-disfigure-options.cli
+// file      : bpkg/pkg-disfigure.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/configuration-options.cli>;
+include <bpkg/configuration.cli>;
 
 "\section=1"
 "\name=bpkg-pkg-disfigure"
diff --git a/bpkg/pkg-drop-options.cli b/bpkg/pkg-drop.cli
index 7c8f7dc..6ec7130 100644
--- a/bpkg/pkg-drop-options.cli
+++ b/bpkg/pkg-drop.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/pkg-drop-options.cli
+// file      : bpkg/pkg-drop.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/configuration-options.cli>;
+include <bpkg/configuration.cli>;
 
 "\section=1"
 "\name=bpkg-pkg-drop"
diff --git a/bpkg/pkg-fetch-options.cli b/bpkg/pkg-fetch.cli
index 02a8192..ba1d5d9 100644
--- a/bpkg/pkg-fetch-options.cli
+++ b/bpkg/pkg-fetch.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/pkg-fetch-options.cli
+// file      : bpkg/pkg-fetch.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/configuration-options.cli>;
+include <bpkg/configuration.cli>;
 
 "\section=1"
 "\name=bpkg-pkg-fetch"
diff --git a/bpkg/pkg-install-options.cli b/bpkg/pkg-install.cli
index f6d410b..0c1385b 100644
--- a/bpkg/pkg-install-options.cli
+++ b/bpkg/pkg-install.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/pkg-install-options.cli
+// file      : bpkg/pkg-install.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/configuration-options.cli>;
+include <bpkg/configuration.cli>;
 
 "\section=1"
 "\name=bpkg-pkg-install"
diff --git a/bpkg/pkg-purge-options.cli b/bpkg/pkg-purge.cli
index 05fe716..da618d3 100644
--- a/bpkg/pkg-purge-options.cli
+++ b/bpkg/pkg-purge.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/pkg-purge-options.cli
+// file      : bpkg/pkg-purge.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/configuration-options.cli>;
+include <bpkg/configuration.cli>;
 
 "\section=1"
 "\name=bpkg-pkg-purge"
diff --git a/bpkg/pkg-status-options.cli b/bpkg/pkg-status.cli
index bd2959c..fb20f78 100644
--- a/bpkg/pkg-status-options.cli
+++ b/bpkg/pkg-status.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/pkg-status-options.cli
+// file      : bpkg/pkg-status.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/configuration-options.cli>;
+include <bpkg/configuration.cli>;
 
 "\section=1"
 "\name=bpkg-pkg-status"
diff --git a/bpkg/pkg-uninstall-options.cli b/bpkg/pkg-uninstall.cli
index 5e68ec3..536f6ec 100644
--- a/bpkg/pkg-uninstall-options.cli
+++ b/bpkg/pkg-uninstall.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/pkg-uninstall-options.cli
+// file      : bpkg/pkg-uninstall.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/configuration-options.cli>;
+include <bpkg/configuration.cli>;
 
 "\section=1"
 "\name=bpkg-pkg-uninstall"
diff --git a/bpkg/pkg-unpack-options.cli b/bpkg/pkg-unpack.cli
index f5f2fd5..847ecb2 100644
--- a/bpkg/pkg-unpack-options.cli
+++ b/bpkg/pkg-unpack.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/pkg-unpack-options.cli
+// file      : bpkg/pkg-unpack.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/configuration-options.cli>;
+include <bpkg/configuration.cli>;
 
 "\section=1"
 "\name=bpkg-pkg-unpack"
diff --git a/bpkg/pkg-update-options.cli b/bpkg/pkg-update.cli
index 37d838e..09a5f59 100644
--- a/bpkg/pkg-update-options.cli
+++ b/bpkg/pkg-update.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/pkg-update-options.cli
+// file      : bpkg/pkg-update.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/configuration-options.cli>;
+include <bpkg/configuration.cli>;
 
 "\section=1"
 "\name=bpkg-pkg-update"
diff --git a/bpkg/pkg-verify-options.cli b/bpkg/pkg-verify.cli
index 7a94f25..850b7d4 100644
--- a/bpkg/pkg-verify-options.cli
+++ b/bpkg/pkg-verify.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/pkg-verify-options.cli
+// file      : bpkg/pkg-verify.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/common-options.cli>;
+include <bpkg/common.cli>;
 
 "\section=1"
 "\name=bpkg-pkg-verify"
diff --git a/bpkg/rep-create-options.cli b/bpkg/rep-create.cli
index 4969dd9..b472cfc 100644
--- a/bpkg/rep-create-options.cli
+++ b/bpkg/rep-create.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/rep-create-options.cli
+// file      : bpkg/rep-create.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/common-options.cli>;
+include <bpkg/common.cli>;
 
 "\section=1"
 "\name=bpkg-rep-create"
diff --git a/bpkg/rep-info-options.cli b/bpkg/rep-info.cli
index 2d8b45e..0db3004 100644
--- a/bpkg/rep-info-options.cli
+++ b/bpkg/rep-info.cli
@@ -1,8 +1,8 @@
-// file      : bpkg/rep-info-options.cli
+// file      : bpkg/rep-info.cli
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/common-options.cli>;
+include <bpkg/common.cli>;
 
 "\section=1"
 "\name=bpkg-rep-info"