bodewig     2005/03/30 02:03:01

  Modified:    docs     Tag: ANT_16_BRANCH bylaws.html cvs.html legal.html
                        license.html mail.html mission.html
               docs/projects Tag: ANT_16_BRANCH index.html
               xdocs    Tag: ANT_16_BRANCH cvs.xml
               xdocs/projects Tag: ANT_16_BRANCH index.xml
               xdocs/stylesheets Tag: ANT_16_BRANCH project.xml
  Removed:     docs/projects/antidote Tag: ANT_16_BRANCH design.html
                        index.html module.html
               docs/projects/antidote/images Tag: ANT_16_BRANCH
                        screenshot.jpg
               xdocs/projects/antidote Tag: ANT_16_BRANCH design.xml
                        index.xml module.xml
  Log:
  merge
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.3.4.7   +1 -0      ant/docs/bylaws.html
  
  Index: bylaws.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/bylaws.html,v
  retrieving revision 1.3.4.6
  retrieving revision 1.3.4.7
  diff -u -r1.3.4.6 -r1.3.4.7
  --- bylaws.html       27 Jan 2005 12:43:26 -0000      1.3.4.6
  +++ bylaws.html       30 Mar 2005 10:03:00 -0000      1.3.4.7
  @@ -75,6 +75,7 @@
         <div class="bluebar"></div>
                       
     <div class="menucontainer">
  +
       <div class="menu">
         <ul>
                 <li class="menuheader">Apache Ant
  
  
  
  1.20.2.6  +2 -6      ant/docs/cvs.html
  
  Index: cvs.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/cvs.html,v
  retrieving revision 1.20.2.5
  retrieving revision 1.20.2.6
  diff -u -r1.20.2.5 -r1.20.2.6
  --- cvs.html  27 Jan 2005 12:43:26 -0000      1.20.2.5
  +++ cvs.html  30 Mar 2005 10:03:00 -0000      1.20.2.6
  @@ -75,6 +75,7 @@
         <div class="bluebar"></div>
                       
     <div class="menucontainer">
  +
       <div class="menu">
         <ul>
                 <li class="menuheader">Apache Ant
  @@ -186,16 +187,11 @@
                                   <ul>
           <li><a href="http://cvs.apache.org/viewcvs/ant/";>ant</a> - The
           "main" Ant module.</li>
  -
  -        <li><a 
href="http://cvs.apache.org/viewcvs/ant-antidote/";>ant-antidote</a>
  -        - Antidote, a GUI frontend to Ant.</li>
         </ul>
                                   <p>If you are not familiar with CVS, <a 
href="http://jakarta.apache.org/site/cvsindex.html";>Jakarta's
         CVS page</a> may hold many helpful hints.</p>
                                   <p>Nightly snapshots of the CVS tree are 
available at 
  -        <a 
href="http://cvs.apache.org/snapshots/ant/";>http://cvs.apache.org/snapshots/ant/</a>
 
  -        and 
  -        <a 
href="http://cvs.apache.org/snapshots/ant-antidote/";>http://cvs.apache.org/snapshots/ant-antidote/</a>.</p>
  +        <a 
