Return-Path: 
 <cvs-return-19859-apmail-avalon-cvs-archive=avalon.apache.org@avalon.apache.org>
Delivered-To: apmail-avalon-cvs-archive@www.apache.org
Received: (qmail 85849 invoked from network); 10 Dec 2003 08:34:21 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 10 Dec 2003 08:34:21 -0000
Received: (qmail 27797 invoked by uid 500); 10 Dec 2003 08:33:57 -0000
Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org
Received: (qmail 27742 invoked by uid 500); 10 Dec 2003 08:33:56 -0000
Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:cvs-unsubscribe@avalon.apache.org>
List-Subscribe: <mailto:cvs-subscribe@avalon.apache.org>
List-Help: <mailto:cvs-help@avalon.apache.org>
List-Post: <mailto:cvs@avalon.apache.org>
List-Id: "Avalon CVS List" <cvs.avalon.apache.org>
Reply-To: "Avalon Developers List" <dev@avalon.apache.org>
Delivered-To: mailing list cvs@avalon.apache.org
Received: (qmail 27729 invoked from network); 10 Dec 2003 08:33:56 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 10 Dec 2003 08:33:56 -0000
Received: (qmail 85795 invoked by uid 1438); 10 Dec 2003 08:34:20 -0000
Date: 10 Dec 2003 08:34:20 -0000
Message-ID: <20031210083420.85794.qmail@minotaur.apache.org>
From: mcconnell@apache.org
To: avalon-cvs@apache.org
Subject: cvs commit: avalon/merlin/platform/xdocs/starting/installation/3.2
 index.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

mcconnell    2003/12/10 00:34:20

  Modified:    merlin/platform/xdocs/starting/advanced/unit example.xml
                        index.xml
               merlin/platform/xdocs/starting/installation/3.2 index.xml
  Log:
  Housekeeping.
  
  Revision  Changes    Path
  1.3       +1 -7      avalon/merlin/platform/xdocs/starting/advanced/unit/example.xml
  
  Index: example.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/unit/example.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- example.xml	25 Oct 2003 15:27:07 -0000	1.2
  +++ example.xml	10 Dec 2003 08:34:20 -0000	1.3
  @@ -96,12 +96,7 @@
       */
       public StandardTestCase( String name )
       {
  -        super( 
  -          MAVEN_TARGET_CLASSES_DIR, 
  -          MERLIN_DEFAULT_CONFIG_FILE, 
  -          MERLIN_DEBUG_OFF, 
  -          MERLIN_INFO_OFF, 
  -          name );
  +        super( name );
       }
   
       //--------------------------------------------------------
  @@ -112,7 +107,6 @@
       {
           Object hello = resolve( "hello" );
           assertTrue( hello != null );
  -        getLogger().info( "Hello established." );
       }
   }
   ]]></source>
  
  
  
  1.4       +1 -1      avalon/merlin/platform/xdocs/starting/advanced/unit/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/unit/index.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index.xml	10 Dec 2003 08:21:54 -0000	1.3
  +++ index.xml	10 Dec 2003 08:34:20 -0000	1.4
  @@ -147,7 +147,7 @@
           file to your basedir.
           </p>
           <p>
  -        </i>Example merlin.properties</i>
  +        <i>Example merlin.properties</i>
           </p>
   <source><![CDATA[
   merlin.info = true
  
  
  
  1.2       +8 -2      avalon/merlin/platform/xdocs/starting/installation/3.2/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/installation/3.2/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml	10 Dec 2003 08:21:54 -0000	1.1
  +++ index.xml	10 Dec 2003 08:34:20 -0000	1.2
  @@ -61,11 +61,17 @@
             <tr><th>Topic</th><th>Summary</th></tr>
             <tr>
               <td><a href="cvs.html">CVS Build Instructions</a></td>
  -            <td>Instructions for building Merlin from CVS.</td>
  +            <td>Instructions for building Merlin from CVS. This section 
  +                includes details of the relevant CVS repositories used 
  +                in the Merlin system (util, repository, meta, and merlin)
  +                and the procudures for building the respective subprojects.</td>
             </tr>
             <tr>
               <td><a href="binary.html">Install Instructions</a></td>
  -            <td>Setting up and validating your Merlin installation.</td>
  +            <td>Setting up and validating your Merlin installation.
  +                This section includes details about environment variables
  +                used by Merlin, setting you PATH variable, and validating 
  +                your installation.</td>
             </tr>
           </table>
       </section>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org