Updating site. Bringing some of the 2.0 content in; removing the stubbed out 2.0 examples; updating the nav and adding the all important '1.x vs 2.x?' section to the front page

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk@546345 13f79535-47bb-0310-9956-ffa450edef68

Author: hen

xdocs/building.xml

@@ -39,5 +39,11 @@
         found on the <code>commons-user@jakarta.apache.org</code> mailing list.
       </p>
     </section>
+
+    <section name="Examples">
+      <ul>
+        <li><a href="ant.html">ant</a></li>
+      </ul>
+    </section>
   </body>
 </document>

xdocs/examples/cp.xml

@@ -29,8 +29,19 @@
 <section name="Commons CLI">
 <p>
 The Jakarta Commons CLI library provides an API for processing command line interfaces.
-It was formed by the merger of ideas and code from three different libraries -
-Werken, Avalon and Optz. 
+</p>
+</section>
+<!-- ================================================== -->
+<section name="1.x vs 2.x?">
+<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.0 was created, but never finished or released. Since then a CLI 1.1 bugfix release has been made.
+</p>
+<p>
+There are currently no plans to continue the 1.x line beyond bugfixes. The 2.x design is generally preferred and is in use, 
+however there is no current activity to make a 2.0 release. To this end, the 1.1 release is recommended to most users 
+while the 2.x line is recommended for anyone interested in helping to get this better API released. 
 </p>
 </section>
 <!-- ================================================== -->

xdocs/examples/cvs.xml

@@ -27,44 +27,26 @@
 
     <menu name="Commons CLI">
       <item name="Overview" href="/index.html"/>
-      <item name="Download" href="http://jakarta.apache.org/site/downloads/downloads_commons-cli.cgi"/>
-      <item name="Javadoc (1.0 release)" href="api-release/index.html"/>
+      <item name="Download (1.1)" href="http://jakarta.apache.org/site/downloads/downloads_commons-cli.cgi"/>
+      <item name="SVN repository" href="http://svn.apache.org/viewvc/jakarta/commons/proper/cli/trunk/"/>
+      <item name="Mailing lists" href="/mail-lists.html"/>
     </menu>
 
-    <menu name="User guide">
-      <item name="Getting started"   href="/introduction.html"/>
-      <item name="Usage scenarios"   href="/usage.html"/>
-      <item name="Option properties" href="/properties.html"/>
-    </menu>
-<!--
-    <menu name="CLI1">
-      <item name="Overview"          href="/introduction.html"/>
+    <menu name="CLI1 user guide">
+      <item name="Getting started"          href="/introduction.html"/>
       <item name="Usage scenarios"   href="/usage.html"/>
       <item name="Option properties" href="/properties.html"/>
+      <item name="Javadoc (1.1)" href="api-release/index.html"/>
     </menu>
-    <menu name="CLI2">
+
+    <menu name="CLI2-dev user guide">
       <item name="Overview"          href="/manual/index.html"/>
+      <item name="Examples"          href="/examples/index.html"/>
       <item name="Options"           href="/manual/options.html"/>
-      <item name="Builders"          href="/manual/builders.html"/>
-      <item name="CommandLines"      href="/manual/commandlines.html"/>
+      <!--item name="Builders"          href="/manual/builders.html"/-->
+      <!--item name="CommandLines"      href="/manual/commandlines.html"/-->
       <item name="Validators"        href="/manual/validators.html"/>
-      <item name="Utilities"         href="/manual/utilities.html"/>
-    </menu>
-    <menu name="Examples">
-      <item name="Overview"          href="/examples/index.html"/>
-      <item name="ant"               href="/examples/ant.html"/>
-      <item name="ls"                href="/examples/ls.html"/>
-      <item name="cvs"               href="/examples/cvs.html"/>
-      <item name="cp"                href="/examples/cp.html"/>
-    </menu>
--->
-    <menu name="Development">
-      <item name="Building" href="/building.html"/>
-      <item name="Mailing lists" href="/mail-lists.html"/>
-      <item name="Team" href="/team-list.html"/>
-      <!--item name="Tasks" href="/tasks.html"/-->
-      <!--item name="Proposal" href="/proposal.html"/-->
-      <item name="SVN repository" href="http://svn.apache.org/viewcvs.cgi/jakarta/commons/proper/cli/trunk/"/>
+      <!--item name="Utilities"         href="/manual/utilities.html"/-->
       <item name="Javadoc (SVN latest)" href="apidocs/index.html"/>
     </menu>