href="http://cvs.apache.org/snapshots/ant/";>http://cvs.apache.org/snapshots/ant/</a>.</p>
                   
       </div>
     </div>
  
  
  
  1.16.2.6  +1 -0      ant/docs/legal.html
  
  Index: legal.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/legal.html,v
  retrieving revision 1.16.2.5
  retrieving revision 1.16.2.6
  diff -u -r1.16.2.5 -r1.16.2.6
  --- legal.html        27 Jan 2005 12:43:26 -0000      1.16.2.5
  +++ legal.html        30 Mar 2005 10:03:00 -0000      1.16.2.6
  @@ -75,6 +75,7 @@
         <div class="bluebar"></div>
                       
     <div class="menucontainer">
  +
       <div class="menu">
         <ul>
                 <li class="menuheader">Apache Ant
  
  
  
  1.16.2.7  +1 -0      ant/docs/license.html
  
  Index: license.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/license.html,v
  retrieving revision 1.16.2.6
  retrieving revision 1.16.2.7
  diff -u -r1.16.2.6 -r1.16.2.7
  --- license.html      27 Jan 2005 12:43:26 -0000      1.16.2.6
  +++ license.html      30 Mar 2005 10:03:01 -0000      1.16.2.7
  @@ -75,6 +75,7 @@
         <div class="bluebar"></div>
                       
     <div class="menucontainer">
  +
       <div class="menu">
         <ul>
                 <li class="menuheader">Apache Ant
  
  
  
  1.23.2.6  +1 -0      ant/docs/mail.html
  
  Index: mail.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/mail.html,v
  retrieving revision 1.23.2.5
  retrieving revision 1.23.2.6
  diff -u -r1.23.2.5 -r1.23.2.6
  --- mail.html 27 Jan 2005 12:43:26 -0000      1.23.2.5
  +++ mail.html 30 Mar 2005 10:03:01 -0000      1.23.2.6
  @@ -75,6 +75,7 @@
         <div class="bluebar"></div>
                       
     <div class="menucontainer">
  +
       <div class="menu">
         <ul>
                 <li class="menuheader">Apache Ant
  
  
  
  1.17.2.6  +1 -0      ant/docs/mission.html
  
  Index: mission.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/mission.html,v
  retrieving revision 1.17.2.5
  retrieving revision 1.17.2.6
  diff -u -r1.17.2.5 -r1.17.2.6
  --- mission.html      27 Jan 2005 12:43:26 -0000      1.17.2.5
  +++ mission.html      30 Mar 2005 10:03:01 -0000      1.17.2.6
  @@ -75,6 +75,7 @@
         <div class="bluebar"></div>
                       
     <div class="menucontainer">
  +
       <div class="menu">
         <ul>
                 <li class="menuheader">Apache Ant
  
  
  
  No                   revision
  No                   revision
  1.11.2.6  +2 -19     ant/docs/projects/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/projects/index.html,v
  retrieving revision 1.11.2.5
  retrieving revision 1.11.2.6
  diff -u -r1.11.2.5 -r1.11.2.6
  --- index.html        27 Jan 2005 12:43:27 -0000      1.11.2.5
  +++ index.html        30 Mar 2005 10:03:01 -0000      1.11.2.6
  @@ -75,6 +75,7 @@
         <div class="bluebar"></div>
                                                                 
     <div class="menucontainer">
  +
       <div class="menu">
         <ul>
                 <li class="menuheader">Projects
  @@ -84,22 +85,6 @@
                                 </li>
                         </ul>
           </li>
  -              <li class="menuheader">Antidote
  -          <ul>
  -                            <li>
  -                                    <a 
href="../projects/antidote/index.html">About Antidote</a>
  -                                </li>
  -                            <li>
  -                                    <a 
href="../projects/antidote/news.html">News</a>
  -                                </li>
  -                            <li>
  -                                    <a 
href="../projects/antidote/design.html">Design Overview</a>
  -                                </li>
  -                            <li>
  -                                    <a 
href="../projects/antidote/module.html">Module HOW-TO</a>
  -                                </li>
  -                      </ul>
  -        </li>
               </ul>
       </div>
       <img style="float: left" height="10" width="10" border="0" alt="" 
src="../images/menu-left.gif">
  @@ -115,9 +100,7 @@
       </h3>
                           <h3>This is where the Ant sub-projects live!</h3>
                                   <p>Now, that Ant has become an Apache 
Top-Level Project it is time to make space on this
  -    Web-Page for Ant sub-projects. In the first step <a 
href="antidote/index.html">Antidote</a>,
  -    the Ant GUI, is included, but some others may follow!
  -    </p>
  +    Web-Page for Ant sub-projects.</p>
                                   <p>To make sure you do not miss anything: 
