Hardcode fewer references to version numbers.

garydgregory · garydgregory · commit eea0f8c2e2cb · 2021-10-04T10:19:37.000-04:00
Prefix component name with "Apache" for first reference on a page.
diff --git a/src/main/java/org/apache/commons/cli/overview.html b/src/main/java/org/apache/commons/cli/overview.html
@@ -16,7 +16,7 @@
 -->
 <body>
 
-    <p>Commons CLI.</p>
+    <p>Apache Commons CLI.</p>
 
     <p>The commons-cli package aides in parsing command-line arguments.</p>
 
diff --git a/src/site/site.xml b/src/site/site.xml
@@ -15,9 +15,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<project name="Commons CLI">
+<project name="Apache Commons CLI">
     <bannerRight>
-        <name>Commons CLI</name>
+        <name>Apache Commons CLI</name>
         <src>/images/logo.png</src>
         <href>/index.html</href>
     </bannerRight>
@@ -34,7 +34,7 @@
 
         <menu name="User Guide">
             <item name="Getting started"      href="/introduction.html"/>
-            <item name="Usage scenarios"      href="/usage.html"/>
+            <item name="Using CLI"            href="/usage.html"/>
             <item name="Option properties"    href="/properties.html"/>
             <item name="Javadoc"              href="/apidocs/index.html"/>
             <item name="Javadoc Archive"      href="https://javadoc.io/doc/commons-cli/commons-cli/latest/index.html"/>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
@@ -62,10 +62,11 @@ usage: ls
     </section>
 
     <section name="CLI 2?">
-      <p>Commons CLI 1.0 was formed from the merger of ideas and code from three different libraries -
-      Werken, Avalon and Optz. In dealing with the bugs and the feature requests a freshly designed and not
-      backwards compatible CLI 2 was created in 2004, but never finished or released. </p>
-
+      <p>
+        Commons CLI 1.0 was formed from the merger of ideas and code from three different libraries -
+        Werken, Avalon and Optz. In dealing with the bugs and the feature requests a freshly designed and not
+        backwards compatible CLI 2 was created in 2004, but never finished or released.
+      </p>
       <p>The current plan is to continue to maintain the 1.x line. The CLI2 work may be found in the Commons Sandbox. </p>
     </section>
 
@@ -78,12 +79,8 @@ usage: ls
         The Javadoc API documents are available online:
       </p>
       <ul>
-        <li><a href="javadocs/api-release/index.html">CLI 1.4 (current release)</a></li>
-        <li><a href="javadocs/api-1.3.1/index.html">CLI 1.3.1</a></li>
-        <li><a href="javadocs/api-1.3/index.html">CLI 1.3</a></li>
-        <li><a href="javadocs/api-1.2/index.html">CLI 1.2</a></li>
-        <li><a href="javadocs/api-1.1/index.html">CLI 1.1</a></li>
-        <li><a href="javadocs/api-1.0/index.html">CLI 1.0</a></li>
+        <li><a href="/apidocs/index.html">Javadoc latest</a></li>
+        <li><a href="https://javadoc.io/doc/commons-cli/commons-cli/latest/index.html">Javadoc archives</a></li>
       </ul>
       <p>
         The <a href="scm.html">source repository</a> can be
@@ -93,23 +90,26 @@ usage: ls
 
     <section name="Releases">
       <p>
-        The latest version is v1.4 -
-        <a href="https://commons.apache.org/cli/download_cli.cgi">Download now!</a>
+        <a href="https://commons.apache.org/cli/download_cli.cgi">Download</a> the latest version. 
         <br/>
-        The <a href="release_1_4.html">release notes</a> are also available.
+        The <a href="/changes-report.html">release notes</a> are also available.
       </p>
       <p>
         For previous releases, see the <a href="https://archive.apache.org/dist/commons/cli/">Apache Archive</a>.
       </p>
     </section>
 
     <section name="Support">
-      <p>The <a href="mail-lists.html">commons mailing lists</a> act as the main support forum. The user list
-      is suitable for most library usage queries. The dev list is intended for the development discussion. Please
-      remember that the lists are shared between all commons components, so prefix your email subject by
-      <code>[cli]</code>.</p>
+      <p>
+        The <a href="mail-lists.html">commons mailing lists</a> act as the main support forum. The user list
+        is suitable for most library usage queries. The dev list is intended for the development discussion. Please
+        remember that the lists are shared between all commons components, so prefix your email subject by
+        <code>[cli]</code>.
+      </p>
 
-      <p>Issues may be reported via the <a href="issue-tracking.html">ASF JIRA</a>.</p>
+      <p>
+        Issues may be reported via the <a href="issue-tracking.html">ASF JIRA</a>.
+      </p>
     </section>
 
   </body>