Stay tuned and visit this page from time to time :)!
       </p>
                   
  
  
  
  No                   revision
  No                   revision
  1.5.2.3   +2 -8      ant/xdocs/cvs.xml
  
  Index: cvs.xml
  ===================================================================
  RCS file: /home/cvs/ant/xdocs/cvs.xml,v
  retrieving revision 1.5.2.2
  retrieving revision 1.5.2.3
  diff -u -r1.5.2.2 -r1.5.2.3
  --- cvs.xml   29 Jun 2004 15:03:50 -0000      1.5.2.2
  +++ cvs.xml   30 Mar 2005 10:03:01 -0000      1.5.2.3
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   <!--
  -   Copyright 2002-2004 The Apache Software Foundation
  +   Copyright 2002-2005 The Apache Software Foundation
   
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
  @@ -42,10 +42,6 @@
         <ul>
           <li><a href="http://cvs.apache.org/viewcvs/ant/";>ant</a> - The
           &quot;main&quot; Ant module.</li>
  -
  -        <li><a
  -        href="http://cvs.apache.org/viewcvs/ant-antidote/";>ant-antidote</a>
  -        - Antidote, a GUI frontend to Ant.</li>
         </ul>
   
         <p>If you are not familiar with CVS, <a
  @@ -53,9 +49,7 @@
         CVS page</a> may hold many helpful hints.</p>
   
         <p>Nightly snapshots of the CVS tree are available at 
  -        <a 
href="http://cvs.apache.org/snapshots/ant/";>http://cvs.apache.org/snapshots/ant/</a>
 
  -        and 
  -        <a 
href="http://cvs.apache.org/snapshots/ant-antidote/";>http://cvs.apache.org/snapshots/ant-antidote/</a>.</p>
  +        <a 
href="http://cvs.apache.org/snapshots/ant/";>http://cvs.apache.org/snapshots/ant/</a>.</p>
   
     </section>
     </body>
  
  
  
  No                   revision
  No                   revision
  1.2.4.2   +2 -4      ant/xdocs/projects/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/ant/xdocs/projects/index.xml,v
  retrieving revision 1.2.4.1
  retrieving revision 1.2.4.2
  diff -u -r1.2.4.1 -r1.2.4.2
  --- index.xml 16 Feb 2004 16:45:10 -0000      1.2.4.1
  +++ index.xml 30 Mar 2005 10:03:01 -0000      1.2.4.2
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   <!--
  -   Copyright 2003-2004 The Apache Software Foundation
  +   Copyright 2003-2005 The Apache Software Foundation
   
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
  @@ -28,9 +28,7 @@
       <h3>This is where the Ant sub-projects live!</h3>
   
       <p>Now, that Ant has become an Apache Top-Level Project it is time to 
make space on this
  -    Web-Page for Ant sub-projects. In the first step <a 
href="antidote/index.html">Antidote</a>,
  -    the Ant GUI, is included, but some others may follow!
  -    </p>
  +    Web-Page for Ant sub-projects.</p>
       <p>To make sure you do not miss anything: Stay tuned and visit this page 
from time to time :)!
       </p>
     </section>
  
  
  
  No                   revision
  No                   revision
  1.17.2.5  +2 -2      ant/xdocs/stylesheets/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/ant/xdocs/stylesheets/project.xml,v
  retrieving revision 1.17.2.4
  retrieving revision 1.17.2.5
  diff -u -r1.17.2.4 -r1.17.2.5
  --- project.xml       28 Jan 2005 16:39:21 -0000      1.17.2.4
  +++ project.xml       30 Mar 2005 10:03:01 -0000      1.17.2.5
  @@ -69,12 +69,12 @@
               <menu name="Projects">
                   <item name="Welcome"               
href="/projects/index.html"/>
               </menu>
  -            <menu name="Antidote">
  +            <!--menu name="Antidote">
                   <item name="About Antidote"        
href="/projects/antidote/index.html"/>
                   <item name="News"         
href="/projects/antidote/news.html"/>
                   <item name="Design Overview"       
href="/projects/antidote/design.html"/>
                   <item name="Module HOW-TO"         
href="/projects/antidote/module.html"/>
  -            </menu>
  +            </menu-->
           </menusection>
       </body>
   </project>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to