forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: rev 21410 - in forrest/site: . docs skin/images
Date Fri, 18 Jun 2004 06:57:48 GMT
Author: crossley
Date: Thu Jun 17 23:57:47 2004
New Revision: 21410

Modified:
   forrest/site/build.html
   forrest/site/changes.html
   forrest/site/changes.pdf
   forrest/site/contrib.html
   forrest/site/docs/cap.html
   forrest/site/docs/catalog.html
   forrest/site/docs/catalog.pdf
   forrest/site/docs/compliance.html
   forrest/site/docs/document-v12.dtdx.html
   forrest/site/docs/document-v12.html
   forrest/site/docs/dreams.html
   forrest/site/docs/dtd-docs.html
   forrest/site/docs/faq-v12.dtdx.html
   forrest/site/docs/forrest-contract.html
   forrest/site/docs/forrestbar.html
   forrest/site/docs/forrestbot.html
   forrest/site/docs/howto-v12.dtdx.html
   forrest/site/docs/libre-intro.html
   forrest/site/docs/linking.html
   forrest/site/docs/linkmap-index.html
   forrest/site/docs/menu-index.html
   forrest/site/docs/oowriter.html
   forrest/site/docs/primer.html
   forrest/site/docs/primer.pdf
   forrest/site/docs/searching.html
   forrest/site/docs/sitemap-ref.html
   forrest/site/docs/sitemap-ref.pdf
   forrest/site/docs/skin-package.html
   forrest/site/docs/tab-index.html
   forrest/site/docs/upgrading_05.html
   forrest/site/docs/upgrading_06.html
   forrest/site/docs/validation.html
   forrest/site/docs/validation.pdf
   forrest/site/docs/wiki-sample.html
   forrest/site/docs/your-project.html
   forrest/site/docs/your-project.pdf
   forrest/site/faq.html
   forrest/site/forrest-issues.html
   forrest/site/forrest-issues.pdf
   forrest/site/index.html
   forrest/site/index.pdf
   forrest/site/license.html
   forrest/site/live-sites.html
   forrest/site/mail-archives.html
   forrest/site/mail-lists.html
   forrest/site/skin/images/external-link.gif
   forrest/site/todo.html
   forrest/site/who.html
Log:
Update whole site.
The Community and Howto tabs are removed until we decide what to do with them.
The docs still remain, but are not linked.


Modified: forrest/site/build.html
==============================================================================
--- forrest/site/build.html	(original)
+++ forrest/site/build.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -55,33 +55,24 @@
 <table summary="tab bar" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Home</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="contrib.html">Project</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -124,45 +115,6 @@
 <div class="menu">
 <ul>
 <li>
-<font color="#CFDCED">About</font>
-<ul>
-    
-<li>
-<a href="index.html">Index</a>
-</li>
-    
-<li>
-<a href="license.html">License</a>
-</li>
-    
-<li>
-<a href="http://www.apache.org/dyn/closer.cgi/xml/forrest/">Download</a>
-</li>
-    
-<li>
-<a href="who.html">Who we are</a>
-</li>
-    
-<li>
-<a href="faq.html">FAQs</a>
-</li>
-    
-<li>
-<a href="changes.html">Changes</a>
-</li>
-    
-    
-<li>
-<a href="todo.html">Todo</a>
-</li>
-    
-<li>
-<a href="live-sites.html">Example sites</a>
-</li>
-  
-</ul>
-</li>
-<li>
 <font color="#CFDCED">Getting Involved</font>
 <ul>
     
@@ -196,28 +148,6 @@
   
 </ul>
 </li>
-<li>
-<font color="#CFDCED">Related projects</font>
-<ul>
-    
-<li>
-<a class="external" href="http://gump.apache.org/">Apache Gump</a>
-</li>
-    
-<li>
-<a class="external" href="http://cocoon.apache.org/">Apache Cocoon</a>
-</li>
-    
-<li>
-<a class="external" href="http://cocoon.apache.org/lenya/">Apache Lenya</a>
-</li>
-    
-<li>
-<a class="external" href="http://xml.apache.org/">Apache XML</a>
-</li>
-  
-</ul>
-</li>
 </ul>
 </div>
 <!--================= end Menu items ==================-->
@@ -348,7 +278,7 @@
 </div>
 
   
-<a name="N10080"></a><a name="run"></a>
+<a name="N1007E"></a><a name="run"></a>
 <h3>Run Forrest, run!</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Forrest is now ready to go. Type '<span class="codefrag">forrest run</span>' to see

Modified: forrest/site/changes.html
==============================================================================
--- forrest/site/changes.html	(original)
+++ forrest/site/changes.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,13 +57,13 @@
 <td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Home</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Welcome</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -72,16 +72,7 @@
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
-</tr>
-<tr>
-<td colspan="3" height="1"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -163,40 +154,6 @@
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Getting Involved</font>
-<ul>
-    
-<li>
-<a href="contrib.html">Contributing</a>
-</li>
-    
-<li>
-<a href="build.html">Building Forrest</a>
-</li>
-    
-<li>
-<a class="external" href="http://svn.apache.org/viewcvs.cgi/forrest/trunk/?root=Apache-SVN">Browse SVN</a>
-</li>
-    
-<li>
-<a href="mail-lists.html">Mail lists</a>
-</li>
-    
-<li>
-<a href="mail-archives.html">Mail Archives</a>
-</li>
-    
-<li>
-<a class="external" href="http://issues.cocoondev.org/jira/secure/BrowseProject.jspa?id=10000">Bugs and Issues</a>
-</li>
-    
-<li>
-<a href="forrest-issues.html">Open Issues</a>
-</li>
-  
-</ul>
-</li>
-<li>
 <font color="#CFDCED">Related projects</font>
 <ul>
     
@@ -215,6 +172,10 @@
 <li>
 <a class="external" href="http://xml.apache.org/">Apache XML</a>
 </li>
+    
+<li>
+<a href="http://www.apache.org/~vgritsenko/stats/">Apache Stats</a>
+</li>
   
 </ul>
 </li>
@@ -1718,11 +1679,6 @@
 <img class="icon" alt="add" src="images/add.jpg">
         Validation of important core configuration files at build-time using
         RELAX NG.
-      (DC)</li>
-<li>
-<img class="icon" alt="add" src="images/add.jpg">
-        New document <a href="community/">Community Resources</a>
-        including draft "Apache Statistics".
       (DC)</li>
 <li>
 <img class="icon" alt="add" src="images/add.jpg">

Modified: forrest/site/changes.pdf
==============================================================================
--- forrest/site/changes.pdf	(original)
+++ forrest/site/changes.pdf	Thu Jun 17 23:57:47 2004
@@ -1281,10 +1281,10 @@
 >>
 endobj
 122 0 obj
-<< /Length 4401 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 4323 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gatm?=``WC&Ur?8@-rm'aU03r\!'G7*k&DQ2j3Mejn/]]%*;Z2?j;.A9'*gc#9\P7!!<gVm';PBd)YeNnTE1Ie]le/pZBV/`d2d64^5+5BBEq<s2+fp/!'L\l.`8.FS4tk08qpKXF=C0]E9(MUM8UEr?Hm*4q`5r*dIV-l@M$RfCQ6H\>aZM_u60"hER<QoT825kEKUZs2;6A55(&3kWb[U4Q0/Zj)ZCi6Z8aG7C@u+K_KO:G[^5oq""@=c'N@['q:s5f+p,Y,?SJ"dkU4?6D*gqZm$r?ffr)XaCQg+h6bn>5J0GR<Z,(jZ-THR)?)gd[qH_dR(RaK0msa:"a\D%ReLR)s+9s1Df`R`U-tH'8Bn><;9gfgf8\!mn[9_f]D]u6>*rK9bm`0,oulr&mpA5gF0=sNcB=`>rP2P81#Ga,U_JReIku+[E'hJZ;t%\CT>5q&Q7R.TZ5!\l_NY_S+T.>L;4aXFZLgHRXa!qd%'Jb1efp:ZJ\TR-3!d=K,VMc"':(;Ud7(F_mSBQc)iA1[Hk8a124:A+b/@c$Kh]gRn&A8\i=)%4/IBg_h`(CH!^^Ed)(#[Ch/$O2g?4rRR,&NWDJek2DU/60esL`*ou$'rZ*eAuM'lT^YY34.^.;Z#I)fIIYHH4NEVA[pV3JUB@(0Cl-he_3:hmoXpk(h]?JpWj5@ECQL?l?q#-F=7+]@qI:\Nc!UT1i>F\L3+``!og&f.<jf+.Y!%j(^3C>_84KSP32T/Vpg.)!Zd`Y29J'I:Bko'lfS`h>el<+RdSV<Ha)p\f_YYY3HL(?YnF0t]r@ZeRa@J'@A#=@A=m\?:p^[a/rH-2B/HVCf*qb7Y&*_RG=Tb%6<eOH9"Y73P96mG`:E>j'AKfYT,VXM,$i$u^8p;fHQWK?V(3`'HIikQiE@2Z2k9V@j3\=e\=;p#R?U0_mHBS^SUP8WJQs2%2$Bk>@9,r+GXLaLL6F@m8OK]tqAs@'c!3S\R*6bAHV/,3kf2/-Ha&2AkT$en]G;RMVjujJFu0D_UAH4]Us_hII@kb7]#-,3#gP8n2X#`-I#@T@B;\a7Y?,&^TG;f#46`+Se?ZP2Ep$g*!P.XHsb,hRAgj,_CWXj-jX/:9Kal*6B\d:io:/0obNJcaLh\MQju]&MA5Ei*N3n"V.#8jH"i,7V!\1B?4[V?ABYT34Mha)35rGirC>gg9:tbUY19^fc@]-S<ujhN%`BHE&kC5//Su=d!c!b?()*@$_h$cP?<@UO!=TaW0%s8CK1=TEcJFied&.2*#D)Pjk2ZN2bp(oaq'*E(o3^gP[K(9RPemNSk)I/1+2[Voq[</!-[%;7jahGMfrJG%OB2=j]d7\r9fITqSG=i_i@?rf;@Bi]TNkV))\C/"O)8f-kDH!*52g*r$!&0k&UgYOoY.DShrV9-mTAk]KfI(HDO>fEsFB"MuaiO.#9%.,!Ne>39:cH"mNLJriSX_2dq7p`B+I.&ooI`D;VG^?JAm9_\A4,$`sX@coMM*Mn"$P8SK:(gq7p+dJb',HA_QjcYq4#1<9%iia&ZbPFo^;o-lpIX,*(H0-C`pOiTB6%ibTS9Q,Y41"ref,Cjru8@#i+oMh=1IXVG`,C4`95o9K!%q.i.od6D0S*4\/1!E\WT:;QN9gGtS6D\C@^gdM+O/%+U,0aXg'tT*5gU=p](G,jtK#)K7(e1<9//2\1QkQuuD8iZ@"!24RJIR-.[]4*ZV+;2bMYcDaG9:/jdQ`3W@4C->R6R*RogSt60%k[4W-YimWl`eB<B$^3o8_MXFJ+FmXS_.Ep:b$gP^&asBpFPG;-,"IEg1*]?LjJ;4^c+W(1;Y1(7ii6;P`ju0C$\X9GA5MG)r.*!MI$"U:<.J+moE(%JuX\&j39E78uBRlkCebnKOk2JhHYY=`K7Qfm%12Q;VNKS/uWKKGc6C,hjD>3%c]f(AQKU*^BW5!?mRNpgjk7'ttlU]OG(70S<>X$H6Cj(ZBSC"9m:0s"[pg2=38sTLCrIApqpK)9695a^L6F>k&(//t+8+nIjC)@K75M:dnUQRP>@Wkm_NJaB8ddmEeMP[_o6MWn0%$PrRh+X#9+4o(rJuk\fr^N+VlO?ao`?H2.+(1<BR!W<phY55]K$luC_M+o?N,&E!&KA]7.O"M0SGL-!YR1@-8M:=>)Dk2='d_ITMO21^;c%BbD$B<R<1lb>G+<VKbF69[cOV45I7Kda4W]\"qHCWOAF[SP5B;mmo=b.^`73hAsk8#GM+Vm)EIZ=S/Z&Tm:;D4U[2$bYM2q054[`_Z^^:-7RtJY*ut(ddZ.45D=1\86K\i<2-[&H8%_E0J+ph!*pnN)dnD8MnNa\\-t4h'gG8GYC%.n9311.sc_$*WFEen-<H1ii1(WJT!Ql1,rf_I0M'4CQmqjXQp68M?GU3&Ra^lo5].1'=![nI(TTVo)Fh-/.Z4Ap$:.sFl:s=[D;pRqrX--d;qT#GgGhHV@bm(U;U7,@`L%$+U\JSbaMtf*TD1:8DU>ZQpPpY;tTLA8V=9Z%@G,9^5rrZ1c9k"AB]obe@%u47hW=+kH[ZM!g%]8gJ9ln?>ske#[e:*f)g;olCG:L^1K+cT[0h/!G]@Zj%o\h:baV0n;$$/F_7(Toh#15B8gEt^;6`JBMK'X'#sL3'hf)%QgBkZkYh;f:&a8N_i89@>7iQalM[r2ShV[pgBo-0[XH5.T.l-_]7K_Q6RI<@;@<#tAW;EgE&>Zk>L8=tX8s]mDr<DCKH;slG5&sIB?_G1U_L1A=WGSocq1*TP[J]9n<ec"))07:;i?r/Vf,4be:m&\O9fN=p_;#Y]H_&W0fN[Tau9l!rUYC/]Na*=1,i<91)\RN?-.Ia\sR-*J]T</i[tMWhE+!Y\fO7Mcn43UGFX+sR]G[ORX,U"gSR+e7e7kli.rZJ*A=<u%s,Ct4<0]GD&$-8=GulN$K3Sn9#/u8g7B4=[jlinm?M>(`/L/VluVNVi<C7l,p"E2FS,[<JK->kMd@g8@8')#I:@=-B0h4\<h,aMUJa[hf(iYC/Xl?V;\J@2j>:d/Z^BBfCQ/Ni.24g`7H#3nk)QeKBimiOX@9Ds/!PD:X<?YfTX1W6J-:fcXY<3h!uh)@8d;7MhiN79pS"beaV/]L_&(]Ndp#qH9Fo[OKM88Cd3PIXhZHu"M[rh0ALmoD#%<SGgl7uFSHrjN!V9:L?rZ@kd,N%^A^)AK7j3O/cTcr^!+IT3"`+""mKq^GI@N2BnY;77PpDZl$&B:JmGN:5R6OGO'O>Mh1KZ;G$d?E9ZipGn[&uhm,"\Mu-lp4K[*<QT-3]P6M1*]SN[X3Yq[R0Gg#f16C\Ql4laPJ*/!j\-n'DFlc\YbJ]Qh*@n7!kUR\&-_T`!.VXl>'`XEFqTl?LcC+.[_cW\3.OGPY-@^[3X7Qi:\k.=@#S/Se08U_L(Op(R%7==*%\9APR_*Y`#0KEs./<g:L'CB&W8D,U_TBS]A:3Z@drR&ku+,cF@.Ko@Y=/tm/20<$k-m0Oor7JY'4d$a=jhifb6kG1oanH^X;_Lf]5Ys#ccM,W9pXq/Va2?#+>4Dl[.?SNlEl?#/R`En]KTH\#[0fY/bfJ\JEQ&jcmI,V%!`Alr/@Md(Q\aZ+k&a2^W^S`M<c1Q(&D*#p4]_uG6=%]jr(UX"lj&%9n8[[]WN`fIO(;<jGo!BtEj3a/,C&==R!ZPMCTtJjc+O3RuYo"$#(,gPMT:g-nMA3eOWB/t;jEU9:`[nb'$YGf]Fc)nF+]9"(.[l3TN_]rDB!O*8BhWDCEn<0N0]P\%S=q)oMUp7'*pXL\E),_e_5s^mMdXU-G1L4PphW``'Q2:B['g(V8sD1dC<XO5Ycu?E#4G?'gQ<[sO4Qq"BDDYTBg%6CPr3#*+931;H^\r$;P\23R78DNb6c1h4)$M`/A1`jT^*GI,d6SST&Fqu)BR;\98"SGLd[JrVPH0sprpAghVstrDOi9X9l;1b38q%Qh4A!UU>()kbO]gO?=-T8HmnD9]Op/u>:*EV5scS?4jEIP*=8_"cdYp8^h$sfeiqF:_^"d#TCIrSk@O25M3,493f']K%75Psf9g?+VdUCo,IT@DDEh0"fD"P_\C'2kVYTSD^`$cNDH_;0EVac2!.XNDA[LT1cXDoWK'nOqcrA$f)=h8c,E9cq"=;Kb'ffl6%2_@iFS,4]gngi7H@Ao0;sg_li2kTeAZ).h3rZFQK7g>V$p8In2[uT/^NM.P.1XENkSZO'h3[eG(u8_7'WT3dF@rW`i99-'Uj7^SP>0)qchcOms'6?+I*)!Gr422Z^M\N&K)KA,VO4;(TK+O3k.as3c]NU_D/ZZE7RBrMNab5.45S-eYf?!`&q#L\[Y#R:F;TPIQ/DO8iH9ToPj0X/4f9sW;>9m7bHB+HN4#*=eSc5eRFg%F@\[;err>[%Vbd~>
+Gatm?=d.U[&UrVE_:$NLM&&_m:-,@R8QslrBgoXWS?i%m!^h"83#EW^<%@o24ZL%Y(bB+90"VBAqO!j<^?ulQ\iID#hHZJm=KcUcBC"+IbZq:/?hcj5jY>XHI=$+#XF>TsKe_b[eShLX[m9!G1u8&+h\*HbQJd,[^nYgK(X/#SSd30RD7(H,mLMGC_ddsW%r!qL:3]qO:HU6#a5Kl0_rpWCa#knuFA@Lbk\]t&W4%i0iVb;D]J,()I!P_bk0#^^MTsP+CC?Q=YutT\dkU4766EO\[%]\/o&2=da"/l4\t<%#p%p]3h'tkZ0+M,",K&DOq(:<T1a9-[CJ5fS<Il3tS`[UhmD#=-jgtriV^RZS!E/N)<Ksi5rH4TB[s6Y:Ol$(LZkfN>>r.+U<rMUej1AAgm[WV?L9kFR>^p7bs-R^P<EtDkN5$5j2)lc=Ml@4rIu*'u&ka"OIG'IEVa81V@h=)[kqGbn$sEFoo::,.)@We3(tKmp!eJ,5Uc8XqdrJcZ`\o5P@&&YLJDHhc__)Mj[.ti%ctdom9I^^4h$u>#7D9`&iXTV*$u\^f?MqOb<tc,h/]o2ramQ#>HdFq5*.mgkTQ4gpIs5u-n$C$XX3X#3c5Kp!At=10Pmt@Dm/Dn[p<Ilpec"e0llTlDDE>pf^J]6uAOCM<0aVl[3/'R&o]HC<)#+F?De$;;X(TeYfb5Pu?h*n&Hu2m&"g2Kq?8eDGE0.:Ph7NAm8GD'$^S;"io5/G/CAiFIo)PW]W7#p",)UuJf3^_S8'*a3OXF.C`).t0HhD9$0F`2>)V3p'?o`tNaE!S.V">2N*=du]k7OjIUo#.f*+<iqc\cFpCpUFc5p#V<+q1e?`C@qgH0:n5-*h]63uP3mAmoLa'k5`jKg#XK3j0tl2V9b1^&l5=4'^tT6b,,QlM7k$1!Wpr7+q7p0aKLZS)V`X%aZKA"/Hh>(9b%u_fl#8q@dCEET@^5[T7<cD["d0A8l2A)OBJCp2^i=cTEi`(;;[Dk0;ImG%$gUVYfGO3hC7DkO^p&n%7Fe'qEG[G<mdSTHm->CHb-hLg6S%RP_qTM\dO4,6_lB:]ZZ*TgQq'YFd_/lPSq6#(cO9jTZ$b+RZceg52$:U`"l3Q#%n\,h88OG*o*fiup_@iLU;kq\4!&d^0(2NA^8s5[Z+j!;A9[ZZ9B-+G)S_;5b@n+gL&-,]7JOLOX+5c,f73>uscp,\9H3ATGGRgFfoP&Ot,r!Cg@`$69MK@#:(LJB(lVs&<`DMVB'&s.!?L/?JLVWZoK;;/UZ*Nq\NsW!Tf*i"60-V^3WkTY4s^>.c5G;BD9jH-(B\_Y+1WflT_2T#?Q\`\JN)Pf_(W!;$!a(F/R+G=[K0V.d&*]@U2NL\t`9Uok:`oA*Fg+rNCg+.CkOW.=#O#h>(<o\c;t5"@"H&FI+q<=4&KD2`N@0EI+5)?qUG+co$ni$b+9$)W=H>=!a?,,X+f^ma8RKiNtW.ZeN)XR0?K@@mc2+R^+M%ht[Z(m#MQq`'be4^QrL^!LGB%:q[gIF"fMkfl6-o`O2ZY#COVJpHrZ5`f%j/Rr-Q*0)5*C:53D!XtIQ$r(3<?%5*>h&_\hFoCj02QQ`Q$@526GZ@$GrDX;96a$)/U/7?CCr\9S:>qh7U/+KKZ(4:Z8T;UX"H8DZ6RG.EA4IEHKk];M_*&Sd#7*61EjQZQ,]YFMU_K10\=2j(^<.03Er(=rJ5`nXCDWg<&=8:NjQH!g^\hYfr:n0-^gf0M1=PNJ!X*qW,@eOicRn[7Ub$SlXfs0\!sC'1H4nkI[,MK,@tB-cB$oYr0]%k#r%c8<ZBUNG9eibpOFl)XS=kgS6MrI%+>Fbr?Y2r.Kl'0G/D:CQkgSqB-mHimNsCopMFZlA:]n8G99^HsJdmsEUePSua,a8IK5iF[HXdbN?@'%Y!@B(lB:=KmbQLs>!Qs)DJ`0KkA>2OtZQZ4fb4>>pj^jrJ@@#15[m'_2.ID+8n0.[Rb.Q<rrFK]lni&qi<&YG9V_!NIYg;j]JYn'lWs"UdMODh%RLE0bl;X+OR(YC9hXJc=6aqUS>0&(Af"/\e.R]0%k/E?`==O[h&AF`%YA@!jPeE7D.@Pd3*E2Uu;e=GKS7Qh4'(g>/9cD"dEIkU3/0@Xn`^g(n_.ffp4S$rG%ASVEE2T2:(mdt/V%3AHN7Q\kK(1*6Ei57V10,EZ,gdatkP6.=aKd4Hp-`L4n<V7PH:;K.e):hIPWp"?&i\/b#/7cRQGFku2M2Zf^<NrfejI6.,0#Oj"9``&]U[j%=DW'BfIqfSr-tLNbCeGiI8IXDV[;E`B_F?%s32uAA)Mr4n;cC_<$PEY,/maW@`L#NPm)4<f:$-qcg,pUV!dEI-mhj3^_FKZAC@\)#;#Ed$]PAtCmpg$#r5@F(i!-knKS@q#,H-HOoY'Sg)hZ4o,p$&<sUJda(p7>;8Ql24Ju<jZ\JD3SWsZM0`L\ddA4b@"b12MaQ'NVXUfRS4(BgEN>WH2IE7O<_H;8CDQPi*;`bPh/Hdiq0A#Z21m>S0J/MMYeM_-]Us*cu7YQIdlX<8&3@'Pmc>MQI^<5LIgco1eS@uj_P/,Nla->JFoN3u!_XreC2;j.)S9@S:HC!ODr>-h%/+uYu;V0:`76qt03lt?]'^X*P*]%aa"(p5/C=.(cp$F/i]!&I$(^k"rp_;#Y]Tt@JQl@H$cF+9O_t,tc]O0BA1>c891*qLSAA0?qbd1/b4A(aG$c91C(/VKC#8&D,9/tJ0K.]l>2*I&)Rss-N*I':W'kh4_,_>E03<aaHeCVDs[*-FsMQ31KMtU$]i@WnYa'I9i0ZP,Qnos=aH=fRhW&_FOa"A6GYp!K6@DYg4hr?SUP9bIP#N[h%M+G*OXH)6jW3F6udpkmI.S82P5NI3I`k),5KXq=I\5?iR'>#lDS'IfRJO2k%UX,WAmR[eJ"D)hn>/Ycl6@$r&$6gMuHMjWK8AH(k$=boed,<Lg1,I+[/_R&m&Ep]t/10Cl^:6@0l\5!<#_r0iPK?c]RRHfIHNX`EnG*s4G=-nN')%^;h$?X.M-pN#0M`Go7[7#)(,s5]CCXK-&g=29Im:ANVRNcD!5Sut'=p*t3,M@K7jWp?8M!LJ&1IfFjX(h45>Ku?>](8>3u54-Ci*tA!e<jGf-5uF,gf>N%e\[h1L-bJJYYP?ht)jQau[n`6Q&8"q5M0`rV5s[br*ehAIrL$oRb;.,1<#-[7Ak&V@oc:0o$[3*Lftag^jY>?=HPJD]7i7"--.,V;#m6hQf=4'(h%\V^\J3JYBNR6+P'X&a<ml&`3al9MRS.2&P@>!Z"Ld_")D4WP2:-hhu3<6MQ6a2SnTJnQdkP#u)5,aVK/Hfl[UD6[;823GhP3F'3sT"O8+HP9@_4@SdR)#V1jdK#A#$4hWA$;r6_A#K[H5r[VYEmOF0&0d]_>C/=N,QR#)"aD"d*#HnfqAt^Hqef0H![#/4L6XDBgELa:f-_)N)[%mKTe!-<FC8][\du;5WDjGLA7&tf'S$/$UaH0<%H)Y9hQHDN(gg+:5U=Zh$7G<27(OjBu4",$/[TUpL)mN3F,RYR*Ytn3+-UeALkYtQl8ibb@S1tCI@DOMDYYJ'&,=IDU77B$&dI@P%ge8Jq,`To_9('7pgW]H?0P>&)OeVO@Sjth1(!]_.AmX&U`C=D>46s0cI!-W$$9.0\>$H]c'P5OI)RHX^(7)M1_>D^8p7t76p;Xo?/77?EZ5B't2.E6j!"6h1c+!j);R`i'UCidQCrWM;Bf'7e$ZCJbJf[Z9BjTOS4Mqg?1d7X8<<u1#'sT/ED+S`+nYpdi^;X*;>VVNURTr"nJAPY<\cY5%7(<&P(?k"c]Y9N:pfMpMn=n#/h)"lN,q.9ZdaJUhe!#m9rCkKo'eU0+YjQf1dM813reu'^*A<>Kc@l+L(IENJI1Z7-X2\CK4:f'>*jNn@k,MXNlT/D/D'o+s^a,D_s&J)QaA*-3Zq[/'b)s3sY'diEgN+4-SPB.'.<qlUJIM>ta?tqX7=l4fc&*JsYS7;'3ZUA35C)MWOIi**NtV<t(H?>V9V'X.,<^,$eA4M=C)#!`]"hY7jJQi`R#<20$[PE@>k_fX*C_uW)22gpQVNCfpDc>$M^1rfN)+*F4Wao7+pk3554[IplK7@u\TS?fNEZ`9jHLU7ppZDYA#B6=jThCJS=Y=SiR]]89m_ZAL*'Y">nl+*c1C84Yo>mAmXF>Lj(EigRE/`<3@hT$^Qq)Nan]]'?.7AhEHr2MMZ"7Uq&j=&2-r5+&3J+B*>AdV_[ID?rFPoYg$pe`^Jc.4I:8/K[-h.Am;C06YPD,qAq?P!I1[b\L?8@EI"$!)~>
 endstream
 endobj
 123 0 obj
@@ -1305,7 +1305,6 @@
 129 0 R
 130 0 R
 131 0 R
-132 0 R
 ]
 endobj
 125 0 obj
@@ -1333,18 +1332,7 @@
 127 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 93.984 436.932 203.652 424.932 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A << /URI (http://forrest.apache.org/community/)
-/S /URI >>
-/H /I
->>
-endobj
-128 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 216.312 384.132 279.3 372.132 ]
+/Rect [ 216.312 397.332 279.3 385.332 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (mailto:peter@apache.org)
@@ -1352,10 +1340,10 @@
 /H /I
 >>
 endobj
-129 0 obj
+128 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 370.968 344.532 426.636 332.532 ]
+/Rect [ 370.968 357.732 426.636 345.732 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (mailto:Kevin.Ross@iVerticalLeap.com)
@@ -1363,10 +1351,10 @@
 /H /I
 >>
 endobj
-130 0 obj
+129 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 126.312 291.732 234.636 279.732 ]
+/Rect [ 126.312 304.932 234.636 292.932 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://forrest.apache.org/docs/compliance.html)
@@ -1374,10 +1362,10 @@
 /H /I
 >>
 endobj
-131 0 obj
+130 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 126.312 120.132 356.628 108.132 ]
+/Rect [ 126.312 133.332 356.628 121.332 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://forrest.apache.org/docs/your-project.html)
@@ -1385,10 +1373,10 @@
 /H /I
 >>
 endobj
-132 0 obj
+131 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 495.576 80.532 556.56 68.532 ]
+/Rect [ 495.576 93.732 556.56 81.732 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (mailto:mpo@outerthought.org)
@@ -1396,35 +1384,35 @@
 /H /I
 >>
 endobj
-133 0 obj
-<< /Length 4200 /Filter [ /ASCII85Decode /FlateDecode ]
+132 0 obj
+<< /Length 4177 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gatm?D0+aG&cV3*U%&rr12!&Opnfn4bh50eICXF&Z'0@.mK\Q",b.GX!D(?#YO@'hi;t98ELP!S`h\FpG-Q;cfj4C<n`98l)gT0XNZR@2mV$V"NEl5hrXZ2A5B4=](d7#VJ"Jt$Ie[gQT@)\3(_c>Xm(W4Wm=<:6%Nr(qS\5tJpn<jnISZU3c/['fPXt]j?F:;"T%5nR.T/!-['+8eMFID5g)ndI<]k;mYBe:\aA919JlH!^YFa#]m[rA'2=W_r1n&cB1[3<bj5\6'-_&FO^O@)lCp\qXIF("s"g/MmdJcQ=ZB?m_X[`mLs#@Q8e-rgO+r2E@L0j'H3ucHJR9,]bNQGT%n_r._!lftF(mL$k#hZ8#57jr=c@qq>[T5aN9GJY@WZrWE"F-LCDu@'\],ukF>B-6/M6Lis+^.SU*1j5^+tuI$d?m><gZr^3lIN?perU7qNP34cF[R&K5X[GKr5fPBcjiL&rQ>/`ZA`T9N'YF@rN0>sq:#0<03<(a8CqqB6!34Ec.\WfG6P#aa]]BdH-&M*54c>(^6@3+U8446h/4K_J$a^Q0hp!)hTJ/7qSK+]p6j!_2WE,nF-<hf<Nke10A7KO/MiPf"e4o&3C^Y'/uP4(4"km17D[gOj,t,&Z@/mc`?+%B>U$ug$/>i;IPStgXV@Sn=!CNmf'.7kXK^poBC1L/#(VLPFF85ZCa/Rt[i^K.q[NIY;:2_(X^(M/o7h`b8`GCjr&[Ltc)R66+7rZn,31Y6oS-Sp9<':,EO3q`1l0:RYYkk(>J,/d(>>ZV7FrptSadh.@6h-Iol_-cG&shN<3ck5SfpUq;Ooo!^__N-Ua4.1H(*;86P;tAN*4`\N6*BSY<!]9T:a*',k-B&`<+fQ(f6,7Ii-"""82j*[Y6:?bJ"d7h*/nm<ZJI5*RjE^R<7/,hZu2j>%[t0+]S\QBqu3m-l$"0MlGWM8Hmru=]6mJl29h5[uD.K^"ghLZs_<O)rm_J1GG?U#YGZ'r5)ueMAud[c'!kt=A/6=$/Dr)@cW,^JLRU2nEh[9R*eq21+*J^#[FFY9QY@S[Y`#_Y[A?.UDBj<'1n"F)-ZWibcngb)25soD8A`[$)GT^Eg=7tOlbrsWPn3.qN.C""YF=c+Ia<!6a^Iq4l1;qq6Lt48R>6H5=[<qDmXB*q*(,1Ad,?Aa6:O'CsK8Ll\C8h@0IRb&^iT7-kq6j3"/Pj5[rF6%Kt^2XG6sV(NT"S_auZno$i32ZIi(%N9.,`ijE8cS_Nf[UeHUfdu0/JURb@T3F&K#+,3<p1:ABiH/);Sr8g^8DL]rG)f@#o.gEgf(qV@Nh6Ii5Vi5>C'd)\#%ki3g/6\2?[90*$=o=)7c\kE"BrsWAiJ0a5%:9f?^XjQi:m!@J6jiS&HAPDI)QuWWiFWOo@FR"?itdrp;R+#\SX[VL-oF?RSG1dok'T\!&WDL]Ql<2aZ!Sqj8\e0qUP)e/@T*Z_TKuWO*2*JS3e2Pt(?Ail3&i=tM>F'QU7r$_(!0XcC5J[!a54-cgI<MH5iOkN"r9Z\P_SZ(,#:1A>L\>Mmt-cL?..PZf"Y4um%P2/S\i`tp^VVt5TKFU('j;sPT4IaXZ0kuhM9A]3q<QT'S".Bs!iSRC$Ru-/IC8'5^7=%"!r[`UVm.Jq"j+kJr)SU/-cil4j1UgS?K.#lN3`ZW8O:k0%B;5PTq]AJJT0;@JJL3@BIiIFT2++D$AsEfI9l(Ch*]NJp@BJ+!2_^1C]kA@-.Y`O4PSpS4l/>D8aDbLLWg6HZOpO2F`3Cc,p.3r(rJf7P(:KOqfRmMRg%hn?X!#_(a`B#"2M4dYp/\V.'QrqMIK[Q1a`/WH#LtW`2;V<^e,ViUBRgbS\(CN091X@]G&Mk4!_3>86SY6Asj$>:_tWcCj,Yf5NdG(tT]I]1<op?Aif;%23E/3q+'rMfC?gcam*@?2j<qqShC++329L/JoieYhaA"8MD)7OO(+D5:5\d!feL".pR.(F,POHJH`lK/LM:kN@k$ZPg*f+.FLkkWH>*VSP%6.:Q,(c5a_8_(8ejs[\M6'i;uN3Np9_4SB]EDkWGVncj;8Raujig?19%brV<f52*Dst#gXFqk:g9SkDra>N2Oo9@45G[EMtug?V58e1][7'HF>LU:G(,6!rG$gb+(%u8.r0PY:s.HJsTHeJMF^e;'mSXs1At3>T\rCKfa^u17k.NlVXog<S[oMZZ1Tn1r!b44':9^h=`jS[2;fY0!Vr&*%6imI#S^Ai%?B'Z6r$]+kY!ek]Hb)BImLFN?A3XBJ+^lOlCqOVK%R;r4eLQU2sE=0X2GjNi,tXXSKnpbUV],)G/:*^"6WZ0R"[?NH^1N$+V]9%q#)5UURHMBcGeZD^QP]"Cp>G4C>S9-?uZ'GeX+=a/b-1qqK;qRHtAuL8_5Z#oXdbG;Ri-0@5o#>kFEkr_*^tV-Z3eT^-$_rGgmdTs$+oRtk*Go]*/;BWpN*oGn/=)_#Me@e\Dj^3(Pac<r?7Ge,.(3#B^f:m]V?%$Im[,u@&`1hNdcG-.jrrUr;b<aqu;EEQLRG*2;DNjL7WUauf^OVb^@4%;B#NRB_O1t0l"YIB01NEbQ+\\jsLEM[`4Ma_C&354FuN"H3[>B3>CLoNS[;p0o'gIYg@UJt'b`e%"GD@U0]4\#-AcN_^s9R<3mauaZ.X0Y0mKoHd3DLd3kkLcV/T'*11)aE%B3Nt,9*';[cZ4rAd$UTC=alpJ\KcBHqrm9;W%`Gk/(I3GU04?"\cmSoI-d*g>YmIYg[FElrWO]]1#$E`L:>0Q%p6F<k1S6o%LTu>YK)._S$X!ihD^65f).fV5`uA69?BL3*C5<oLXnd0RMLU'QJq"08U!P85<XRS45kft-j,ILh@jlsGr:^^4G7T*ui5_d#F\O?[BLGWdFSC1T<>I4nS?X0O"</PUO1\R00U)I)A$3,E;U@0@._8N:UOQT[(,bRAn@W$='17HA`XTDdMJ2Hdm=qA.hK,.QW#<=ldRlqM^NGg\Ns<&fe:;s82;10UAcOFX%HR)fcK28`W/An5ps'50<bu@5"23,6j(n!]8*(5033X"YLSteuBYL?B;W;jM20f2[/q@GlgYRY8b^SVuWY$JWj3tR"3NX-/"^"Vh`+N7RY=!@ZIlss_k6J/di2$*dRUE,Vq\B6E(?Z1Wg"Iq1;1+NABiZ/^0al?W^n,48:HJ/FqU/%\[>lFXK\*t'i9BEPGR3mGp'c?koaD:*eJ^.Jr/L9lP,rKo\19>"q?9=d>iT=1/MUuM^gSV/Rc31gDltMA[]XsK1*s?8l.M7uU.om*e->o30g1!ogTg'46*PiY<5@0X5eTt\(/b,1COI+gGC4YlNe"AXTXb7G,^'Lkqq&HBBYcJOdopX,C%U;5D'Ykga2*f%%LbJ&CCNB/(]N<l+P76u_`Ec``DLAqahY?bQ_:eP_sZ6@/P4b6gb/HkQ8J=X+Aur58Rt8tL(&[>1C-ijQ?[JZla<Ds<6Z=jOEPb>Y>VQ[Gh#VX"aKu(7]"!20'@Vc2:*q$4#C9&g:1dq!mnEn_7LHlm,WJTB15qOs1[=E>21doR_.,!?$1uA9uCI?#R:!;eU[YY5+ME872fDL-u_2'(CNo!"T>*MV'@i^*(0'b6(890bNKB!$_63>T!qm<:,U!Z+p@M0abjIf2hI%cL=SS&m`GsHo6=Y]<Xm^Aes55JRPl29).mOK(3-0#\/HJ(i(f^AT(H4BN3A.u'7EILdc/_;9<2+*[&m<5-iVY3W<kckb)_Q6n#\!`53g&N(o+oU[u&I=`>cJ3m_C0Nk9ed'Dq>khnt&pl*9d7>Q^!g4Q2pMC:Rss6rq,g,045X[AY;)JJITs4l@47ZajksjHKZ4KJ<g']99R_qces104m0.='2Hah8[Ui+g2DV9b.f.oSM_4n[G-!Y?"+><B%sq#S0#PW[E71&):*S:9@B[T:S7O>3Unpe<G'0qq;S<:cR;[f?">#A^!XX1"H=$UYrXLAd!IhoI;%\^CK1a,6i%^No$LF42,N_A&FFrG4TjcfES^ML"&hpNd-jM7!*/d+?qS%*rN;'jPKb2p-0R!IrWYZ/g['e2B2>Wf5@8?_.ltLRS>b]%D?"Ph202#(*KC7Cc$+YWg>1(/K!5`?`0lR.(D=/8@Q-)g/mc'")%>lgO+S#8FB.[`7PH+Ef&h5Q.bJ35[A'8jd"A5!ifsl/)bRg><V*%Tc^R9ZF'9%Q#PM@BdJ~>
+Gatm?D0+IA&cV3*U%&p\R@"cIWU!i&@QR>U9@>Zj>ru!Z"%5Ef@ZoXMUh'5OG<ro]5n^IW]t)7E-kX)D`U:'NnC>FujfLUb4_Hm'R%K=-M\C:kLB$33n5\g$Ngg0HLOAa_o1.+7hi.OjHMDUQiSijYPKdm<miP%IDUQ0;42ElnjeH5M6t*J&+p2"?(m!7CqicN">Ubs^@bFQiMp\-fQ<N99j"9Sb+S3ak]>G&eqhM`V#l#DAESsOM!sEfEgb2&WST>sQ2!q\<)-Fk5=nN'=*<ND0_Dg?;S)(89S#nZrVF6d][6n+P$P"uYP6e`FJH$l%?Jf\5<7e9eZQ6Wma`e8:lB19]!#!\tnKpb.6G!qKp'^mRb;-BZ0Qo$,p9o(jl]:49J%^/UZ[Ej@V<3n4/H[&N>tXi92f/3E/@[34`CT]7FQ%q2g,[>L/unW5cOK`A`(h!m%=<#?OC8%7rem@_#5idC"7>;.RgM3P+tqZ38+4_patd#2[+i9-571S+,c*LQO>r65llP"i:-!fESoZ1Wj8&XTV=WO7_ib^0Z@/mc5p(OWE[Os4_0?$:R941!V1QY`6:>S,3h6LpKgS)G[7?st!([6dj!db[OkA^MIOX"<2m=An`P<(oFOBF"C\Bo7S_2*!a'Q+<B#4AtN6^/+,ONNg"PGrp4PUdTUfu4?iFAFFBG$N/?tG%!hr;?@][1!@g!rAkUEjhG)d/qHif&)ehX2T4Nouj+-*,D\))C8%A]4^bVQP/=.[H5K6iJpE=b\>f!\(IWV\t[kXC('0]?a:471sj]iF7B2E"&[6ETm0uMLYlP:(_FrCf)%p]qF]b5sDR5Qt,TaG/i!7+cCHrn%KAfr3X`TU-bjehI=,7ekmp,PS[97f9-Jg:9paao],btYHKH.ncj.kZdL&$NA_eQ@GS_<H6Xi[gZQmV<i=#8OO5V9=Fmn;qiV\n)D"?)3#=\9."(>L(GiX;^W[!O)ZnKg1_nhO^TO:RYmZjp0PR5\UEU#L1.-D;Q5Q"_-)9B<e.d9eS3V,M+]GrK&/fk6T1\Ia5VFn2;UAlB"k%ZJ[:?2%9YSEBNZrs2_`#UE.Yi<!'*"[HA'XhR>Z[sJ[2@``Oj+c@Ed`Gp5-.!NE$=VQO$XH)Z\27J@E+&NmQgjH@m)B!\rcWTKh-(dH*ADGCpk$7@lZ&qGj22)cg:oJ;PljDks`U`cq,^_[$E/27!=B^(75Z4lY`[ip@9TAgRmMCp3K=n4'2h'^P/Lgp5J[/0eHhQ0&<km--q]C9<t2p%1mXt59].[U(V9G/!*9rTb(DF(Br7UoLD;KUe:oS!kkgE,-P21h$@c!<iFTN;TCI4\$5LYM?VSs]W8\sdS@lRo3o>%N:0:l_T35,_D#k9loTnN#r5K9Q#Kd6TEQ&u:Jt_'cOi3GX95ua@6skrY6.;B<A[C''bt!S=%$iKW[3P"4akZMfeu`:#:+b[-cj0GKp(r]:uhob^I:kqr%:N3dO!^$B^InC]XTADg8F/UCO^s8fFeEt_&`jMRZ\X`H*),0'!)W>#BG(m<%<C<#QGtk$e+g!6s1/6OX3-#nUVIn?)PXAHhd1.*lbpj09:b:QbV">YHS5s!hcQli1K-Jl?!W\OVQ!R$9GWCZ*D!Y)NF"Or6rQa!X=jnSX0Qpf9iWNCrlh`IdBN4<uSS&_3l7P*j8"iF#)Q9gPCb>&''XKp>ue(ClA?eR[",dq7[tIN#5*8+Y-`$9Sr,1R_<VDEGUtcW<J.+YV[ZOBW3b=,(79\ONR@pSCG((5#if#,-)n!P&U1CLbjeS1o"Sk[lDo(.s(JkRPk?FCS=2edk)?-@Umc(Sng<V;2jh#N-ur]U7fK8Zj$_<UCQY1OMs2GNFcBFnLi_576anH4hPS7CdI9n_"O%g:;V,e0T\"e<<EbXV!\lRN\mkWc\9UQp7W6;"D;O2W;pj1eJFHd-4NS0?LE+V:$B>k)4`8's%eXNYoQLCIaZ+*\(]m]9c,L%'^:I7"iSq"/W$'3PRol!9/U<&4'i`9aBj<UX[GlZm1nR`Q>l8G/Y#%5fe]3X7tdR\8]@Cs'R_UMW6bT*CSPfV:nAT:Ka"o-0U4Y&e5.E"6XF3./d3o-l3$)-?:UEJ'Z5;EL:Ep6\g?bQ!fQBQ!.@i5od@XU:#fZ]"afV4:$^WOk'lO*ccM)2OV1EGc*cIpEHL>YN$n[M3@U(S+n>oTAt=ZOh_$%2jX[2S#QP=&8KX_'`,a5c-`G;i><*pS%bh"XCk\J@lCC.LrUDGF$<ag',\Wb*ld'c7G9KtG:P_UL[4b8r54\qIDdboZ2RZoJ:3pX\I*[XS:Y3N3GceN$]):`HX,FTn\!L78lkOBWBWSHF)B<sF1sn02d#2esoU-'c6jrpihE!?`lX?JM5B<LFdl4qA6]<48ES+X*QdQe#rQoSHieM3/d^RbU]lfu5c<rBXGe,.((`02&d$0^WM0m7>Q]NtCTk1Z9b-&.[qX=D+_O/tiAmEmkQsF6MMBct11+>kJ6fc2tmeQsQ_/+c_R:NcXD<cF78CDP%S36Ib-^;-h3Q/l\2,kP[n78C0"O0GW8tUt*4N^U?JRI;*@7$_gcq]W*HfC&UB<q\4p<h(gF&jbR:**u;3M4jTU!gfB'L6McJ!b:n;CTq5<cnX3R\LkTQYMPOl2hil8*17(5lB9&^E/(JY2t&PG:*W)gbos6G-c*q+Z.PD!o-P:93u*C@'OLHB4"rdbq1]LRMdm/rb-AOc$#oZ`h?]3muPj9kX-M/U",,j6`<a!l/psE'VSSRA%3JPLIPePh.,uY0;%d<O>[eV8&Ue32B1"[Tf74k303;0K/``&p\/n+6Vu]8d'W),<(*Pp!u')<o?gWBg`UQ`0)u3G6olF#Z0D<9qeqM*b0j0RgUs`R8nB![HokRIhoT<@I1h_R$#^eB/o;l]hSInt7Jm&+Bsp[Zn5Yd?.XLouX"7Rn3T<sFp(=\gk)hJ&BYiRk/RRhS*4?%$nMp[.=[CJnX\<f/(Reo_NNMKEg;/[u#D$VUA<;15Vkh8k<nbe#!-\G`F$0.KZsiY1cVlDM_D4<H9:jUi5uiF=m?%*2X6R[4L@R[S6(\tiL5(mU_eF_!<ppt?W,?\E5bG1GZ5o3+Z6IQYc9TSR[-t7GR`gn$5En>j/>P1$`!PDqn+W4JS6Lb&caTD^H3'HPFt?W4`$"R<Zu;7@V;K8/C"ZJN(DM#,`boU/0kpp.i?Z@1iS]o<Xsf]uY('"u-+,SO3D`VJ6b'&D"TFB9]l4A6n^r\M@/n2C!G=b#bs&O>7)Sc&FZ.%e5KpT,_!_hJY/(=!RDSt&okl)0n;PJrQCD(s_`(sBb%Sb6YiGSGJ]IGCJVW1's(`VX'*@g3cH`NN33gJh@o]pE+'%`Qf8`NnlF,Yp0m'n#\c2Yl;S,LE/#j%h&<r_OLcR?1S$UqP%DAE\ee!J@X'9n:H:>c1L)MPWlaJSu*G07Pk=;Y*DD=,EE>(1K4]<AOTcMjYRN#I+Enr]/,&Gm1^>7Q_bV/.J\^f/7GDUHsL<#)]=jCd<a>GgK_;i!@BlIj\_!NCR/9'SlkT;Zu*JsUkR)H-A[&IH=N6[NtOAig0I&j)U<)_Qt688FrX9dBu6b(V&d,kSX>o@E@#F;]![:#&"="8^IV!4S5SY!5n`0KWGC4K-23GAhFe9c<o^+M09oI]H7MiVcbUK['5[M$\epfB,F7f3ZmIcRe^YbU:UBF_(QN!>(9+i817ch`_db9<tQ\]2g2f,9_A/$EhNV!B+o;d/HV!gsjNl4(>pX.O9Y"[:5<XZ0h6$)fpT'@?KR]K4DE&)HX\8BcOG,t[>SBAhdof_OkFb=RaBWAY#ML\:.Xq,`f3B?_`?mD^2?Qe4oDGP'_X:(Lji39]c&NT[r.'l)3VVb]Z,4UJN\Wm$:h!liP8T2?l,]$+u+_22r_;Mf0aY)]P"o_Ate06ZWk[H`O>+aH/!p<duY2..Kj'(%m_ScO0!\G(Ej+^7Ztd-jP8&63qfJ>KAC,Kkp[KEe`.&tiS6-@`\o)Om_r<cPg17`DjRI^;FKhegDtc(>(bkYF&7#,-N._M](?T.k.H?gkFXbEg,(@crMA*0-bJ#Lo@(8C5b3pNNumD2&W*;=JpFipZNG^$!#djGrcMa.(%EZZpI$ip&n=/trq/M74Kq?G6]R=B7#Q7k\uC.=m;LdZR=uYkb8D;kiFa9['#-_Z'WJC_A?~>
 endstream
 endobj
-134 0 obj
+133 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 133 0 R
-/Annots 135 0 R
+/Contents 132 0 R
+/Annots 134 0 R
 >>
 endobj
-135 0 obj
+134 0 obj
 [
+135 0 R
 136 0 R
 137 0 R
 138 0 R
 139 0 R
-140 0 R
 ]
 endobj
-136 0 obj
+135 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 18.0 723.6 169.296 711.6 ]
+/Rect [ 18.0 736.8 169.296 724.8 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://marc.theaimsgroup.com/?l=forrest-dev&m=102471820523388)
@@ -1432,10 +1420,10 @@
 /H /I
 >>
 endobj
-137 0 obj
+136 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 97.668 710.4 123.66 698.4 ]
+/Rect [ 97.668 723.6 123.66 711.6 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://forrest.apache.org/docs/libre-intro.html)
@@ -1443,10 +1431,10 @@
 /H /I
 >>
 endobj
-138 0 obj
+137 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 384.288 710.4 445.272 698.4 ]
+/Rect [ 384.288 723.6 445.272 711.6 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (mailto:mpo@outerthought.org)
@@ -1454,10 +1442,10 @@
 /H /I
 >>
 endobj
-139 0 obj
+138 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 144.324 288.0 207.984 276.0 ]
+/Rect [ 144.324 301.2 207.984 289.2 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (mailto:stevenn@outerthought.org)
@@ -1465,10 +1453,10 @@
 /H /I
 >>
 endobj
-140 0 obj
+139 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 18.0 222.0 123.648 210.0 ]
+/Rect [ 18.0 235.2 123.648 223.2 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://marc.theaimsgroup.com/?t=103607092100004&r=1&w=2)
@@ -1476,111 +1464,111 @@
 /H /I
 >>
 endobj
-141 0 obj
-<< /Length 926 /Filter [ /ASCII85Decode /FlateDecode ]
+140 0 obj
+<< /Length 878 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gat%";/_pX&:Vs/5^c3J,qb9EaQ(u+ROW1.1u=N]\8Zt&#?,,qk24KM&g&PrM]tT[iQh1GhqcrriTPaN=H6$j.niF@Q&Zj-ej',:QW@uhS7$&b46uWOlaks&qI>4Tg;gi#SA09"PCmeG*.E:lPZ)AcH?H/X+s\r-gWWbs7e7>@[ks/*TgUGjQ&C8L%RRlB@r<YiiHBOhdJ8l6K?78ZohCenO"AVEmN.j&c(89FWJ!CjR2*0**AH5><Q%i;GpuVoR`9?\@MV3tFn1mn&dD/K;X@NpLna(-H&a&A'j(>e2aU+b'i'eNf;[YGVm?CUEkpGl!cJ/g,.lph/of4uPuU\#2O&GdK'\#8JOl'8b3K95nSXK@&(\Z_BD@J+cmdY:Xa/#&=tO)9AP'j$!g,eZP!q/8M`u4CIUFYCllJB!7Z`,a]uknpLd[i=[$$ePPt=iLSbT/!hA+,%EjIO(Z.*d7qi6^L.)o]H-`=`M88s]tJ;>M(HE%DQ"mu?>o\J7+;!i3>5TBFR8ZkD9G/sZI\^N.J$JqJc@(;1b1'"GP4(L3#1q67Y*dSU?W'Ec-/NG'nNKBAZPF=d#CCl?[nQ_`W&*C]2rd%j@4n:5WB%.PV^g$r=MX:H+bCRYa7oUrpSgiYfIrn-CnRh_9*a.<ps2$_dk":+lT<ANg@A+Mbqp:J-OK`Al.WMA!<5t'aN8`'\]F9k09-OL%bi!`B7K9%$$BPaZZL6@__kO`aQ0d"</pc&k(M<5XToV'fiU*=G@_aD^-lh-*L\5fe&*!Z_pZX*.6`^@<Ep`JYq2Wh?q\"qGRbLFTUok<UnsfD4EBQsHQ&L0P*l>b)En4d73+#TZNRI7T3&kK]FgXg!Y*L-?*BB]af"Rtd<c+'k?/:[?R51JEY,?osK>k.)5.05"^1tA5OU_0VgI"XC^;"6a78N~>
+Gat%";/_pX&:Vs/5^c3K,q_/#ON4b42-&A;BtQ$EE5@'/a(DbORX[O88:@9f/W(8$1VUKiqsMbb-^20_^^Dje]d06F?82aKhu;uW2+9Jo6+lcOSbMGnMfC`JIXB2#4VPQ%3PQZSh1;uk*OpACM(%T3>MuaUG5Hu-,Lu>(=kJ`K<4hhs[]VAp.!hkM\MKF#CFmar9tHmHI0H>NH#S[6aZ[g\jt+hKpRKX$eD(IN5"_ZM2D@-</lTO>c=!4F";2E''bZ7p*Kbd@Je5'0jQX7U3#bN'el;<-^<kAC"ESu`)MU;`Je)mmjRiTh>pZ\8&O'k&Q"5F<]OblPR/p@e$7X/6c2i`Q$E@2hLTniU#KIA!P`X_]#L!2=:E)rfe3kcTcAGdk5#&"e?1e&I!dc_&$,W6Eg0eXmTXPr6!`4j)q2h-4G_>p<3@gQ(HrNm?dXOR[0/_?YLmHYkfc5go#sPZ(??.pe[R3V0R60.YXPuBh.gFa1js/50fn%\QKgrtMb/;MV$l"L3rK787OVC?S0kD60ZNcNd%F,-oq.Lh>M:]p;)N]0&h5IBUK8$%i(q-=b?VX24"JF16i#(rm?b.BPGd[OO(i?G(J$j:fk!FPbShCA;6_P>Bqp:P/;KU5qX^S,o6tN@aNT&`mHljDHQ_XV-;UXTZ(;kbG.Y)h1FORMnL';]EN9\rrOFq:$f5C/!Bs0AtiU,m6`"\r!UMtN<*S2)<:[8k0bIG/V)])B<>-<9kmp4cFqj^@ZS8S&?aYH7]kcIY[I=ss`;(nR>R+s'aFVS`>B%_n:hDInE-O=,&IeO;&@N;L:n0J["(i@iq4VG//*c,sL<g:V7g>^I?>K"]bZhi0pB=i;4;hHs8Qf"BHaPm"(1fY<;~>
 endstream
 endobj
-142 0 obj
+141 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 141 0 R
+/Contents 140 0 R
 >>
 endobj
-145 0 obj
+144 0 obj
 <<
  /Title (\376\377\0\61\0\40\0\126\0\145\0\162\0\163\0\151\0\157\0\156\0\40\0\60\0\56\0\66\0\55\0\144\0\145\0\166\0\40\0\50\0\165\0\156\0\162\0\145\0\154\0\145\0\141\0\163\0\145\0\144\0\51)
- /Parent 143 0 R
- /Next 147 0 R
- /A 144 0 R
+ /Parent 142 0 R
+ /Next 146 0 R
+ /A 143 0 R
 >> endobj
-147 0 obj
+146 0 obj
 <<
  /Title (\376\377\0\62\0\40\0\126\0\145\0\162\0\163\0\151\0\157\0\156\0\40\0\60\0\56\0\65\0\56\0\61\0\40\0\50\0\62\0\60\0\60\0\63\0\55\0\61\0\60\0\55\0\60\0\66\0\51)
- /Parent 143 0 R
- /Prev 145 0 R
- /Next 149 0 R
- /A 146 0 R
+ /Parent 142 0 R
+ /Prev 144 0 R
+ /Next 148 0 R
+ /A 145 0 R
 >> endobj
-149 0 obj
+148 0 obj
 <<
  /Title (\376\377\0\63\0\40\0\126\0\145\0\162\0\163\0\151\0\157\0\156\0\40\0\60\0\56\0\65\0\40\0\50\0\62\0\60\0\60\0\63\0\55\0\60\0\71\0\55\0\61\0\63\0\51)
- /Parent 143 0 R
- /Prev 147 0 R
- /Next 151 0 R
- /A 148 0 R
+ /Parent 142 0 R
+ /Prev 146 0 R
+ /Next 150 0 R
+ /A 147 0 R
 >> endobj
-151 0 obj
+150 0 obj
 <<
  /Title (\376\377\0\64\0\40\0\126\0\145\0\162\0\163\0\151\0\157\0\156\0\40\0\60\0\56\0\64\0\40\0\50\0\62\0\60\0\60\0\63\0\55\0\60\0\62\0\55\0\61\0\62\0\51)
- /Parent 143 0 R
- /Prev 149 0 R
- /Next 153 0 R
- /A 150 0 R
+ /Parent 142 0 R
+ /Prev 148 0 R
+ /Next 152 0 R
+ /A 149 0 R
 >> endobj
-153 0 obj
+152 0 obj
 <<
  /Title (\376\377\0\65\0\40\0\126\0\145\0\162\0\163\0\151\0\157\0\156\0\40\0\60\0\56\0\63\0\40\0\50\0\62\0\60\0\60\0\63\0\55\0\60\0\61\0\55\0\63\0\60\0\51)
- /Parent 143 0 R
- /Prev 151 0 R
- /Next 155 0 R
- /A 152 0 R
+ /Parent 142 0 R
+ /Prev 150 0 R
+ /Next 154 0 R
+ /A 151 0 R
 >> endobj
-155 0 obj
+154 0 obj
 <<
  /Title (\376\377\0\66\0\40\0\126\0\145\0\162\0\163\0\151\0\157\0\156\0\40\0\60\0\56\0\62\0\40\0\50\0\62\0\60\0\60\0\62\0\55\0\61\0\61\0\55\0\61\0\66\0\51)
- /Parent 143 0 R
- /Prev 153 0 R
- /Next 157 0 R
- /A 154 0 R
+ /Parent 142 0 R
+ /Prev 152 0 R
+ /Next 156 0 R
+ /A 153 0 R
 >> endobj
-157 0 obj
+156 0 obj
 <<
  /Title (\376\377\0\67\0\40\0\126\0\145\0\162\0\163\0\151\0\157\0\156\0\40\0\60\0\56\0\62\0\162\0\143\0\61\0\40\0\50\0\62\0\60\0\60\0\62\0\55\0\61\0\61\0\55\0\61\0\63\0\51)
- /Parent 143 0 R
- /Prev 155 0 R
- /A 156 0 R
+ /Parent 142 0 R
+ /Prev 154 0 R
+ /A 155 0 R
 >> endobj
-158 0 obj
+157 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-159 0 obj
+158 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-160 0 obj
+159 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-161 0 obj
+160 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F9
 /BaseFont /Courier
 /Encoding /WinAnsiEncoding >>
 endobj
-162 0 obj
+161 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-163 0 obj
+162 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F7
@@ -1590,73 +1578,73 @@
 1 0 obj
 << /Type /Pages
 /Count 11
-/Kids [6 0 R 25 0 R 46 0 R 55 0 R 78 0 R 90 0 R 111 0 R 118 0 R 123 0 R 134 0 R 142 0 R ] >>
+/Kids [6 0 R 25 0 R 46 0 R 55 0 R 78 0 R 90 0 R 111 0 R 118 0 R 123 0 R 133 0 R 141 0 R ] >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 1 0 R
- /Outlines 143 0 R
+ /Outlines 142 0 R
  /PageMode /UseOutlines
  >>
 endobj
 3 0 obj
 << 
-/Font << /F3 158 0 R /F5 159 0 R /F1 160 0 R /F9 161 0 R /F2 162 0 R /F7 163 0 R >> 
+/Font << /F3 157 0 R /F5 158 0 R /F1 159 0 R /F9 160 0 R /F2 161 0 R /F7 162 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
-143 0 obj
+142 0 obj
 <<
- /First 145 0 R
- /Last 157 0 R
+ /First 144 0 R
+ /Last 156 0 R
 >> endobj
-144 0 obj
+143 0 obj
 <<
 /S /GoTo
 /D [6 0 R /XYZ -5.0 634.8 null]
 >>
 endobj
-146 0 obj
+145 0 obj
 <<
 /S /GoTo
 /D [55 0 R /XYZ -5.0 321.8 null]
 >>
 endobj
-148 0 obj
+147 0 obj
 <<
 /S /GoTo
 /D [55 0 R /XYZ -5.0 158.666 null]
 >>
 endobj
-150 0 obj
+149 0 obj
 <<
 /S /GoTo
 /D [111 0 R /XYZ -5.0 665.0 null]
 >>
 endobj
-152 0 obj
+151 0 obj
 <<
 /S /GoTo
 /D [111 0 R /XYZ -5.0 343.466 null]
 >>
 endobj
-154 0 obj
+153 0 obj
 <<
 /S /GoTo
 /D [123 0 R /XYZ -5.0 612.2 null]
 >>
 endobj
-156 0 obj
+155 0 obj
 <<
 /S /GoTo
 /D [123 0 R /XYZ -5.0 528.266 null]
 >>
 endobj
 xref
-0 164
+0 163
 0000000000 65535 f 
-0000071588 00000 n 
-0000071722 00000 n 
-0000071815 00000 n 
+0000071241 00000 n 
+0000071375 00000 n 
+0000071468 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
 0000004310 00000 n 
@@ -1776,53 +1764,52 @@
 0000056094 00000 n 
 0000056270 00000 n 
 0000056441 00000 n 
-0000060936 00000 n 
-0000061062 00000 n 
-0000061147 00000 n 
-0000061317 00000 n 
-0000061507 00000 n 
-0000061697 00000 n 
-0000061873 00000 n 
-0000062063 00000 n 
-0000062264 00000 n 
-0000062467 00000 n 
-0000062646 00000 n 
-0000066940 00000 n 
-0000067066 00000 n 
-0000067127 00000 n 
-0000067336 00000 n 
-0000067532 00000 n 
-0000067710 00000 n 
-0000067892 00000 n 
-0000068095 00000 n 
-0000069114 00000 n 
-0000071955 00000 n 
-0000072009 00000 n 
-0000069224 00000 n 
-0000072073 00000 n 
-0000069480 00000 n 
-0000072138 00000 n 
-0000069728 00000 n 
-0000072205 00000 n 
-0000069966 00000 n 
-0000072271 00000 n 
-0000070204 00000 n 
-0000072339 00000 n 
-0000070442 00000 n 
-0000072405 00000 n 
-0000070680 00000 n 
-0000070920 00000 n 
-0000071034 00000 n 
-0000071145 00000 n 
-0000071254 00000 n 
-0000071361 00000 n 
-0000071478 00000 n 
+0000060858 00000 n 
+0000060984 00000 n 
+0000061061 00000 n 
+0000061231 00000 n 
+0000061421 00000 n 
+0000061597 00000 n 
+0000061787 00000 n 
+0000061988 00000 n 
+0000062191 00000 n 
+0000062370 00000 n 
+0000066641 00000 n 
+0000066767 00000 n 
+0000066828 00000 n 
+0000067037 00000 n 
+0000067233 00000 n 
+0000067411 00000 n 
+0000067593 00000 n 
+0000067796 00000 n 
+0000068767 00000 n 
+0000071608 00000 n 
+0000071662 00000 n 
+0000068877 00000 n 
+0000071726 00000 n 
+0000069133 00000 n 
+0000071791 00000 n 
+0000069381 00000 n 
+0000071858 00000 n 
+0000069619 00000 n 
+0000071924 00000 n 
+0000069857 00000 n 
+0000071992 00000 n 
+0000070095 00000 n 
+0000072058 00000 n 
+0000070333 00000 n 
+0000070573 00000 n 
+0000070687 00000 n 
+0000070798 00000 n 
+0000070907 00000 n 
+0000071014 00000 n 
+0000071131 00000 n 
 trailer
 <<
-/Size 164
+/Size 163
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-72473
+72126
 %%EOF

Modified: forrest/site/contrib.html
==============================================================================
--- forrest/site/contrib.html	(original)
+++ forrest/site/contrib.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -55,33 +55,24 @@
 <table summary="tab bar" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Home</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="contrib.html">Project</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -124,45 +115,6 @@
 <div class="menu">
 <ul>
 <li>
-<font color="#CFDCED">About</font>
-<ul>
-    
-<li>
-<a href="index.html">Index</a>
-</li>
-    
-<li>
-<a href="license.html">License</a>
-</li>
-    
-<li>
-<a href="http://www.apache.org/dyn/closer.cgi/xml/forrest/">Download</a>
-</li>
-    
-<li>
-<a href="who.html">Who we are</a>
-</li>
-    
-<li>
-<a href="faq.html">FAQs</a>
-</li>
-    
-<li>
-<a href="changes.html">Changes</a>
-</li>
-    
-    
-<li>
-<a href="todo.html">Todo</a>
-</li>
-    
-<li>
-<a href="live-sites.html">Example sites</a>
-</li>
-  
-</ul>
-</li>
-<li>
 <font color="#CFDCED">Getting Involved</font>
 <ul>
     
@@ -196,28 +148,6 @@
   
 </ul>
 </li>
-<li>
-<font color="#CFDCED">Related projects</font>
-<ul>
-    
-<li>
-<a class="external" href="http://gump.apache.org/">Apache Gump</a>
-</li>
-    
-<li>
-<a class="external" href="http://cocoon.apache.org/">Apache Cocoon</a>
-</li>
-    
-<li>
-<a class="external" href="http://cocoon.apache.org/lenya/">Apache Lenya</a>
-</li>
-    
-<li>
-<a class="external" href="http://xml.apache.org/">Apache XML</a>
-</li>
-  
-</ul>
-</li>
 </ul>
 </div>
 <!--================= end Menu items ==================-->
@@ -378,7 +308,7 @@
 </div>
 
     
-<a name="N10082"></a><a name="procedure"></a>
+<a name="N10081"></a><a name="procedure"></a>
 <h3>Procedure for Raising Development Issues</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p> There are two methods for discussing development and submitting
@@ -413,7 +343,7 @@
 </div>
 
     
-<a name="N100A3"></a><a name="tips"></a>
+<a name="N100A2"></a><a name="tips"></a>
 <h3>Contribution Notes and Tips</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p> This is a collection of tips for contributing to the project in a

Modified: forrest/site/docs/cap.html
==============================================================================
--- forrest/site/docs/cap.html	(original)
+++ forrest/site/docs/cap.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <span class="sel"><font color="#ffcc00">Sourcetype Action</font></span>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
     
+    
+<li>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+</li>
+    
+</ul>
+</li>
+  
+</ul>
 </li>
+<li>
+<font color="#CFDCED">SubProjects</font>
+<ul>
     
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>
@@ -344,7 +381,7 @@
 </dl>
 </div> 
     
-<a name="N10060"></a><a name="Usage"></a>
+<a name="N1005F"></a><a name="Usage"></a>
 <h3>Usage</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>The source of which the sourcetype must be defined must be specified

Modified: forrest/site/docs/catalog.html
==============================================================================
--- forrest/site/docs/catalog.html	(original)
+++ forrest/site/docs/catalog.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <span class="sel"><font color="#ffcc00">Using DTD Catalogs</font></span>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
+    
     
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
+<li>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+</li>
+      
+<li>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
 </li>
     
-<li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+</ul>
 </li>
+  
+</ul>
+</li>
+<li>
+<font color="#CFDCED">SubProjects</font>
+<ul>
     
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>
@@ -304,10 +341,10 @@
 <a href="#xxe">XMLmind XML Editor</a>
 <ul class="minitoc">
 <li>
-<a href="#XXE+v2.5p3%2B">XXE v2.5p3+</a>
+<a href="#XXE+v2.5p2+or+prior">XXE v2.5p2 or prior</a>
 </li>
 <li>
-<a href="#XXE+v2.5p2+or+prior">XXE v2.5p2 or prior</a>
+<a href="#XXE+v2.5p3%2B">XXE v2.5p3+</a>
 </li>
 </ul>
 </li>
@@ -388,14 +425,14 @@
         </p>
 <pre class="code">
 &lt;nextCatalog
-catalog="/usr/local/cvs/xml-forrest/src/core/context/resources/schema/catalog.xcat"/&gt;
+catalog="/usr/local/svn/forrest/src/core/context/resources/schema/catalog.xcat"/&gt;
         </pre>
 <p>
           For a TR 9401 Catalog, add this line:
         </p>
 <pre class="code">
 CATALOG \
-"/usr/local/cvs/xml-forrest/src/core/context/resources/schema/catalog"
+"/usr/local/svn/forrest/src/core/context/resources/schema/catalog"
         </pre>
 <p>
           Actually you probably do not want to touch that system catalog,
@@ -403,7 +440,7 @@
           which refers to both the Forrest catalog and your system catalog.
         </p>
 </div>
-<a name="N10062"></a><a name="xmllint"></a>
+<a name="N10060"></a><a name="xmllint"></a>
 <h4>xmllint validating parser</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -418,7 +455,7 @@
 xmllint --valid --catalogs --noout mydoc.xml
         </pre>
 </div>
-<a name="N10071"></a><a name="vim"></a>
+<a name="N1006E"></a><a name="vim"></a>
 <h4>Vim</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -429,7 +466,7 @@
 au FileType xml set makeprg=xmllint\ --noout\ --valid\ --catalogs\ %
         </pre>
 </div>
-<a name="N10080"></a><a name="onsgmls"></a>
+<a name="N1007C"></a><a name="onsgmls"></a>
 <h4>onsgmls validating parser</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -441,7 +478,7 @@
 <pre class="code">
 SGMLDECL "/usr/share/sgml/xml.dcl"
 CATALOG \
-"/usr/local/cvs/xml-forrest/src/core/context/resources/schema/catalog"
+"/usr/local/svn/forrest/src/core/context/resources/schema/catalog"
         </pre>
 <p>
           Then point the parser at it:
@@ -450,7 +487,7 @@
 onsgmls -c path/to/my-catalog -wall -wxml -s mydoc.xml
         </pre>
 </div>
-<a name="N10097"></a><a name="jedit"></a>
+<a name="N10091"></a><a name="jedit"></a>
 <h4>jEdit - Open Source programmer's text editor</h4>
 <div style="margin-left: 0 ; border: 2px">
 <pre class="code">
@@ -458,20 +495,20 @@
 Utilities &gt; Global Options &gt; Plugins:XML &gt; Catalogs
 Select the "+" button, and use the "File System Browser"
 to specify the TR9401 Catalog file:
-"xml-forrest/src/core/context/resources/schema/catalog"
+"forrest/src/core/context/resources/schema/catalog"
         </pre>
 </div>
-<a name="N100A3"></a><a name="oxygenxml"></a>
+<a name="N1009C"></a><a name="oxygenxml"></a>
 <h4>oXygen XML Editor</h4>
 <div style="margin-left: 0 ; border: 2px">
 <pre class="code">
 Select the menu:
 External Tools &gt; Preferences &gt; XML Catalog
 Specify the XML Catalog file:
-"xml-forrest/src/core/context/resources/schema/catalog.xcat"
+"forrest/src/core/context/resources/schema/catalog.xcat"
         </pre>
 </div>
-<a name="N100AF"></a><a name="xmlspy"></a>
+<a name="N100A7"></a><a name="xmlspy"></a>
 <h4>xmlspy</h4>
 <div style="margin-left: 0 ; border: 2px">
 <pre class="code">
@@ -479,36 +516,36 @@
 (located in XMLSpy install directory):
 
 &lt;nextCatalog
-catalog="file://localhost/C:/apache/xml-forrest/src/core/
+catalog="file://localhost/C:/apache/forrest/src/core/
 context/resources/schema/catalog.xcat"/&gt;
         </pre>
 </div>
-<a name="N100BB"></a><a name="xxe"></a>
+<a name="N100B2"></a><a name="xxe"></a>
 <h4>XMLmind XML Editor</h4>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N100C1"></a><a name="XXE+v2.5p3%2B"></a>
-<h5>XXE v2.5p3+</h5>
-<div style="margin-left: 0 ; border: 2px">
-<p>XXE only supports catalogs automatically detected via configuration files.  
-            Download the <a class="external" href="http://www.splike.com/howtos/xxe_forrest.html">XXE 
-            Forrest Config</a> files from splike.com; this also add support for WYSIWYG 
-            editing of forrest documents.</p>
-</div>
-<a name="N100CF"></a><a name="XXE+v2.5p2+or+prior"></a>
+<a name="N100B8"></a><a name="XXE+v2.5p2+or+prior"></a>
 <h5>XXE v2.5p2 or prior</h5>
 <div style="margin-left: 0 ; border: 2px">
 <pre class="code">
 Select the menu:
 Options &gt; Options &gt; Schema &gt; Add File
 Specify the XML Catalog file:
-"xml-forrest/src/core/context/resources/schema/catalog.xcat"
+"forrest/src/core/context/resources/schema/catalog.xcat"
         </pre>
 </div>
+<a name="N100C3"></a><a name="XXE+v2.5p3%2B"></a>
+<h5>XXE v2.5p3+</h5>
+<div style="margin-left: 0 ; border: 2px">
+<p>XXE only supports catalogs automatically detected via configuration files.  
+            Download the <a class="external" href="http://www.splike.com/howtos/xxe_forrest.html">XXE 
+            Forrest Config</a> files from splike.com; this also add support for WYSIWYG 
+            editing of forrest documents.</p>
+</div>
 </div>
 </div>
 
     
-<a name="N100DD"></a><a name="info"></a>
+<a name="N100D3"></a><a name="info"></a>
 <h3>Further information and resources</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>

Modified: forrest/site/docs/catalog.pdf
==============================================================================
--- forrest/site/docs/catalog.pdf	(original)
+++ forrest/site/docs/catalog.pdf	Thu Jun 17 23:57:47 2004
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 2275 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2272 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gatm=lYkN9&HD1563mcH!Ff7$8$NNEdO&)DY$:1#"6P#nA_JIX9.hMNc%!L'7#FK;Nmj^Sg?)/k4at$[fjEp+fpucd5-_6cH=De^ZAEF8-B;ZTDtk8ROlI'-N32p$qWIEJ`JVp*20GZ25$d$BFdeYQnYW6frM8Z_>*\o7Em7aRLrdajbr,<Crjo\HrjCm,_6D"$Ug_oEd'nklKq1(2&UOVr^\e(8%ZEUFqZ@375MkkI`/hLso.@"rJ1r5ir:6u5+e>'4<ouEeC/u)s^Kd7M;:]h38\0mm'l16l\AV<qW418e+HSHZ"0HhcCs@B=p"&1dQ-E^]3^!J(eH='G^OJ2HXXs'p@uJMtR^6!t+$$W&Gt%N?d:+Cta>anr+KdgA\mfg(X2Pek=W#'g'6<&+/jdTo_cN9VM,fs$4'L,K@aQ`&3RnOgR;ksl-DqT\2.LAPe\l5P>BAq&Hi0G;=i"X-8DZ[$G3b7Lr3`Bbqd%<(XcUUe0/Hd3ZoVV`n)1V9Z$Hh^a<n11X6J]eI$%jg&NFglk>M<g%]qQ6NVsI2lI36fZZ=BrW\-G(e;AXgeg+&M/%/lU(5UsEZ-$XB8\n,\L]Z=IkUC3D=RuJ]"3OD1-inXd(*]M9^YSN?4f$P<>1&VtaXHa,6sVQ=1<hgR=%L+b4](d]cp(Ho]TVCirbKc1#[!tI*%d<Sck09h6W@2b]Ip<DKgMhMLaXC71jq"!@Oh:>Eq1&+0C8"<RTBc?l*dDW$2/8;o9O9h.R$@S^f'2T%8mq8N`7m=UN$'&Q9*&M<_c&?L2/n>Tlf:u_D6-'WT$ZKW+jLXiV7"Kq$bM,F<a!MCnit54[@][)f(E2E,SGjd4PMK,%2<TNe]ko*QW?Cim_.,rg`mIIobpWIL#kfk4K*?7q/eFOuNa%D2ohu^L2,Eph+cZS_mJ=>L+Lac#uDd>IORhU!:;,5tl[HM(J=<&)n1*K.&<K+Sm@4.>@m.562Rb,=/g5`@-,ok14FXGO4h;lk@R1%KYcSmCnAZM5ph''U,VK).f/7kpB5<keL4Ybb7A`9dn%ilG:n`>-(K\#CM+=Dj1Q-(LV3\=k5jQ2D^)XRI0oK"E`h\DsJ'.4"O/uDeZX%Q,EbqC:6W-bILA?47C(p;%YM13DD4P'u`l`f'^PO2!W5p.ppa?4_Wt1AS0]@=]LYAF1)VP4]-4YU'c<E$d-_3573UEJY,.\LjIAVNF6juO9A#rQCRA`d$&/KO//df^G!-d5p]J%Q\K/&fZ(03<Zn,#A&&FZj)!Bs5F'0upG*W\dWUJB]W??9b=YOg0?B5.orL)m<b66kl0Jgj?4:C=8c)IEC#0=+NZEGa($;l%EDO_kTVpOtm3tdp2iP4KH=B;^C-AtV`L.lFhBgPF1-`IeK=E9^ZL2IKJXPLGF(X.51gJO#UV/Q6b![Sk3ccnpP`&'Uq8;$DLPIf1kHjab,`O-X13E0/LZQ-ERA!UuC)4BgfHPS$%80UiVRO'%4L+g02ZfTShsSK?*d@\J5lSVOGk21=F5kr7VKu=h'cPEkTE37!"V2?:>P!FtX5]^_CsB8\8PnaBNchjg#>e#%`hUAAo)@c$2*=krY-mG$C,JD@j'L0upfOuBH!i]Z&grL"-sigJ66(E%:`S/8nX:[/dmnIJDf*g_"[J1YlYO/+=HQ7XIFkmH?AtCVH\Qo13?_Ih-,gHT`7e%2[VWN@9G.NnN7Q\Kb:\91e2f9*\`Re)7mEp'nQcc_"4^,bB@Rb9a/n"-a8ulA>(7Z+c#R!I>sM[+b(El?B3:&&BjW5aDP9oO>oBsMT$!`!Nt9@%rhoYel-FK\[.XPOCu(M*$1WF#$Fb!-,KBr1UKD-[:BcuO>6?!X/TekJQ"q\+5@:bt[nd:9lqiO;T#s(U.uWr:m$BMBl9m>5-_k(!78`s-^cPskguPMeG600Q^'+'$Aq'@>_`_ZDm8j*n0nR.GDc`L[GJX7;*8iLqq1/\H-EC-PE8ucLNjsM;l!-$kdg+m88s>RM%F',kMZK_.LNJ_s#HY'h,*&i+R[9^h7k4i(p%&pP#t;OS<Aba;X=><M;2$>qPRs%rMK=ri>q<cO[Nf&!T>om.(A!_PXiE$:d%^rGC\a?EHj<f?q"a%I#8Q<g.W["lPR#P.@WJ@%7iq3MRiXPBqE;bVUa<=dI(SgMDAD8&k-d9#7Np0j\idC>Ul"Qqc?KDHU?Zs2r/kl#A@hg-E-a1m5/1qI[l8d.l2b%ZK]5$G*P*is:Rl:1[?e1="&Yk'YC-ZDT#KfhG%HA@$EbE5$GAV$&)Sa%rr~>
+Gatm=lYkN9&HD1563mcH!Ff7$8$NNEdO&)DY$:1#"6P#nA_JIX9.hMNc%!L'7#FK;Nmhktg?)/k4at$[fq7Gkfpucd5-_6cH=De^ZAEF8-B;ZTDtk8ROlI'-N32p$qWm]N`JVp*20GZ25$d$BFdeYQnYW6frM8Z_>*\o7Em7aRLrdajbr,<Crjo\HrjLs-_6D"$Ug_oEd'nklKq1(2&UOVr^\e(8%ZEUFqZ@375MkkI`/hLso.@"rJ1r5ir:6u5+e>'4<ouEeC/u)s^Kd7M;:]h38\0mm'l16l\AV<qW418e+HSHZ"0HhcCs@B=p"&1dQ-E^]3^!J(eH='G^4/)GXXs'p@uJMtR^6!t+$$W&Gt%N?d:+Cta>anr+KdgA\mfg(X2Pek=W#'g'6<&+/jdTo_cN9VM,fs$4'L,K@aQ`&3RnOgR;ksl-DqT\2.LAPe\l5P>BAq&Hi0G;=i"X-8DZ[$G3b7Lr3<*^qd%<(XcUUe0/Hd3ZoVV`n)1V9Z$Hh^a<n11X6J]eI$%jg&NFglk>M<g%]qQ6NVsp?lI36fZZ=BrW\-G(e;AXgeg+&M/%/lU(5UsEZ-$XB8\n,\L]Z=IkUC3D=Rpr2"3OD1-inXd(*]M9^YSN?4f$P<>1&VtaXHa,6sVQ=1<hgR=%L+b4](d]cp(Ho]TVCirbKc1#[!tI*%d<Sck09h6W@2b]Ip<DKgMhMLaXC71jq"!@Oh:>Eq1&+0C8"<RTBc?l*dDW$2/8;o9O9h.R$@S^f'2T%8mq8N`7m=UN$'&Q9*&M<_c&?L2/n>Tlf:u_D6-'WT$ZKW+jLXiV7"Kq$bM,F<a!MCnit54[@][)f(E2E,SGjd4PMK,%2<TNe]ko*QW?Cim_.,I\6O#IobpWIL#kfk4K*?7q/eFOuNa%D2ohu^L2,Eph+cZS_mJ=>L+Lac#uDd>IOQ=U!:;,5tl[HM(J=<&)n1*K.&<K+Sm@4.>@m.562Rb,=/g5`@-,ok14FXGO4h;lk@R1%KYcSmCnAZM5ph''U,VK).f/7kpB5<keL4Ybb7A`9dn%ilG:n`>-(K\#CM+=Dj1Q-(LV3\=k5jQ2D^)XRI0oK"E`h\0C'9C4"O/uDeZX%Q,EbqC:6W-bILA?47C(p;%YM13DD4P'u`l`f'^PO2!W5p.ppa?4_Wt1AS0]@=]LYAF1)VP4]-4YU'c<E$d-_3573UEJY,.\LjIAVNF6juO9A#rQCRA`d$&/KO//df^G!-d5p]J%Q\K/&fZ(03<Zn,#A&&FZj)!Bs5F'0upG*W\dWUJB]W??9b=YOg0?B5.orL)m<b66kl0Jgj?4:C=8c)IEC#0=+NZEGa($;l%EDO_kTVpOtm3tdp2iP4KH=B;^C-AtV`L.lFhBgPF1-`IeK=E9^ZL2IKJXPLGF(X.51gJO#UV/Q6b![Sk3ccnpP`&'Uq;'k^LPIf1kHjab,`O-X13E0/LZQ-ERA!UuC)4BgfHPS$%80UiVRO'%4L+g02ZfTShsSK?*d@\J5lSVOGk21=F5kr7VKu=h'cPEkTE37!"V2?:>P!FtX5]^_CsB8\8PnaBNchjg#>e#%`hUAAo)@c$2*=krY-mG$C,JD@j'L0upfOuBH!i]Z&grL"-sigJ66(E%:`S/8nX:[/dmnIJDf*g_"[J1YlYO/+=HQ7XIFkmH?AtCVH\Qo13?_Ih-,gHT`7e%2[VWN@9G.NnN7Q\Kb:\91e2f9*\`Re)7mEp'nQcc_"4^,bB@Rb9a/n"-a8ulA>(7Z+c#R!I>sM[+b(El?B3:&&BjW5aDP9oO>oBsMT$!`!Nt9@%rhoYel-FK\[.XPOCu(M*$1WF#$Fb!-,KBr1UKD-[%gA2d>6?!X/TekJQ"q\+5@1\s[nd:9l;5^c%.fa<pgWsGR1scf(tb$LTYI4orQh,u@7&c1X$Lq2-o\jCo(H[EoBsLZBFjK2qdM:3]a/IVS^W).r8J^K0H9h="T'OH<BY<]M"m"?FfMEG1XM<jiiYn;QF@:IGYF"rV_3aHPALQ+XstWUY5=ZSTef1h#NGE_("ru5]R*@1*$212+,a!M-<$-=PJ`9!P.+^)_Do!!>KNMW@`&t&P<>tf/^)LN$E%\8LjOOD=I/a8jnXZGjI.Q:.".<bch:aeVThUPn^Lba3/%,jF:Li5A<$Csh-\hbb)NK>o2U`7U1JI-C5WB3hmK$F";&Q%mqheOh6b7Fs2j6l?FYE$gE^ZTqWP<h1->l^2-r=c>OJ+CgMCXWC#K8j5fI(,rnBSkb>7NJ$IKPm44"^gF8?\ZnNe#~>
 endstream
 endobj
 6 0 obj
@@ -20,10 +20,10 @@
 >>
 endobj
 7 0 obj
-<< /Length 1997 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1995 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GatU4D/\/e&H;*)+_V=N@PK0,n%i0MFe,0mMKF\:FBc1?O_J%#,^L.Fa8^T9M2WiQDD\-m>2;b4*q,\Imc\l$O`g(0Qlt.N/Om1R*+?a>^[NnT!obE]G)]XBr-<*BjB7ca_L-3Z>p#iW1QKp^'@nlSR`H85+BDI*bUgF0CW,S@:;4\?MDWigEG2D"b'0;aLeI]q\<uT:fp;3J-9KUsgJk9H"^LdSO,L12,gB5Lddj&L8R1K)`E>6_Kl1qC@N!7:)7*\]!QGte._tY?dmPl"42FhS<?F%pPg>7EdpL'\qlE?Rcq3b^C@@VDX#Ch:0>C9-AnRH3(LPKQ>Y]4kGI4kU3@f,RBWLT3T#PtWA\E8:3ZJ#ZZ;K[l)us6ne&A7LO6n(In7t.Gh$?"FVoIQVf?q2;BT[l5#&&;kr6Rs:f7\Z<XB>uVh`fucRo`C.Vmj,uZ1S2@Gu8)GebRbgp%2j.Pru;a`[Uga#l5Yp:.r%S#q`87=j]@?P$#X?>P8s,I2"Z#6!4StVrMcfG$Q7CQ+F,+Cnn,TGB9&m0IF98c3"/14Y^s_,+(36435fIrEG^T/oE2MZP]DXHFR*?e%r7r=iRmaZ#!G(50\AI@mY8<g!kln2C4("3ZS82+/!&SJHCT?+kI`b%PRHN(^5ojnYQcO3>BAI\#-:)%\jY/WeHinni''O7uPikXN$.G+/,GO.-HP5[J@qlplD3ChsfO!qP4?(*e;FW?KbE2J"penHm?J'q]M$L<RhB@WYEH6r]^K3cc*uCOTL`)F;cTpGuj4\?ZT?T,/Edrjj/J&,<!DF-sMJ6>Oai_$1b,]P0u3j2@rU3Y[8nR.Vfd]eX@7Ze]fI_hs=icdBpZp9ik1g3oA\OFlbS5pG@J6g"r.j:9\#$:;:^jOVW9_a*U<3/'dI\jtt1h%[gaZ\Tb@4IZS5J64**B(@Ri,j!i8j+%7Z=NT1HR&l+o3-flAQW.q'ad0e5_7AbKJju\9$ZeO812#G)7EE[I7-WXqALhkco!q<c#ZOs_Z$X5LK.cTopPKUD99P[RIX'>Z+=r!JX-sJN(1:&?EDEnbVV(()u>"cQrb4U>F6T&Z0HY"ab1Fp!hX0'AL`h?Oli@W9$VF4^fC:rM8?dM]ZAnc6uJl(Rd2hn,;=FNesr&-bb6K#k6"MqJ+W<BV.V8t?)T@^>M=b9d.d^8JOEL,iuLS2\V`M),@JS#II^*6NP,Lh4?o2LXo\:%>p--*;PK3F?s>Ojc".K<7Tj!rkgCBi7H%uIdU8'!#Z`OhE?`7sf9$3N:Jgs?J,dl'/p-<-dSYrV1P[H#,Y=BbJNj;d!YHeU_jAF(r"&ok=^\?5ec:YB?J(?OeIO-dQK-]aJC;ib=L_VUA1R6R+AE46F2'dp,X\RS/2`h5[gWd-k!B6U2FGq6YiC^\537j/?C5)?G_]P<+%dj/5c%W",:Na*Mf#t:nnGd]P2J.:,Hm9T0,K[X9U,R@5"*E=K$5'VJ./bOF'1+S(C@%\0`G3"AbkT7)3IfRiP7o0bN0*"$6TLY$L0RXLs(HRprN+E6ebio0U"Lu2=^[FF8Eq!s5*/Jg3:@MPBoNQ\Q*eZLl!sr<9&+fi4cX?s3+USoM!Y$<WA\$Y,!<E[I\>OTZ"@7j\+l*>!5i&-HLn;lS#K!CrRFLm2mRVZ2fqG5_/spHI_=EG?c"!+)puF^PM"Ks*\/GVUeN?K_:0qki48iG63h9%E^9G4th3VR:\1mp']m_RVPDA+OM$rp7r)T]hNEKc3C;uPS")(A'XVdr((%!)Nq@$jMVBBGp&>6,6cTit9:uFQI.RY;CalW$j*:6kkjN.tp"Afa40`i13Yo;F^QZ?[AgiWrt.].nj`NGK0iGdIu1Jfrt"k/,cR'$.4p:fnC5`PcC<EHpk22J^R+9q>L:jC#V4SQY_#X$-mQ]?1c'AS`(NJN%$=Y2N=8H;n3IjDrtS<7a*$5q_->OQgJ>`%%[/b,ii'NX]YNmBKJ2"d33-<"T4pN3S:f(:%P)#*\~>
+GatU4D/\/e&H;*)+_V=N@L4>Yn%gb%Fe,0mMKF\:FBc1?O_J%#,^L.Fa8^T9M2WieDR;8%'&AC,*q(.6GLW,HaL_!P9TX*bk9J_`N3Ha.0DkuR5[<C)Xte1\5E=!d4Nl/>R'2KJf>f</N8q:pKN66M-F10/LaCRs1J8h*)DO=[P:uHX,#.`***VWinuX7aj&-s;(Gjl$gJC(@B.'-cPDZ2#Ja;1SER?Y8Uff0F=s!;fM$r.M3(mnhcqSDD/-G]DA,:7*^_e:t"aH>RRL$oA-(%<;C-WG$q)hG/rDbDU@7=(L:5X6pHe62B]t&H=rHWcF]steeqL&,,H?.WOUW$`c=cq0"S,F2q1k*Lqla?VRl0+b%N?T2!!8sTCY"&)5C^9cj?fUD#NK@XhC-7H()83#"()bbBJ>UB&%t3Mb9aKt3MU`j?m/u4:^Y7;1h;@tFedm/h7?-,)QT)C_PImeoo#+-;VspSqoLW/TQ>FeZ>$>LCUj6c&Z%t3EkVMH"-u^)Wngq/>St=MIf+l_3WTso2f%R3Q4(AQu@raTq1,,r]'-i8TJk<;WK,cJn^S^hujRsjC-:?9M%l]]M3Z.!1bLe-n(9Ip,VE%Fo9Sb;DS$O;mF\1P&SIL.)&(%Q:5_6h0OR!BALDP7bN.T(FGhn,B&e;g$]:uF)%\jY/WeHkdoCJ`8U\WS?<b"S_O3l9uP]OjVgAL$qo_5-2?gqu=%I(]\#N2nYDfdLj^X*^&S4bR#5"MJk<AhY).YY-fs"AoEF#!6)Uql%8SOUajSsB0:YIU_:&`EJJneXRS&K>.3Pbgb$Xn\K@"SpT/Ui]=s"[pfrm+9CCb$'LEZ_BliFn``-2>^W]2!o3th,P/Rc?<5u>rg3Q*K?^p[^2m&*Gh%+e$#73Vo?run]mHEMY"EZ),7E(6Y9G/md+c$)^H>gE.iEUMmrT:fZ1PiUI_5dEP)<<_J)s.Uq?jHeSqlE=ojMYaL%XQ^/_[#]>a/*ZOcsRVaUi8@[WO7\AjLP!2'-1$]th%YZ3E\,5ua@^2B!sBrt$GPtN5bX$X,r`tlp_bj5Y*)\@[.BhHsVel$FsEdaVU;"\#b=rBumbUO\BCX+mR.P\S`R4fOUf;XXFpfnK>FKJYK*9nTpdI1j:;DB^],Xd*N)\O<5@mG(-;t<n.>+/>WR'b2?==c&?X;5C$\4rK)]%A1h;pF=Kb3VA:LdGI2WMbmChih3C`TOUV<2:gEZ9!VAO?$P736s&R?=VtEh-*qcdu4fo\)U!"-<S7!Q3P:^nLt:PfehL3$p)iq3"736UhI"slN+BQ_LblnpaBY`h9PnsID!_T6`_TnAl\A)s4@k8HBB!)fr+Sr^$j"f?.Ze\cp_A]aI^TtbZ8sj$c.^a<mf\UU]<!n+X9u?T_5VF;UE(Ahf-#T_ph0u%KS2<Yf=8SI9=lBSSo#i35(;V)t/KT<E'smRju4.lcAbCD]kPK1I?Zn7G(IM`7Grg:YUSP(7M<s@58\\"CN7\T`Vb0o^<:j3Um@^U@9*e:&s@;,:uT\"Qb=Ij=+Tl!>ol=LX#n&D>iobn/`[aP7RuY*N1!+'cm5g?\/J*%bs1`rsK;.":m0E",A$,'KQ:)*C.C$C-)Ou34.X^js^95+UX!(($l$6L[t"]0q00hSUO@4<slGRl&fS5VKOq,]IjB2a!s!neYV;i#=0K\Vu,MS#nU)-/1inC]j#@HGGXM&3;$!SHiLZ1]@_+sjcO?W=?n2D6Oa\FH5\eEVYAlIEFUl.b)uc^`b/<\*VY`b2_BGIYmXiu1-,\7ek[s7.>UgY5N=1\*HoP9Zi(Nm=I3R%EH2+?$NVs`BG@^deNT;)7g7+Z%[L'f$B^3_/)S5+ZH&i!C,C"/$$@@pna5scfti/tr2Mk\hj#+egBc.-=J%+Fj#t^On2pcu1!l^@*WH+`U37]Smou@t)hfPfN40l40b@sX)_aY!GKa)lSh?>'[<,3WWWn.l[#F%'9\W9)ZIECl"n7Z"Zu8V;!X%3J#Q~>
 endstream
 endobj
 8 0 obj
@@ -35,10 +35,10 @@
 >>
 endobj
 9 0 obj
-<< /Length 1610 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1608 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gat%#D3(GM&H88.JaV!YWcc,0#$S"Sh7fjgX(uq.hO`GM@#:(d#<9asG4Y/aJAF,T2Od67Amh3U4FTE$5HYdF>L.=DZE;Yh@9_K?A(g@*?Z:9#6d5;,<GMJRi?B@(ke2+qC&RDXnaT'd#E7m'rSbH_T=+M10PQTIj0=+Yk2I/[N@,Q>)18LnOX3NH;cNY-aNMHm7U[/]@QX(6<@QA#N2&'E_Q8%)UQVfTmi`/G\0B\GgF<F>OdV7gEP`)oqQ@eYQABL1>4/ob(_-(;j>ekcds9L)Sk(n]jW]sI2X9R;7(TrFq]u0\;'aS^eGPQC\564n'LK.WCLtSM/&t-?b4tnriKqktmZ`@-j"eogarrZ4W#VdYX@6*b4=f_q8tgLY6D6#P*N"LFB8),Kr#4=<*nP"fl"7?u^9CI"*6//HGQ7(H9f`?eUs*9WQV/5^]rdf/:Q%FR+6t3c=H5P\&gi@eP2udA5\,tHfs9UB))1:>a/Oo:I)Lh/pp@5Y=/`'ie_doM&(-E8iT-aEc.#AG(A'H&_=j#SGGEg^.,Gq>%--mPhir-2/jna!of=s$)Yb_r1;USh1qAjf=;H1hN'ttM-S,!c\HK+7nq\+*U)DHYY''@<J)9Fa+lhg[bZ3JQBS*dsEYsNXN&UnDBt)C"AWUWLTI9;&8#+!g!L%"l/)/%9?he`Ab.\LNBX0*h<H,in9!4#Z8S6f9=UW9(W<-d3@NuDhVO$6sA.u`P,f%R#T(Qn_[+^emq:=hV.hmti5F^,Y#ANJA!DMcPi\?*(OBU9H&8!^04lJS(,CG]?EHs[_G6eZ"*#CVVKc35c!W[gMjP+>:<M:>gHVd[^i*ARq[os1LVqu$FpWHiU.]I.?b1u1>&?iXDY,C<J8od(HLnQ)-LWF)g9hJ;3)Y"@80KPVGR&/)$TGPr8*CH1p!!2?;3>8/S282d`RjL54XYWgBr&:Qf(]Y*J5sBCif?*`[qD&e"g?\nd&Wr_me_#6i7.M(9-"Nr`[57\ShCEZ?[W*[M%F=@F_rt=7j]^,\Nm!uBjPX2L*ZYFDU<MYqC=%UV^>B-iId7,CF!r_E,k4gFL",ule5kb<)q!aT3hifdr`TuE4[_BI:Zb\4-8*UuKAC#RC?MWaUtXHW;0)X)ocu!rY<-kFV^S<`>]r/VDj']LF[eI0`hf5]Si)\_X6W+,(E`FOAP1q>+(/2!2FD@,>=r-gCGe`13UK,+B_=O%gkI9CUhi6Z(kN2?5W"kfdh"[q5#`d(GF6<a3Ra`<VkCF'1pLkQhr^4T=<7I>KEGj0Se^dH^T+boMTujY=]=cuJf%0"nS*F;J.fG4(_<#)S@(0F.,*$\\*ROh3\QuK4,.,F#\'!CLn8N,Wpsrk<b\m)lL"cL3hc:+cGKX4^]AI_B<2.l`bbsPk%_[u)Ag_r)20$56b):r1-*TX#&5^>"b++Bos!0IlF)KrqmQg^?cOP]bC:84PBsrg99G7(IW;ag^",n^O6iaGObbDZPZ`3,ZbY>X#3f%H;0dYuTe"X%a%^c)F=(-PE2[n*ks&Q#<CpGD]^jnce\rT'>,`L!5l_ZgG[4t8+7j`h.i$LIQo\XN/no3UM)LOZbsJa^_=Ib9,;m.6!Q/+\Fo~>
+Gat%$CQG5K'`FV1JbIPneMu464Be`4m_%&Le[C[K40,e3(uch-!`"#O-NCdr0\?THA7hZ<I)A,1fKR%$iT#6h]^m[JODV,/$esAeY[t^:p`DgDG*2+feiL5<Id\C$@J$+579KNEqo?`]2)l5e%Rc:FY!*ru\/tWbXaaL/Xr%*iC_T^)4Ws&Sh(K[-4$Y^o/[s,K`<(]u/*GL4ifD(!>%qAQ]2bl3F9@JL:T@[iKL[>M]66PJm^X734KEpm8dkhE#dHemF=:X]'e8Msol9E3<OCq'3;M*[bsi01ie1*An-Hn4S&KqKnb.':)NVZ3WWq'`)(&gj!aEI4S>8dh#pd@!XiPQiPfk83QBB6Kr0N]HV-H>d<-cE?A^O1b)79V2"[9S_\@QA_%cS_Q>\+a-CDc73*fj%UfcFTS>+86;!5%_*(<_l))(DT'60)Tc7]$)M1os<3L1M?YaUi(%9<\ubR*fC`%WFkFNH\ADes8#)WjeWdB'_uLB8Hm!W9q<6J^H=Cg5Rk?f+%HWkoc4KFM\>8TZChK[5]H%2i])Eri#OfgrG*eKh3Gp;.F/tO:/2m>Q*?,rj)Cro9Xe=i1%68Z^k,C[RR9eV[RB0<5F,;l\/<8ULTKAf0QQ,g'LX$E-G:ll`2Il1LNed%I7VjBf#&1s,&NK`@,]%dFB!m`'Fn2Ff9&&/L&THW_c]7A));pX-*p[ol+h$Yi?t,`P?45%p2a<HS2V'ha\;UjYP5/[T77MPhGlXl?+Tk9m^52VMPO720"-J1.+0Y0G@?B5aa"f$q)bY:XoU*An>5=cKH98!uZ7nSm/-*`#o('(dl#cJR4VAl$WP%,tHfL5eY,Lk\tZk24cJqU$8B8/?7YP(WUd<9m8ak/p*9:;+(j@62sB^9AeeUKq\nRE!W5F]L/!RQU:;9i>k:Q#lk"umNigI;Dl-^(S)='^oa"AUAc*:1e[lT.(VTAWRo,_WVS=aC"cfS7OFiqIB&/"31/bWoIsgc@_F_d:#7sQi3mXCJ<o3ffO=D(gi9H050)bkmiG^a_5""O(M+XP<J)2pp@U<\eQX#<aJn!mX%;6Jp>5A'-<F'V3`k-rY$TH]I1>f"MKjQ]kQ!i8X^Whd[\H._fS<Y2/4?M_4VK-nqrj6B1q`8Q?o18]mC96>H>euD2:ZS?d($I6qQ,Od=l0os?X3,Ba-=Do59OoAC_o*kD&II-X5,0KQ]q`/U93n[j#3^38_n[?0n_WA!7MKKc9q55qc$;V?XXRcjA(b2S:]<Id)<2_I`j<=Ye0s0)$_eN4=fD9J(8H>(L:R=MmhIc'Y1G^e7\II&XLdP%TF,W\Yq=V.,*0`>P=/Tk&oj4`t7Y=K%b;fU=\.tC3l@lX0g\)<VHNA:$B8bo.U1f8-$-i<u%c(9lXBgVmRGI5i[qdRSgZd32CoRYfV0]1/UuLIYj&r=:_GqY:ffbZ@7/iZQ8qMIJD,T<`77&Ihp5CD1=P!nUjk:gPDr.m3!#1b>8Z6$>M3_Y'FU;0]Xta_SV&-:qs0cG-<FcUhU=)>"=JL*?(n$EV0(L(EK`k`1p"1.a//8^k)uuX"9$)*q/g!6McHk$mXZ'c0L-QRn<3^ToF?6o-<-8280"j;5P3U~>
 endstream
 endobj
 10 0 obj
@@ -195,14 +195,14 @@
 >> endobj
 40 0 obj
 <<
- /Title (\376\377\0\63\0\56\0\70\0\56\0\61\0\40\0\130\0\130\0\105\0\40\0\166\0\62\0\56\0\65\0\160\0\63\0\53)
+ /Title (\376\377\0\63\0\56\0\70\0\56\0\61\0\40\0\130\0\130\0\105\0\40\0\166\0\62\0\56\0\65\0\160\0\62\0\40\0\157\0\162\0\40\0\160\0\162\0\151\0\157\0\162)
  /Parent 38 0 R
  /Next 42 0 R
  /A 39 0 R
 >> endobj
 42 0 obj
 <<
- /Title (\376\377\0\63\0\56\0\70\0\56\0\62\0\40\0\130\0\130\0\105\0\40\0\166\0\62\0\56\0\65\0\160\0\62\0\40\0\157\0\162\0\40\0\160\0\162\0\151\0\157\0\162)
+ /Title (\376\377\0\63\0\56\0\70\0\56\0\62\0\40\0\130\0\130\0\105\0\40\0\166\0\62\0\56\0\65\0\160\0\63\0\53)
  /Parent 38 0 R
  /Prev 40 0 R
  /A 41 0 R
@@ -353,7 +353,7 @@
 41 0 obj
 <<
 /S /GoTo
-/D [10 0 R /XYZ -5.0 667.628 null]
+/D [10 0 R /XYZ -5.0 642.868 null]
 >>
 endobj
 43 0 obj
@@ -365,56 +365,56 @@
 xref
 0 51
 0000000000 65535 f 
-0000011353 00000 n 
-0000011424 00000 n 
-0000011516 00000 n 
+0000011346 00000 n 
+0000011417 00000 n 
+0000011509 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000002438 00000 n 
-0000002544 00000 n 
-0000004633 00000 n 
-0000004739 00000 n 
-0000006441 00000 n 
-0000006563 00000 n 
-0000006611 00000 n 
-0000006815 00000 n 
-0000006999 00000 n 
-0000007199 00000 n 
-0000011650 00000 n 
-0000011701 00000 n 
-0000007412 00000 n 
-0000011764 00000 n 
-0000007552 00000 n 
-0000011829 00000 n 
-0000007818 00000 n 
-0000011894 00000 n 
-0000008119 00000 n 
-0000011959 00000 n 
-0000008363 00000 n 
-0000012023 00000 n 
-0000008627 00000 n 
-0000012086 00000 n 
-0000008761 00000 n 
-0000012151 00000 n 
-0000009025 00000 n 
-0000012216 00000 n 
-0000009397 00000 n 
-0000012281 00000 n 
-0000009613 00000 n 
-0000012346 00000 n 
-0000009765 00000 n 
-0000012410 00000 n 
-0000010013 00000 n 
-0000012474 00000 n 
-0000010185 00000 n 
-0000012540 00000 n 
-0000010404 00000 n 
-0000010691 00000 n 
-0000010804 00000 n 
-0000010914 00000 n 
-0000011022 00000 n 
-0000011128 00000 n 
-0000011244 00000 n 
+0000002435 00000 n 
+0000002541 00000 n 
+0000004628 00000 n 
+0000004734 00000 n 
+0000006434 00000 n 
+0000006556 00000 n 
+0000006604 00000 n 
+0000006808 00000 n 
+0000006992 00000 n 
+0000007192 00000 n 
+0000011643 00000 n 
+0000011694 00000 n 
+0000007405 00000 n 
+0000011757 00000 n 
+0000007545 00000 n 
+0000011822 00000 n 
+0000007811 00000 n 
+0000011887 00000 n 
+0000008112 00000 n 
+0000011952 00000 n 
+0000008356 00000 n 
+0000012016 00000 n 
+0000008620 00000 n 
+0000012079 00000 n 
+0000008754 00000 n 
+0000012144 00000 n 
+0000009018 00000 n 
+0000012209 00000 n 
+0000009390 00000 n 
+0000012274 00000 n 
+0000009606 00000 n 
+0000012339 00000 n 
+0000009758 00000 n 
+0000012403 00000 n 
+0000010006 00000 n 
+0000012467 00000 n 
+0000010225 00000 n 
+0000012533 00000 n 
+0000010397 00000 n 
+0000010684 00000 n 
+0000010797 00000 n 
+0000010907 00000 n 
+0000011015 00000 n 
+0000011121 00000 n 
+0000011237 00000 n 
 trailer
 <<
 /Size 51
@@ -422,5 +422,5 @@
 /Info 4 0 R
 >>
 startxref
-12606
+12599
 %%EOF

Modified: forrest/site/docs/compliance.html
==============================================================================
--- forrest/site/docs/compliance.html	(original)
+++ forrest/site/docs/compliance.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <span class="sel"><font color="#ffcc00">Standards Compliance</font></span>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
     
+    
+<li>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
 </li>
     
+</ul>
+</li>
+  
+</ul>
+</li>
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<font color="#CFDCED">SubProjects</font>
+<ul>
+    
+<li>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>

Modified: forrest/site/docs/document-v12.dtdx.html
==============================================================================
--- forrest/site/docs/document-v12.dtdx.html	(original)
+++ forrest/site/docs/document-v12.dtdx.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,7 +57,7 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -66,28 +66,16 @@
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
-<tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -98,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -127,45 +119,6 @@
 <div class="menu">
 <ul>
 <li>
-<font color="#CFDCED">About</font>
-<ul>
-    
-<li>
-<a href="../index.html">Index</a>
-</li>
-    
-<li>
-<a href="../license.html">License</a>
-</li>
-    
-<li>
-<a href="http://www.apache.org/dyn/closer.cgi/xml/forrest/">Download</a>
-</li>
-    
-<li>
-<a href="../who.html">Who we are</a>
-</li>
-    
-<li>
-<a href="../faq.html">FAQs</a>
-</li>
-    
-<li>
-<a href="../changes.html">Changes</a>
-</li>
-    
-    
-<li>
-<a href="../todo.html">Todo</a>
-</li>
-    
-<li>
-<a href="../live-sites.html">Example sites</a>
-</li>
-  
-</ul>
-</li>
-<li>
 <font color="#CFDCED">Documentation</font>
 <ul>
     
@@ -182,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -201,199 +150,115 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
 <li>
-<a href="../docs/cap.html">Sourcetype Action</a>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
 </li>
-    
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
-    
+      
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+</ul>
 </li>
     
-<li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
-</li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
-</li>
-  
-</ul>
-</li>
-<li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">Upgrading</font>
 <ul>
-    
+      
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
 </li>
     
-<li>
-<a href="../docs/dreams.html">Dream list</a>
+</ul>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">SubProjects</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
- 
+  
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Community</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../community/index.html">About</a>
-</li>
-    
-<li>
-<font color="#CFDCED">How-To Samples</font>
-<ul>
-      
-<li>
-<a href="../community/howto/index.html">Overview</a>
-</li>
-      
-<li>
-<a href="../community/howto/v10/howto-v10.html">Single Page</a>
-</li>
-      
-<li>
-<font color="#CFDCED">Multi-Page</font>
+<font color="#CFDCED">DTD documentation</font>
 <ul>
         
 <li>
-<a href="../community/howto/multi/howto-multi.html">Intro</a>
+<a href="../docs/dtd-docs.html">index</a>
 </li>
         
 <li>
-<a href="../community/howto/multi/step1.html">Step 1</a>
+<span class="sel"><font color="#ffcc00">document-v12</font></span>
 </li>
         
 <li>
-<a href="../community/howto/multi/step2.html">Step 2</a>
-</li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
         
 <li>
-<a href="../community/howto/multi/step3.html">Step 3</a>
-</li>
-      
-</ul>
-</li>
-      
-<li>
-<a href="../community/howto/bugzilla-patch/howto-bugzilla-patch.html">With Images</a>
-</li>
-    
-</ul>
-</li>
-    
-<li>
-<font color="#CFDCED">Developers</font>
-<ul>
-      
-<li>
-<a href="../community/howto/v10/howto-v10.html">Write a How-to</a>
-</li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
     
 </ul>
 </li>
     
 <li>
-<font color="#CFDCED">Committers</font>
-<ul>
-      
-<li>
-<a href="../community/howto/cvs-ssh/howto-cvs-ssh.html">CVS through SSH</a>
-</li>
-    
-</ul>
-</li>
-  
-</ul>
-</li>
-<li>
-<font color="#CFDCED">Getting Involved</font>
-<ul>
-    
-<li>
-<a href="../contrib.html">Contributing</a>
-</li>
-    
-<li>
-<a href="../build.html">Building Forrest</a>
-</li>
-    
-<li>
-<a class="external" href="http://svn.apache.org/viewcvs.cgi/forrest/trunk/?root=Apache-SVN">Browse SVN</a>
-</li>
-    
-<li>
-<a href="../mail-lists.html">Mail lists</a>
-</li>
-    
-<li>
-<a href="../mail-archives.html">Mail Archives</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a class="external" href="http://issues.cocoondev.org/jira/secure/BrowseProject.jspa?id=10000">Bugs and Issues</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
     
 <li>
-<a href="../forrest-issues.html">Open Issues</a>
-</li>
-  
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Related projects</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a class="external" href="http://gump.apache.org/">Apache Gump</a>
-</li>
-    
-<li>
-<a class="external" href="http://cocoon.apache.org/">Apache Cocoon</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a class="external" href="http://cocoon.apache.org/lenya/">Apache Lenya</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
     
 <li>
-<a class="external" href="http://xml.apache.org/">Apache XML</a>
+<a href="../docs/dreams.html">Dream list</a>
 </li>
   
 </ul>

Modified: forrest/site/docs/document-v12.html
==============================================================================
--- forrest/site/docs/document-v12.html	(original)
+++ forrest/site/docs/document-v12.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
+    
     
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
+<li>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
 </li>
     
+</ul>
+</li>
+  
+</ul>
+</li>
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<font color="#CFDCED">SubProjects</font>
+<ul>
+    
+<li>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<span class="sel"><font color="#ffcc00">document-v12</font></span>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<span class="sel"><font color="#ffcc00">document-v12</font></span>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>
@@ -498,24 +535,24 @@
 <li>This should be 3 if my math is still OK.</li> 
       
 </ol>
-<a name="section"></a><a name="N10138"></a><a name="Using+sections"></a>
+<a name="section"></a><a name="N10137"></a><a name="Using+sections"></a>
 <h4>Using sections</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>You can use sections to put some structure in your document. For some
           strange historical reason, the section title is an attribute of the
           <span class="codefrag">&lt;section&gt;</span> element.</p>
 </div>
-<a name="N10145"></a><a name="Sections%2C+the+sequel"></a>
+<a name="N10144"></a><a name="Sections%2C+the+sequel"></a>
 <h4>Sections, the sequel</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Just some second section.</p>
-<a name="N1014E"></a><a name="Section+2.1"></a>
+<a name="N1014D"></a><a name="Section+2.1"></a>
 <h5>Section 2.1</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>Which contains a subsection (2.1).</p>
 </div>
 </div>
-<a name="source"></a><a name="N1015C"></a><a name="Showing+preformatted+source+code"></a>
+<a name="source"></a><a name="N1015B"></a><a name="Showing+preformatted+source+code"></a>
 <h4>Showing preformatted source code</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Enough about these sections. Let's have a look at more interesting
@@ -538,7 +575,7 @@
 <p>Please take care to still use a sensible line-length within your
           source elements.</p>
 </div>
-<a name="N10171"></a><a name="table"></a>
+<a name="N1016F"></a><a name="table"></a>
 <h4>Using tables</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>And now for a table:</p>
@@ -578,7 +615,7 @@
 </table>
 <p>Not much of attributes with <span class="codefrag">&lt;table&gt;</span>, if you ask me.</p>
 </div>
-<a name="second-figure-anchor"></a><a name="N101B5"></a><a name="figure"></a>
+<a name="second-figure-anchor"></a><a name="N101B3"></a><a name="figure"></a>
 <h4>Using figures</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>And a <span class="codefrag">&lt;figure&gt;</span> to end all of this.

Modified: forrest/site/docs/dreams.html
==============================================================================
--- forrest/site/docs/dreams.html	(original)
+++ forrest/site/docs/dreams.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
     
+    
+<li>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
 </li>
     
+</ul>
+</li>
+  
+</ul>
+</li>
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<font color="#CFDCED">SubProjects</font>
+<ul>
+    
+<li>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<span class="sel"><font color="#ffcc00">Dream list</font></span>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<span class="sel"><font color="#ffcc00">Dream list</font></span>
+</li>
+  
 </ul>
 </li>
 </ul>

Modified: forrest/site/docs/dtd-docs.html
==============================================================================
--- forrest/site/docs/dtd-docs.html	(original)
+++ forrest/site/docs/dtd-docs.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<span class="sel"><font color="#ffcc00">DTD documentation</font></span>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
     
+    
+<li>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
 </li>
     
+</ul>
+</li>
+  
+</ul>
+</li>
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<font color="#CFDCED">SubProjects</font>
+<ul>
+    
+<li>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<span class="sel"><font color="#ffcc00">index</font></span>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>

Modified: forrest/site/docs/faq-v12.dtdx.html
==============================================================================
--- forrest/site/docs/faq-v12.dtdx.html	(original)
+++ forrest/site/docs/faq-v12.dtdx.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,7 +57,7 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -66,28 +66,16 @@
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
-<tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -98,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -127,45 +119,6 @@
 <div class="menu">
 <ul>
 <li>
-<font color="#CFDCED">About</font>
-<ul>
-    
-<li>
-<a href="../index.html">Index</a>
-</li>
-    
-<li>
-<a href="../license.html">License</a>
-</li>
-    
-<li>
-<a href="http://www.apache.org/dyn/closer.cgi/xml/forrest/">Download</a>
-</li>
-    
-<li>
-<a href="../who.html">Who we are</a>
-</li>
-    
-<li>
-<a href="../faq.html">FAQs</a>
-</li>
-    
-<li>
-<a href="../changes.html">Changes</a>
-</li>
-    
-    
-<li>
-<a href="../todo.html">Todo</a>
-</li>
-    
-<li>
-<a href="../live-sites.html">Example sites</a>
-</li>
-  
-</ul>
-</li>
-<li>
 <font color="#CFDCED">Documentation</font>
 <ul>
     
@@ -182,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -201,199 +150,115 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
 <li>
-<a href="../docs/cap.html">Sourcetype Action</a>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
 </li>
-    
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
-    
+      
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+</ul>
 </li>
     
-<li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
-</li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
-</li>
-  
-</ul>
-</li>
-<li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">Upgrading</font>
 <ul>
-    
+      
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
 </li>
     
-<li>
-<a href="../docs/dreams.html">Dream list</a>
+</ul>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">SubProjects</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
- 
+  
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Community</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../community/index.html">About</a>
-</li>
-    
-<li>
-<font color="#CFDCED">How-To Samples</font>
-<ul>
-      
-<li>
-<a href="../community/howto/index.html">Overview</a>
-</li>
-      
-<li>
-<a href="../community/howto/v10/howto-v10.html">Single Page</a>
-</li>
-      
-<li>
-<font color="#CFDCED">Multi-Page</font>
+<font color="#CFDCED">DTD documentation</font>
 <ul>
         
 <li>
-<a href="../community/howto/multi/howto-multi.html">Intro</a>
+<a href="../docs/dtd-docs.html">index</a>
 </li>
         
 <li>
-<a href="../community/howto/multi/step1.html">Step 1</a>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
 </li>
         
 <li>
-<a href="../community/howto/multi/step2.html">Step 2</a>
-</li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
         
 <li>
-<a href="../community/howto/multi/step3.html">Step 3</a>
-</li>
-      
-</ul>
-</li>
-      
-<li>
-<a href="../community/howto/bugzilla-patch/howto-bugzilla-patch.html">With Images</a>
-</li>
-    
-</ul>
-</li>
-    
-<li>
-<font color="#CFDCED">Developers</font>
-<ul>
-      
-<li>
-<a href="../community/howto/v10/howto-v10.html">Write a How-to</a>
-</li>
+<span class="sel"><font color="#ffcc00">faq-v12</font></span>
+</li>           
     
 </ul>
 </li>
     
 <li>
-<font color="#CFDCED">Committers</font>
-<ul>
-      
-<li>
-<a href="../community/howto/cvs-ssh/howto-cvs-ssh.html">CVS through SSH</a>
-</li>
-    
-</ul>
-</li>
-  
-</ul>
-</li>
-<li>
-<font color="#CFDCED">Getting Involved</font>
-<ul>
-    
-<li>
-<a href="../contrib.html">Contributing</a>
-</li>
-    
-<li>
-<a href="../build.html">Building Forrest</a>
-</li>
-    
-<li>
-<a class="external" href="http://svn.apache.org/viewcvs.cgi/forrest/trunk/?root=Apache-SVN">Browse SVN</a>
-</li>
-    
-<li>
-<a href="../mail-lists.html">Mail lists</a>
-</li>
-    
-<li>
-<a href="../mail-archives.html">Mail Archives</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a class="external" href="http://issues.cocoondev.org/jira/secure/BrowseProject.jspa?id=10000">Bugs and Issues</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
     
 <li>
-<a href="../forrest-issues.html">Open Issues</a>
-</li>
-  
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Related projects</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a class="external" href="http://gump.apache.org/">Apache Gump</a>
-</li>
-    
-<li>
-<a class="external" href="http://cocoon.apache.org/">Apache Cocoon</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a class="external" href="http://cocoon.apache.org/lenya/">Apache Lenya</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
     
 <li>
-<a class="external" href="http://xml.apache.org/">Apache XML</a>
+<a href="../docs/dreams.html">Dream list</a>
 </li>
   
 </ul>

Modified: forrest/site/docs/forrest-contract.html
==============================================================================
--- forrest/site/docs/forrest-contract.html	(original)
+++ forrest/site/docs/forrest-contract.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
     
+    
+<li>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
 </li>
     
+</ul>
+</li>
+  
+</ul>
+</li>
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<font color="#CFDCED">SubProjects</font>
+<ul>
+    
+<li>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>

Modified: forrest/site/docs/forrestbar.html
==============================================================================
--- forrest/site/docs/forrestbar.html	(original)
+++ forrest/site/docs/forrestbar.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
     
+    
+<li>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
 <li>
-<span class="sel"><font color="#ffcc00">The ForrestBar</font></span>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
 </li>
     
+</ul>
+</li>
+  
+</ul>
+</li>
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<font color="#CFDCED">SubProjects</font>
+<ul>
+    
+<li>
+<span class="sel"><font color="#ffcc00">ForrestBar</font></span>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>

Modified: forrest/site/docs/forrestbot.html
==============================================================================
--- forrest/site/docs/forrestbot.html	(original)
+++ forrest/site/docs/forrestbot.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
     
+    
+<li>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<span class="sel"><font color="#ffcc00">Forrestbot</font></span>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+</li>
+    
+</ul>
+</li>
+  
+</ul>
 </li>
+<li>
+<font color="#CFDCED">SubProjects</font>
+<ul>
     
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<span class="sel"><font color="#ffcc00">Forrestbot</font></span>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>
@@ -345,7 +382,7 @@
 </div>
 
     
-<a name="N10029"></a><a name="Creating+a+buildfile"></a>
+<a name="N10028"></a><a name="Creating+a+buildfile"></a>
 <h3>Creating a buildfile</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>A sample buildfile:</p>
@@ -484,13 +521,13 @@
       my-settings.xml) that just sets those properties (don't include it in
       CVS/SVN!). Then in your project buildfile, have <span class="codefrag">&lt;import
       file="my-settings.xml"/&gt;</span>.</p>
-<a name="N100C2"></a><a name="Workstage+Properties"></a>
+<a name="N100C0"></a><a name="Workstage+Properties"></a>
 <h4>Workstage Properties</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Each workstage implementation is configurable with properties. The
         following tables describe each property and whether or not you are
         required to set it in your buildfile.</p>
-<a name="N100CB"></a><a name="Misc+Properties"></a>
+<a name="N100C9"></a><a name="Misc+Properties"></a>
 <h5>Misc Properties</h5>
 <div style="margin-left: 0 ; border: 2px">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -523,7 +560,7 @@
           
 </table>
 </div>
-<a name="N10102"></a><a name="getsrc.local"></a>
+<a name="N10100"></a><a name="getsrc.local"></a>
 <h5>getsrc.local</h5>
 <div style="margin-left: 0 ; border: 2px">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -556,7 +593,7 @@
           
 </table>
 </div>
-<a name="N10139"></a><a name="getsrc.cvs"></a>
+<a name="N10137"></a><a name="getsrc.cvs"></a>
 <h5>getsrc.cvs</h5>
 <div style="margin-left: 0 ; border: 2px">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -654,7 +691,7 @@
           
 </table>
 </div>
-<a name="N101E1"></a><a name="getsrc.svn"></a>
+<a name="N101DF"></a><a name="getsrc.svn"></a>
 <h5>getsrc.svn</h5>
 <div style="margin-left: 0 ; border: 2px">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -700,7 +737,7 @@
           
 </table>
 </div>
-<a name="N1022F"></a><a name="build.forrest"></a>
+<a name="N1022D"></a><a name="build.forrest"></a>
 <h5>build.forrest</h5>
 <div style="margin-left: 0 ; border: 2px">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -745,7 +782,7 @@
           
 </table>
 </div>
-<a name="N1027E"></a><a name="deploy.scp"></a>
+<a name="N1027C"></a><a name="deploy.scp"></a>
 <h5>deploy.local</h5>
 <div style="margin-left: 0 ; border: 2px">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -778,7 +815,7 @@
           
 </table>
 </div>
-<a name="N102B6"></a><a name="deploy.local"></a>
+<a name="N102B4"></a><a name="deploy.local"></a>
 <h5>deploy.scp</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>${user.home}/.ssh/known_hosts must properly recognize the host, so
@@ -814,7 +851,7 @@
           
 </table>
 </div>
-<a name="N102F0"></a><a name="deploy.cvs"></a>
+<a name="N102EE"></a><a name="deploy.cvs"></a>
 <h5>deploy.cvs</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>This is only available on *nix operating systems. </p>
@@ -913,7 +950,7 @@
           
 </table>
 </div>
-<a name="N1039C"></a><a name="notify"></a>
+<a name="N1039A"></a><a name="notify"></a>
 <h5>notify</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>These settings are used by all notify implementations.</p>
@@ -985,12 +1022,12 @@
           
 </table>
 </div>
-<a name="N10418"></a><a name="notify.local"></a>
+<a name="N10416"></a><a name="notify.local"></a>
 <h5>notify.local</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>No properties.</p>
 </div>
-<a name="N10422"></a><a name="notify.email"></a>
+<a name="N10420"></a><a name="notify.email"></a>
 <h5>notify.email</h5>
 <div style="margin-left: 0 ; border: 2px">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -1039,7 +1076,7 @@
 </div>
 
     
-<a name="N10473"></a><a name="Forrestbot+design"></a>
+<a name="N10471"></a><a name="Forrestbot+design"></a>
 <h3>Forrestbot design</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Forrest and forrestbot use ant buildfiles extensively. Ant 1.6's import

Modified: forrest/site/docs/howto-v12.dtdx.html
==============================================================================
--- forrest/site/docs/howto-v12.dtdx.html	(original)
+++ forrest/site/docs/howto-v12.dtdx.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,7 +57,7 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -66,28 +66,16 @@
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
-<tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -98,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -127,45 +119,6 @@
 <div class="menu">
 <ul>
 <li>
-<font color="#CFDCED">About</font>
-<ul>
-    
-<li>
-<a href="../index.html">Index</a>
-</li>
-    
-<li>
-<a href="../license.html">License</a>
-</li>
-    
-<li>
-<a href="http://www.apache.org/dyn/closer.cgi/xml/forrest/">Download</a>
-</li>
-    
-<li>
-<a href="../who.html">Who we are</a>
-</li>
-    
-<li>
-<a href="../faq.html">FAQs</a>
-</li>
-    
-<li>
-<a href="../changes.html">Changes</a>
-</li>
-    
-    
-<li>
-<a href="../todo.html">Todo</a>
-</li>
-    
-<li>
-<a href="../live-sites.html">Example sites</a>
-</li>
-  
-</ul>
-</li>
-<li>
 <font color="#CFDCED">Documentation</font>
 <ul>
     
@@ -182,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -201,199 +150,115 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
 <li>
-<a href="../docs/cap.html">Sourcetype Action</a>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
 </li>
-    
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
-    
+      
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+</ul>
 </li>
     
-<li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
-</li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
-</li>
-  
-</ul>
-</li>
-<li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">Upgrading</font>
 <ul>
-    
+      
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
 </li>
     
-<li>
-<a href="../docs/dreams.html">Dream list</a>
+</ul>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">SubProjects</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
- 
+  
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Community</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../community/index.html">About</a>
-</li>
-    
-<li>
-<font color="#CFDCED">How-To Samples</font>
-<ul>
-      
-<li>
-<a href="../community/howto/index.html">Overview</a>
-</li>
-      
-<li>
-<a href="../community/howto/v10/howto-v10.html">Single Page</a>
-</li>
-      
-<li>
-<font color="#CFDCED">Multi-Page</font>
+<font color="#CFDCED">DTD documentation</font>
 <ul>
         
 <li>
-<a href="../community/howto/multi/howto-multi.html">Intro</a>
+<a href="../docs/dtd-docs.html">index</a>
 </li>
         
 <li>
-<a href="../community/howto/multi/step1.html">Step 1</a>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
 </li>
         
 <li>
-<a href="../community/howto/multi/step2.html">Step 2</a>
-</li>
+<span class="sel"><font color="#ffcc00">howto-v12</font></span>
+</li> 
         
 <li>
-<a href="../community/howto/multi/step3.html">Step 3</a>
-</li>
-      
-</ul>
-</li>
-      
-<li>
-<a href="../community/howto/bugzilla-patch/howto-bugzilla-patch.html">With Images</a>
-</li>
-    
-</ul>
-</li>
-    
-<li>
-<font color="#CFDCED">Developers</font>
-<ul>
-      
-<li>
-<a href="../community/howto/v10/howto-v10.html">Write a How-to</a>
-</li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
     
 </ul>
 </li>
     
 <li>
-<font color="#CFDCED">Committers</font>
-<ul>
-      
-<li>
-<a href="../community/howto/cvs-ssh/howto-cvs-ssh.html">CVS through SSH</a>
-</li>
-    
-</ul>
-</li>
-  
-</ul>
-</li>
-<li>
-<font color="#CFDCED">Getting Involved</font>
-<ul>
-    
-<li>
-<a href="../contrib.html">Contributing</a>
-</li>
-    
-<li>
-<a href="../build.html">Building Forrest</a>
-</li>
-    
-<li>
-<a class="external" href="http://svn.apache.org/viewcvs.cgi/forrest/trunk/?root=Apache-SVN">Browse SVN</a>
-</li>
-    
-<li>
-<a href="../mail-lists.html">Mail lists</a>
-</li>
-    
-<li>
-<a href="../mail-archives.html">Mail Archives</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a class="external" href="http://issues.cocoondev.org/jira/secure/BrowseProject.jspa?id=10000">Bugs and Issues</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
     
 <li>
-<a href="../forrest-issues.html">Open Issues</a>
-</li>
-  
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Related projects</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a class="external" href="http://gump.apache.org/">Apache Gump</a>
-</li>
-    
-<li>
-<a class="external" href="http://cocoon.apache.org/">Apache Cocoon</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a class="external" href="http://cocoon.apache.org/lenya/">Apache Lenya</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
     
 <li>
-<a class="external" href="http://xml.apache.org/">Apache XML</a>
+<a href="../docs/dreams.html">Dream list</a>
 </li>
   
 </ul>

Modified: forrest/site/docs/libre-intro.html
==============================================================================
--- forrest/site/docs/libre-intro.html	(original)
+++ forrest/site/docs/libre-intro.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
+    
     
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
+<li>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
 </li>
     
+</ul>
+</li>
+  
+</ul>
+</li>
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<font color="#CFDCED">SubProjects</font>
+<ul>
+    
+<li>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<span class="sel"><font color="#ffcc00">Libre</font></span>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<span class="sel"><font color="#ffcc00">Libre</font></span>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>
@@ -443,7 +480,7 @@
 <p>The number and value (and its meaning) of the attributes on these
           elements are specified in the libre.xml file.</p>
 </div>
-<a name="N1004F"></a><a name="+Contents"></a>
+<a name="N1004E"></a><a name="+Contents"></a>
 <h4>libre.xml Contents</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>That libre.xml file follows the
@@ -484,7 +521,7 @@
   regex CDATA #IMPLIED
   substitute CDATA #IMPLIED
 &gt;</pre>
-<a name="N10062"></a><a name="Building+Blocks"></a>
+<a name="N10060"></a><a name="Building+Blocks"></a>
 <h5>Building Blocks</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>The following elements get the following meaning when interpreted
@@ -664,11 +701,11 @@
 </ul>
 </div>
 </div>
-<a name="N10176"></a><a name="Important+Side+Effects"></a>
+<a name="N1016C"></a><a name="Important+Side+Effects"></a>
 <h4>Important Side Effects</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>There are some things that libre is doing that you should be aware of.</p>
-<a name="N1017F"></a><a name="No+libre.xml"></a>
+<a name="N10175"></a><a name="No+libre.xml"></a>
 <h5>No libre.xml</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>When using an <span class="codefrag">&lt;auto&gt; </span>section, the filter will
@@ -676,7 +713,7 @@
             can however include a manual <span class="codefrag">&lt;entry&gt;</span> to point to the
             <span class="codefrag">libre.xml</span> file if needed.</p>
 </div>
-<a name="N10195"></a><a name="No+Duplicates"></a>
+<a name="N1018B"></a><a name="No+Duplicates"></a>
 <h5>No Duplicates</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>You can combine multiple <span class="codefrag">&lt;entry&gt;</span> and
@@ -688,7 +725,7 @@
             in the output.</p>
 </div>
 </div>
-<a name="N101B2"></a><a name="Example+Constructs"></a>
+<a name="N101A8"></a><a name="Example+Constructs"></a>
 <h4>Example Constructs</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Adding sorting and filtering to the filesystem with libre becomes a
@@ -698,7 +735,7 @@
           choosing (or creating) the DTDs, the one applying those to create content and
           give the resulting files a name, the one that sets up the directories to store
           those files and writes the <span class="codefrag">libre.xml</span> files.</p>
-<a name="N101C1"></a><a name="Sorting+your+files+or+your+menu+entries%3F"></a>
+<a name="N101B7"></a><a name="Sorting+your+files+or+your+menu+entries%3F"></a>
 <h5>Sorting your files or your menu entries?</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>In every case the very pragmatic approach can become something
@@ -744,7 +781,7 @@
             items should be easily slided in later on, and/or deeply nested directory
             structures can all benefit from this same filenaming/sorting strategy.</p>
 </div>
-<a name="N101F1"></a><a name="Naming+your+files+or+asking+them+their+name%3F"></a>
+<a name="N101E5"></a><a name="Naming+your+files+or+asking+them+their+name%3F"></a>
 <h5>Naming your files or asking them their name?</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>Given the poor expressiveness of the filesystem, the labels that
@@ -777,7 +814,7 @@
 </div>
 </div> 
     
-<a name="N10202"></a><a name="Next+Libre+%280.1%29"></a>
+<a name="N101F5"></a><a name="Next+Libre+%280.1%29"></a>
 <h3>Next Libre (0.1)</h3>
 <div style="margin-left: 0 ; border: 2px">
 <div class="frame note">
@@ -786,7 +823,7 @@
         the forrest-dev <a href="../mail-lists.html">mail list</a>
         a line, and see what happens...</div>
 </div>
-<a name="N1020F"></a><a name="Itches"></a>
+<a name="N10202"></a><a name="Itches"></a>
 <h4>Itches</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>There is quite a number of fast code patches that can/need to
@@ -824,13 +861,13 @@
         
 </ul>
 </div>
-<a name="N10237"></a><a name="Upcoming+Features"></a>
+<a name="N1022A"></a><a name="Upcoming+Features"></a>
 <h4>Upcoming Features</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>More importantly however there is a major set of new features that
           is waiting to get in there. It all boils down in fact to having a more
           expressive libre.xml file... some of the thoughts:</p>
-<a name="N10240"></a><a name="Combinations+of+filter+logic"></a>
+<a name="N10233"></a><a name="Combinations+of+filter+logic"></a>
 <h5>Combinations of filter logic</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>Some itching stuff:</p>
@@ -863,7 +900,7 @@
 &lt;/filter&gt;
     </pre>
 </div>
-<a name="N10262"></a><a name="Separating+property-retrieval+from+formatting+and%0A++++++++++++testing"></a>
+<a name="N10253"></a><a name="Separating+property-retrieval+from+formatting+and%0A++++++++++++testing"></a>
 <h5>Separating property-retrieval from formatting and
             testing</h5>
 <div style="margin-left: 0 ; border: 2px">
@@ -903,7 +940,7 @@
 <p>And more logically introduce other tests like <span class="codefrag">&lt;globtest
             match="..."&gt;</span> or <span class="codefrag">&lt;availabletest&gt;</span> or...</p>
 </div>
-<a name="N1029C"></a><a name="Replace+the+introspection+with+semantically+richer+named%0A++++++++++++properties+to+read."></a>
+<a name="N1028B"></a><a name="Replace+the+introspection+with+semantically+richer+named%0A++++++++++++properties+to+read."></a>
 <h5>Replace the introspection with semantically richer named
             properties to read.</h5>
 <div style="margin-left: 0 ; border: 2px">
@@ -952,7 +989,7 @@
 <p>The DTD would then list the possible attributeValues.</p>
 </div>
 </div>
-<a name="N102E0"></a><a name="Avalonising"></a>
+<a name="N102CF"></a><a name="Avalonising"></a>
 <h4>Avalonising</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>There are a number of perceived opportunities in taking up a
@@ -975,7 +1012,7 @@
         
 </ul>
 </div>
-<a name="N102F6"></a><a name="Unresolved+Discussions"></a>
+<a name="N102E5"></a><a name="Unresolved+Discussions"></a>
 <h4>Unresolved Discussions</h4>
 <div style="margin-left: 0 ; border: 2px">
 <ul> 
@@ -997,7 +1034,7 @@
 </div>
 </div> 
     
-<a name="N10313"></a><a name="Libre+Design"></a>
+<a name="N10302"></a><a name="Libre+Design"></a>
 <h3>Libre Design</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p> So why is that silly 'yer' package name in there? Yer originally was
@@ -1034,7 +1071,7 @@
 </ul>
 <p>... hope this somewhat clarifies how things have been setup for
         now.</p>
-<a name="N1033E"></a><a name="Dependencies"></a>
+<a name="N1032D"></a><a name="Dependencies"></a>
 <h4>Dependencies</h4>
 <div style="margin-left: 0 ; border: 2px">
 <ul> 

Modified: forrest/site/docs/linking.html
==============================================================================
--- forrest/site/docs/linking.html	(original)
+++ forrest/site/docs/linking.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
     
+    
+<li>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+</li>
+    
+</ul>
+</li>
+  
+</ul>
 </li>
+<li>
+<font color="#CFDCED">SubProjects</font>
+<ul>
     
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>
@@ -491,7 +528,7 @@
 </div>
 
     
-<a name="N100A6"></a><a name="menu_generation"></a>
+<a name="N100A5"></a><a name="menu_generation"></a>
 <h3>Generating Menus</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -520,7 +557,7 @@
       <span class="codefrag">community/mailLists.html</span>. Note that <span class="codefrag">indexfile</span>
       defaults to <span class="codefrag">index.html</span> if no value is supplied. Therefore the
       link for the howto tab is <span class="codefrag">community/howto/index.html</span>.</p>
-<a name="N100F0"></a><a name="tabs-external"></a>
+<a name="N100EE"></a><a name="tabs-external"></a>
 <h4>Tabs for External Resources</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>You can make a tab point to an external resource by using the 
@@ -535,7 +572,7 @@
         specifies a directory (ends in '/'). In which case /index.html will be 
         added</p>
 </div>
-<a name="N10111"></a><a name="selecting-entries"></a>
+<a name="N1010E"></a><a name="selecting-entries"></a>
 <h4>Selecting menu entries</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Forrest decides which menu entries to display by examining the
@@ -583,7 +620,7 @@
             tab="home"</em>, and put them in the menu.
         </p>
 </div>
-<a name="N10163"></a><a name="other-menu-selection"></a>
+<a name="N1015F"></a><a name="other-menu-selection"></a>
 <h4>Alternative menu selection mechanisms.</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -591,7 +628,7 @@
           entries is not the only one, although it is the most flexible.  Here
           we describe a few alternatives.
         </p>
-<a name="N1016F"></a><a name="dir-menu-selection"></a>
+<a name="N1016B"></a><a name="dir-menu-selection"></a>
 <h5>Directory-based selection</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>In this scheme, each tab corresponds to a directory within the
@@ -616,7 +653,7 @@
           
 </ul>
 </div>
-<a name="N1019F"></a><a name="book-menu-selection"></a>
+<a name="N1019B"></a><a name="book-menu-selection"></a>
 <h5>Specifying menus with book.xml</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -630,7 +667,7 @@
           </p>
 </div>
 </div>
-<a name="N101BC"></a><a name="tab-selection"></a>
+<a name="N101B8"></a><a name="tab-selection"></a>
 <h4>Selecting the current tab</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -645,7 +682,7 @@
 </div>
 
     
-<a name="N101D3"></a><a name="toc-generation"></a>
+<a name="N101CF"></a><a name="toc-generation"></a>
 <h3>Table of Contents Generation</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Each page can have an automatically generated table of contents. This
@@ -691,10 +728,10 @@
 </div>
     
     
-<a name="N10209"></a><a name="linking"></a>
+<a name="N10204"></a><a name="linking"></a>
 <h3>Linking systems</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N1020F"></a><a name="direct-linking"></a>
+<a name="N1020A"></a><a name="direct-linking"></a>
 <h4>Direct linking</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -715,7 +752,7 @@
           one of them (here, the PDF) are likely to break.
         </p>
 </div>
-<a name="N10235"></a><a name="indirect-linking"></a>
+<a name="N1022F"></a><a name="indirect-linking"></a>
 <h4>Indirect linking</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -743,7 +780,7 @@
           'idea' of "the todo file".  It doesn't matter where it physically lives;
           that will be sorted out by Forrest.
         </p>
-<a name="N1025D"></a><a name="resolve-site-uris"></a>
+<a name="N10257"></a><a name="resolve-site-uris"></a>
 <h5>Resolving site: URIs</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -780,7 +817,7 @@
             another category.
           </p>
 </div>
-<a name="N1029B"></a><a name="resolve-ext-uris"></a>
+<a name="N10295"></a><a name="resolve-ext-uris"></a>
 <h5>ext: URIs: linking to external URLs</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -823,7 +860,7 @@
             related URLs easy.
           </p>
 </div>
-<a name="N102CF"></a><a name="source-uris"></a>
+<a name="N102C8"></a><a name="source-uris"></a>
 <h5>Theory: source URIs</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -842,7 +879,7 @@
             translated into plain old HTML in the output.
           </p>
 </div>
-<a name="N102EE"></a><a name="future-schemes"></a>
+<a name="N102E7"></a><a name="future-schemes"></a>
 <h5>Future schemes</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -915,7 +952,7 @@
 </div>
 </div>
     
-<a name="N10392"></a><a name="concept"></a>
+<a name="N1038B"></a><a name="concept"></a>
 <h3>Concept</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -930,7 +967,7 @@
       </p>
 </div>
     
-<a name="N103A9"></a><a name="implementation"></a>
+<a name="N103A2"></a><a name="implementation"></a>
 <h3>Implementation</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Full details on the implementation of

Modified: forrest/site/docs/linkmap-index.html
==============================================================================
--- forrest/site/docs/linkmap-index.html	(original)
+++ forrest/site/docs/linkmap-index.html	Thu Jun 17 23:57:47 2004
@@ -42,12 +42,6 @@
     <linking label="Menus and Linking" href="../docs/linking.html">
       <menu_generation href="../docs/linking.html#menu_generation"/>
     </linking>
-    <sitemap-ref label="Sitemap Reference" href="../docs/sitemap-ref.html">
-      <linkrewriting_impl href="../docs/sitemap-ref.html#linkrewriting_impl"/>
-      <menu_generation_impl href="../docs/sitemap-ref.html#menu_generation_impl"/>
-      <source_pipelines href="../docs/sitemap-ref.html#source_pipelines"/>
-      <forrest_xmap href="../docs/sitemap-ref.html#forrest_xmap"/>
-    </sitemap-ref>
     <searching label="Searching" href="../docs/searching.html"/>
     <skin-package label="Skin Packages" href="../docs/skin-package.html"/>
     <!--
@@ -55,16 +49,42 @@
     -->
     <forrest-contract label="Our Contract" href="../docs/forrest-contract.html"/>
     <compliance label="Standards Compliance" href="../docs/compliance.html"/>
-    <dtd-docs label="DTD documentation" href="../docs/dtd-docs.html"/>
-    <catalog label="Using DTD Catalogs" href="../docs/catalog.html"/>
-    <cap label="Sourcetype Action" href="../docs/cap.html"/>
-    <oowriter label="OpenOffice Writer" href="../docs/oowriter.html"/>    
-    <forrestbar label="The ForrestBar" href="../docs/forrestbar.html"/>
-    <forrestbot label="Forrestbot" href="../docs/forrestbot.html"/>
-    <upgrading_06 label="Upgrading to 0.6" href="../docs/upgrading_06.html"/>
-    <upgrading_05 label="Upgrading to 0.5" href="../docs/upgrading_05.html"/>
+   
+    
+    <developers label="Advanced Topics">
+      <catalog label="Using DTD Catalogs" href="../docs/catalog.html"/>
+      <sitemap-ref label="Sitemap Reference" href="../docs/sitemap-ref.html">
+        <linkrewriting_impl href="../docs/sitemap-ref.html#linkrewriting_impl"/>
+        <menu_generation_impl href="../docs/sitemap-ref.html#menu_generation_impl"/>
+        <source_pipelines href="../docs/sitemap-ref.html#source_pipelines"/>
+        <forrest_xmap href="../docs/sitemap-ref.html#forrest_xmap"/>
+      </sitemap-ref>
+      <cap label="Sourcetype Action" href="../docs/cap.html"/>
+    </developers>
+    
+    <upgrading label="Upgrading">
+      <upgrading_06 label="Upgrading to 0.6" href="../docs/upgrading_06.html"/>
+      <upgrading_05 label="Upgrading to 0.5" href="../docs/upgrading_05.html"/>
+    </upgrading>
   </documentation>
 
+  <subprojects label="SubProjects" href="../docs/" tab="docs">
+    <forrestbar label="ForrestBar" href="../docs/forrestbar.html"/>
+    <forrestbot label="Forrestbot" href="../docs/forrestbot.html"/>
+  </subprojects>
+    
+  <samples label="References" href="../docs/" tab="docs">
+    <dtd-docs-container label="DTD documentation">
+        <dtd-docs label="index" href="../docs/dtd-docs.html"/>
+        <document-v12-dtd label="document-v12" href="../docs/document-v12.dtdx.html"/>
+        <howto-v12-dtd label="howto-v12" href="../docs/howto-v12.dtdx.html"/> 
+        <faq-v12-dtd label="faq-v12" href="../docs/faq-v12.dtdx.html"/>           
+    </dtd-docs-container>
+    <document-v12 label="document-v12" href="../docs/document-v12.html"/>
+    <wiki label="Wiki Reference" href="../docs/wiki-sample.html"/>
+    <oowriter label="OpenOffice Writer" href="../docs/oowriter.html"/>    
+ </samples>
+
   <older_documentation label="Older Docs" href="../docs/" tab="docs">
     <primer label="Forrest Primer" href="../docs/primer.html">
       <cvs href="../docs/primer.html#cvs"/>
@@ -73,32 +93,30 @@
     <dreams label="Dream list" href="../docs/dreams.html"/>
   </older_documentation>
 
-  <samples label="Some Samples" href="../docs/" tab="docs">
-    <document-v12 label="document-v12" href="../docs/document-v12.html"/>
-    <wiki label="Wiki Reference" href="../docs/wiki-sample.html"/>
- </samples>
-
-  <community label="Community" href="../community/" tab="community">
-    <index label="About" href="../community/index.html"/>
-    <howto-samples label="How-To Samples" href="../community/howto/" tab="howto">
-      <overview label="Overview" href="../community/howto/index.html"/>
-      <single-page label="Single Page" href="../community/howto/v10/howto-v10.html"/>
-      <multi-page label="Multi-Page" href="../community/howto/multi/">
-        <intro label="Intro" href="../community/howto/multi/howto-multi.html"/>
-        <step1 label="Step 1" href="../community/howto/multi/step1.html"/>
-        <step2 label="Step 2" href="../community/howto/multi/step2.html"/>
-        <step3 label="Step 3" href="../community/howto/multi/step3.html"/>
+<!--
+  <community label="Community" href="community/"  tab="project">
+    <index label="About" href="index.html"/>
+    <howto-samples label="How-To Samples" href="howto/" tab="howto">
+      <overview label="Overview" href="index.html"/>
+      <single-page label="Single Page" href="v10/howto-v10.html"/>
+      <multi-page label="Multi-Page" href="multi/">
+        <intro label="Intro" href="howto-multi.html"/>
+        <step1 label="Step 1" href="step1.html"/>
+        <step2 label="Step 2" href="step2.html"/>
+        <step3 label="Step 3" href="step3.html"/>
       </multi-page>
-      <with-images label="With Images" href="../community/howto/bugzilla-patch/howto-bugzilla-patch.html"/>
+      <with-images label="With Images" href="bugzilla-patch/howto-bugzilla-patch.html"/>
     </howto-samples>
-    <howto-developers label="Developers" href="../community/howto/" tab="howto">
-      <write-howto label="Write a How-to" href="../community/howto/v10/howto-v10.html"/>
+    <howto-developers label="Developers" href="howto/" tab="howto">
+      <write-howto label="Write a How-to" href="v10/howto-v10.html"/>
     </howto-developers>
-    <howto-committers label="Committers" href="../community/howto/" tab="howto">
-      <cvs-ssh label="CVS through SSH" href="../community/howto/cvs-ssh/howto-cvs-ssh.html"/>
+    <howto-committers label="Committers" href="howto/" tab="howto">
+      <cvs-ssh label="CVS through SSH" href="cvs-ssh/howto-cvs-ssh.html"/>
     </howto-committers>
   </community>
-  <getting-involved label="Getting Involved">
+-->
+  
+  <getting-involved label="Getting Involved" tab="project">
     <contrib label="Contributing" href="../contrib.html"/>
     <build label="Building Forrest" href="../build.html"/>
     <SVN label="Browse SVN" href="http://svn.apache.org/viewcvs.cgi/forrest/trunk/?root=Apache-SVN"/>
@@ -123,6 +141,7 @@
     <cocoon label="Apache Cocoon" href="http://cocoon.apache.org/"/>
     <lenya label="Apache Lenya" href="http://cocoon.apache.org/lenya/"/>
     <xml label="Apache XML" href="http://xml.apache.org/"/>
+    <apache-stats label="Apache Stats" href="http://www.apache.org/~vgritsenko/stats/"/>
   </references>
   <!-- Uncomment this if we want aggregate HTML/PDFs for this site 
   <pdfs label="PDFs">

Modified: forrest/site/docs/menu-index.html
==============================================================================
--- forrest/site/docs/menu-index.html	(original)
+++ forrest/site/docs/menu-index.html	Thu Jun 17 23:57:47 2004
@@ -57,10 +57,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -76,143 +72,115 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
 <li>
-<a href="../docs/cap.html">Sourcetype Action</a>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
 </li>
-    
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
-    
+      
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+</ul>
 </li>
     
-<li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
-</li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
-</li>
-  
-</ul>
-</li>
-<li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">Upgrading</font>
 <ul>
-    
+      
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
 </li>
     
-<li>
-<a href="../docs/dreams.html">Dream list</a>
+</ul>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">SubProjects</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
- 
+  
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Community</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../community/index.html">About</a>
-</li>
-    
-<li>
-<font color="#CFDCED">How-To Samples</font>
-<ul>
-      
-<li>
-<a href="../community/howto/index.html">Overview</a>
-</li>
-      
-<li>
-<a href="../community/howto/v10/howto-v10.html">Single Page</a>
-</li>
-      
-<li>
-<font color="#CFDCED">Multi-Page</font>
+<font color="#CFDCED">DTD documentation</font>
 <ul>
         
 <li>
-<a href="../community/howto/multi/howto-multi.html">Intro</a>
+<a href="../docs/dtd-docs.html">index</a>
 </li>
         
 <li>
-<a href="../community/howto/multi/step1.html">Step 1</a>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
 </li>
         
 <li>
-<a href="../community/howto/multi/step2.html">Step 2</a>
-</li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
         
 <li>
-<a href="../community/howto/multi/step3.html">Step 3</a>
-</li>
-      
-</ul>
-</li>
-      
-<li>
-<a href="../community/howto/bugzilla-patch/howto-bugzilla-patch.html">With Images</a>
-</li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
     
 </ul>
 </li>
     
 <li>
-<font color="#CFDCED">Developers</font>
-<ul>
-      
+<a href="../docs/document-v12.html">document-v12</a>
+</li>
+    
 <li>
-<a href="../community/howto/v10/howto-v10.html">Write a How-to</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
     
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
-    
 <li>
-<font color="#CFDCED">Committers</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
-      
+    
 <li>
-<a href="../community/howto/cvs-ssh/howto-cvs-ssh.html">CVS through SSH</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
-</ul>
+<li>
+<a href="../docs/libre-intro.html">Libre</a>
+</li>
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
 </li>
   
 </ul>
@@ -269,6 +237,10 @@
     
 <li>
 <a href="http://xml.apache.org/">Apache XML</a>
+</li>
+    
+<li>
+<a href="http://www.apache.org/~vgritsenko/stats/">Apache Stats</a>
 </li>
   
 </ul>

Modified: forrest/site/docs/oowriter.html
==============================================================================
--- forrest/site/docs/oowriter.html	(original)
+++ forrest/site/docs/oowriter.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<span class="sel"><font color="#ffcc00">OpenOffice Writer</font></span>
-</li>    
+</ul>
+</li>
     
+    
+<li>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
 </li>
     
+</ul>
+</li>
+  
+</ul>
+</li>
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<font color="#CFDCED">SubProjects</font>
+<ul>
+    
+<li>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<span class="sel"><font color="#ffcc00">OpenOffice Writer</font></span>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>

Modified: forrest/site/docs/primer.html
==============================================================================
--- forrest/site/docs/primer.html	(original)
+++ forrest/site/docs/primer.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
     
+    
+<li>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+</li>
+    
+</ul>
+</li>
+  
+</ul>
 </li>
+<li>
+<font color="#CFDCED">SubProjects</font>
+<ul>
     
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<span class="sel"><font color="#ffcc00">Forrest Primer</font></span>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<span class="sel"><font color="#ffcc00">Forrest Primer</font></span>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>
@@ -667,7 +704,7 @@
         first invocation. These are Centipede-specific compiled Ant tasks.</p>
 </div> 
     
-<a name="N101CD"></a><a name="The+Forrest+DTDs"></a>
+<a name="N101CC"></a><a name="The+Forrest+DTDs"></a>
 <h3>The Forrest DTDs</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Forrest is the reference repository for the XML Apache documentation
@@ -715,7 +752,7 @@
         web-accessible from the Forrest website for your perusal.</p>
 </div> 
     
-<a name="N1021F"></a><a name="sitemap"></a>
+<a name="N1021D"></a><a name="sitemap"></a>
 <h3>Forrest site generation using Cocoon</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>The <span class="codefrag">docs</span> target of the Forrest build environment invokes
@@ -824,7 +861,7 @@
         <span class="codefrag">site2xhtml</span>.</p>
 </div> 
     
-<a name="N102D2"></a><a name="Where+we+are+heading+to"></a>
+<a name="N102CC"></a><a name="Where+we+are+heading+to"></a>
 <h3>Where we are heading to</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>We have been explaining so far where we are now and what already
@@ -947,7 +984,7 @@
 </table>
 </div> 
     
-<a name="N1039A"></a><a name="Where+you+can+help"></a>
+<a name="N10394"></a><a name="Where+you+can+help"></a>
 <h3>Where you can help</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>By now, you should have a better understanding of Forrest (if that is

Modified: forrest/site/docs/primer.pdf
==============================================================================
--- forrest/site/docs/primer.pdf	(original)
+++ forrest/site/docs/primer.pdf	Thu Jun 17 23:57:47 2004
@@ -240,10 +240,10 @@
 >>
 endobj
 31 0 obj
-<< /Length 2591 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2571 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gasaq?ZXu3&V&E1@/\G!*?,^mM.Gbs)ok]ol*rnNXR!7BoDp-Z#oAb46->5bl+82@@R8+Vm26@W!UMES]>%Y0_g:9k9"Z8l95hLL/A9j`n<WPS^VEIZR&lUY\$!Do]ijgW>OO$K6]reQS(mUQLI`ob?mQ06ZP%8&o@EfJ\,J1^b9qF%<=gK&cVmnN-OX:e:)mf\3km3=XJUI"Q]ms#85?N#a_E/W2V8FAFTR\gD4*e6Ns@aDj#n-(.V[9lo3'Q6rY\KE<Q0ieMZu8@l\.IlL/g;0ogRbs`t/A!53j"paG[2-QRRd_a;%]q$-!>J9Yd0+R0R8j7?KO!FN7XP3a]fB?)Mk"\>'-<]m63/mq6*%<`J!Yj"WBr'o-BJI<=4Kg0)b(nr/674U6O1/$V2%\qI.O=4GRJ%ppB41Q2s6r8u!)0oR]f(pW.jIUe]/>#oTG=[o*k7o>&%2b90RR@,MbE+EU)*G7*0XtnVaqd2SCICVAEa!;!_R*A\%EX8]tB<niZW6du1NA;NHB/""0!)13+0Gt)a@9]V]g@&Z6)b]^ulY-H6ohK;u\6f)GYp=T7"=YIYq>.`@eYXdH;]9k'($?k5,kEpP^F_XNQ(sWm_IJjp4A_@CnDj7h30Vm5<;m08#!:^L5d4Plpnq'f>et?Q(]WpskF;-/mlstVV'lg237)]i.2_p@b4i+.YA\mdkkiLuHJhgW24i7_^V^rbrl;c[+;+LbDr:@SD(1,o&T[&QLCi_H!@iM-_pp!A"W/%'pAs+\EkN!i@QndRlRH3RaLcF=+ll<ZNH0Z=,]<,XF%E.d&"rMU*T@pBL8n)kZV7l2XpQ%>pN,:Sl7<%-i\DQh`QJphgOj<2a#]R1B=-=`PW'i^+moVZkKKC;"l]uA<'@OTGms%$J9`@NS.f&S[QU':6JKW3>QuIB.cZoH&4^.aUuk]raDb+QCZ7J)!oucFb*DreXp.`-bAqg["IrZcHI&ja2#o)&]7WGqa\:D5'&Wmi"iWR'`?S]ggB:5BG"&7'c&T?_,kdVMDsK.f=BKN8-(_H.U-939FAPPpOl.L>%M%c[V=1?t8IV%GQ^6"GU'TSZC$LOVQ)-BPh@nXKd/l5RnP+`4g@/%85:OZnA9>K)MZpE67JW7k6UrYb-E.6cEJ,Z1!Y%i1;BAEO)<J$`*Ga<?jHp:TaW"(_dCb'C$'`(Z7:>gu2M;Z!TdsaV`(G6Vq@:2AkcF!Igp(9dEKEmp;L^4SCVjsr1H#JEQ'Pt*,F>.POfFh^Gn_`j1rHi=ckMI:qcS`dL.o.X!%ZEL[]T=Xe&Fpe^\&K&-"uF:lbD5G8c`Ud'C?7NRZ_I^;%ekV1O?tN\k1=L/&cGR-2jN)]FrgqJd/s]Lu<ML,Oj%nn+XJ?;.isdQG%)U5@k4o+V;K([hV'$CHAT>lio_JJ]l:ap-Q`3GH(uq9B_B_cdEGK>WmZEn^KOHf=9]7jg2Eu"_<l`KJ*A%;Qg9M%nWA3L/EMf%$'btHVj*r?7L0UAB,t4RSp_&c_q^g8-;BnV8]STh.AA':fYgiadWoH\6]45.F`+OPCoC(%oj)d-[Z_Citb/HC6ja_j_?3Xl%D6diPb0&h69%jjJJXg/pCkAU=o+n6/N^M/6<O.ont?aU+0dDaf?*LA;H?"fumb]oFg=>f?jFAC$;Y04D+pF9X3I\.UDA<)EkW_2l4.T?[oV-)(I_L,1ckq)"7XTOT&bcC3HKb0TAZ,c#7mN"t1Fk$#IfY)k&Mq/>mu8q;C.CbCW[XGh8^%.[8FA[@a'+$jq9:VIJMa8?2,^82RW,Au(&'>-#9&Of`*i8C7O'E51K6AJ4A=eOdG>]nI;O]!KiGTk!M>NZAETS/u<pc60^Q8[b,=h#a%=%Bgln(n.H,6;t,+*D4cV;"_K?I>Bls,QZg6iIH*N,%/TH"C1B6Tl1H4UVWLbkro<bg>k+H=[`?HMXHLO%Yg'XeoD`f/X6n)d#KUTNF<?;pC803/$^/>%#;lbZ'C($_-#q$MgF?3W<;TiR+lOugn^_hM1PaHEg#WZlof/oZlrF,)J[1#Y%9:=!+n?971-c%(dud@4JSHV)7/km!)@5(0p`GQeAD`sFI9(s:1XAM**OT&7-ccQL\J1=`STR@=-lMDP[prfNGBYZW02).9^6))%=5Ng],((cd'rH]lRuOP3_rML4:9(j-_Z`C@t^XVGCiAC^;6<;eN=r(OL5G!/P?bX.;D$T"ns?8p#SIi0Yss6S`D(4f3i?LF%$!KI;^"(#bhbB)d@T)E$3\:&tO$4q0PqC0s"U8cgdlm>b")dBbt\V<J`)-6r"KF3/<Z\iDm)5d<qghCO"Shgj"6qF7-.M;BOo:OWY%hBqG6rEU^@bjSLHM*ADphnE\j/lbs<@+p>F':MrHnTK@Dsbq0)BWP6FO!2dH1Bg3rAIaVtF5;]_80E+N9I9djV=fIadJ-5lg1?FW5`%!ZijSd'ULe3R*.6RRKSqSH2gt/QJG/MaeHc^%Mh;3B8H=XP$-/'O&r>sb!I2R]."O0LZ`>4!+RKQir*=7^JR)TI#MA,3e='dd*hMl3@-/\*P_-b)*!%Nn]HhEkDQ+UjFS;BKQG08kj.uE*=rrA_8;E+~>
+GasaqD0+IA&cSq?_>6ObFDOKq-Sot[EU4s;Nn\X$\kY=]5<pJ>Tcj^XV!Rl*r@J>+=@ff>p5Fa<"SN;:cS#!1]i]`>4[1&>DnTGX]\UI!<q$X7^e068,cf!jfA;!0f6d52]+0IDUp5,h\%_/>8L8ggM1YH&6lb'rnc%jVrsJ&^8Y&`?#;O?le5b,B@OYG-%^KKuZ7GXMVTZ7u-TU^RS8]4)j@B\rYSjh5"<o/H15Y39^[+@JI4Fqid\:s:Z_lpa$XP*YMA88j%1Z.b$[E?oX)s0`X0EP'_=pNC2D3"2=$mY&;A/)b/#qYCN"to;J3!TYpW4lm6Z4sKNk$]`^5+Lu:3hQ'@fR+SGr^2c58$o#U4TnDLnQb3EG1B.O't,9FuFA4SrqrIj<.<6-$Eog(R$+`7K%?"puucX__?haQa]G?@;L5.LaC[F$aWgaZ@^QJ1(%;MME5jl6)%?"bXs%6,<Oq.PXT,JA?NHR^V%2YFF2$J3:oe(*UVkJOB,T2A7mJjWJaFhANDQli2)P:0ELKlG^+cMgG6b!5/4nd=Gf%C:E)9o[p$uPp#?"0(!.]X:B@H=e&TG+2GFLJdcfA,S.e-W,kEpPIk9HY<MWYOq2s_`pQ_`8rU@39%OG8;g7Q/t0_G5MaL7!Kr\EYM!l)"sr.hnVDV+o;G]*bMU,^X66-D"'@-EO7jmqQmk4ZjibG>Q1IW;9pRS[_l5N.]ibP-M$QnnqUk3'mSMgaKlDjO,N;FkgPjDMLK&uY%#!*pM\Y+Hh=^pobS/m8jc1$+qYEP-6!FqUrKPcC"%O>C#tb$>$-7nu\`E[\0N%fl8Q*O6WjL0dcKZ:km6Y"Bs4pW(-n/m8G^`FV0ZMO-,ngOj<2a#]R1O(bf_.;q[H7,/@Uc^?XJ&]>VrWd8,EjtX+/!9T:1E)'q<g\,1.#^CCo)Zua&k"+]<l]?$N4;@-_4(L=Nr&&I8IfYAB4E73I)f>O-K5J02D1Y]gGeN:mbSoCSe(m=Kl!u..&IBS4W.JK>C@Qt$lJY$-P$M!8BsV<P1l3GhMr'1^_\a0E;Mj"AV5R1CSfUi<kT%hjlO]_L=SeVh6,d5JF(GZK/W.nbS>Mm'<EX'heig@a2(cV#Nc-Dcf7qV.rh(CSOjW\?D\gD`(].D`%iqc'R\ZMsSYA[qV'JeL'p4`N;=82UZ%a8X,1C`nGq04FRW"j%4A;nA!jbt/+UDL59q2ZS/)@b-4A9RBZ_OF=`s/Fc5FZtsITE`*KQUWX2@!QRQ=S5RQ_MlqWgUMF&uq$M_h>hP'YU:8Yn2$eQ#^.2<hKV5>O`#tNKM(AlSH=\d)mH^J%M='!JjXRUENc=E\0M7_m+7%L_rI>:7>pop`I^TJ*ITK`/U(U(S?"AE4i"Zpsh1hpUkcOB30nT]l"m`ZN[NDLgXTEMOr3QS^q=p"!Gt+Q0/KETjkBulN0qTPB_s9/^YQh,DZoWNAHQRqn8UdHAf]h8Xt;N!-$hr!QbG,B9?V%TI#Lpn(E%e1R[)LGMZlN,f6!J\tdWN).-<j(e']*]4VPA_3dSi]q?Qf8snpj"mg</eV[uE3RMrK!_h`cQ]<\Yb1.u,AZK?T^?L;7QJpom`8.X\IH%-!(bU#D'r'CPh*KpHm4)0OFnLZ.R%c'BDpQPLm27Z)EdSbKL0<NkPoI`]3";B`=6C!CJgpC46)AAqe>&p<n>:=+roN<iQ_CFs.WPX\Y5pj!%HTg_Y@]_;J4WF^D19Z42F,sJ9sT`1GsbMBJ`ZMW/Ka!L@TdYB*Ue<]9r4#!VY9PTJjCQ`cr)E"2+dIG$]3`A@2S7%M:UsHAn7st5#Lsn,htHVY=p.d:nQ5Ve/&am:JY#[4ESg?k;8:*5BSJU$+b`PDC=-*W:(KU$uL4me\KO0SIh4k%sOsClU04o(=+/d9TTC-5D0,"Ul#/=#77orMaQACO@FjaZfMZU*n,d[ONAs[OAU+D3cd!.4@^X:aj<olnHF2;nLk;@Lq>V+0MKQ&1c#t4Oc6(-n-d7='!J5Mb>5P7h$J-Kp.pI.1k7%[B^g)+kf`#h3&0-KWZDV_iS;p<R-"q:iMNSF_&"q\0H<:1kb)%tdJMo'6"p,"Q4R-I_[W\hR&ZWNAH+2#=sLgNlRtI4ms36;]u)S^@OA'QOh&UnY(>)r9"s+:WLLFUkja,h>1C=&gqIF&^N,%m3giijP)NO=,,aA=$q[A]"HaB]6T"]+j*F\.XAsL`=diSidI:Qm\2R!Z0+V6;8Ua+r,VQF4##dm\,P$oZH-9;Y&8e)mfZIu^"0%lTkRkj<^B_^m_n+Cs*'89Ui\Vg0%e3S!Q$B`3A?M%a:cq=(GC@)ak!sa/L:8bPK@f;0F'm:foH@!M$*mYo_p`WC*1#:mo(<rM*AII`i9*&6mlOcD,(LX2+YG.qn+mOW6i5Ec\F75=[l*Qn]$t*$>1sLnm.V<G-MtN[VCtun&&J/[o.2#5k'gl6O)@FUnK<,%Uc[&n7SdEt9OmJ2GV9:d[]b>HLjV5)_oMnW<>/l#FTc(p%alcFdqfFKF5k#re<G(P,5H,;%/q6b5#>BAgkRP$<7.[Hj%9I*i$jjcX<cB1hZ,f\6d#~>
 endstream
 endobj
 32 0 obj
@@ -278,7 +278,7 @@
 35 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 61.656 517.566 132.984 505.566 ]
+/Rect [ 61.656 507.706 132.984 495.706 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://cocoon.apache.org/)
@@ -287,10 +287,10 @@
 >>
 endobj
 36 0 obj
-<< /Length 3530 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 3457 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GauGcCQmM]nb`7lc$bH9nNd<Q^54XcOuf./4&+2ipd<jJO9A.68O<W[dj^mdpFa5t!'VYm-Kgfg@>VrUp:X,un8RucLRSf5*_HNnj2J1ulY$"9>Jtsl^EZG1pKa"-O":E<XD\#[o>AJjnkH^2C=gAs`WK2QnDGBpO?d<%.)q1#@e&>gh\Pj'J"WN^%Yo99j-^VI=1;tZk.J?6XuLo\pC[FVSr3Ghq;(Y]rtZ,pF,hId9#>A)gRPn9qE6iEZ!?ZG.oo\<3r5!o>UW;c3_MntmWO3LBZ8!cHPg2Ki+l'Y]Vd3Gj@?IeYAWJ!XN[^!dE=s-7O5Dq7gi?Pd@XA>i72[e4tu"hO#0)$Za5OOVgUEL4j@Q&?kd#?<f0UqX#`"n0a^9hB0iTk^>1hc/5_Y)1hj'<9G*9nCU'g+(e(ED@83Q4f7?tAq=<)'M\k)*?G+Xr*5>^6;.=9Ja%@[D?N]W@H=&jQpf];d4OhL5(0@+I@$JZ<W`br:N'C[UMFURKni4T6+c(eQ.2MXSl";Ks92S$Y;QNAbk[1#cmA"`;%9%kQpbUD\UXCh>.)B8hdP*!r%6n3r^ul:d>*0\P%3ls?kr!2b6QZp?o@+\5*f?\-e/ANTnkE]&U2mG"+h7AH^5kTZqN[_Mgi?7O.TM8FjnJ&Tn!?g*YEhd[bE#8eTO'XcQs)5_8't=oalJb:(i&3.LAs!)'C;LHdRhLZpjUOZWTabQM2^TMmqcsW@NnA%%^C;,/)tgInkE5Y%-c?[N"^lXTLO@AB-gg,#ID2Xr%+F:BDnH0s)%qq4_&/\3[3g=#R71RO\KIq<JUJ5&oJ4r<eqg\HI!-=]4G#\fFq.$S)N+W";!O_^3abhPt?=NTMi(T%BK2S+*W&JaDAYQ\hL?sngl:l3/H?rpE=1JXscPLbBZgDKM<0VE6NuI["04\NkOeGf'YnK@!PckODW9=rCRHkq0PPAVW,D%#>sOOQKNcJmlRf7EH;Fq7$<:GN+S<-P@f0s?M)'E]f)Yu5'6u`"gC$L\">Q9&:Ou1=]Aa5Z6fWjN*WM3eQe8l%rTukK3X]HC_'_WSQU*(QNpi7jS6^K3\i40L,;Z<?[O)ZX#jlVi)0%ae3C1U^<M>4`WZn03+6EI]Ufgc!:bpLM1%h!17s\'OJF:FEMlK:1<A.<CN!Sc<ilIUOl$e^iaSq=$j%BmC_>fO*WSJBf2^&%0uotG7gg8l?Edtt75=DdLs,u`jE*QNDs]k=3WkXc-T4"TG09C#RL2u-jTMH(I`o`J8$l:\)=a?%p`m,!/(p/2(k*dTE8'H1NjUc0N:H0on1Y^ZFu71"BCCgmZo#_FiF$*Z7.Y-K`n$P?k*<SGSon#a!ZfG0:Q6p$'$'t70'N;GYc&cF?$nZ8R,U$"rN:=kBq'n#2'OqM*CT1u@,B^1'ViH0r^r$d%g*Mu-X14fh;qmdK,2p[OW1Y+)Cj&'=k4go6g1YaaD1H3D'(hUa&3JMIE%.I:+@+:9O=Q4=iTJt<L96C6-&PZqb<u]!&hB8[N4k]og1<$M1[1VF3`j<Z-"o[dlp^tW9#83I)F;:\:SXZCGSdbj&1ATpkM`AC^&YJZ<?eY+>RZoGq/o-Q*Dh'A#@BM?;;e?X-eQZ8$B.rXFR%o^hR?E88ni*++hU6E,]ml7!/2rc:Xbc9VIu\GV^ZNF,^?[&9^qN1fk,qkT0TBVLD8#$c2C4(U7u-&S!,Dd<r<,W%%&mM"scclp*GR`'2`j;p<3si1.<u^%4tOoU4fAT6$i3bI(`ZP^?`1$\c9T_nOCc0,F7rqfnUZea6,2%i04\4T'6mO;K4*7Q-2'aEPoIJnP:.,VV,bZ+KR=,:=0*/hKJ'L;o*HD5H^SBWZ(Y?;1i4hE]LYOSGB5K:&JVOMlt*9pOAP+<&D<7pql'MAe&%aTGa[gMB"t^,/-)m,E3:;^)K0GQ^5s>D=&HS?HY'Q#6T.E_b$?6:$hq"N>]?qP#mbAN_+3<fOE[(*p'6ht;&r\L7RQ$ZQKcZoOB+iHRG]J_16,B+DKJc3J3@M+0L&SIQ*"4]pt#?skkmc4DmeT1U&qY5-L+[Z9>O`*G<sTH9b1V0V3(g1h)4lfMK:!SRle$n+\*i/\2"(jjE$Eu)0MjfqoB<u>.Sh/jU5GV$`h*qXVhb%]-2[>%%)S.BEicW5XTZaRHUjFC2'/8CI_"W(4aEo<Ynj2oW6L0,_:I<9s/82usmOp7TfJQqu%oJQ#X@djGtROub\Oha.Y-kE1qT+^RU)#6`Yi:u^Pj4RQ'U"Dg2l/=!O:es"fM*cE(gKs%Ekod.LD\hb9d%[2mOrbe-H(Um&@at1"I]E0CRKVEa`r-Q-l$Kp@aae"8W&HdY:VfmK`9VO`GR?U<dBD)3RcjdRKmTXKEIa3L>u&mS"<2'rM@5R`7U4<f:6&<U3&ThgYBAcU]6dgYYlU$<!P4'9YQ#"rVfl^JWW:!B!j"ba%a=ki36d,_7:a$3U^eQpVTVW'.ZC^8b0bUP#=RaV!IN058%,M%n<lQ'pb9)FC*PQK6`8,H4F;[FRnRB&AAd^SCoGh$Qt_,'fOG-]935=HPd+YdeD&O=-oSZpD?3ogm/ebsg1+>Pa\KiJf2CbYgfQg*b*eEUI=cCslTHSf:W)pJ8l>1cW5Pd\?8LjP''O7>`0YP0J2-`>f0[!U\I6jdWAe7o:6_[%((WCET@g-]`'ruR2W-_8T`N9TK8s)Q:5hBsD,YPaXc;#VR1K"MDX:cVB,K,DTpf]QK"nE`8l:-3X27#JF<E*b["06N4[Jb/PqCAn0"J[P;IKZ&h3E;JZ_m/FZK\Oh*DM&A:8O5^-!+TlZa5XLpCc/`[R'<]LSHhJkl@3^$f/C/LFsUc)D(Tfj<sZB*#Z8bPp8+h6+gH(@faONQYFqRhS4g#,1L$E'Nut#[A)p;b2mc4d"<J''K1JG93Ke.64Zp\>*5qI:%XgkI+,_p[t&C6lA]p(**]HQ>Lu4.6-ZIrH>$`kftR.I61l`elR%m3M[e$!nDDlsCfAc1,@r_<p"1Y?:=oMKel$?cZC*uA7:Rk@K-i"U#;h/S=d;:dC;Xtr#&3f>[bV#6fq\'WdT9r$HMPm^kSH<UF+^K,KTR-7oV+<'o9.10A*T&m8u9.p]^K8Vj*@cNJLKOm`Gmus0+M-&9ms/4Gr3h+f:Nj<@>N?r/7L$Yi^L,&^-58[<PD::9ZE">insD64Umk4/c,8!T_G6@&-7Xp@clo?/"*(g5YXpOm&>PG1kj_*f-'b1jgoZe]U@ZH.L4SGofK34[PdO@UfkbTgjIN2]E9`<%2L0g(0t;._Y13BW\q8jf56Mp(k]_B@`BaU#Lt._9h;n[>]osUK,#05G8k-a%LK.E,q[_b>XZkqcI_p1T)nnI=h=DIKcVaNe<>_YJn.u5?mq5'Gn]"AR`!f\$+CA84l@-='hm6a][L6"q78hl5B]sMC\=[][f);5W9Q)1+g_8C.8'PnoInHNQ'tZ_1@E]F@*'Z(6IRn]#a*LYks"P3OWVlq''p()hiSIrZF`MQMZP*Q9hFqIn!(h\8L>M3#5)'q5I)R&2Z~>
+GauHNl]^)3&c[<0L$$+fp@oa3I,Dl13(]Z9Vk'^LFo7s$#=sFl`Zu]0eEJTWr9mpA%m38NjN$=DF$;.[fZ!:<\%<c4\@_U\h:7:]!9Fg4l!cULoeZL\/CH5)h[(Y!q^0QaQ7W5DXKMPFou#V9nkHj6C=_57.KEM^#iHe2kh0YeTG0'IWl9I[I9Y+:/`#dsgX1a=?ecoX@XH*e<jB5]FY/N+?%;Trn\<'!hhG]5Um</)b$o.S!u6eu6&P?9lSW$j?JdA:SA2i7M#T^N<I)7t?Ol_Qo1PG)4:]Q&3@.t9;U)3\d/@3E]DDRQ*-Q@gcLsck-TOXA[IdYOZ8=<?PPci[$nV(cW/G9C<_8$CK\ao#MD\(pQ"hGS\o&Q"bhCK./W["+!dWEWA(GG'9JME7HWNg6J#Z[-8MEbWHY,^9otI%Z)fnT@,>@s,;hN!q3_)f$;&3=Sej@Tp%^^f3f<;>a][3qRie@*fptd3REn^[X<\r]fCDS#Fn&pIq?csaKLK\scinANBJh[1%cOth#r:upa3YFDea!i=nGF2aufRTVSr&i$>H&hIV'$&!P5tQBRA+^_1F).9XPi9r-l\nKsPb:/<6C5\`Lk>Qr>mbm!'mPn0o,>Xm,2jhcNM@&=l"@Rb!f4S3X'pfngD@Q"r#JScXkaWs;.:KZ&[[j./h52BC(\#S?N'Wsnj/Sd;H[c1;4/*1/'e<poa;7,HBDPA\YUCn*V3.Ws-Rgu&>Is"ae8[tr$VfHm#rQ[-tlc]cHb!B8jlg8#e$)gD;<HD^5:U0+_a$.8VTbM[B+<@XG2^g&3i.*T>`VONW8V9hd++2B+41S+='/bJcRl&il]q5c/EiVK\_9L%AF*=hD<*hDHYI.p4/CJB(QQVb=(3Mn"..;("+*EW0D,Yd[Il-a5,T"17.L*Xp\L'I$>)@4@\b!%H<ni.umKRCYfCDE<d[0NePi;G*E*bZ'T(dbWZ^G<Yi)3fp;PH7bS.(h^^/a"Tsg?7'4L6?371?*R'Pa_^.uR6orRIRW/tc]'3A4d5tS*2NUE#e,X"u@.iaNIQGuopj!Xc;I;O$9a$J2p:7b.o9;*43_4/uo!C8^HI>G'_J8SQ4RdYAa#DkAO[ZsiXE!63n;TQ5DH-DHM3?a=o>!*X[Lf_^2a!VMM(g`14_a`un;Ti(]1'=cT<V+TjhTpH:5->kOKpg3m_B!,m/mdLd0mKmA#c2Ukmj3=+jBaEb4I-,G^[V+#BLfY2"8"@kS''uqCHe2)mPf=LQ\fQcW`W\M9]SlgPLbnOI_8LZ_kT_>!9^$&&/e<mQkr")<M_6dhTW1Y&PbW3ZZe^&iQ9R3FYgecOXNsq?Qd8N.3qCAgiT3eh^K6B'->%Y^N8=FEZ^@9HMAH?=;(pe[7\5m$CjX80s;Nd94io%BucBs!E.4=);q^epc3ldHR$Ri]&*a8.?b[=YP?\8>9"GbP[V<9,L/IKf,F/S`Xr&hOn'^IHE/`^P7Z)E`Vj$q(U)&ZFVV`ho<t#=:U(.f2scjO:"H9P?[95Q>uh:g6/dLkZC&lr2*C(oHSpjBAW^8CbH8thKSd+o2mcYB<8@jpTuSQ2sQoqf"P!t!Nt@Mj4X]0C2N7>GQ4lST<4bJf/@DN*CM(,4RXQ2U9R0F]e<>f_!@tQknK<]GP$KS.Oli-/ZoRf8&-8n#(jr23;>L\!Zf#'@3s:Lk"nf4\lfgRF,^>p&GB9,[%eP9coZo;/,^+A;k81$1Nl91,Zo&(2'75_C>8SE&q8;s*N@&K\B?qB'Q]WNRM2=H*58D>IUo;(k?JkTE\/-/jdnEpM8DFb@ajIm:DWY=qKSJceEpSA%hWjh*e(YH#\4s=-a&?h`cpi)7*,_t#V^G+3,ElHOV84T,:u;l6Y"$3VUG3TZrV>Y:Xk),Y8^Tt!f>f[I>1ni!D+lEm]+4N#0FCb63P^#Yc*JV)gPiW@U#pHbQl+$R/4IJooob,0Ph"Z;.#&]KT`NQURc97MgE[r,XYFlGlks2fq1\RKZj(8ls"Ut`OB5p2?(nVPKfdp#*IsSGj/rk\Ynt@bQE\*;i_o=o1]MIN&/_!U,j;uPkJS*N$5uA!j!PM$:!&n6#H4i[qpu^(<%A>=$_S6>GZW,<]XtI_X$ViP==14?CaZNlqBVj4CRTMOPX0j*S/8G`I)03]lDY@f]I/Tds>E]d'hD.*,6!S2OpDY?s0Q6'otE@k)t?h$LV*I/gDhuS=8QT70CA)5!F+G77(h;r>d'O>^FRSL&h@boE-g*m;ueC,,gqNcJ&q=+"<H#DWO%cm^!U]=a$\4brs(Q=<F3cBD^r]-Pr_ZRuC%GHb8[So7Z<UD6Mh:hOU<>7E&2S"QtkBnftSXr&m8%r$"o<=6B)Q$(_P-gq)Q?B/"!QHTRh:61l'JpLP$ep;gg[e<c9hEhE(m?UE0H7X[9oF")iW'Gi$u/6pP8-c[\;S6>SVY;PgchLcuL\-0oWJ2WYcm@Qfah!Rm9'qj1Z^j7b>?oDNAZk2(.;='1/H@ir%^+O9&Yh!hE8,E<O'06p=3.Oqq\@0!,bX<mG30%:Y2@(nfd-5R*YF].pVGLCt\b*<8483H(h._FmfR3er935>CN7,43lMYC='H:=spB9lIIK5X&HX_=gbtch\f2D=jg_rFAC-QcZ<sWYl4i\n:1jhCJ'S90fQ'eo29<L=M%/O2#n`?8d:e\RmFVl`Jmc$>ql:mZ3'6R2cM[,d1:[D%Yij5&5%<RY#A3dH:C!oc%X?PZ]=*4,;NSVb1&,(s">VP=s$>P\1=1_P@DqgOt'Ogs?E)5pcb)1=Yi':]]:jj+%06Ej[mZ+bU\:i>8,t%7Ce=TQ]h6iZu!N`[YD7h<o\d!QSVK)-4,+$k>a91C?'F-6R@eY%S(cVDib<U&"(6'pAM;9u6#!Qh_)3$P)Qg85d;"=aCS_)fhY9C:Z[8m]YQ9q>&11mU_]P\>j#p?-d$/?E@VJQnR7GZ@K@Wh%QA!6FXpBKFs^3-8r_.@?IN&GM.g<bqm2qRGfKr&D]dbBl;2f?o9)V#R,Uk@U?Yu/t^iUDPcdiYs+5)DIEk0LWHC,_=3"b[q=U!c-g0Y(P`Mqc0!%,+R>^>0X-D$Fgg"f7-(lT&LZ/s>nsT1<;o4&/FAWZ?_KN?*=A*P:X#`9CabM:G40];*"r[$10qFlrM_=ZOWEJ%]20MUK'-Fh["c4H!Qr?<kH(b&ajZ1A/Iq[E)aCFe`uN5/0c-Vo?F*ms-rPZ!/&in(<W`%0/XN+j=75A7[R&c<)ll'aO$<0puM=[Hj3=Ei!ZE[;O8[X$P/dB4a%bZurS>Ug;#Bgj[T2]`P<0hBD(H&4>"qM_lZihm)VW;cV3<LY35f&OjZlCXAXOp+"Sb6Mp/8\j9>'?>]SCF3b6\3"8`VJkE8hYS6t.GK&Hs8o2J!Q5_AJdO;P`'bg6d?T*;#oHQR_6A<"[P^Z,3BG#-f:o2u\YB>i[4jl-_2.i#.HaZ4PMuO#?qPPJ~>
 endstream
 endobj
 37 0 obj
@@ -310,7 +310,7 @@
 39 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 55.992 87.966 103.656 75.966 ]
+/Rect [ 55.992 78.106 103.656 66.106 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://forrest.apache.org/docs/dreams.html)
@@ -319,10 +319,10 @@
 >>
 endobj
 40 0 obj
-<< /Length 4062 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 3985 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GatlTCNJ5go"0C*m`RJYZ!"d_pW[E9?91e.=8SjRF1Dem"\GXA6H=irs8-"#$XtQK0dGRd4MtH5J]2*U5i1@)rU<!R"ek+_m^H9sC3LDoI/"MZJfJ`4R!YeSYO2q%J%n"J]&q91pT'c;n_qMID9&)?e2rFGM/Mc)ff'$neRTY,\"_mm_-6D(<nPSoa]e*me/spT+b1^,GC/nuZ&p>NaT?KU<oDeY$iP'WRWd#XML]7_NZD]ChDjH%m`75dI38X$'#a@5ebq.6Z47L#[^,>p@W(IpTPUj@'l>n`m%:qdI!#n!6.eNTUO@=6ID;+C_qWI([XNHC$n>[g<9#_un?O#or#CI50Ksb?hJC:E^!LZ]QLH.*a's-G*M5D_V$D(1<m%FOCY>pe4H`#$87u^(+%u1jL-P6$*Y5pOY"*8f[#/g(bL%IS(cd@]"kGC@E%RQa$B,L4=0%&0la'N=XqteYGeOpPM9dV;gPPK0qKTV8)efR.@I0LYm2;03fH3Y`ToqSZ7E(*I&p(2P_jV(4L:6L8;CNb(g.=2%.Lg%XhbXIEm]ZV:ja1^/`<dr"QKMZZ&m7*(eJ.lST+tN9/+LIkW$ZoLA>tos)STB^rT!21]hrQpXJR]\:Qe_H7@kS>&c_Is%uR8Yao9P'm(h@#1MUDr+'Hj3>TMZ&<YZu9I3*_QE"rJ'!.Vf5f'r<Sg/uc!3UB:6AXV5s!n'%\/gWrH2<bgq<cVWIQcMKH6,B62!D-j2jorIs>-"G%,I^mZ,6YtXFO1/g'pt"!KBl"4bnpVer-Y=sHU==Q^^Ds9Z`(8T/&_WpTI[[^.#MR.#.C9)7=0dX>@Zb/\*4j?Y4rkM'PUD,1CfYdUXY;=2i]HtPd"TP8&7tGe^B[c`?T?#6*s8CG_,juMSMSiKnV%"Q9i/EXmXD9+f.5#bCH.7E,[H?F3BQ?LZLc[MJ.1DBB5iH5b@io#\K*E?kLKdMf3kCWCM=,/*Fu'9i^PmK]'Jn8_!RdEs?.,?QM64j&kXHEbX56aND9%#J$F/%o5F4]I\]s_DLm-S0C'G%ni1g;0n5Z"KtuDg7F.1R*lGpU543$$5F+@D,f=8aLB;P49t/EJDW69*ZlQf55SN""oV/BcRG+aZa>aE3n647^sT+9EcA#oa,Z8*Y]>6\:i">p@t'4Fp%2ub3gf\.R-_q>mt59lM/sesdGM^nZgpC"o61\B%,#u=>QTDDfsm9HTL/e0&FOrg\5$'rOUe\.HOt>34OD<`m?[oL&r4Ve'NpkKK8W+AKuA^],^qc-.)B"Ie*<@^\JH*$>P8VVlE5FOUG8;_(cDS6;4\4NEJ,HV)FFas1SLbr?Bk=Y<D6BY7ob4_VQZ5ijkr'qV9\M@Q'L!8A+CW1IG^uNoH5*%mB@s)Ah8"<>tA\2'".;'D(UW.*@DdLqplq!U?5aBfdl(ST(-$_iL&jGcVg]4/MpXKCD)1;;rY?Nif"HE"HR+g<=)^J'bhf5dT2#TO[*U)9=(O)/-0K#5:uBd:jEJ>c(99ffhIAS#mRf;UjVt'QLjC,#+rhr(FRenF7AZt((])5'!IJ>,p]t3?,LlROGnF<Cpj>]8jX>07\8r6WSWGo;SL<E??R0*P$iSBG*%-A^UT6R0PtJ>G`0Wb/5LVN3"Bf)jrg4-i\s6`PJNCjARl;-ggI,KODEG4EmY>g;RW58$tZB(')3nu8LoK6?L^NdG@N2TY33_jdX"'r\,Dh@;?6l2UjFd5W%.X#gtrQ[!$^*TIfp_>M\+B-T'?ZhEeeKn:e=ZWWo4U2`'lTJ1YD=cFIh)b(>C:h6B2XJa;*D`lEfj`cs_:San@B[^V:iMC\B0"-=NNU#`NeCfX>?&JM-&aqV;^];Z!J<Xhu!.7)8Sn@I/WL\.QA0h?tKTk)QI4@17<e22>3[.d6asNeWWrC])al#/:[b6Ql*D7"qIq7?rjKgM$l?BMb!met'q6d/C?$r=%?pn+LeNP#5BpLWlfi.m+007)UE15[k6!>TR!l;4V30E%M$<G;kX=%o^)kYB9`c57P.E\:R;uT>=q@^gHHFk1a3A`1LD`B:/FP$bU`rWdpqeJ>[=.kEcc*f7s'3LTZ<l&'Y;].1^7c'Q?!m$aIF06S4?YqR^N>+JS+C*bWU&nKL5=QSTs2=BkN=m+7NOq8Cl2M/<eHfQ,&,\V##deoX.gj,=*QY$dgC[u_%i"0CL4`R\D>ZP"sGHpmM&>ed_A;5[G?0<.#X^L1<\Mo7j%Z9O:1a8OJL0/%=ZU+J#KH'B(PR[<:6A[I2+6b>V$FTlF]p$U!8'Z'!2PUEUUNe$D?o+H0VE@-d7n"9#tdLdD6%E_sP32+r$?4=gWlPtG\84&U@>D5Ock^4WQGBpd1Q`WUl4$nII@>El:UlDZr:^bJ'CXk0Aa#Z&-PM!tQ>Ua_I$<L)f%i_)k&mfX\$WJiO:n<b[0e$ks-)AV%O=X;J.*6.0GOVW4hb1P]'P;!mo8VsE,IFH^FN<'CN7%B.UENgc$0&a4qE.XAqE3qRGS:4BC:i6D`bUHpblbCo&Yf_0$^?pHaha]"+kc."l""<<-fekH+]g`ibAe_Fp7R/EV!3mdKbqcF?BjL&)&uGE55mOl+AEM&01H&'O]!MXYS!m$n'[4P!JHTYNr([_K$]ugS8DSL`2\7[Je:B+R"H38r-6lC#=qF1c*p]go*4`j$&<56W<lp"C,e,I$V]36-E^s4#jP3e(0Ue*HGKZZjBoi=3%D<>p!7]A,V31j7i)h,8Q7C$=3jPFd2aKTXTPh15\RT.Lt0Ii!Qt[L/?!))[.(@Z50i('s1(?6VlBn^[i9TU_\NS(pPjI!@gd;b0B(&Ki0mSg-#;.ZJup_,NR<,1GlHDAKG6@:;TG8I,^ti('6D&2DT-fqI,2kB4*a=0#@="AcT-Z348*^ao:bS34:5Ad&u7dnT':<N.L+W;L:p)F?Xte*nJcM;=1T]#\MCZ@-j(e0?78Ypi/6:qh=crfO09PWrcj[Po"o;$jqi9AaN%=c'Ro'GnjT@qETAcfdY4rALYWiITVQUNHU$SF%`>Y5>DKFY5n%jOGU_s\fKn%FUG7nsH2['hYO5@h`\K_)=nTp)]f)H2@:V%0ZS_Ab&6P#)iqW&V`H"77@/_!L<h(:*nasRV]Nmp?3&[Q?'IRkaqn':H:l2YR%>o7@4mIuj^jNa/V(a)>B\1BNaMYQicW9d=f*/qp25]OT%?4/`bln'fS(9^A3[8>56$@X7ZQ<t8KqLs@<>kHMnPp#bgIe'?*=1fTp'6]1PJ\QASBS5b5;W'0j2\cG?GKhWQT3/lHn&Z<0i1=dC57nt'q'alKciI0>PkSOiT#32[$/Q1Y9ol>e!E`h0e$k!]"[Qed<cOkdB,TCYniVgSedgh]V-l1m4c3*ZnERkNl,guBe+aoY'JPZ'_SCOG:sOJ7L+2?YKnU69"-k!gU7;,3X/A,(Eo0#e[mWebTil*#mU^/P9MP:UJO)V;"lmMh\IA)?08A/4N]cYZ6WeZb6#bgXHFSSegWK*Y;rm>[^SMG7p_X1S01JrLmDG'>AAaoT8i*fK76uq;0&,1a="+kdiO[:c/tsu(TD&GKlIWc+"4NQi3EL99L+pDj7^AiAdWYn*$cQ7lf$nT;=bt#s6q)B8*iBc&mH&V*i4UkTJ%e8Y=P9rmspR`8#^iA*JZMD5GQcTDK@Hr`nkI>*3*Q99oXVX5\:0&L(crl+$h$fguk-dD&^??]n,Cs\\=h)S$o'eG,6H.5/.]jB=tTA87.,^r-!0!@7\)u-!PqFgk,Hn&Z0?^]'i*nPne)Q(AmQ2+la.#3oW8JlK:.3$4!?Gj6,n(nR]EY1Cms>2gQHse5Hb\*P'\E9abIITtbfa,<tP:W'Af70ahf.c,n+']SJ6PONf_*TA.(,Clg!f1Ht.M>6E"DR`niO7P)uid<4":&We98`o^p>]HA_oAtGRN4Aa%_[tC9-1O:*/Ko?P5n+Ynb/JX.4HtpTN2e1IE1TdE?p#]19^H[1'2#"(7.(gb@AO!F?=Z<)qj/i[L5rulFs![uO^.;<jOkI\Opsb,UShU(&9EKb88A@^.7ChWSoLMle_G5CJW1O+DmJRR0gJ9m~>
+GatlTCNCH(n[j8Sqk\:EUs$Fnr?aULlV*hGOZM`#h%/EU,SAjb]n^;"q_!C&YXdMP'\1<-F1]?lMoED]]XrO^_oH."KV#rigV32Z]/RRKL]?9cTX$9GJimAqeZ427r=Xk,pT+=qmX>5+`6t%C6&l)INs'qS]C/hQ@3T?1]+nU930;[+0o38X(t#taTlo8kGW<&N+W^:3!JdiVK9tZN?4>oX*H-2CV@0Y@j+*STB&F,68j_'GaYtb@[W-@rjimRSG;36XI#gX!Z[m$kL/YVdM&.,AeZ8eSYK3:>ed\A,3Qt>/Hbq!BFF,9k*r1+3&4SWjA;,GY/6U:^L\dQ>FaSXjVe8lt^7Ua%c\La#`l#YMrLR(*!R"4XW.68YGLKC5@/W5+\8Ai\=o4m/)HdStYr),N:c;G5$`_!<%t<_Edjq8dm$$`*a0t;Y5Btb<JgY.Ua/+(L,qh!b1bUuKD!?[(,N2`u:'Qr362jamQ8G^[X,=#`Bi5Jk?k.:e*qYS`dtU*VW]ekE)6P<%::,mtf<g`/X;O$R6Nu$q&TH3B;\bZ@g9-PGpK&`?r)>>t/Fda*`$8VeKROKorVZ0qHT'7_<l3K8S(]YJ6*NS8;F`$=+%4))4q_pR`d1>a;a]<"9du?h$LQJh<%8o$rEiA(+7A"`pPnX<@2:5`Hs*%r&P-H_m8e;lhu5+Q;HQg-5rIWiFd@?qWoL/QRt&(rLCqLtWbIuJ@?R_?V"!qOMtipZI?H^(;YG$Y@5[Mi[rR9#bSmqMo'jq4<H8/iB*%o>_\hS>p]iou2,E,,NI`Q.&u<Z*]q$rMj1)U`<-,-4k;YA_$U_IX'O6<C6SAM(b/2@1HtiCG8I;9MDO$4n'J%Qs':_s.3bA`%]9[<2-ue:G/"P<+nf5P-At!A[-pu!F%!72i(.F@ehSN<X^Z\J_A$<#)i\k;eeeLEcJg+??52dVVXh#N&XrU^^87BEI%tYlNWhh,/MFS4&JdCQR8RJYFn.8`2i(BSP&?h+p>CBOC.?E"5?tXEugkg>k\]OKJ*9]j(/M?dNHnl\_F5JL27<6SG+`f3KiuOp:rUnL,,HEXI[.?>1ms6?Yk>tFsN+%3$@2Y#6AZb,gdn\h%re]I?l\5$$oVGi+Y[!QM*e[IF(Zf)(&iiRdnVc=*014J-;:m>R?mU]O#HNpe;)DJ,%>&uNSATE@$4?RaE96U%@d\;R`)b7BPkU\HGrQ2l.&^((e'&22^?_;h_6F(f1Q^0o3RjM(:7E=L6o2TH+'B8\L!H9spT?s:[5\Dc)#aEF4Y,ut0n8A*dZD/o`?jbE',-^1)0ADWZJj[7]eBQORn$L[\+cW]cOMeTDYoAX"-S;U-!?Z\KBJ#YbD;9r:&KCG8b16^R8V?61=AF7gN%u2dgXde'TM>c_6>B@M"5),N["\#dMP#1T*[q,pS-HhWa[/^5H5ol1Lh_r/I0%Q8p,=7I9VPf1+(<j5E;;Y8*dVD<t9R&AD/g%ekLRn7"&8i>Dlrd`Q:l^A+'t5dI:S_lkOMTchOWjE6Rs4-Ri#Z7468qFWte,90?9RS.Hm:TKgFqV-p-)5nS.,[N^B]"@?m1l93h*"DD?D1r._SnsHG;]sc\?M^llN>#fEds5tuseS>UXntd4s`TNXgn>@%oKDNWh,]F(3c#2/'*@<$F?6Pdi@)g-/Z"E"+DBG@--n48Y/FRk>&]Z%mJK88So,!b@C8NlU);ZRYXQ:mLTa=_ujrfq%i\s6`PJJggb/bR8]66=Y7'9[rb!e7::>+S'N1nmM8Y/<7P#_p6]]'I')5^N;>u-;odX!dipZ$jLMIjRg)6"ZN#-*PE%JP&U*9dA5r=Nj>/OE:'p=N?3PrieHJ4duD<">P\!.pchB<^W(%"mD:(7Qc(U7EJ<O=Ts%e/-RGTYpKjd.Vtco)7)Qhlm?jdg>mk6Vp*QLM^3!&X[VlX5=A;._2`pf/npL8-H:qZ=E?'`JrfXp0J$(1Nugs!b5qP22>3[WNYY1F#8Q7>3!(!1\b7^%>!.6',?fc#$#h`hp4)$lh&C@Q0_9VcMdCbrRbqE&,UP!P>OpaD<BA%'cr'$,%;Q3+>FDBklh8TX3SO!#g:!=hTfZUAnj*jQ*+J_^\.No4mVo"3:$Y?Md4n^2i<Lfo*bC'bF\6LD]TXI'UU/(UR/R`$]-am8Gp+fO$hNqq:N-@oY<L`!I'a]<jpRE`6mIJK)uY@W:Do8Y)F.tP.R5<!Q!L"LVpX)SB`Lr.S3<d!5Y6oB$)-qg9J3kJf&,GLi<O`>eYo.^egdc@'RtcnuMsf+eMU/dB6h\dE#80SlbM#//8M6(Q!WXbH[X`Nk<=65JP/4L:3VGjG@[Z?Dum#d3@%sp3@+6JhgZr_q+u=K%?bH:L$+(!SR),-0cQ2F<Jug5Ml@;+uFljPe3B'7^&R<Z,Qt5e3I.^ThPKG66g/*h['7a4^R$R]gHHp6@aPsojK#l7VQ\h_Q`cL[7i@-!)?uTlVjY(V'/6HCc=I\,eW8AcVR%p7!2+bZUn"-0-NcErU;p<N+:Sn[9cl,f1C1O_X-?-^(E`e$)K*S4`FFt1$Ur=1.8*%6-.g-Gn#X9TBGhTYCchtf?@PZ?;X\Vh.%B?0rj_"5ZtK&3EQt",[7[C:0KPqijkO-KO!pB,fbJ91B]QDII)t@Kbqc64tFZ.1H:tTrVV,I6(3CB(R'F(81B`,fEg0'GA5*S!$Jl*m!)d!+pbl-`S'D(7P*;<cPSCdNOb!4Kl?_X#u]2WpTb-NfcZkFi@rP12;sHa2920XGnZL,H$V=]6pY7]Kq?)[?8+XtnulLX*0o6.lK>!7&n\;AUP]AP,Vg4UX!acskQ-jXhLSc[+LG6%`:B$WYu:FrM?TE,KEaWDNK5kT`rA*NLUh09bj@l+/[0rG85jB^+]NAGDW#TG1)%1[e8<;g[[po#cK^2\AFT/t7juik,^$ak8)ad<MjUhl\.q4jno`P*qq4'"(jo*t5NNFhDMZ3gk<md>GS$l=,tNSf^!Pr,fr]6bp)XfoOhLt=DocX!l'=Y=IN#[0"l=(4$_AjMY/lULbm=.DoZG!6*]hbC/_g1@?7O$X.LKO-JUA%YEZAV&2<gp0ls5C4$;)e7\WtDI*JQ"_p'tN&JnXApnZm#?@L#obK#WJHkOl%)5J'jV)9_Z>g1linlF$.U$6sgCSj=tKK4FEb.usA%/X?c*!mAXR]]''.KN'T7D\nONN]$&=MW;>@rBie'W5O%^#"<92O")A#0]-b:.C;VPg9n3lZ9FQHFS2;_>SdA^eEEK>A/h.?RgK(FGJ/HaF[FIF\fLP[B0=lf$[HDcA^Ye@=#C8#X7gf"5VS7JX?g$N%YpQp1<5j]bhVCYcaWMYA:_A23NpCL@nd^@V6?Y;#ROe!)>L9EA7fdrhc;4S4H5D6o&0PujHF?TS4P(h71Bm]\,A./Dh9aU;26^RU(YB(fquH!-tepU?X.F$Q]NE3IW:Zf#Dk[Yk*>C3jJ/1!]gQfV($#\65+u@4h<G,]g)>(s'KkYcKO?jllqU@bO,S[hYRWuG79FFs@4j(S%=\ra[KnVY15?=f;>O.Q+o,_U(504uZ9uS8WFkEQ8!_-V(?kJ-93mSlA>pZu&raN#-Fi`jR"=(oVj.tHc8-5H`&61+dl&XZbYc3g"[JVnpCR.O(E2eU";N;'bQ!%_BeD2q@M967%c!%_ns*mu%K&G<"RcqL:S,KkcB1SqVCLefb3:G)a*)Pi8Y9AYH$-?,4FK]"hDE7#GNgUZjd&9%N4j)TYA6\4J:KdKK^fWW6Hjk\3Sq1f4>n.7:4qjoC:%k/l>K`r,3$dM6%6gHH\BmkW9&5r_[&X#AM;^D`8_p"hb>dl-e@<3iMrt]-aqZW-OXXD@+Gq''lQ&^h@(+;rm(^kHh,V6D&!YtG,"-T<+C.)G*FT;<6al-hnL_UVM7^SLiD$SfoE/';3%oL00Q%OXA3\d,kQt9jdlspD\%o"f^0!_?c"&g.$)kF\/YBQ=T>0dP$/08b.@oOqS[4=IkYP/0`~>
 endstream
 endobj
 41 0 obj
@@ -351,7 +351,7 @@
 43 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 310.85 656.7 385.31 646.7 ]
+/Rect [ 310.85 643.5 385.31 633.5 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://www.w3.org/Provider/Style/URI.html)
@@ -362,7 +362,7 @@
 44 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 444.98 656.7 471.66 646.7 ]
+/Rect [ 444.98 643.5 471.66 633.5 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://www.useit.com/alertbox/990321.html)
@@ -373,7 +373,7 @@
 45 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 229.5 645.45 262.84 635.45 ]
+/Rect [ 229.5 632.25 262.84 622.25 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://www.useit.com/alertbox/990321.html)
@@ -384,7 +384,7 @@
 46 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 396.25 469.95 416.81 459.95 ]
+/Rect [ 396.25 456.75 416.81 446.75 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://blogspace.com/rss/)
@@ -395,7 +395,7 @@
 47 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 348.23 341.7 370.45 331.7 ]
+/Rect [ 348.23 328.5 370.45 318.5 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://xml.apache.org/whoweare.html)
@@ -406,7 +406,7 @@
 48 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 420.86 298.95 448.09 288.95 ]
+/Rect [ 420.86 285.75 448.09 275.75 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://gump.apache.org/)
@@ -417,7 +417,7 @@
 49 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 229.5 287.7 261.18 277.7 ]
+/Rect [ 229.5 274.5 261.18 264.5 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://scarab.tigris.org/)
@@ -428,7 +428,7 @@
 50 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 291.692 287.7 341.152 277.7 ]
+/Rect [ 291.692 274.5 341.152 264.5 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://eyebrowse.tigris.org/)
@@ -439,7 +439,7 @@
 51 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 266.74 190.95 288.97 180.95 ]
+/Rect [ 266.74 177.75 288.97 167.75 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://jakarta.apache.org/slide/)
@@ -450,7 +450,7 @@
 52 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 282.31 136.95 301.2 126.95 ]
+/Rect [ 282.31 123.75 301.2 113.75 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://www.w3.org/WAI/)
@@ -459,10 +459,10 @@
 >>
 endobj
 53 0 obj
-<< /Length 1470 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1606 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GatU4>B?8n'Roe[d%`B1.j,CiIHtI6h+l[<CYJ$sAfh9o[Pet"!D\hc^PA:=3-K,%aYXY@3k%nW%\NSUQs>'t`+7@?5s-mCEafX`Ic*/P>\6pTYXu&Gs%LW6NskM3#sNs!\TJc@2]V+0mIFK$pi\fM[bgXk#FF.Mr1BU!0$'"A.aiF4U6Q!#H#Iti`N"F1mq%ZT\$=?`kAi0&U:5eiQosLda-K0on32)X?7j)b,V!RR]\'IK>LYg6@E5i+lPb5M,,N_#H%e_q6s>7t9UEguk(R"5cb!$u[E__Y[GrYb9gpmto0I(Bo&:4riccP&T[m=T[46;Enme>;#3BKKigJ<[5e5HS[ZV4tr32>[:\SmLBY+XX$B1@po@][8&%Or`rX(jF>eQWQ7r>Tm;X:EE^qo=tqBAn)#i(I*+7;N@ToS"!F++e\4\61rGC$KGR0Y%u=eMuCe9EcfVm7-D]gP^jo^6%A%#%r?khWF?MW4?h(g,Rjk#l)31h>I=K0l1sNOM'`9+Ed`Z!J.(&=Yo-81!5Gdm#KR*2^d1ZAnHfRq%rdD#9gHhe78:"Q%]ldP;a_c7="NJ'@Z@J`l7H02#U5BN$]=@\Eh+8'EhU;_6Y>#L+t[Q9LUZ.P.qnKIHA&oRA2C7F5Pi'J&f"DFVn[:0q/CT>BU?UoAuo]-\3?"YNme'P,`=@80Ff;r;.j9*,9Dga*JA55@6b)g'q_8UC<D;,CK_:aUt'mc:=PH7roZ*l?Y<_+]bJ[Wa^L[b@i6W]#ub2jNl&\IXSKdX=2l=T(o&#01uX'c]o!==*]%*IpNuk1UeA\t6sD%d6(<$A9l7#:paDo)X?e9V4(8ZljQebOsgLL53`j.5O!C*YcheHG>;rb[j.[[lR12'u6O8j7q&kJmL"rjeu"Lb:1)4!'Sg@s1gKUmQ.CsD2\8'p9GOs-b<?X`qlF2q^V$\Y7il2ASqT51CQ/tpl)HkYc`KrNQZ++ZYf^WT^pR)@EdU0kO2@cZ;r:fF!7=Iqdd8=]`q`T**V<jZ4Z?Jp0!6JRaHc*g1K;[bPo.t9kd_V0FL/N;l,g.1&o5$NcPmuA+j#bNq,VAO)i`*WOp>NlZA/I_rWc#[2^1n.R+B2Q9>MD+/,"#r_2)>jU/5lUjKPu@1Eo[k=).uO<I6356h'l!2k#VK,RGPGAV(ZT,I!42pFXLpQPLn1e8h_AT+R?H:@Ni%-+\(IMeZO>dr[P13O_"o0lfCEnrEmk-9COf>lk@RcYNkNs1f@##38l"O?aX&JgY)Kdgdum?DH%-Sd6KL:_B+*jAe473c%2d+A!hm5VhNr[6^8(li*J$Y%HC5;u;O1#dM\^Bb"&%W3,EY25/sMjE\oZAR2sZBeE)V_0>lS\f(58rU^<DJIe'[3TE)hs0X%i=b8GE8do5"(>C%9Wp6Hp`B5@!=u[:^P_ATbN0'GIET,,:S(R'g%8![UM5d2[1XL+kZ6o,=<MJV5OndmDZ~>
+GatU4gN&cS&:N/3n0h@@@i-$`qj'3Wn"uUS&h2L5XnMjQ5oL+cA,n^bf5G_KYcbK6EA9W*QT9K*C%Qj<]"2==6&DbhK9<==7Y[eX5PPU1Rp'@&>M=J*rB'`71>D@J]tY[+g4\0@@G:JuhEFH"qsA,K(#"SVN'jsIAc'.".G@n!;\*or/pnOVjS;7p`=o$rP4mRE++l+2@4:reQg*otStt)I.iDV:H]d1l&RQ"E:#qV<CD!\q2KCI4k<LM-57E\;i'R<:Rt'e%_D$dGV]ne5W/b-=(es_nnYp::gSp4j;p(R#m+$C!.24="C\p=\h<!V"gesa<2>@$EPrsnFh6)p##Xbt'?*$mU8CL2Da:"URO^O%'/j@KDTIld#nkd?&Ku4^M!5#Qilki-o075@<;F[kfEeRt*.dj-5C+DlAUiP4mqc9#')ZsfL'O-\s":XYL5uc\E0`R\a"fSgA3%ZqojN0,QVD^0T!X0:.)O+If`G;`sNh=n^j^f\7IHaL,`\CpX8L=fkT+[.orAFUsGBH'<%8&F_LiM"*(i!JdRP%QH8%+<Z%gBo!$@^:gju=_3!b.ia)2u,87%,P[b<:QCH!`F[f'"EcR\@D(k:na&p<_["9Q4[`a2#!&igp=>Kpp5tW"\BQVf:A'7C_Nt3U:t5pTaP#=N]"F;uO%e#@;N=>1>aB[o''jD;QT.)`=fVa(\869#TQF]L);iA%#;G4@`Ddb#F\"UrJ8s>QJ0WQtq4arjI4)kGJN!9-5tF'mq;>+YoRHp+[6nJf]!1HF#M0S%"mo<*g<XTC^I6;&P/_m8b/D2AD03eY]o^["PPn\;[pUD'U8-lnDXjdUo8XU\F@`>HP7Js4Rgof%(Mn5-I*k\Q@suf@M@>SdB/!A84.%9f18KW]8^/,^!2*o20!3T-ZQSarInXWUik&GM[qB:(YKcPE68F"F+i>0PNTY2/Ak/LiX,"a*BC)IDF`si=a9i`O/-[jeB9WDR%hPTa&uu'EY.C]\iLZ846$f40PLN)W6_BH$F"65R2p'Cc.98jpDgB;huClK5,@1F].Fl+D$7m8I7IU20UoW(O=gOEK,G++O@c-6;M`p:38CfoE;7:+:$rtQHNEsqZ]mMC!]]Ap;$Jc&ud9+'9h/.d</`3r!;n_.-Gb!Km1ZaO1MXCP)"=DmM'Hu`H3$l-\Z;']TdZG#@fHMC3:0\%pnQM7kM1uLd<"$VMi).jX@c?=eDJOko:^ub?HT#Ec`_.lniB*p)n='GY6':2/VS9bZ00n5.\dMjWuTioJXiP#RQe?kQ`ekVnhQR@@.7o9j]5ko,1;jFZ5)$]^=dh0S>$`?+,oD?I-`bG[>>!f+5Z<SEo[d0si#5dm[T(ESY[%?9`VZiVGfEhK$/alN9FaVa46:$\S%6p:[j.q8];N[-FsY`/+W2;"3jV9Fk5VZa:]VGL4sI=jrE"`t(9<dV_-9?U=>7ps3>-"7k2#Cc#LYoBI,=Vt]F]$GIpnbs,8!FLisA.?ikt9FDY_26R-rR-M;lc!lulfu>o8mn[kUHoj=WC(u<:[)bp&B,Z^AGH*Y4eCQI)<arI+6/PUQ^reD'P`=R#5:2XASY&;=&%CZcOo&h#r#`;8GZO~>
 endstream
 endobj
 54 0 obj
@@ -482,7 +482,7 @@
 56 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 174.636 632.4 213.648 620.4 ]
+/Rect [ 174.636 619.2 213.648 607.2 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://forrest.apache.org/mail-lists.html)
@@ -736,27 +736,27 @@
 77 0 obj
 <<
 /S /GoTo
-/D [33 0 R /XYZ -5.0 573.3 null]
+/D [33 0 R /XYZ -5.0 563.44 null]
 >>
 endobj
 79 0 obj
 <<
 /S /GoTo
-/D [37 0 R /XYZ -5.0 156.9 null]
+/D [37 0 R /XYZ -5.0 147.04 null]
 >>
 endobj
 81 0 obj
 <<
 /S /GoTo
-/D [41 0 R /XYZ -5.0 115.7 null]
+/D [41 0 R /XYZ -5.0 102.5 null]
 >>
 endobj
 xref
 0 91
 0000000000 65535 f 
-0000063536 00000 n 
-0000063643 00000 n 
-0000063735 00000 n 
+0000063502 00000 n 
+0000063609 00000 n 
+0000063701 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
 0000004569 00000 n 
@@ -773,7 +773,7 @@
 0000009881 00000 n 
 0000010004 00000 n 
 0000010045 00000 n 
-0000063920 00000 n 
+0000063886 00000 n 
 0000010180 00000 n 
 0000010374 00000 n 
 0000010576 00000 n 
@@ -785,65 +785,65 @@
 0000017932 00000 n 
 0000017959 00000 n 
 0000018152 00000 n 
-0000020836 00000 n 
-0000047077 00000 n 
-0000047200 00000 n 
-0000047227 00000 n 
-0000047405 00000 n 
-0000051028 00000 n 
-0000051151 00000 n 
-0000051178 00000 n 
-0000051371 00000 n 
-0000055526 00000 n 
-0000055649 00000 n 
-0000055739 00000 n 
-0000055928 00000 n 
-0000056117 00000 n 
-0000056307 00000 n 
-0000056482 00000 n 
-0000056665 00000 n 
-0000056838 00000 n 
-0000057010 00000 n 
-0000057188 00000 n 
-0000057370 00000 n 
-0000057541 00000 n 
-0000059104 00000 n 
-0000059227 00000 n 
-0000059254 00000 n 
-0000063986 00000 n 
-0000064037 00000 n 
-0000059445 00000 n 
-0000064102 00000 n 
-0000059579 00000 n 
-0000064167 00000 n 
-0000059773 00000 n 
-0000059956 00000 n 
-0000064231 00000 n 
-0000060371 00000 n 
-0000064297 00000 n 
-0000060586 00000 n 
-0000064363 00000 n 
-0000060791 00000 n 
-0000064427 00000 n 
-0000061147 00000 n 
-0000064493 00000 n 
-0000061471 00000 n 
-0000064559 00000 n 
-0000061696 00000 n 
-0000064624 00000 n 
-0000061896 00000 n 
-0000064688 00000 n 
-0000062214 00000 n 
-0000064752 00000 n 
-0000062454 00000 n 
-0000062651 00000 n 
-0000062764 00000 n 
-0000062874 00000 n 
-0000062985 00000 n 
-0000063093 00000 n 
-0000063205 00000 n 
-0000063311 00000 n 
-0000063427 00000 n 
+0000020816 00000 n 
+0000047057 00000 n 
+0000047180 00000 n 
+0000047207 00000 n 
+0000047385 00000 n 
+0000050935 00000 n 
+0000051058 00000 n 
+0000051085 00000 n 
+0000051278 00000 n 
+0000055356 00000 n 
+0000055479 00000 n 
+0000055569 00000 n 
+0000055758 00000 n 
+0000055947 00000 n 
+0000056137 00000 n 
+0000056312 00000 n 
+0000056495 00000 n 
+0000056668 00000 n 
+0000056840 00000 n 
+0000057018 00000 n 
+0000057200 00000 n 
+0000057371 00000 n 
+0000059070 00000 n 
+0000059193 00000 n 
+0000059220 00000 n 
+0000063952 00000 n 
+0000064003 00000 n 
+0000059411 00000 n 
+0000064068 00000 n 
+0000059545 00000 n 
+0000064133 00000 n 
+0000059739 00000 n 
+0000059922 00000 n 
+0000064197 00000 n 
+0000060337 00000 n 
+0000064263 00000 n 
+0000060552 00000 n 
+0000064329 00000 n 
+0000060757 00000 n 
+0000064393 00000 n 
+0000061113 00000 n 
+0000064459 00000 n 
+0000061437 00000 n 
+0000064525 00000 n 
+0000061662 00000 n 
+0000064590 00000 n 
+0000061862 00000 n 
+0000064655 00000 n 
+0000062180 00000 n 
+0000064720 00000 n 
+0000062420 00000 n 
+0000062617 00000 n 
+0000062730 00000 n 
+0000062840 00000 n 
+0000062951 00000 n 
+0000063059 00000 n 
+0000063171 00000 n 
+0000063277 00000 n 
+0000063393 00000 n 
 trailer
 <<
 /Size 91
@@ -851,5 +851,5 @@
 /Info 4 0 R
 >>
 startxref
-64816
+64784
 %%EOF

Modified: forrest/site/docs/searching.html
==============================================================================
--- forrest/site/docs/searching.html	(original)
+++ forrest/site/docs/searching.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <span class="sel"><font color="#ffcc00">Searching</font></span>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
+    
     
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
+<li>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
 </li>
     
+</ul>
+</li>
+  
+</ul>
+</li>
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<font color="#CFDCED">SubProjects</font>
+<ul>
+    
+<li>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>
@@ -332,7 +369,7 @@
 	server, Google search is probably the best choice.</p>
 </div>
     
-<a name="N10046"></a><a name="Lucene+search"></a>
+<a name="N10045"></a><a name="Lucene+search"></a>
 <h3>Lucene search</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Lucene is a high-performance, full-text search engine built
@@ -382,7 +419,7 @@
 	search is probably right for you.</p>
 </div>
     
-<a name="N10085"></a><a name="Disabling+full-text+search"></a>
+<a name="N10083"></a><a name="Disabling+full-text+search"></a>
 <h3>Disabling full-text search</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>If you are convinced your users don't need any full-text

Modified: forrest/site/docs/sitemap-ref.html
==============================================================================
--- forrest/site/docs/sitemap-ref.html	(original)
+++ forrest/site/docs/sitemap-ref.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<span class="sel"><font color="#ffcc00">Sitemap Reference</font></span>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<span class="sel"><font color="#ffcc00">Sitemap Reference</font></span>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
     
+    
+<li>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+</li>
+    
+</ul>
+</li>
+  
+</ul>
 </li>
+<li>
+<font color="#CFDCED">SubProjects</font>
+<ul>
     
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>
@@ -561,7 +598,7 @@
 (*.xml)
                         (in forrest.xmap, faq.xmap, etc)
       </pre>
-<a name="N1013B"></a><a name="forrest_xmap"></a>
+<a name="N1013A"></a><a name="forrest_xmap"></a>
 <h4>forrest.xmap</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -571,7 +608,7 @@
           <a href="../docs/cap.html">SourceTypeAction</a> to work out the type of XML
           it is processing, and converts it to doc-v12 if necessary.
         </p>
-<p>For instance, say we are rendering <a href="../community/howto/multi/step1.html">a
+<p>For instance, say we are rendering <a class="external" href="error:site:multi-page/step1">a
             Howto document</a> called 'step1.xml'.  It contains this DOCTYPE
           declaration:</p>
 <pre class="code">&lt;!DOCTYPE howto PUBLIC "-//APACHE//DTD How-to V1.0//EN" "howto-v10.dtd"&gt;</pre>
@@ -584,10 +621,10 @@
           </pre>
 <p>
           The intermediate result is visible at the URL 
-          <a href="../community/howto/multi/step1.html">community/howto/multi/step1.xml</a>.
+          <a class="external" href="error:site:multi-page/step1">community/howto/multi/step1.xml</a>.
         </p>
 </div>
-<a name="N1016A"></a><a name="Other+source+pipelines"></a>
+<a name="N10167"></a><a name="Other+source+pipelines"></a>
 <h4>Other source pipelines</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>As mentioned above, all non-core Source pipelines are distributed in
@@ -622,7 +659,7 @@
         &lt;/map:match&gt;
         ....
         ....</pre>
-<a name="N1017E"></a><a name="late_binding_pipelines"></a>
+<a name="N1017A"></a><a name="late_binding_pipelines"></a>
 <h5>Late-binding pipelines</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -648,7 +685,7 @@
 </div>
 
     
-<a name="N101AA"></a><a name="output_pipelines"></a>
+<a name="N101A5"></a><a name="output_pipelines"></a>
 <h3>Output pipelines</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -660,7 +697,7 @@
         We now wish to render the XML from these pipelines to output formats
         like HTML and PDF.
       </p>
-<a name="N101B9"></a><a name="PDF+output"></a>
+<a name="N101B4"></a><a name="PDF+output"></a>
 <h4>PDF output</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -701,7 +738,7 @@
 </ol>
 <p>Lastly, we generate a PDF using the fo2pdf serializer.</p>
 </div>
-<a name="N101F4"></a><a name="HTML+output"></a>
+<a name="N101EE"></a><a name="HTML+output"></a>
 <h4>HTML output</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Generating HTML pages is more complicated, because we have to merge
@@ -749,10 +786,10 @@
 </div>
 </div>
     
-<a name="N10240"></a><a name="intermediate_pipelines"></a>
+<a name="N10238"></a><a name="intermediate_pipelines"></a>
 <h3>Intermediate pipelines</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N10246"></a><a name="body_pipeline"></a>
+<a name="N1023E"></a><a name="body_pipeline"></a>
 <h4>Page body</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Here is the matcher which generates the page body:</p>
@@ -814,7 +851,7 @@
         
 </ol>
 </div>
-<a name="N1028E"></a><a name="menu_pipeline"></a>
+<a name="N10283"></a><a name="menu_pipeline"></a>
 <h4>Page menu</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In <span class="codefrag">sitemap.xmap</span>, the matcher generating HTML for the menu is:</p>
@@ -835,7 +872,7 @@
           sufficiently complex to require a 
           <a href="#menu_xml_generation">section of its own</a>.</p>
 </div>
-<a name="N102B5"></a><a name="tab_pipeline"></a>
+<a name="N102A9"></a><a name="tab_pipeline"></a>
 <h4>Page tabs</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Tab generation is quite tame compared to menus:</p>
@@ -857,7 +894,7 @@
 </div>
 
     
-<a name="N102D2"></a><a name="menu_xml_generation"></a>
+<a name="N102C5"></a><a name="menu_xml_generation"></a>
 <h3>Menu XML generation</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>The 'book' pipeline is defined in <span class="codefrag">sitemap.xmap</span>as:</p>
@@ -958,7 +995,7 @@
 </div>
 
     
-<a name="N1035B"></a><a name="linkrewriting_impl"></a>
+<a name="N1034B"></a><a name="linkrewriting_impl"></a>
 <h3>Link rewriting</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>In numerous places in <span class="codefrag">sitemap.xmap</span>, you will see the
@@ -967,7 +1004,7 @@
 <p>This statement is Cocoon's linking system in action.  A full
         description is provided in <a href="../docs/linking.html">Menus and
           Linking</a>.  Here we describe the implementation of linking.</p>
-<a name="N10373"></a><a name="Cocoon+foundations%3A+Input+Modules"></a>
+<a name="N10362"></a><a name="Cocoon+foundations%3A+Input+Modules"></a>
 <h4>Cocoon foundations: Input Modules</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -1000,14 +1037,14 @@
           currently distributed as a "block" in Cocoon 2.1.
         </p>
 </div>
-<a name="N103A7"></a><a name="Implementing+"></a>
+<a name="N10396"></a><a name="Implementing+"></a>
 <h4>Implementing site:-rewriting</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
           Using the above components, <span class="codefrag">site:</span> URI rewriting is
           accomplished as follows.
         </p>
-<a name="N103B6"></a><a name="cocoon.xconf"></a>
+<a name="N103A5"></a><a name="cocoon.xconf"></a>
 <h5>cocoon.xconf</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>First, we declare all the input modules we will be needing:</p>
@@ -1052,7 +1089,7 @@
             They will be configured in <span class="codefrag">sitemap.xmap</span> as described in
             the next section.</p>
 </div>
-<a name="N103F5"></a><a name="sitemap.xmap"></a>
+<a name="N103E3"></a><a name="sitemap.xmap"></a>
 <h5>sitemap.xmap</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -1153,7 +1190,7 @@
             <span class="codefrag">cocoon:/community/linkmap-index.html</span>.
           </p>
 </div>
-<a name="N1046B"></a><a name="Dynamically+generating+a+linkmap"></a>
+<a name="N10456"></a><a name="Dynamically+generating+a+linkmap"></a>
 <h5>Dynamically generating a linkmap</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>

Modified: forrest/site/docs/sitemap-ref.pdf
==============================================================================
--- forrest/site/docs/sitemap-ref.pdf	(original)
+++ forrest/site/docs/sitemap-ref.pdf	Thu Jun 17 23:57:47 2004
@@ -206,7 +206,7 @@
 /Rect [ 167.616 160.953 258.936 148.953 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://forrest.apache.org/community/howto/multi/step1.html)
+/A << /URI (error:site:multi-page/step1)
 /S /URI >>
 /H /I
 >>
@@ -238,7 +238,7 @@
 /Rect [ 216.648 732.8 383.676 720.8 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://forrest.apache.org/community/howto/multi/step1.html)
+/A << /URI (error:site:multi-page/step1)
 /S /URI >>
 /H /I
 >>
@@ -1030,9 +1030,9 @@
 xref
 0 121
 0000000000 65535 f 
-0000041238 00000 n 
-0000041352 00000 n 
-0000041444 00000 n 
+0000041176 00000 n 
+0000041290 00000 n 
+0000041382 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
 0000003841 00000 n 
@@ -1042,7 +1042,7 @@
 0000004398 00000 n 
 0000004574 00000 n 
 0000004769 00000 n 
-0000041584 00000 n 
+0000041522 00000 n 
 0000004908 00000 n 
 0000009116 00000 n 
 0000009239 00000 n 
@@ -1055,101 +1055,101 @@
 0000010404 00000 n 
 0000010569 00000 n 
 0000010761 00000 n 
-0000010973 00000 n 
-0000013601 00000 n 
-0000013724 00000 n 
-0000013751 00000 n 
-0000013959 00000 n 
-0000016742 00000 n 
-0000016865 00000 n 
-0000016976 00000 n 
-0000017109 00000 n 
-0000041649 00000 n 
-0000017246 00000 n 
-0000017381 00000 n 
-0000041713 00000 n 
-0000017516 00000 n 
-0000041779 00000 n 
-0000017651 00000 n 
-0000041844 00000 n 
-0000017786 00000 n 
-0000017948 00000 n 
-0000018117 00000 n 
-0000018286 00000 n 
-0000018454 00000 n 
-0000018589 00000 n 
-0000018724 00000 n 
-0000018859 00000 n 
-0000021588 00000 n 
+0000010942 00000 n 
+0000013570 00000 n 
+0000013693 00000 n 
+0000013720 00000 n 
+0000013897 00000 n 
+0000016680 00000 n 
+0000016803 00000 n 
+0000016914 00000 n 
+0000017047 00000 n 
+0000041587 00000 n 
+0000017184 00000 n 
+0000017319 00000 n 
+0000041651 00000 n 
+0000017454 00000 n 
+0000041717 00000 n 
+0000017589 00000 n 
+0000041782 00000 n 
+0000017724 00000 n 
+0000017886 00000 n 
+0000018055 00000 n 
+0000018224 00000 n 
+0000018392 00000 n 
+0000018527 00000 n 
+0000018662 00000 n 
+0000018797 00000 n 
+0000021526 00000 n 
+0000021649 00000 n 
 0000021711 00000 n 
-0000021773 00000 n 
-0000021904 00000 n 
-0000022039 00000 n 
-0000022174 00000 n 
-0000022313 00000 n 
-0000041909 00000 n 
-0000022451 00000 n 
-0000022584 00000 n 
-0000026064 00000 n 
-0000026187 00000 n 
-0000026221 00000 n 
-0000026418 00000 n 
-0000026630 00000 n 
-0000030223 00000 n 
-0000030346 00000 n 
-0000030394 00000 n 
-0000030589 00000 n 
-0000030801 00000 n 
-0000031009 00000 n 
-0000031214 00000 n 
-0000033673 00000 n 
-0000033781 00000 n 
-0000035441 00000 n 
-0000035564 00000 n 
-0000035605 00000 n 
-0000035818 00000 n 
-0000035980 00000 n 
-0000041974 00000 n 
-0000042026 00000 n 
-0000036145 00000 n 
-0000042089 00000 n 
-0000036326 00000 n 
-0000036527 00000 n 
-0000042154 00000 n 
-0000036816 00000 n 
-0000042220 00000 n 
-0000036989 00000 n 
-0000042284 00000 n 
-0000037261 00000 n 
-0000042350 00000 n 
-0000037489 00000 n 
-0000042416 00000 n 
-0000037730 00000 n 
-0000042482 00000 n 
-0000037891 00000 n 
-0000042547 00000 n 
-0000038058 00000 n 
-0000038338 00000 n 
-0000038495 00000 n 
-0000038667 00000 n 
-0000038824 00000 n 
-0000039044 00000 n 
-0000042613 00000 n 
-0000039263 00000 n 
-0000042679 00000 n 
-0000039563 00000 n 
-0000042746 00000 n 
-0000039876 00000 n 
-0000042813 00000 n 
-0000040063 00000 n 
-0000042880 00000 n 
-0000040265 00000 n 
-0000040570 00000 n 
-0000040684 00000 n 
-0000040795 00000 n 
-0000040904 00000 n 
-0000041011 00000 n 
-0000041128 00000 n 
+0000021842 00000 n 
+0000021977 00000 n 
+0000022112 00000 n 
+0000022251 00000 n 
+0000041847 00000 n 
+0000022389 00000 n 
+0000022522 00000 n 
+0000026002 00000 n 
+0000026125 00000 n 
+0000026159 00000 n 
+0000026356 00000 n 
+0000026568 00000 n 
+0000030161 00000 n 
+0000030284 00000 n 
+0000030332 00000 n 
+0000030527 00000 n 
+0000030739 00000 n 
+0000030947 00000 n 
+0000031152 00000 n 
+0000033611 00000 n 
+0000033719 00000 n 
+0000035379 00000 n 
+0000035502 00000 n 
+0000035543 00000 n 
+0000035756 00000 n 
+0000035918 00000 n 
+0000041912 00000 n 
+0000041964 00000 n 
+0000036083 00000 n 
+0000042027 00000 n 
+0000036264 00000 n 
+0000036465 00000 n 
+0000042092 00000 n 
+0000036754 00000 n 
+0000042158 00000 n 
+0000036927 00000 n 
+0000042222 00000 n 
+0000037199 00000 n 
+0000042288 00000 n 
+0000037427 00000 n 
+0000042354 00000 n 
+0000037668 00000 n 
+0000042420 00000 n 
+0000037829 00000 n 
+0000042485 00000 n 
+0000037996 00000 n 
+0000038276 00000 n 
+0000038433 00000 n 
+0000038605 00000 n 
+0000038762 00000 n 
+0000038982 00000 n 
+0000042551 00000 n 
+0000039201 00000 n 
+0000042617 00000 n 
+0000039501 00000 n 
+0000042684 00000 n 
+0000039814 00000 n 
+0000042751 00000 n 
+0000040001 00000 n 
+0000042818 00000 n 
+0000040203 00000 n 
+0000040508 00000 n 
+0000040622 00000 n 
+0000040733 00000 n 
+0000040842 00000 n 
+0000040949 00000 n 
+0000041066 00000 n 
 trailer
 <<
 /Size 121
@@ -1157,5 +1157,5 @@
 /Info 4 0 R
 >>
 startxref
-42944
+42882
 %%EOF

Modified: forrest/site/docs/skin-package.html
==============================================================================
--- forrest/site/docs/skin-package.html	(original)
+++ forrest/site/docs/skin-package.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
     
+    
+<li>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
 </li>
     
+</ul>
+</li>
+  
+</ul>
+</li>
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<font color="#CFDCED">SubProjects</font>
+<ul>
+    
+<li>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>
@@ -313,7 +350,7 @@
 </div>
 
     
-<a name="N10038"></a><a name="notes"></a>
+<a name="N10035"></a><a name="notes"></a>
 <h3>Notes</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>

Modified: forrest/site/docs/tab-index.html
==============================================================================
--- forrest/site/docs/tab-index.html	(original)
+++ forrest/site/docs/tab-index.html	Thu Jun 17 23:57:47 2004
@@ -5,7 +5,7 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -14,16 +14,7 @@
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
-<tr>
-<td colspan="3" height="1"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -32,7 +23,7 @@
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -41,4 +32,6 @@
 </td>
 </tr>
 </table>
+</div><div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
 </div>

Modified: forrest/site/docs/upgrading_05.html
==============================================================================
--- forrest/site/docs/upgrading_05.html	(original)
+++ forrest/site/docs/upgrading_05.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
     
+    
+<li>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+<span class="sel"><font color="#ffcc00">Upgrading to 0.5</font></span>
+</li>
+    
+</ul>
+</li>
+  
+</ul>
 </li>
+<li>
+<font color="#CFDCED">SubProjects</font>
+<ul>
     
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<span class="sel"><font color="#ffcc00">Upgrading to 0.5</font></span>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>
@@ -450,7 +487,7 @@
 </div>
 </div>
     
-<a name="N100D7"></a><a name="Excluding+URLs%3A+filterlinks.xsl+removed+and+cli.xconf+added"></a>
+<a name="N100D4"></a><a name="Excluding+URLs%3A+filterlinks.xsl+removed+and+cli.xconf+added"></a>
 <h3>Excluding URLs: filterlinks.xsl removed and cli.xconf added</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>In Forrest 0.4 certain URLs could be excluded from command-line
@@ -470,7 +507,7 @@
 </div>
 
     
-<a name="N100F1"></a><a name="Skin+invocation+changes"></a>
+<a name="N100EE"></a><a name="Skin+invocation+changes"></a>
 <h3>Skin invocation changes</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Users with custom skins <em>may</em> need to update them, depending on what use they make of passed-in XSLT
@@ -480,7 +517,7 @@
 </div>
 
     
-<a name="N10104"></a><a name="Upgrading+skinconf.xml"></a>
+<a name="N10101"></a><a name="Upgrading+skinconf.xml"></a>
 <h3>Upgrading skinconf.xml</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Look at the 
@@ -491,7 +528,7 @@
 </div>
 
     
-<a name="N10112"></a><a name="Upgrading+forrest.properties"></a>
+<a name="N1010F"></a><a name="Upgrading+forrest.properties"></a>
 <h3>Upgrading forrest.properties</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Look at the 
@@ -504,7 +541,7 @@
 </div>
 
     
-<a name="N10120"></a><a name="Run+a+clean+target+after+upgrade"></a>
+<a name="N1011D"></a><a name="Run+a+clean+target+after+upgrade"></a>
 <h3>Run a clean target after upgrade</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>To avoid any issue with old classes being loaded, run a
@@ -512,7 +549,7 @@
 </div>
 
     
-<a name="N1012D"></a><a name="SVGs+should+omit+DOCTYPE+declarations"></a>
+<a name="N1012A"></a><a name="SVGs+should+omit+DOCTYPE+declarations"></a>
 <h3>SVGs should omit DOCTYPE declarations</h3>
 <div style="margin-left: 0 ; border: 2px">
 <div class="frame fixme">
@@ -531,7 +568,7 @@
 </div>
 
     
-<a name="N10149"></a><a name="To+be+continued..."></a>
+<a name="N10145"></a><a name="To+be+continued..."></a>
 <h3>To be continued...</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>..as more issues are discovered/remembered :)  Please send feedback to the 

Modified: forrest/site/docs/upgrading_06.html
==============================================================================
--- forrest/site/docs/upgrading_06.html	(original)
+++ forrest/site/docs/upgrading_06.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
+    
     
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
+<li>
+<span class="sel"><font color="#ffcc00">Upgrading to 0.6</font></span>
 </li>
-    
+      
 <li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
 </li>
     
+</ul>
+</li>
+  
+</ul>
+</li>
 <li>
-<span class="sel"><font color="#ffcc00">Upgrading to 0.6</font></span>
+<font color="#CFDCED">SubProjects</font>
+<ul>
+    
+<li>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>
@@ -447,8 +484,13 @@
       </p>
 </div>
 
+<!-- local-catalog ... CatalogManager.properties
+plus status.xml
+plus FAQ about CatalogManager.properties not found.
+-->
+
     
-<a name="N100B3"></a><a name="To+be+continued..."></a>
+<a name="N100B5"></a><a name="To+be+continued..."></a>
 <h3>To be continued...</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>...as more issues are discovered/remembered :)  Please send feedback

Modified: forrest/site/docs/validation.html
==============================================================================
--- forrest/site/docs/validation.html	(original)
+++ forrest/site/docs/validation.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
+    
     
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
+<li>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+</li>
+    
+</ul>
+</li>
+  
+</ul>
 </li>
+<li>
+<font color="#CFDCED">SubProjects</font>
+<ul>
     
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>
@@ -388,7 +425,7 @@
 </div>
 
     
-<a name="N1004E"></a><a name="Validating+new+XML+types"></a>
+<a name="N1004C"></a><a name="Validating+new+XML+types"></a>
 <h3>Validating new XML types</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -402,7 +439,7 @@
         an entry to the <span class="codefrag">${project.schema-dir}/catalog.xcat</span> file.  This
         section describes the details of this process.
       </p>
-<a name="N1006F"></a><a name="Creating+or+extending+a+DTD"></a>
+<a name="N1006D"></a><a name="Creating+or+extending+a+DTD"></a>
 <h4>Creating or extending a DTD</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -463,9 +500,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-                                                                                                    
+
       http://www.apache.org/licenses/LICENSE-2.0
-                                                                                                    
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -550,7 +587,7 @@
         </div>
 </div>
 </div>
-<a name="N100B8"></a><a name="Associating+DTDs+with+document+types"></a>
+<a name="N100B4"></a><a name="Associating+DTDs+with+document+types"></a>
 <h4>Associating DTDs with document types</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -558,13 +595,13 @@
           is:
         </p>
 <pre class="code">&lt;!DOCTYPE document PUBLIC "-//Acme//DTD Download Documentation V1.0//EN"
-          "download-v11.dtd"&gt;
+          "download-v10.dtd"&gt;
         </pre>
 <p>
           We only care about the quoted section after <span class="codefrag">PUBLIC</span>, called
           the "public identifier", which globally identifies our document type.
           We cannot rely on the subsequent "system identifier" part
-          ("download-v11.dtd"), because as a relative reference it is liable to
+          ("download-v10.dtd"), because as a relative reference it is liable to
           break.  The solution Forrest uses is to ignore the system id, and rely
           on a mapping from the public ID to a stable DTD location, via a
           Catalog file.</p>
@@ -584,8 +621,7 @@
           own catalog file located in
           <span class="codefrag">${project.schema-dir}/catalog.xcat</span>.
           Use the "project.catalog" property in <span class="codefrag">forrest.properties</span>
-          if you need a different pathname. Remember to raise the "verbosity"
-          level if you suspect problems with your catalog.
+          if you need a different pathname.
         </p>
 <p>
           Forrest uses the XML Catalog syntax by default, although the SGML
@@ -596,7 +632,7 @@
 &lt;!-- OASIS XML Catalog for Forrest --&gt;
 &lt;catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"&gt;
   &lt;public publicId="-//Acme//DTD Download Documentation V1.0//EN"
-    uri="dtd/download.dtd"/&gt;
+    uri="dtd/download-v10.dtd"/&gt;
 &lt;/catalog&gt;</pre>
 <p>
           The format is described in <a class="external" href="http://www.oasis-open.org/committees/entity/spec.html">the
@@ -605,19 +641,27 @@
           a public identifier to a DTD (relative to the catalog file).
         </p>
 <p>
-          We now have a custom DTD and a catalog mapping which lets Forrest
+          Next specify the full path to your <span class="codefrag">catalog.xcat</span> in the
+          <span class="codefrag">src/documentation/classes/CatalogManager.properties</span> file.
+          Cocoon needs this file when it starts to run. A template file is
+          provided in the "fresh-site" when you do the
+          '<span class="codefrag">forrest seed</span>' to commence a new project.
+        </p>
+<p>
+          We now have a custom DTD and a catalog mapping which lets both
+          Forrest and Cocoon
           locate the DTD.  Now if we were to run <span class="codefrag">'forrest validate'</span>
           our download file would validate along with all the others.  If
           something goes wrong, try running <span class="codefrag">'forrest -v validate'</span> to
           see the error in more detail. Remember to raise the "verbosity"
-          level in <span class="codefrag">forrest.properties</span> if you suspect problems
+          level in <span class="codefrag">cocoon.xconf</span> if you suspect problems
           with your catalog.
         </p>
 </div>
 </div>
 
     
-<a name="N10103"></a><a name="entities"></a>
+<a name="N10109"></a><a name="entities"></a>
 <h3>Referring to entities</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -640,7 +684,7 @@
 </div>
 
     
-<a name="N10128"></a><a name="Validating+in+an+XML+editor"></a>
+<a name="N1012E"></a><a name="Validating+in+an+XML+editor"></a>
 <h3>Validating in an XML editor</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -654,7 +698,7 @@
 </div>
 
     
-<a name="N10136"></a><a name="relaxng"></a>
+<a name="N1013C"></a><a name="relaxng"></a>
 <h3>Validation using RELAX NG</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>

Modified: forrest/site/docs/validation.pdf
==============================================================================
--- forrest/site/docs/validation.pdf	(original)
+++ forrest/site/docs/validation.pdf	Thu Jun 17 23:57:47 2004
@@ -120,10 +120,10 @@
 >>
 endobj
 18 0 obj
-<< /Length 4306 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 4390 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gau/\Bli%Kot,YVb@rGQ7U-QbTZ"tIN]O/'7S;-)eINe4,gcSpK7bq+r:dq=Y\uf-U9/MmZ2#I7SU8"Zf<=Tpk3os>AWt*oDLJdWCbDg2!rdg:!>X6>nJCWS/t`(?g!/s\A7c&Y#p%'+-dR[I1_FZohHZJ9#AV-A[&e!U[;W@p`2"D6osVd"1+De,fZfRr>gcn`?(.AdQ.F!Y-JLB1R]$s,V`S(M8B*G\C>(DE3p+V[UM!$]MO:?7l&"];5,"#T\13Xg#<T`,In];0B[2HG&Qd56Ya&q]qLKjj[WnGM>$dWL-!_<52/ukVQS<n*[AuPaZWrPB6J%IsL!oA3QI7jgZu)<-;.rl,nCA:[dPZaS95$iCLQ7O4d3)Bhk*>22cPhbPb_d[k84A_'/U!KCa'RBRD:?YGFQ(jT[mfg[LL=1"4jsW'+LZ<Eo&8p8%a'\Ee&$*P@XF;OYDrm=2--We%Dno`KqLf'2&*l#F:2@QVkb2i.scJpYRc!VMC)J2)B?2*NBjbj(%dc%pbfnhL7*WnXG/Q8@S(R*_*VF9e[D\)%MVR+ngWqsB*aDoq,>RX2<F^K5oB?ZC7qQiMJ2L>aVbr,:(IU[9)Z@Od-jGq-6-KQTL(1`eLFkrAR6>H@Pk`"legtU&>XWM[;p!-GJ8r8okHaE]YO6CBH<ug41J$k)H\7a/epmEa7/IN-D33Q(M.H2e\DuUdK5aL]:,;><uMhB<Z9>CY`E9c.jReJ9E#\-8,s3K1a(C\^QgLkn$@%94D8+A+4-p15`YJXO4J9'5O>["?<na:V/$XaEDMj[Dso<-]`?UL_"Bt?+:N)l<1]>D8K[fLpQGt8AG.u:CD/AjiV1Q"OO0G\FL&RSo>RcB;5P_j(An]=lSD'67VXSI'QGU)ImWK>ZsMgR'@5P>'5O9CMG?]q^6"JUannoao\/qDjB>S<;1H(34$dZN#sFOM>]@]NhW$4jGf5bGG_5R8%t#.p:g/qjcPlNo2pu<1I;ih0qicEeqS]YV(6JWE0<cc6P?[-qD\B'TE7#"m@9kRn8-$#E$=7Z24\qBj,\Z-WBcoSZ(Os:ElnIp6id(5O"/T^)Lii<m#Lr)o"Y'G\PS47MLHuUcf,_+pWS%nnQSqiLjQXF(f^IA"_]?Zaj5NfN6lcJtZQPQVL0n.WV!sitH,[*4Xt21K/B=&md;XJbIjiH%7\Sr,330KSPt"Fno4s>s_oM*_Q;4?#M@]%I%:k2l%<(0?eU*TL*O3q(NG)I(Gt@0eJ&!d6pjH9j[&Wsm-?p1#UBkT*B/l"n1Oj"H]YG]A_A5nQM+oi"bGm%T1p.;U^_/*fOOi1,,#:(Z_/g&JQo<P/)Z3,L&'M11@N:\n;#L:X]>*lPh[&^+9@3rQVa7LQk@=@`PbdT(".T#9q[7;'l]B0o?p-8\B6H[*I,+<3B[PiFa@1M9&:XE>GM50/dFD!$Ie`0XG;l]_4Isa[09_pOk9>>9kVq5B(*cp1?V0lsi8C0PhgUr9nen(#BDW5bUj>u$4I$UU^OC!b5t'd<-m*KfoON73/j!erO_',piapNe)AF,X!l$W)QWG)kaZ1POl]BLqGM3U@>Z3<;d,Bl2GDU7d>[ca#%'*q&45Dj=/57r&NXr&tf-r;LLkk7<88sb-9Ak-_+fg\87JS2/]hV=c;E#"TTG3_qiQMTK!]?f!q[+68in^c9%29Lg7fsnShLa28(9X*;7=T/biRXa$eZl,gDW$U<%/`:A:#c&AeT_&kar%I<@g&ed"36<C"Ek64jnXq!Z?9P)C9!IuI?"d[fIKI)BtVYXD<-gE'rq[D6CINT5mS?R,ZGL]UJ<Y&H<6?2>*0XU[6e8)%1,Zd4&r0"YGO!2/a`>`'nTsV,pBf7'POE^UYg@0hocQT1$c-d#Ba^hM*g"1)6sH>WToM-q%7j40tp)HG%.-.B>-eLiupkM'E*;!f5Xia34M_i-eD>#CI;PHI!/M$dXP_3jZ4sZ#+o%#NDYa;<j(JG+:<S0dRn6ERC/:f<DfP#q:+Eh1PphBP.#<"N;@3t(.PHD'/t#d")fV/aPIq7D7Djk_e<A?Yp<Hq:3,fp6EK:",hC`D_!@u;YQS9fNJd)%_b:7u+J9,bA:Wr!6&65/Y`U7MmAUnRL#e+\)egMMpR@mB$"CKHb@9!IAr8%_,ajdQErm-Z\-HT@p90CM^jK0p<n?SH4*6=3>`qmQKgS1V`(>@lG0:'"i%=Cs%kX]>'IMENQ[?lll`tJ]E>Iq.Ce9c'&-L\>fWT@O4VJZ\U<Xb\?iaj:+q2fE\Ks[*MgD@0gC@^?ar_FBb/3VQ#]4(^$u=U\,&R!^51r;l0cEh/W<&NF`@DgR;&0fK,4_)>!OBKJTjmX5,5c<nQRd_]FB"PC(7$\'4]VQuWq%1V<,4)8RTF&U:EW`-o="51HHqg\;aN'"YECK^j1,k!4sihCWSq.d-i"rKOj]G`3'fqP2+/E!Tk/@]5DbMfFUO'f=[LiO&trQ'2!Tk%pa;;"Le#=/,SGp&9h1kdZ]^D$r7c-H/N!ge3Td@(80[+/8VlP;]P*IaF>ksdge0iL)<I^Ps*HEc+C\A`X0hfn\Pm"M/6O\%nV]GOKb:WGr[2#=BNSU>[I@-%QNF))=89;',s,!:En!5'L"nO>23J?188d[*5K+#HLK90t\i)B)(/<]?o5#$gMB/NABVBBY>VjJ+<EsHdEDBBkkXV)jHqEk)"U^B'S5r"d0[g+UQUM't#^+]RHD%2_PbJ@![m^<t;se!KOD8>-2*jFYY<!U#+LPnZSATBkSqBZOJZc/k1e-2q&V'c.G:!CA'H1*p+T_@Oig*(J?I<oNAG)4ENO*q81n3kWC>?PllEOsgd>gBL/24SlMb0]Z4`Q%_rR@cajTVU&U`D*OCqGip_/H7C"IV,2@rpEfbgc<b"Og`SCQE?pc[f8S'c=6Ik=*>[cY2LHN61`l47AZ"3EsA+d0?YaK"U3a'R&g7S$./iYp5$K;;2MLbr"tb05kcH2(76)!PP9S6KGNecmr0AB!Ygsi9J*TZBHn6Y[ghKQo='o\qmDo\n8Rh\uq64n^cZf%q'lnX(/CbKmV5X+JfL2R'u@J;?VBRHL_#MC9edBhTo]p-.eh>dhgJ5]pc"q&oTAHHX-crRak09MDpUh5]$bkPXmE&g#hhD!sH;>IIt*:!>)f*10oc)=Uc3?HS%>=-b8X>,Q_]U`.Bu3>@*4r=^VNhO-L!>$dr0Bj>dh+&]',)X=Z+So9=k^*Z4[VdpTp$EmP>Q,ULm'7=r7SU6[/FH\K*^X0oZ5=N>,)3aNFrV<hN$O;Kl9*ka3JBXr"9JoKijR#Y\]/:1ou"@I1:B*K0Cl`_EtLMD]7WYZ'LQ,e5f'"4J#bUN:n/R*npI?nE]DMs_\6dHb?E>Q&2EA0/%Uotqcs1C"2gMdc1O`C&%qo#mihcJ,Y&4/S&5a^1,`MK&\'6[b%^(a&([-Am3mZ\o+HQf%Z)&9?]1e+,(GSj5Y9q6%H)k%ERo:bI^SoA+tBGW;5;@4'iS$B'HK>Z2qb\=Xn.uR0"du#93<T=R/QEJ$GbE6)gLEqI\d%F;r-38sVMWcr0@:cQm0FpU9FTs989Irl@QqBasZ;4t,Ag5`i;2Zh&;t@L/+`GpY>ST8QqQ)2c;ohTUX[*7c?$/Q$7hYp0[F<G'L1dUJd]k5/!Z3T2bml9a42<U^g"\SD#\$of(NU/n6ccfoB<p#TW'%@Sd'=?[5)g1nJ2OFbY\B&@a$r`JY&BE;N^dlV1SRgGhU*G!R`ABN\8m6id#Mqk8"WmE3lDLh?5Br7etKj%Zlk:TOnUf:_Y@DgH^[Q0%ck[=loR3smC?hiG4Cb"*(+t.3pm:!T&"+Zr9cZ:pm*c\<DTRtjF1C5b<"2t64!Qm6]VsX<[EQJ3XU$0D![]LCYH'e"K^?Ji)7h]*eM%kn2b(+2TH;'H/(X)eqq2=%&2CCXb[D!VGl/27\jP-2]&b'h_XqmIK4k^U'U7m2@@$LKpD?qdu?]P-J?$bj#t?)ku^>U&Ds-PdHZtb7#eYT5SEY?K+[`"jh/2lNu`A'#8fB\\J6#-SM=;sZ/KXOgLA:WRFb:Yla)GQg`E$Ln#V`<fOZ=iO9Tb&hV<RpCN?_Y]/+hFGu*qXP:X,:-P-Zn7i^(IEj+f#5A]@rrT+p"E>D>hc',5MTAiqGp)1#Q(1#PIgO[soF8Iei3>QUb^a=#D$4>H[$:<SfBTGloWniKF%mP/(f4SN\_cLt^=PuH5#tdJ=m&5Dl&oX]ak@.HQSq)uiqZN1_X:ad)lX+oq]e9$!1>Qb^c0=*Y/:\jm@aIdD:Rh,,5-dL/X_<"<SN19@rrATt6_j~>
+Gau/\CQmM]nb`7l<R]1F1FG_@PLhc7^Z/)KV"UX!Vq2Fn"\EMY5p7YulJoX'nKJ__`B1^!A7B>@fEW2-^&YpX]:-Hj7\3CfUV#X<Cp^eE7PjfMrWH3[LErIFUV"e7Y>="lT8k7IP*%R,JoL@8m;!O.lL*2^M`FZO?C!He>h!Xu<A(08aD'3G0%U9]CtNo/XRhlu)h.1'##s9G\sf_D@dTm*FBNK1GEIJi?8T#F21F9'=[u7_)bsYfch'p(D4f11-FdI&IKT1lRJguEpBPn:4HG/-:"3F%(1E^Mno*3D*b]u^@cqjTC?jfSA1:s`->RgVOlh?0RAHT-nLLBhmomltN7.HK&ne1:q;Z6lGYOM=eut_e7?8H8c)*cT#1KWr7Gho8ijrSf?4fqjVI\FspLCDkma`\.0jQb__)5`;F9o;alWH,"#P!d&N"%->0[PP+KGHib'0dBuH#Z.Nm'3GCXq7IH3._Wc[AO9GU0HRP?T"s!cKY!2_B/7B"YHaeFuZSp#(c'$)sD(^n/I#_N0jrQO^HOMN[<de"WMT8<Em@q3)D/G/=3TeSgeJN@o'eTHn<UkN!Si/[D8B_"gR!VOE4joZ907ceb1q7kkAD1'+'Li^_$rJ[4%A^Rl?A?*"?ORqqJU^7;>V%/!osWQb-qY/1tV?@<d5/g>lfk*7q_m'9As/Urnrk!oLRD"dPPtWuL6&"ho#A<k*`u)r[]5/1TO0/7:DF+30gj,YT(Ks&K.k!>'W0T_E!s/7D*)2p3d7>%!mCd&6en*,Xj[Xhf]5[h[(&f4^c01l15"UIN;UG?;OcJSKWH7\FFXVLALpO6Y8o&,kJSkfQQ;HidEX;3]#gHfE:@lA]O>RU?$`lG_R%dkb_LrWgm5,=iJ6lH`"e8LiAB9'dd9UF[B3T"[cchTQ*:Ruf%H+X8_"pRX87f!Sg"H<r?^J%*uj6X/k*4cK2'0ZG?>-VZ:QLo4kt.FQ7@i/;96dYd\fW_%QZ8c%Ff%-Ge3GdJ?B0a[cb79%&d9"`Pko[2;T)PnbsS@([X=BE^/OoVUhJsYeN-^,j`#Zc1?)Mh1E`LekU3t.jF7$2teJ^LhN7(Pjs(Y%e*"Y&uGPVWM`LI%5f0H?IX;6qRe-Je9JD9@@LYhuL"LHC=8L;f]<a>saB?q*9I&U&"?Oi";(nNphR;H[6kG_*'OU>aaW^M!3d8"o&-]]/6mD@pC'r77V1Ya^%edcn%dZ*SnkLWj^Ri>$b%]tPKOLg<Fg6n8nn6V3@;!QXa"]:'J!oDXjU?Gugk6JD>T4At,"cXKS4"N6f*b%O!/M5>[H3@i7bEOZ*DUs-)[edk1j5*3TR%3eo_cr1j1TTFq/fG6IWb>'JbiT8m&A@Cq0pfsV.(Lj:0DaNVSqP0:.pVqbaqs3X7S5:&a/4a/5MV1c&N'u=Sb8P'F@gC(Dj"O>Rq"cpmHL\);S]:U&du3\O]sR9R17^T^2KUu[l%;I?Z4h(0MNtH37fNc7mr\F&rOA';`)8`_L)?W7)]Rg';E,=]iV8mt<Z+;9Z%qnD!5,5N9=NHn6A7$*'U6qs^9O=l(`N0l%rll'@@`o5ih[)%I<DFuE@,f#1'YEsEQ0/Y?()_6HrXU?*.>l>rOaTfMZEJP[GeEeobd3Q*<ZhS.Q.O7V]IURCoGK("k\6DQB[,<65$''c3bpb)A&hr"5R%_@$,B:XDq'5R%54M13a2l)7M<WcT1rHY7%fT4m"-Kd#EZFk&Bh%]QT/#HZn<Fdi2rD*8Cg!@h)6L6O<$R/D'kA,B`=f<Rb$HjF)bX+P7W#=(OS!<,E>3`"]6VQp[;8$UG%=Gr3HB[5T.$UY`6/<%Ajh;rn99q'BJ2C2:sKrRDWpQDGV:\3Z3/V_k4DJcQl,F7agCmrgaFB[!boRu9>7a2B+W]t-$>/;6#',>/ht^+cf^Jp(RqkSLZr(#tuUi=l0;R5]E1:`N`+eULk'KqT$6=n9O3PtV.FF]B97Ya^#K@5UG9=BU>D8<PP"hj%53P:s#>6E#bs1Qg!8Y.g!"l)e[s(=/t@<c2=[qE>575T0&9V&-H35ZJaHd)7VAemosr2Me]p];H3UGp%sg\oi6\FVpDel``[;4a!.8+9ht5i>3B)3_U,073QK377DRgKk.'kU<u`)LsGsV0pEfHgSSS@IGq&jasZG4>kn\2#iHbgPM3c^"iG^'DH>>(@m:DoJ5!6d"g``TnUQbu.dWH/1;RbZWP5a13`:XdBNX[_Ml=fC8;:9S)mL\XqEbU,@q3:!*VMg-p6dsc#_3)CnZt'#K[).udTP*nrRuE3$W6GuW,i_oQUU1$gZ>`L/Lf-!DW\8]A/V04jFJ3la@*\h_&$Z;=e[*ibmog=EeMT_Di!o;7:%VYWj#?'@mjG=oZ^25!4s]j,$1nC;JXG@@Tl%"1mMq>:X)jT[s\^npllS1]#gjR3;HMr.H_A*1@XA2oLqkQEY9W8$-WtB.T4UYe:&=2/*dsMFg?b'D)K1tQ<;Xt2>]J"9Sc1^HR'NNpT'<>F_@No?21ndBN\ONZ?+7?XH?!9-.7n!_.:rh&`n1DaeY22Lbm%C^]!=jc%DrpR4QMWhiD%]58;4k_bXUgM(=NajRtg['#MN^lE>o^7^s3nG.ti6*Nb#g7EE=0Kd#N[M5ucqO@4.?#Q#rI$9%N;*6P+Q_27RVp0QgDbYW+)76q<86g'n02lQ:Z^!/LCmh-lW\QR70f>U[%.i4,k+jqS6r;Cgl!p/DWa\NI-5In<"ab:OQRI@3=`l7(?ZY'*bq>iH;^?t3j'Q(h7I+0$S\>p!#U_Q$KJ\!_GW,M@JTuE6:.im5Iae*"No6#YD'`4a:DRrj1g/3La0E!nX[ga*<%3Q:)h$/cmil-slK8E8HN(b2WpRa@/D,;6dbotq.)oF9Ms8JLZRJ9oMU9&4+9dZ2$LZ]c:IC,Y&Ns=s:dKl*KC;B7BNL3CcAV6tG^rS.>/7Bl0rbT6N\$mpO-,11mL>Oo.Xa242.gLkpDiHjC8s,G3'1g(T,Gm&Z[1ieZ><Me42$:hBR-]G359k='fB'@/U0119g+q,`1I7bq[0peuogA[F5Ca_<dp#e\87H^eD`;Kk?3V5HU0^]`F61cmJ4h>dk@`3NqE[e1OL?$P&0kX;C,$ob8jW?Jo\+=O3nm.YB0n[(K[<,Oe/)\fF)],$K,@?&SGA'_m,K$ZM)=<U>4c+,Zolag)e;rSl1?RE1,!Fn/^ao2ME?rY`,O)nkT)b5HF^3b_RY#$4:kL]js@$H7r`Tf/oJ6S&G:=(C5bQLgOFn1j?#IM4G1)CA^&W33t\dm8WOB0/i*i>H6R<h4.&0RWDe$WIEekjVgT04#B-+LiU7p#IOZD`"JTHNpIVnX+cL==C1sU'g_ip6$@"*h^e&^R0BYc#^-k9RC@g*U)g6HAV_5*!r9%`VQu[Kj,Z!gtJBGYVeYbj$F3%jg3f8<WDt=^G+.'59M+<.OF[bNViZs&%0TP/roa36B,\c&MkS2hsFK00i8+jg?,#gA1"eir9RgrBZJG"BG[njX^+b<Mj3SJZkc?YH=5#$`CY1-8pWJVCfhf<-1O-^E>f+VIKp^6`Y4<Tf4Y3i>ri,h-C3+0p?T'oElfhD[\9U7=b0J%%eAV-N>38Ggfg$&<foA"\Nmu'p!dC0fdb-qjR?0T-e,4k@r"8_,AL3!/ih'lQ1\J[1uHKcKFetZo3D>J$9H`s9]MQ1NjTK-f72k+^X8[Tp3F-6^&Ks_G+Pp[>nNt!54,,6-s^MD&qcQde1D`oiqLnPlB8%^*g.B`%R8t]M64E7M6GuZJ),1cp$abq8U5tH%+WOkCB"U@M:m+cA$X?Le5F(G0J1WV!'@UWj08n(t(r]>`^(SPVUMh![>oUWM5G=rb7CdZ$uFlf`m//,8m2(3Ur&Qtb&<XZ4<"Kg8+5'cCr_;Y$^/eqQpbkHsW2E<bT@i!F`6"65#/p$7WU."QDbhGbu.m$q%f!VSR/4OqW$gNM7(89So&dS.3EgP%@\r8\=e9T/kFW!Q<2J:s%:LaW:d0$MrF;tdq?>SY/+jW,9G.(ZdQnuuXkRs3FEK&rXq-IS^\8>*L3@&P[hm/cB[j!0N^lN3Ho1>a>1A\R")PEER+2gTgmC]41DI:tE_eF]>#;qidlDF%"K5f3T2grse0HSSG+H*BK6Em:B<i$3C7"%OW\plL-G$eK"^l5O5T7@6?lJk]uA_^6Pn^1.Y=PQ-[F48uQ:P[r?XL1ReRlJsm)2NC5)]V0S*_25/j7cr?>#j/d<lRBH70]::g%jga-[;OsPb`7.;Z31dpLTLe<nXUCgu<:L=t!:-C7rd=Kn-?4]lRTgj=:Nb!F@*,ru;)<;(F9;Wp8^S</0t,&lj7P(Dr&L88X0LCj2o&e[i#Umet3/-k4*LGk,,>lPfRjNoUJCSCRquj>'[3%k5L&)u~>
 endstream
 endobj
 19 0 obj
@@ -188,10 +188,10 @@
 >>
 endobj
 25 0 obj
-<< /Length 1338 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1585 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GasapbAQ>u']&X:\BFpjg3QE89Uc/:1=J-9M?%K0Zpi1'8>8c*G5V*J+t8Y=Q*_DOcoL'5n3/j>er/WWL4U8Gd!E0'TkY14(&W^A5\365K.'1S(B&4dj%nl[R.U=$n"cpU,3uD;>i"(OidALiIBnBh[:K1Kq?sET#1Ekc6>bF6RhcTr1Muf_SJ"\;"@),4_N#\oP8!Tp@sNTWnGs0o*D5aVoS@!Y;D'6Z9&]:nNtZ(<78mDp,"][%EU0k=orZb.r8+]b8"B=<dttt+IUJ[E+m3ZggobOB_0Y)Zh"\cpTBi@/WUnQ'YAe1'[HT9]6&stJbs:<dnHm<"Gg^^k&aCti[eI+uNjZk)h/5B1du*Y#TgEu\gNg#3&?2+@^+AecF;uk"MeIEe?b%Dc8%m8@,l0'l=Pg4ts"&7OdISSd`-Hol1du+Zi)PM8PU%tY_f-_:LjGY'k_rg`^Fd1$#?bB,0e]:3-T>8\mHWuXeV2nc4YbLA/oV_!n(PKVi11)VH&RY4Guqi?nL3UGgbDBSn^O+(8Un@h^R`ZdF`F9]DcRn3OV8_7-(W=+4:WVu$U#e5MW7^8[3RPLO?)q#.(lh[I/e<_C>lYBru-@E5W6jA?_C$@ONI'"puIjl>V5;$B`taJnm*<GP*VC`iVM7gNAnnh.6l"eV3W)!f5U@h_f(UgK(\!.4uBV/:h,&k4nEN&R(5P1?l\=2oR(juFeD`Ah9MjB(#WVYg4m^4a@'/bmNqIA8'16j.;6&o=HC688^lZ'*B<qcDC)a8SYK.kc@D4g[.>hpC:5gh<5\tG<5]1Vhs7G+"Fb,,FpPst#aBO+%Nn%I+,IGY,dUE4a`A<r-DI[s:MX1P6=)q5Sl.$,S0YJsphEp#AQ<-*!B8>Qq2_K6UhpDS%]/m:!(n%u;elRMmcme^>Sjt[b\LaNV.8*l='ZV3r@98hr>'dmgbMX`="!7%>XI73#sc(f@_7C,"4<4>^/Nm*k9PY'9G7,XbF1f[0RgiuKBAGoJQb"a;,&6>$qegV=b>Ks$9okV%Q<b]LM<.`RDY*q4&4>moqT;cV/!sm%[?G(622^YLe\K3'BM=K?ucP%<"?gkSPL4/]q)`*-YES\.(q*Tn]D?ls..m*oDRL+?gk7IP94<qJgJo"0$f7^=q\]$)X;6/G:Igsh[$EYOW6iUm_%b?n<tBR_eOehq/BUp@:k;Sn0Ba_#\W1^jWP-)fJL9jcg&X<DE@OR:b?uRkb*CD/!\71:=2i*pZ4arCFXiL*Z7VcP0-o4M<j6Fr6GN/@2:69)^%[<Gi><Ch!RD2_hH^mhUs*&L.M@nO('u@h.<BW3h$IkJFX@*Z+]#/kuA]+~>
+GatU4fl#h.'Rf^W#^n*V5XK7](A'')-:*Pmg;GB@FS`dD[%r^-\eK#%Im7![AWa:(+A!,3pR$0`iE`C0>V28nWT3fqF]Rg^lP'`QET%]t!K-gY7;h=j)X!a!)br;&Q2U?kq:AdJ!IFO>2s<X^MJT,hqqt`S\2SSse#Xmdjs*d3j0L/5Z'8hSL:4toqQQYl;aaTd767$@e`-T4q"Ne[6h#)Yp]6'/nA52C6WbrB+A>)YK0N,%p#<0oa47Mb(K/ceVc[^0*qJhOFaIJ6<]9p%`4WbV*7)%G&#DmM4C<+.qq]kIgRo!m?U9g0hbMV32X74/:tAK.c-sIfLSsM:>`sF3b:Aqdgp]*2Y0D[hTiFV]1,FJCA`fI(j("4lTPUN/T64!NUF:uKq@JX?q)>:R*9sg]k,Y!hchF%rN<7?T_>#h"7CpGMEej!f9B?E_nDg#Zf[c3YZD/2.4V-Q1I#nU5"sceb/7@5pP]q_dH"Z)[2\T[76W7>0&Ys#-GAa*3[CoSKpq:6c$eUf1dn.?`I*FXKSXB"c@I'r%'rso>YiBB<hH+j%O3TehcprpVY(tk$kTqYLU)5FFe2AG:-14_R9pF@a-'.pB0u`f6pNo!2&5EVMo9sin"gbT_eh!$F`RZ?DNoFK3q]qU_i$[K*aF`jDKSf[BNNOPkFDc#i+XAL/UBl,;T]hrd_9g^Vh]I@e=ANo&m%$4<j'#N-b$dg\D2`+kZ$'Cf>;]3Kn3(dAqbC!&##G(Z2.3Nk"%e<s(dD_BLj2l=,ArpBSW;44[,?CWWP(B9#,fT-VnH<FA5.6OW"R)Z6hLQR66F-[Jl8\Pi0cdMN./8'XL<A#p$)$r'YiG9d/5Ti>^ttJ?Qi'QPDPK0H"XZdR(@UCB2WqiPi04GD'mb,9L1[T?Nm@gLM^&S(SY[.L`PMWi\>m.I^qb>YUWB96SVdGeY=6[:I".dVROog(l*PjXOtd&*FN#Ok;1/;,<3,_[0J$Ncj=1M31':/fLglO77Z\:.'"+CUT$mk9,l1UUR=@lEbQ@jS's^AoF:QYd5$nOK9D0&!D(5;d!`+OSdG&A)!F6%]F(HY6T1T'2UA=hgEa+2*CIOf"/GU7T2oG3GN&Vb8kMO-jtusu)`1WB=JZ:L^tERsr^WsGUhL,'$qS[!6-)bdkZlR\iMKo6`q:j;6M,,*d&"d_92DS5%l!R+d#P`ufeR'-_FH-?UKBk>5RP;H/\A(eM?0Zt@p^Z\Q89!P'OoBHS6$[cL[bI%!n=\!--1(Ib,Q8OE%nS!`T$P3,5BR()7$tH(eDOiAHkIBfQM#,<0mZ-Q-9sFfMGn;9kT)D&Y1PU-H=[._INYXW!n@H>8u4<oR%Q$SZM)>F2ofQF+^`s^A;N0[o\p2ID/&-;*8pB6/p&'Abf/u@<e:2L\s5+Qh'L'h[s0[+W6)0h0INki>(+9Me*,prS]#5_UKTqic$3kqs\6DMA%(WM12GUpK?$lbt2R)*/[1g#8PaLG\PU6hd5@om#3G*7X1RhrCI?+*+1QnrUL?08A>';`iG[A2]N&Z@V+V%[Q3iW.#f\Hc,Ukr8J'#[D%7f$d[4!q"-i7fDZ$-c#8srD_>~>
 endstream
 endobj
 26 0 obj
@@ -211,7 +211,7 @@
 28 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 526.344 688.466 619.332 676.466 ]
+/Rect [ 526.344 651.016 619.332 639.016 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://forrest.apache.org/docs/catalog.html)
@@ -372,27 +372,27 @@
 38 0 obj
 <<
 /S /GoTo
-/D [19 0 R /XYZ -5.0 149.387 null]
+/D [19 0 R /XYZ -5.0 101.787 null]
 >>
 endobj
 40 0 obj
 <<
 /S /GoTo
-/D [26 0 R /XYZ -5.0 731.0 null]
+/D [26 0 R /XYZ -5.0 693.55 null]
 >>
 endobj
 42 0 obj
 <<
 /S /GoTo
-/D [26 0 R /XYZ -5.0 652.266 null]
+/D [26 0 R /XYZ -5.0 614.816 null]
 >>
 endobj
 xref
 0 51
 0000000000 65535 f 
-0000019067 00000 n 
-0000019152 00000 n 
-0000019244 00000 n 
+0000019398 00000 n 
+0000019483 00000 n 
+0000019575 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
 0000002229 00000 n 
@@ -408,38 +408,38 @@
 0000009086 00000 n 
 0000009113 00000 n 
 0000009306 00000 n 
-0000013705 00000 n 
-0000013828 00000 n 
-0000013876 00000 n 
-0000014097 00000 n 
-0000014327 00000 n 
-0000014540 00000 n 
-0000014747 00000 n 
-0000016178 00000 n 
-0000016301 00000 n 
-0000016328 00000 n 
-0000019389 00000 n 
-0000019440 00000 n 
-0000016525 00000 n 
-0000019503 00000 n 
-0000016700 00000 n 
-0000019567 00000 n 
-0000016987 00000 n 
-0000019632 00000 n 
-0000017247 00000 n 
-0000019697 00000 n 
-0000017561 00000 n 
-0000019763 00000 n 
-0000017791 00000 n 
-0000019827 00000 n 
-0000018055 00000 n 
-0000018294 00000 n 
-0000018407 00000 n 
-0000018517 00000 n 
-0000018628 00000 n 
-0000018736 00000 n 
-0000018842 00000 n 
-0000018958 00000 n 
+0000013789 00000 n 
+0000013912 00000 n 
+0000013960 00000 n 
+0000014181 00000 n 
+0000014411 00000 n 
+0000014624 00000 n 
+0000014831 00000 n 
+0000016509 00000 n 
+0000016632 00000 n 
+0000016659 00000 n 
+0000019720 00000 n 
+0000019771 00000 n 
+0000016856 00000 n 
+0000019834 00000 n 
+0000017031 00000 n 
+0000019898 00000 n 
+0000017318 00000 n 
+0000019963 00000 n 
+0000017578 00000 n 
+0000020028 00000 n 
+0000017892 00000 n 
+0000020094 00000 n 
+0000018122 00000 n 
+0000020159 00000 n 
+0000018386 00000 n 
+0000018625 00000 n 
+0000018738 00000 n 
+0000018848 00000 n 
+0000018959 00000 n 
+0000019067 00000 n 
+0000019173 00000 n 
+0000019289 00000 n 
 trailer
 <<
 /Size 51
@@ -447,5 +447,5 @@
 /Info 4 0 R
 >>
 startxref
-19893
+20225
 %%EOF

Modified: forrest/site/docs/wiki-sample.html
==============================================================================
--- forrest/site/docs/wiki-sample.html	(original)
+++ forrest/site/docs/wiki-sample.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
     
+    
+<li>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
 </li>
     
+</ul>
+</li>
+  
+</ul>
+</li>
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<font color="#CFDCED">SubProjects</font>
+<ul>
+    
+<li>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<span class="sel"><font color="#ffcc00">Wiki Reference</font></span>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<span class="sel"><font color="#ffcc00">Wiki Reference</font></span>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>

Modified: forrest/site/docs/your-project.html
==============================================================================
--- forrest/site/docs/your-project.html	(original)
+++ forrest/site/docs/your-project.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="../images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="../images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,34 +57,25 @@
 <td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../docs/your-project.html">Documentation</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td>
@@ -95,7 +86,11 @@
 </td><td bgcolor="#294563"></td>
 </tr>
 <tr>
-<td height="10" bgcolor="#4C6C8F" colspan="4"></td>
+<td height="10" bgcolor="#4C6C8F" colspan="4">
+<div class="level2tab">
+<a class="base-selected" href="../docs/your-project.html">Core</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbot.html">ForrestBot</a>&nbsp;|&nbsp;<a class="base-selected" href="../docs/forrestbar.html">ForrestBar</a>
+</div>
+</td>
 </tr>
 </table>
 <!--================= end Banner ==================-->
@@ -140,10 +135,6 @@
 </li>
     
 <li>
-<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
-</li>
-    
-<li>
 <a href="../docs/searching.html">Searching</a>
 </li>
     
@@ -159,71 +150,117 @@
 <li>
 <a href="../docs/compliance.html">Standards Compliance</a>
 </li>
+   
     
-<li>
-<a href="../docs/dtd-docs.html">DTD documentation</a>
-</li>
     
 <li>
+<font color="#CFDCED">Advanced Topics</font>
+<ul>
+      
+<li>
 <a href="../docs/catalog.html">Using DTD Catalogs</a>
 </li>
-    
+      
+<li>
+<a href="../docs/sitemap-ref.html">Sitemap Reference</a>
+</li>
+      
 <li>
 <a href="../docs/cap.html">Sourcetype Action</a>
 </li>
     
-<li>
-<a href="../docs/oowriter.html">OpenOffice Writer</a>
-</li>    
+</ul>
+</li>
+    
     
 <li>
-<a href="../docs/forrestbar.html">The ForrestBar</a>
+<font color="#CFDCED">Upgrading</font>
+<ul>
+      
+<li>
+<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
 </li>
-    
+      
 <li>
-<a href="../docs/forrestbot.html">Forrestbot</a>
+<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
 </li>
     
+</ul>
+</li>
+  
+</ul>
+</li>
 <li>
-<a href="../docs/upgrading_06.html">Upgrading to 0.6</a>
+<font color="#CFDCED">SubProjects</font>
+<ul>
+    
+<li>
+<a href="../docs/forrestbar.html">ForrestBar</a>
 </li>
     
 <li>
-<a href="../docs/upgrading_05.html">Upgrading to 0.5</a>
+<a href="../docs/forrestbot.html">Forrestbot</a>
 </li>
   
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Older Docs</font>
+<font color="#CFDCED">References</font>
 <ul>
     
 <li>
-<a href="../docs/primer.html">Forrest Primer</a>
+<font color="#CFDCED">DTD documentation</font>
+<ul>
+        
+<li>
+<a href="../docs/dtd-docs.html">index</a>
+</li>
+        
+<li>
+<a href="../docs/document-v12.dtdx.html">document-v12</a>
+</li>
+        
+<li>
+<a href="../docs/howto-v12.dtdx.html">howto-v12</a>
+</li> 
+        
+<li>
+<a href="../docs/faq-v12.dtdx.html">faq-v12</a>
+</li>           
+    
+</ul>
 </li>
     
 <li>
-<a href="../docs/libre-intro.html">Libre</a>
+<a href="../docs/document-v12.html">document-v12</a>
 </li>
     
 <li>
-<a href="../docs/dreams.html">Dream list</a>
+<a href="../docs/wiki-sample.html">Wiki Reference</a>
 </li>
-  
+    
+<li>
+<a href="../docs/oowriter.html">OpenOffice Writer</a>
+</li>    
+ 
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Some Samples</font>
+<font color="#CFDCED">Older Docs</font>
 <ul>
     
 <li>
-<a href="../docs/document-v12.html">document-v12</a>
+<a href="../docs/primer.html">Forrest Primer</a>
 </li>
     
 <li>
-<a href="../docs/wiki-sample.html">Wiki Reference</a>
+<a href="../docs/libre-intro.html">Libre</a>
 </li>
- 
+    
+<li>
+<a href="../docs/dreams.html">Dream list</a>
+</li>
+  
 </ul>
 </li>
 </ul>
@@ -370,18 +407,21 @@
        Forrest</a> from source.
      </p>
 <p>
-     After downloading and extracting forrest, you need to add environment variables.  In Unix/Linux:
+     After downloading and extracting forrest, you need to add environment variables.
      </p>
+<p>In Unix/Linux:</p>
 <pre class="code">
 ~/apache-forrest-0.5.1$ export FORREST_HOME=`pwd`
 ~/apache-forrest-0.5.1$ export PATH=$PATH:$FORREST_HOME/bin
      </pre>
-<p>
-     In Windows, go to "My Computer", "Properties", "Advanced", "Environment Variables" and add:
-     <span class="codefrag">FORREST_HOME</span> as <span class="codefrag">C:\full\path\to\apache-forrest-0.5.1</span> and
-     <span class="codefrag">PATH</span> as <span class="codefrag">%PATH%;%FORREST_HOME%\bin</span>
+<p>In Windows:</p>
+<pre class="code">
+Go to "My Computer", "Properties", "Advanced", "Environment Variables"
+and add:
+<span class="codefrag">FORREST_HOME</span> as <span class="codefrag">C:\full\path\to\apache-forrest-0.5.1</span>
+<span class="codefrag">PATH</span> as <span class="codefrag">%PATH%;%FORREST_HOME%\bin</span>
      
-</p>
+</pre>
 <p>
        To see what the forrest command can do, type 'forrest -projecthelp'
        </p>
@@ -415,13 +455,13 @@
 <p>
         As 'site' is the default target, just running 'forrest' without options will
         generate a "static HTML website". For example, typing 'forrest' in the
-       xml-forrest directory would build Forrest's own website. But we're going to be
+       top-level "forrest" directory would build Forrest's own website. But we're going to be
        building a new site, so read on.
       </p>
 </div>
 
     
-<a name="N10051"></a><a name="seeding_new"></a>
+<a name="N10056"></a><a name="seeding_new"></a>
 <h3>Seeding a new project</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -542,7 +582,7 @@
 <img class="figure" alt="New project" src="images/new-project.png" height="356" width="500"></div>
 </div>
     
-<a name="N1007A"></a><a name="seeding_existing"></a>
+<a name="N1007D"></a><a name="seeding_existing"></a>
 <h3>Seeding an existing project</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -561,7 +601,7 @@
       </p>
 </div>
     
-<a name="N1008E"></a><a name="customizing"></a>
+<a name="N10091"></a><a name="customizing"></a>
 <h3>Customizing your project</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -569,7 +609,7 @@
         to your project's needs. Here we will deal with configuring the skin, and
         changing the project layout.
       </p>
-<a name="N10097"></a><a name="skinconf.xml"></a>
+<a name="N1009A"></a><a name="skinconf.xml"></a>
 <h4>Configuring the Forrest skin: skinconf.xml</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -721,7 +761,7 @@
           command in the site root, and the site should be updated.
         </p>
 </div>
-<a name="N100B5"></a><a name="Changing_the_layout"></a>
+<a name="N100B7"></a><a name="Changing_the_layout"></a>
 <h4>Changing the layout: forrest.properties</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -797,7 +837,7 @@
 
 
     
-<a name="N100F3"></a><a name="adding_content"></a>
+<a name="N100F1"></a><a name="adding_content"></a>
 <h3>Adding content</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -805,7 +845,7 @@
         <span class="codefrag">src/documentation/content/xdocs</span>
       
 </p>
-<a name="N100FF"></a><a name="site.xml"></a>
+<a name="N100FD"></a><a name="site.xml"></a>
 <h4>site.xml</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -816,7 +856,7 @@
           <a href="../docs/linking.html">Menus and Linking</a>.
         </p>
 </div>
-<a name="N10110"></a><a name="tabs.xml"></a>
+<a name="N1010E"></a><a name="tabs.xml"></a>
 <h4>tabs.xml</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -850,7 +890,7 @@
   &lt;/tab&gt;
 </pre>
 </div>
-<a name="N1013F"></a><a name="images"></a>
+<a name="N1013C"></a><a name="images"></a>
 <h4>Images</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -864,7 +904,7 @@
 
 
     
-<a name="N10150"></a><a name="sitemap.xmap"></a>
+<a name="N1014D"></a><a name="sitemap.xmap"></a>
 <h3>Advanced customizations: sitemap.xmap</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -906,8 +946,9 @@
 </ul>
 <p>
         If your site defines its own sitemap, it must perform all the operations of
-        the Forrest default.  To get started, simply copy the Forrest sitemaps from
-        <span class="codefrag">xml-forrest/src/resources/conf/*.xmap</span> into your
+        the Forrest default.  Simply copy the relevant sitemaps
+        that you wish to over-ride, from Forrest sitemaps at
+        <span class="codefrag">forrest/src/core/context/*.xmap</span> into your
         <span class="codefrag">src/documentation</span> directory (or wherever
         <span class="codefrag">${project.sitemap-dir}</span> points to).
       </p>
@@ -919,15 +960,16 @@
          <a href="../docs/sitemap-ref.html">Sitemap Reference</a> for a tour of the
         default sitemap.
       </p>
-<a name="N101A9"></a><a name="adding_new_content_type"></a>
+<a name="N101A6"></a><a name="adding_new_content_type"></a>
 <h4>Example: Adding a new content type</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
           Say that <span class="codefrag">download.xml</span> lists downloads for a certain package. It would be
           best to represent download information in a custom XML format:
         </p>
-<pre class="code">&lt;!DOCTYPE document
-          PUBLIC "-//Acme//DTD Download Documentation V1.0//EN" "downloads.dtd"&gt;
+<pre class="code">&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;!DOCTYPE document PUBLIC "-//Acme//DTD Download Documentation V1.0//EN"
+  "dtd/download-v10.dtd"&gt;
 &lt;document&gt; 
   &lt;header&gt;
     &lt;title&gt;Downloading Binaries&lt;/title&gt;
@@ -967,15 +1009,13 @@
 &lt;/document&gt;</pre>
 <p>This should be placed in your content directory, typically
           <span class="codefrag">src/documentation/content/xdocs</span>, and an entry added to
-          site.xml.</p>
+          site.xml</p>
 <p>
           To handle these special tags, one would write a stylesheet to convert
           them to regular documentv12 format. Here is such a stylesheet,
           download2document.xsl:
         </p>
-<pre class="code">
-&lt;?xml version="1.0" encoding="utf-8"?&gt;
-
+<pre class="code">&lt;?xml version="1.0" encoding="utf-8"?&gt;
 &lt;xsl:stylesheet
   version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"&gt;
@@ -1011,7 +1051,7 @@
 
 </pre>
 <p>
-            Place this in the default stylesheets directory,
+            Place this file in the default stylesheets directory,
             <span class="codefrag">src/documentation/resources/stylesheets</span> (or wherever
             ${project.stylesheets-dir} points).
           </p>
@@ -1027,7 +1067,7 @@
 <ol>
             
 <li>Override <span class="codefrag">forrest.xmap</span> in your project by copying
-              $FORREST_HOME/context/forrest.xmap to your project's
+              $FORREST_HOME/src/core/context/forrest.xmap to your project's
               src/documentation/ directory.</li>
             
 <li>
@@ -1058,7 +1098,7 @@
 </li>
           
 </ol>
-<a name="N10201"></a><a name="new_dtd"></a>
+<a name="N101FA"></a><a name="new_dtd"></a>
 <h5>Registering a new DTD</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -1082,7 +1122,7 @@
                    location, in the catalog file,
                    <span class="codefrag">${project.schema-dir}/catalog.xcat</span>.  Eg:
                    <span class="codefrag">PUBLIC "-//Acme//DTD Download Documentation V1.0//EN"
-                     "dtd/download-v11.dtd"</span>
+                     "dtd/download-v10.dtd"</span>
 </li>
                
 </ul>
@@ -1092,7 +1132,7 @@
                </p>
 </div>
 </div>
-<a name="N1022A"></a><a name="integrating_rss"></a>
+<a name="N10223"></a><a name="integrating_rss"></a>
 <h4>Example: integrating external RSS content</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Similar to the previous example, we can integrate RSS into our
@@ -1127,7 +1167,7 @@
 </div>
 
       
-<a name="N1024D"></a><a name="skins"></a>
+<a name="N10245"></a><a name="skins"></a>
 <h3>Forrest skins</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -1143,7 +1183,7 @@
 <pre class="code">
 project.skin=forrest-site
         </pre>
-<a name="N10266"></a><a name="new_skin"></a>
+<a name="N1025D"></a><a name="new_skin"></a>
 <h4>Defining a new skin</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -1198,7 +1238,7 @@
 &lt;/xsl:stylesheet&gt;</pre>
 <p>In order to use this feature in your custom skins you must copy
           the common skin from the forrest distribution into your custom skins 
-          directory (see <span class="codefrag">xml-forrest/src/resources/skins/common</span>).
+          directory (see <span class="codefrag">forrest/src/core/context/skins/common</span>).
           This will protect your skin from changes in the Forrest common skin,
           but you must remember to update this skin in order to take advantage
           of new features added by the Forrest team.</p>
@@ -1209,7 +1249,7 @@
 </div>
 
     
-<a name="N102A9"></a><a name="webapp"></a>
+<a name="N1029F"></a><a name="webapp"></a>
 <h3>Interactive Forrest: developing docs faster</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -1222,7 +1262,7 @@
         a "live" Forrest webapp instance, Forrest-based doc development can be
         faster and easier than comparable tools.
       </p>
-<a name="N102BA"></a><a name="forrest_run"></a>
+<a name="N102B0"></a><a name="forrest_run"></a>
 <h4>Running as a webapp</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -1235,7 +1275,7 @@
           servlet container, type <span class="codefrag">forrest webapp</span> to build an open
           webapp in <span class="codefrag">build/webapp/</span>.
         </p>
-<a name="N102D3"></a><a name="using_webapp"></a>
+<a name="N102C9"></a><a name="using_webapp"></a>
 <h5>Using the webapp</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -1265,7 +1305,7 @@
 </div>
 </div>
     
-<a name="N102FB"></a><a name="invoking_from_ant"></a>
+<a name="N102F1"></a><a name="invoking_from_ant"></a>
 <h3>Invoking Forrest from Ant</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>

Modified: forrest/site/docs/your-project.pdf
==============================================================================
--- forrest/site/docs/your-project.pdf	(original)
+++ forrest/site/docs/your-project.pdf	Thu Jun 17 23:57:47 2004
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 2538 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2208 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GauHMD/\Gm')nJ0+Ttpn.2#gYhCKK?+oC,jH^d[`h>qcHaqei0.n`&uMA)ZHDspLJV4j]0(WE(NCa+n\iPTqdaIuqb:F>O8MgE=Mk3E[br)oTCf&joUD"n7M5nlAE\A?[`n#W-7IOrrqF(nq/E!id$hA)QeZF[DlZ0'q&b+(^H_\rS0,*>6hL7<(&<EB?"j/eFYH2"s'%]F0j4kCu!6(eB1;Xm`9*%=+F=*n8$AuhqJTfX$kEsUUpM)4fMoWpXQOHsUCcT43!EW*%_euB*0`u@lg:J'IK;Op1n5[VSc^<8$5,k\00KaEtRIh\&1%7h1*(%Z8L/%BciO>m:=(cFh26^mZn)2f/,!ljN)g@CupD#6P2$G_`R<q]?(CU9SoAJJjGN#a0FhRbP>ESc=KQ\1E7e\bCSm1j8ReUnd0c(#dY9+`o+6W<KGQ6[>R`:Yl<=e_F!3%T/CW#V*;X0V?.N,&/.kM7q@9Zp$SRZo46j9tM>HS0;SQ"ea(0B<*Z1R%S#r8`>T;Nl7thJ1]YV`(4[Xuf9eE(!nr#.%&&coP;'-iZAU2)g+e.H)5h`'td,l.CIfad<gJ2AbKqT;nkeG8YN1G6X(m))'a75qnY(6PFn1,-T?thE@d8Vi6,U35g)"m\bq,Ta&N%YQpI/q]3RA*uGfQEV59U4i\]H[^-na)BLX*LiKg4A?TR8B$#*mp8/Cb7`QksWegL$+N>jH'$mRk_6u]C>Vd"40R.$!oV1bh?L0]\QU(*l7`H(eQ=/dfZ`Y/9I%g\ha9Y@"D%]l3?C>N;*^l2(2*#0g1YJ=,c1s`LMnBiS1!oVLA#5<qh=H\QqDe9oc0NE<iE-_Ds$JK.IX9nIXqsqh(q"rB/$HeSSnE%T/TncsQ=CF3`!^u[Vi!b=SAb;L[:Rs)g"/-5h%9:ilbHOJg)%Eeg@%5]h7^Los8(^'a1!^OgE2U97_I^a54RjoS`9?Tro)t,pcU^VdnQ.mQSqSNH@D[,TeWZf]>U;PY%M&<-d<e[at$E%.EltcCS-''1'Ok>h7eV/47+IX^#d5)nLA,3i71Qm&EbR0$spS(iWQsj8]SuQ.@9R_"\CIbXV))EinIiQ5;4[AXa7p[JaEG5]B7bU4>L.$!u__PpO580/Cns0/Je5ng+F.@Yuls=_\!S>TS/b;)^@HQ!eQp:FD;9tiH/TC(UdMV5N_0->oLQccQ)IA9_78u(YHMV(5o@%>T8Wp[EK5`PRMCnLM`!Z/A*d@]0ik<XGYiZ+M/@PIO#(@\E[dh1n>.V?)saBQ=]sbY@/b:!o$*p1XQ1>Spgi#\PlmW:KJ-&QltORYQT/2</U,/]R,]Y.nL8\(,m,6T!K+A./)Y>?B-_.)aKd*7_AKJr7=`RoD<E53][JH(BeKs/$WB`du;P_;3Pk%A!>5T]iGh-H/)uj^Wqg1ZcPuU!')L;bIA0!3$Dh,hNR(bJJ#T[RsND'Kice%hn8l65MqE7L991\>K@o'+Z;3Je?/7)XcO&4.l;U[@o&rbO3n9l]L+->_"2)\E5OQ'_Q[]Y")sSG+:Y$5n*CLR/Wg\H\2U\WKEe!kT$D.bk0QjI[]AYtq.Sh#hu5hZ];[c(k`AU[qfU[nGrh+"D:l:=1"Qcb0Ki5VZkP5#>m_s$>?gQ+S>%j@@_Q8N3U;Y;G669j`74mtN*!ctMS7Y)*G,*9et&6hIff8e_+RA.0j;b`0f17N+GperDWmWbOTSh-qgGf[[u9"Y:2CbWLIM<UECMAPC'#\d/[j^We`t.@.@e&X9+!ZYo/(1Dd_p7Ne%A#2a%1[h7W/VB9fg?FLMaUh%MX:FY!k(7aZustM5[]I&3FiOTMpb-"R8]Okk'4&<=%\0XgZllq)[?]>T'JG)afFI:X;GgB;(`44P=$^SY!jjg6@7O'ME`Jp6;!6TfI"_,irF*Jj6jKe@/o!I26=])H[dW!j/cfor>#P)aWf*R68nS:eL0)B]$.dEDbAKa+]=-1s:[M`ubk;[O_k7>rOY/-kE]KLZkUSCt&df&8,]$Q`Uqn-RD+%rejVjB'9Dr_%GEV@h.H_7Hs"m3lE"lic/0K:O0Uj`[VjUaB3dRo;pIXnd\,6!tpDKGQ<jScjCSUA&&0_c@-[V6Tpdq^??ZW?KX]J'$1-YGis<($$9Fd@I(GK:j>W.8"66Cq<3YM:4"5pFlhH7GX6Fs:30cc/ejhFZF&4R*FClod_`l7)JE3Ln8hn/\cJ;]Wf0Frd$BI*Jd@7FVk?3LR6@%q(.gF,\#(u?S#:*U,GE7mXBg/IPaLHSo(K'sYf@RdMY1ccL\;n-2ib.+ibQRO-LeW8*@i;[_%ROjLe)Y';UcSa/(@!eml'SRh1;S1Got'a\cR.W=8;GK8!l2gEB/[?>F)@G_7\sq*p"]PY,>ZF<;MhM+d_rb)KbtTRoj(%aAsBW>dPQW.t&-JP8Vm[gdY=@4pcX;5=&$)MrJHQMl6+6(f!IC=+/)u"_,".5%(`*Tl&IoP:6r(+5Ogpi`7tA@"c,4ILW26So2"#bKGM6N]7?W_Aj@N)>^MboINk/$"@BNl'D&[^Ih@*~>
+GauHLD/\/e&H;*)+VY76'JZ_6=W[D_D:>j\ZY#'K%@DoOQ=sKn/8:=_a$?oe^8"4j-^dPY@T\Q"i^pe0Gk]u6aVXQrjL(hP2USr.C8CJ$_ND"'7u!nY?haeeB:-VXVqQO!rUKMi&Z=q.D/=MsGkL]O`Y^;M'CAS4riT:6\3_(ai7^Bb%9$q"lXlJ`RB\_B3_>W\c^Sa+50^\%Wh9\%N?C\?p0#@rnf<%AZg91ObG'].BX#cLka"SpW@abb?.7Q<LpM3SkqS"UFJGU3SYm@66Cg:dY2p"5#2p49/q<^U/Qiih@2X,&80*^'Ou%6;mg0a#9aiNh>Im<5(]O&SMPRjD)+YAY7"#A$CS5F[Z>.&j$>EiINXTVV5`r2Fj#AX5+@u][OBb9DZnDm:!OSjdQl24m>ZlOr1)cAZW'Pp#dbV`;3%"oD1,dJl7ES&XQU*n^)8':k4H"G>?r7[T?.9%Y`H.,ach&hB8ss?Z,,(.fnB8'g@d#SrbT=Mq!2Q]g]]\n6h]ngd]=uYWC>bI?0nHK3NG#J6[XnX`9c[$aBfDeo7ka!fZ:ZEZXnAre#-f-8^OfuiZCl1RXuVLk9qfl:lQkm$!\6$4N#;dS([-L?IJlU+U:74NNmX2Fs)P=OdS_*`P3pWsj,3%P9sT.>n^LdcGf;YUa31o"&/Y5sEf'$Di+Rgc)]d",b:68]qb.JnE23EM7LrMo6P[CV':QkQ.U'(D<!9\V6qdg>F/<48q2/b<cGKf"q2c4hiopN'kW>i.U<#ifJA$mQKr7Y^Op,8Y%9EdNlEM\41qG'H,HNo=NEMPWL_;u+?7*$UXi0p\U,OTJM^l]d1qoHlO43B3edFG,JJB4cZ?a"u#sAK;`73R'=2tj[gX[4lQ;&.lR\:gh(#+:C1R2P5T1P+LiJ*Ah1WDJ,*XSBUm-<#=H,e!Er;+>(p%cl1o:$8WkKgp(]BG/fKsj]Lo1)M[S^$%S5N9Ga,A_8'N5*t>D.?0h?fB_riY4p]4O1.g290Y6lM/^F*oU2D[ibZkd2,rpSe=1N\_MC]Qe=:#JB1M]d0E`(b:+rO>4faGd;=u"2!PCnHeah5:C[&i-mE.q/`JV'(E"Ep!NB_3$,#.QTu>>D1CLRcfj_4dP%:i=K6";#PhBN>$GX`HCQYSH/b/&*/KF@`a$1YU/B<[fpUO^8dk:%M.%La'lMbZ7i*Lt=_Q)@]$:1%r\%O7)ik?LGW3VZb*,5965h0!)#rXW^IsMMp/PF.+Dn8bKc,['<Ye'0cX!<7[>JT6&%DrmSlRM;Y,MZ0P^oa>Y'&s:$c?I6],5rqMO4D2Km$IP2%p/@lDIT];_s,rmO^@N@\V_%]lXijLfp5CIda^rjTul+KiVsfW:?q7.M#cV4fIVZ<=.'@<'D\6Lmg72TR'.$(-?.OO]_UpiO8X@$eEg;UDt<<8%u>,sK%-pm-8&.(CG42^dEndXoM'$"C:*D<"1BdFLBJX8p'6N*)D%iX3muqXHUk8I;hor)_!Qtr:/&-\l-l&<bRChAn;]2NclW*gp4)GqqP\&l2K9[K^C9Df<Pr?e-u2>t.B4-0_t63Nd$BIilG>iOpl5##K,CFf)6btMMd\X.LN15n7p%ce)2*Kn=jB*d+^P+kKrSar#P@\L7nP\LO=htN2JE:F6L=d5&Lk#\b95,h;nTU[g/QB9>;Q`7W@L<O_?la'.c.W9F@bgOe8^;pKHu202iFHb<`>Bg=Ib\uG_#Efi,j\lD2,^/gVb6B+KlSr/[D\T.o<9D+KE,%Lu!61h4tge$`H3gPgai`/.p$1>]-cedoF&`Qul0:2Mr%tp\-B3/([H32O98L`En8MEerIHYn5Yr>IsV7L2-`V0a%/\m+rJMDbI[dP5prK"7H:7cmh[hKk86%$E`P(Y:0R-W-o-/$^su5:R#U#E4-o?Ds!DT&U:l<HBiSP+"ih$TLF?dc>^k38^Q37M'K:l-:'jf&Q8<a7aZ:pJ=O:kYu*OQ&<7789cEC#L8amOYG-F`CpC;Rb&.mH?B!\*[=u-gBTPLl#hF5%&Lc!5(FKRJ^'hR@#'X?u:A?usrs6;1&&AW!#CuV338:mRs&X:W<!abXW9C0+$H)X0^D>Qbi3jjhFg/]'pl97Bm-)s.RYFUc93u@>!Sin,3j[WSS*aMn:@b8p46TX]n2hOiK,O5`lQrnP(9][\*d1sQ#&hg'n&%rI&p2<$Ip&F!jmJuXl'D&sjcj4h~>
 endstream
 endobj
 6 0 obj
@@ -49,10 +49,10 @@
 >>
 endobj
 10 0 obj
-<< /Length 2302 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2240 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gat=,968iG&AII3Yg^lGku\M52goE+`(na#dkmBfR&1+GKLF<(_31$ojcJBV,mfG:'='Je-B8+9hqp%%Ha/s^Y?Z]``&&71M.s%=e1fi7r.HZZEen?h`aWHUrF1)j=Mj\&oVF9`9TqHco8OQKZ78K:08jUWO&sJ%CeJoab>j;Y;Ns;dPg,Y^)eEM*<%_%rW:kmV2;8gJ<&8)A&b1%^niEe]:pm6hC.'Y<jo2M"ddT&(F-lGWI8$Q?j%'nhV[PK_0c!!SEM/OUI2q6`<Jq=db_YDW(Ri;-:G*Q^/[sD_;3uX:8DBfYQ.WNkb>hfQc:r="Thb`;aD."a<]SnDMhIGT"B"S!^F2m>i-g/Y:EbTAX6O,k!f0RsV-TFGaaXtfKFXhB!42^mc(m3RY_Ze6/TPL,@hIHDRB`:[2S!KT*?*Go0WfT?F,B"%cM95VMC;6Qr*bf62Z&B`loS%^1L!9Pc/_?hREj]m9C/nCpf#@S+M$c^5aZ05lF&looATRg,\/61Pd7BX%biT1jR3u,"JTRk>Nlj.>logs't`,h/6VM%SI^tV<,C3W^n90Y;O.'`3BBr$aLk-3&T$qV:<hmEdXEQ/TbC"'&k_W`SC``X7<PapBmR^^?Fpu89O4XN:d]Q\(G+]!*\0_f<n<d@-t9%*BLKD)7kD7ce_0jR>HPoM5?N_eO1G'-EG<IQ`Mo4jSZ"i$Xd-'T&RS]J_W&11/Fj_%%A\jS]^6A2L5b6E[Uc^L8.t<8l4[Cu]7HmRN9M!Gl>ZPq5Vdr",8`O`ajZ&J_0.kTHq$<kifQnF!c'ch:HZ5o!_2WW&^Y4[pc]"\]4Xq>d8>5k1&Gee1+9CEY(C/Fl\]*@c*5YN(e\fL@S9)GZ4_0<#al:IH)S+gcd>%`6@"Tla-u+kCm70rLD8;`c*7?08O(IhEoT,"`OB4CH5[?%3cA?@%CrUP[%@M3hUcL>>!:itK\`u9aft%=(V&O>M<jSj4t^Q6YE>#(Z.A/W"sf;'fB2bMp-pt<g6U0qmm-<\MH=f>QV+6?D*VI+36"o5_:MkcSK3I'lmkt6`cIsaRHq8-/`PHn%^po7M$QF7rM(R:4.\fF=il1tj++ke="#3=ZF*)=odI]3$=e7i5D&>n$(^@188NTOF]f1n00-j>m2I>QnuSugZFu>Zm^#e4@(Ust*K0dcQg<*G\KPt1dj31`T!/G;Pq`L"638CH7r)Deg.k3:j60D&[7._Af68W6hYZN.YPZmQRhK'DY(_@*QeT%,Q<G<rO9EV_WTmSUbNcTt2h3)H@S@`@WN*Bb3]?n`*c9eu[,,>+7C(?Sk=p"]*oZ(27(#]TO5gcY(Z\cD!#Z^]GGRh.LW:9W3%W[RRQ;m:_.@cel(pik$_@m3N6EAXKQuK\*#IpGm!d;9nkB`f_e/,t/Q"MV)8Npb$EAK@oW-A.NO=#C^aZ53R=1cJm2PFA)>8OBmDJ%RRockqI;;q+]L-3nWu>rA-4s.W'YB6fH5eci*R:')DB[r4/GJ'6CroG:GEiZZQ:hOl8,g4r3,YP^26OPtT=l_]GB3^)4]3*-lU'W'LD!6h9jT#IbA;G#dZJ+&E[C,d'(lhkb!6r;Y-=F),];7Hq&##V@?2OlOWuYd7l42sYu)8_mPm?PPOEe6YbMf3=4#t\U\IS;9k&JS%G$R_P]TV@&Z)WtZ:mjl$'thf<-QlTi,(!`-V'c<)@86r,kSj[Ff1gRGZJ2,^:SiR!e:+4e`G'#ea9c)cF&J_gEgUic..2ohnK2L'*GTeI<h,W#LDt75qn-;"Rpf7L/G)_h=elJ`WTIV&8a_ZeNOO=\>c.t;)FAZMWoqc_ET/KSNuI!a+8dV[T&J`Yp[o0U%:,2r5qMsP[Q6ooqfTmA#B!pB%iYIs8To^U[>mESK>KA*"ne,^"*@ae\#p,/)60WF:Wa6D5VJGWf(%:<=R#_W+r_L9R$P>SfAZB5o`kHkrkJr5uh/Z90@&qZ?85plGmUP^m>FB5o:NQm1?1Sh_@8s?g_:\iF'Ah>*XK+U<ah&:D)4@GuW]nU,[</(.'$37S#e\7$04J#($=kk)&Z2HVG%%+O,,t2"g?t6(_7/Zd&)/'83:Ab2a:('hY"reIHL.mRD9D1r<Zg'3!Ds4S!^R=80uZg>rF+/48;4o$Fg)Bgh78-DfdZ'KU,-R?1SsHX1=._]UZ2^`kUs7c2>r_"*+t_=,=OJt&*%1GJ%2RE_*6B*0/Io51u[5RS.W=-=*]S#2N`*F`M!$5(e<2B>XTJs%4%9sVmqk*7@g#L%@]5!aMuX2&o49<<2NpSg;YTf%I7m@GV70_'Wr;_*e~>
+Gat=,gN)%,&:N/3W,?8/F=`7B94$=3Z(#jj2Qc)L1JJr>&sNr+KF3m.Q%sa6(F1+),\3g\B0=0H^u!?X/9&.i/?\rNm3$2UbU:t`4gCn#r5)ePKoUoibF:,ne%a18<A14j-ZY>^#=1%,T2h],1L3HSF6X4c"W>ULVPja+'"5gQKeE;U<.end.8*RA#?KoM0jN626h[>4ct9K_h:71EeSo+tk`ReU0h^e_jbZ/`X6QK-W@iS1r97gt4'qG2SKV9d9pmWLO3)QHi'@e:_le.Wn*0C54YaC)4II$D"Kpo4=;jLU8o<3l65e8.]YG&fd%k;`X#!J=&Vec'Z@aL[e#(2Caf6KdagJ@Sd\LuggEqN*1uW#84a#23kq9&OLBc9Xh&\[:Dn%(?7O?o,@rBkO/tn#A"EB)7R1=rb*X'OH?d<AB`.GsN346H&d'UbXLjV/F(;$MPHAf$^<sXughp,%QfJ347&p2XP(UU%EI#()i)6l,UN+Z95D^#tqkd[Z;C[8SSdY@#H2R1DZCdf45$;FW4[abL@eTXS?iV"_DC(.Mu'kf8EB\I9BafCTi<`E1FU.%X<4:Jn7NaHJ:rJ%,;iAthG-G!BZ\C-$Ff0OsY6OFf'\)\2lVMVt*`Pa(iZX(%_-jQ6%EWt*aN^^QW$:sMcC]pApEjhreEB!uuA'$7u-)H3/TI+5c8O:%c!eAO%$Fd1(PCFnpMET](iJ<Wrr@hsaZs6pAi%G?&h"MfL:)TY+-GN;.q=t_#D/0Pm573KjMmE/k89RS9_2H?N1#F$sfmX%3"BK;2Dk%AXisZOo_Z0kSf^`%S@D>9.)6ZijksW9DAcI0:dP;V(g>HF!lbtIR`;^!<(ECc!Z"8B7@`]4KSB#YJi0XDj`J/:#!l7YO!b'9HV7]5$=r,Y#Q%4CL0P_iGU\6d$'dfJhL`@:?;NdLGZ`@E$VE,l@A`.H>,3i7^ee<lKrskqPD\(0CaptbHi(D*0UK`p74%*C+FEMJN`-FNN^sP_ro?h_f*25,$gYm6Ak<Kh@fPbl]$R91R7mUF,5>Pur"78@i(`2rZEb46L=Z$W69.JL0(Ut%aACNV7NK]k<L!kp\`uS,+=?M2Q+>-G7,7!aNhO_WWaDRY-#e3ns6;`+5KSnffnmJ]ZNFQMBT[0800eJGqj;ptoF)T((58[.(Y9V$QX'WY%(ompOj@`k;@]!s5'T=@G!<Dp2Uf8\h>Uaua8n<RB.:@pO2BpH>@Q:bAgc>1T?FT"]ruZ\#rlY!fGU(sB*=9rbn`Dbk8**ML2rb>n0=L.4jh'k)j)mkL9[+n5f1MD;C2/0&f0Zpa^9P]@DD6+jQ^1h0:.0rKC3c("ZI3tj1^9,MLl/5W3OICrZ$D@`S0L0s/6uqKahhlN)k,'mXOr-AU]\n0cTSD*\gJe#9J1ANN-"iuba"\DX6uuuoQuh`VG_uW3h-112o9)eI.bD+[L6j2EUoidh7$Q#`*?74jMVf@mH<"^Js\pF*p`[/]uthTWlRMhs+RHgUs/>'8B_nUDkW2VcmNU-q)TZU:es>M=4f9SVbd"<MSc!L#I9XIZ`u9smbCnI<R$u>DOAhm^de#2(tFVIP>ubZaBO1XTfcq7eP*I,Qlt9Uc5/b6>I:B=`PjIQbscq/Du;XCT!)59Zh^0MU]J8=:i[uhFDN,^Po9JfLP9uC/B/bk@oAS<ELhQ'@58+k(6M;9+.G[O<'Ac3hCe'l42Xg:ll]ND2HNX_VXOZ)!.(M^X15X[dHK@dbn.'.-GgA`,JtRML3hPAUqPABEt2uG[20E:Ef_Nh=uV!\`KDX80tOPB1HVj9ma]Hoe;aT*9m2&CW35J9]<=nA[R7PH`T)b]AOLC?eO//7fKOXs(f+gj?Tg[ch8s)]A`32V*9'4<qW@C]n^oe!4Jm92R=;sh'r%.iNaOJ=1iDi,28g`i[T@FOU.5p-Bi.[4A$=f[)]<An$Mo<a=H0_?m2UHP<Kc4.eHqnpU#Ytj[%a_j6^4!B-JNO&,pBUJ0'g54OhdjBU2o6'Cf4]RaH7A>mi?i;p)!2@]6?2PPhb00IXQ?cH[U*JH3\RiG]\nqC4B<KXa39nPZ2&k9I>UBEUA^VbBu6<E>2,7huGhOms91%2@dJ(%V*o"E3sO&d,Xn?3tq'#cjfjL2'\Hk)>7/OGS,^="XnMIZM3b606K:TX]DnLRLU_;I-&>=<t>E9<eshPf5u4EAA+u>SNahtaP2*oC\-:DI<V=;R?]PI5\:Nd6bSEX!p!hpE<~>
 endstream
 endobj
 11 0 obj
@@ -64,10 +64,10 @@
 >>
 endobj
 12 0 obj
-<< /Length 1110 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1480 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gat=+gMYJ*&:Ml+p]64P_@uC_p@:TZ/I6n1-p/V;_FZYB>:44!S!$C"DeC&f[10aU;FRlRn]mQUF7qA14rIX"7R'BT85;\g/FVJ&j'*3C/B)6q-pC!6F%C"AWF.d`3'*[j`g8G'oruPI'VR/d,5gD@mhnDXK#p(KH?,htM\g,0<lu9Xr6I>QZe7s1GO$GXhjW?#-`96I8%%*.XctjU^'Bk2I5i-2.N19cIE+IGCqfoZ_\R0a.h$2\RoN*m%B,8/\OQc.o=I@mku(M>=2s2>9*-qiGaiI1)P.T"#AS_J@$3FCIrnuZHF@*hZC/u1`W_M:&>B?e[.3J$s)`8SlMUn=SSQMj9H]W'#W'0!DTZES+Cu&WcA['G.od9%b5&mX`X0`I#V_12&6RV.iBh#g#WWNWHI4,El=/Hph%$i6/ed#0bXK%&r-U;%44q*MMC8`@rD#&1XinSlI"e@-HcR;):=ZG"%6,aHKd*@TH3>+EYfM9>3"QB"ktu%(2X_uaq\"r-6pm,_,<R*@&.IcaHp6IUdN2rEJ3?rX#+>=\)$BD2)%H"kWRfZbCs!lLXHmH[S`c7GPqYahdE`W&c9-KApP=A_7T&(5n^+T#P!a>E\38bWq/q-FLKSK(!i-h"OMj<InbVr*RrDa;P4fNqg!of$YkI!BQPJB,H<\XaLE%*MidpEq0>fhT\ret-A4V>*d^%<U1+`&q__QGlI[kD>a,n#*"EUnkJPcHqcpm:p'^p8p2bknJJ/iW?@@;56B(j'_7KV5X55F0QoLtTC!SjA<&&MT7)k?$,Zaa*e+?o;PpVZQ;gKg!&9+gNK@B=^##XUk@nciQt&V5hWP/Q0][C0B&VIOa<^6uW`pT3uN[T'C%oMC<,L%`87HJ9?MV74FV[9)$Ua$&aDl+#^?rARm0J]Tk,'^\NKo-"(nJQ&X@Ob4\kdqrF8a%[C(K3ZFrHfBU:WpAsDq7S.uEh?`Z612BLS%N(L+\h7AjlE_@m=<Qj3r:8%Q4+CGBPjKT^r*luES&eRB-\\kKKfV9J>YaRLNRZs)Gb0OBYm390-UJ`PrM>'O78LI]WLbdb-jjuW$#cMGU/r)<YXr!rCGDBPu6(kRR90M^M3Tcdf~>
+GatU4gMYb8&:N/3n=b@QTGhfg]_JI$CSrSDU(,V-U+$XG>#?5;>)!ht!ePlJLE^:^X'Nhf+m?5e4_JBPltuB<3kCf@^5dRHBZPnj6Pr7VH,T<3e?_=;ps'h@#^e;$+b#;&^s=b*+X159^"MWDdG*-G7qdKmKJ$U3D*T6NJAcdK+e@:&?q&:8K.$DeLN3+GF?(OOMJjSD`,#;t0i7:4fA9ld^ZnGJ]^c!pVS=*%`gi.;4+'8nGP&CHYP$ou+,B'VlKoneI:-=pU4p<dJQH8aVd$)OCQj,(7BLaITcGG+=9(&b>4HLR2r9pZ7d'*.Y-/mXhp)Tm94lk[Ikm4%^$2#OmXK.sV<7@GrkXf7Pc4n%LFr/2?HZ&SoWH[j27tD<\h^j^Bn']uQLdH)Q/R7:NPpQ(G%Nfj%-1=LR5AVO"U^YK#(:52#LOB[5HUa?_EsR!/<\-mIe2eu2fG15&UKi2D6fTR!Tl;#]8?NbY"cU%qSk!>o9L5ea`X0aC`W^T.V/rd<^f0TlGB@=18A1p'%OO8]qs&ihMq6S#B@)KJph$:(30])AMq#ZN<O4</9#tQne\iArZJ[q+j3d@r%gq8AA44jm5c2iGGV>#GN`&b\$6]HG&@cQ3!Br&FC=EI'Gt]a^Q$8shbk8([Mi4=Oij\Wr@C*d;[PX+_Z<gNk.OZu[%U>9)n7H][a@9mYZ'['%OP%7qQgM,:P+Wu6qeb]H4itWgq`p0]A&rAgd/?UKe+DP5!?e;f:0pcQj=Rk^]HG=)GmPHQ>+DV9,h$LJ6frj@7gg,Wc_nu'+?k8OGu<S3!3S&g6K3c]6tY40a==GDjU04Z]JDDg:a3h,)?"qZ806J`&`/IBb%Ar9J5F;,MKZh#3f%4k<L$_3,;rjI!%uqn_g7(`13Z(VW5hX30-&gEuB%&30?@aS#A<54Vr,$["CBs&H4=ll=(NRSU,,g93`,dXWLg'S4!5.<0m2nTaD_h'0n0AT?BR]q=q>`;ujTWTruZ#jK-1ejTPr-n33fVFU2F41i3*(!--<"5^>K&*PSg]1tRDE>QY53A6-:O,.pdF4/hY1eo`^VmVj]k&>(t_L07V+WLYKR!oj?9dR)R]37Fj]<7qaF-A(CfkiIb"5,L4n*WS:2N!=:]nIGB7b/FDnQ^h*$62Dege]D35!5Y('o%CnE$5]a+9=+eUnj.+HaJEZe2+:Ilrt'r%YM,M.Y,a^F#`usg2Dn+$6K1lqbjn.>7>4l,rB1&JhC*WK?#Ep)YIY,*(%ffV'h#U\F_2=Dc6Au;A&+=3::/;=K19]O(\`VbVaGj-"36!mi7Tg2@TKOG0knll($'@RN5XNlPE*',bqkMd[1B%0-Kn9UPcC.m@i@6?oC[M^gRu@8QT!*WK2?[_N"8kr$>s=\6t1sTBBV;0)gXTio[.T>5&OFr[;YutJ]/2g5`"V6k9"i\HS1.ZVGC/&CdkG9Na:PNAR!os+'BM!=j#`$/t`aD?ULM563~>
 endstream
 endobj
 13 0 obj
@@ -210,10 +210,10 @@
 >>
 endobj
 30 0 obj
-<< /Length 3637 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 3662 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gat$;CQI5[nb`:m@8S/:@TU!+4bLoY\_\X!6W0^_?^meE&%"d[\k&P>ah)PNrqDFD8fZ9bFr(12SIt&$)00'U:TKDmgXu%P]6%*.Ml!bln=1g&KDtreH_HpT^9];[IpGLGn%Nm]r363Ae^8O*IP6VGcG,q#DnmZ@4C<-F*259/_pFSe<dQ_W:J[;RSf:*F_%VJI^?]!&gUpotdCe"Z+'Ou(/TCZ4h=0d86"Jdm!AAaf?6GiiR=uZbD[Nr?1hOXpMDZ=7gG>WCgX8H?.,1qNjf4mOZF]gS6,J*>@bZ>=IsIhs(P\%k#-kK`0,F"Lht`[Ir9`LAhQPe8M,PL4loSVe\fhs(!df:4MkQcQ6"m@7nU&H7c4qo<rd\C\EJ)#!.kBQ4+l@Z!NX56sTrcSBDV:o1H%ie#o-rV=%h2j:GK`MF/Rt1>GkcqHjlW)Zn!jdF03o2%fOYIA4f<Bm&A-+s4CSZ%65%;`K6&Q&X/MMY1YPEA6+/7GFZ:c!Oo\Ismj&@f90H]l&X6%po\=!hSS'Zl4-Ce)G79K]m7ja*`pk0R#&Z]-rFL@tJ3A(5BJfFKA&jhH_4J_M8+WIg`eUM80XRU#Fffa>c6:+NIuq?pP@7^`\%HEWgV#igSj/m;$Hf)=8js%_*$aYW>tam^Q?C%!$#K_L3m0gYIr]N#%Io:boX*&^T&)74nHoAXrk!O8)CX6$.pB<!M\c"P;1g'k%R=?Pnq`=/3>UK>`DmpBU(;OW/!qV)$2KiN!2d<XR,cluDAku+2D'Z7dkXQ)g=`'@;g(q46`fYPO;F'(EYCc1cs'HP'SKUF'@-0W0'JF/-Mh/s.MJ"iXbiuj"/jnlJc./MMl:1j">6"N-Mjk8p4uO8le5f4Rj:QB\1([%_^8/MPCXO\6'RaYD3`^1lYPSrlB#[HS_.1MeCm\.\i7'=/78$=3;%5)]@",-E=mdVEC6C=Xr@;d)@1=#1t_9rg;%7#AlT%*g*E^-n6qr-p9T.c`Bl8^%<skFVBuKk2aMgF1j3HPg#c#`fbQ8AQi>>;'k37OQ46W,,TVM\6c&:]ImqYS4lIhLIq/,+W,T*&F2\7"d(lFpU4+)BooF^73^!TC"HC&:E;_%:-+p5A7PKjYAG#!D#6]Hip`JFJ3N`7uF-G6SgdS7A6UhPq+6TgY8R)mlkF.DrXl_o8Cllck1W[gF":U(/e>pD$<p+&pfD&Rh%:1MZ%u=gKnR>LOS_i>@e%'bF;(@EsoV!rgp>SF6]U,<J8Gh%n-"nqb"UjF&#s?2IOls_B;e=h7`aLPRg&]0"#BNI==_jbi=/E7/JT?O!f!lM]$#BHD@'2ub+<lQf.P)`7G[:g?g[Nh,$fN?tg]3ds8=8Ea9]:df%<L)fcN)O'g=G`W+FX$!/?SPs1m>5Q\>HG_eUbHa+0rP)IC\<JH)U<%\:E#&j,;+"O4N!Hr0NM:a;k4-q&;o_2f/BfEo2$4X2P-\UItamQT)NL>6Q,634NnR8&]O!W;?(TOKJG>"AS5`MFo'Op?"bk@EjNiEBB*IEq-MJ8K<Qs5g!8\YTLniTc8K/Oo%&c9@KU!-g2Vd=68O[ZUg`@9h6Jm#E"uVm[;9UL\:^2j3b[0\,kaB,N0aN,?%@lC_fJrZ2e5sHO,@/aJ*o6(Mb2PHXUTnP^-C^V&ON9lW_YteclUlF2Qft2\C!bi3`'pZpEUGcK8Hm6'X9?p\:URmPSZSoP2e?6a4EnC3MR,FiQQ#..8Ta_>..8j^/V#+1D"5cl`J$l1LlN]p>#YVVjQ(f%'1$`R^c1IAnj,`dWGlqNQou)k:*RLW_PCWYh;_2q^?r2E7LM%W080r'02R[',RWd]62BpTC&Mm!]Y[A/X;=6df(]'T1_]n-p1F-c5*mK93BmcnMk@A<F#,Z6.S8F"!Ep6M@ko0m*/a/4Om*?(G_N2"L)"f@@nPf-^(;cYkBYXP;OD[,a-X1bgabj6apGl'b]h?;9LPc<FnnPUH-[hhSJQ1WnoN!@#_eM.BC<p?`u,fVr">?ca9DH8NqUU;+$P_>23:*tbGYSUOiOWg4.U=P&V/&bD7'e&V[ZGI6J==A)9N&BHW5E_f/#('1Xi&g7^9o.7mh4-EbWRM\'t03(]n>3OC;Z+YKE23[QePV*a.nre-@a]dA,H[S$d(%p4DNeiRtX>Niq2rU;2YM!n4AS@OG`E/rGKN+9UWO"HjELC)G\(^#2Ji<P"MLC.E2[XP;.Xklmp3CdiV)@#S6YiqH-6sg&LH%[n2d]^Q9t:MW;*;?Y9TIN6\^-c5?mZ[n+TN,Z7#b4OYQ:*BXN2o%"Fm;GAm8B(ToAKl\CGmB1DK8El\8HD``-n<=;Q>M/%%e4mEYIDRFL1AMBEm[7mj<mi_4(L-On6Y3kd*Q;-Tr1B&r=hKsr_E+''drF[nE"HcAm;1qb7IP%jKW4aBW#oAMd!EKD&&rUh0d0J`ZHT70(5`\HTeImm,#N+F'KZ8;oAVOia?U0Z99Vo2EV"f["KpNI8oabLN.A?"OVrr!.I^NWbhA3$&8KOTUCYku,Z^hg4:.TScV,O!qlZAAUlXu6ug_Hg]lZ'A=[3\5q^iLUcS*G<\>P*ic,ZOTPHk\0r:cLK1B-1$!!RYhknNrE'Jld<?R"bb42\"Y&a?g;Sm(`nXCD6U-;Y10Q5L`\r6D=6KlIZ%)YFth"e6e,"iZj50^g2m+qU;Ec_SgVgp."Z'h=Y>S.*rX.ug`RHZ:ph:'ib1)6GIrUs7"KbLIITsf9;N:<W+pA:0'G)*U%^C!FrJ+!;tTl`V&Rp-4R;!]"?NU92_F^t!=7`82X`0.D\ilh:o9bmfVd'7p.^k[%iYXQ^V!r5ZKN3^F=V0&M?d<]pg67#f^f3l6l'^\QGd;#^70VZ#Z>(WK90,T'B('gifa'MZKc6fk8$::cJP@CoN%+4Go=@E(c2/(7^FJ7I.j+Tq.AcrbEcYLggBnqeF/A.OXp8BRC[hcNL2*$)']s)#B9jDKj#Zc..QJST!5F)J46"#Xj1&ZUTPgfdM6XH?.5*6eNEO9?T`i6bdn%:%Pj6rN'_]XTA)G&qpC*NUrur]$_XFF)Y4Y5ND,F'Z:]Vo:=M)u)i>>\f&+pl*C\[=e5BZ*`ALra7Gd,qjBU[6FNpLm*u8:fB[)t`!pdF+S"+ZA"<=D&nV=.&1c'FY@jYL^EGNl(UoTf<:;(07U*oD8PHPM7mhmI(@6^/=jI2pRTg^K;F$%pOVC2PZ(EFXj\rgg%<1SUp.T@XO%ds\&g,"_M5CfsTWC_n3B>Wc([4jIR<-NqU<5&`UK^+)Mr*'&n`7A`$#U/J=NBR#-cS_sXDSeJIOgQ3HeDlNs$1Q3e`,0aIS5ARjH1>Thm[`2NGN!5q(84P01HEoj6<-9;KCAQ?\5@/OMgi=@#MP7i[Ym@72P)0*/GfJPo,Pn]V3O/UkE@?Z\;;"=*)6_*F%J7]`7$$0a0Y5#NP"F^"[jb`Ms85ES(/;>Z+qLYdsoo,fi9*(!U9WRHPGi&@.L6VfF0]1*&g:b6s0dQ$hSL[?h=aEjS*(r&bc<>H9/MK%s0)`/L$hMQMll<)Wkk^s.D#uek6-m&5&1k:MQ=OAL1I1V93t!il=?@P<e>!;sOEP4N,58f]9YmV`ET/Ta+EB(Hp'o)u2$-5DbXWJm$9cHSK=S[eP>0N9\C~>
+Gat$;CQI5[nb`:m@8S/:@TU!+4bLoY\_\X!6W0^_?^meE%pXt"Fcf*]P1O]3rqDFD8fZ9bFr(12SIt&$)00'U:TKDmgXu%P]6%*>Ml!bjn=1g&KDtreH_HpT^9cNRs14(mhgObEpgO3aWh]<jqgDP[FT1[/IKM3rj8"iGjq+A?)hssFYhHC&H$ZdOpY7/P$(`7bnQk%H=r/L6MAE>nHf)+KD1V#fl\=U"%$>[:"MEq5H%C3@B,5['^+%aHe!Q(Q'l,YMf4RWq[\ip7;79hib#LP'ATdP1JqX*Z`O>^ZrpiUp/drs`$t:U=>qFk$I-5-kn[FFKHG=d(-;JunZ1!?3k_<X;$LI-l08=r8#,/=$`pYK$3`i[>q#S<>is(""<`[#FI?Aq0NsP?tITN.Gh6O+4G_N\"o-rV=pC1G8FNd2C/Rt1>GkcqHjlW)Zn!jdF03o2%fOYIA4_Nr>+Ej*pGf5hSKd;VJK6&Q&X/MMI1YPEA6+5LPC4B!Y,m0rphan`VQ[6Nc,1noldW:a@FIpIMm7<,Ah(UggZo>PD)97A;)7T^Pp6YAe%t!XWd:hl(a,\jC#(%P,*A,G-)BY\'a3]PVe[<iA3/8'+r'>K1-c<GJDgBg9[X3QX4?oL.$Hf)=8js%_*$aYO>tam^mcotG'A<R#FI%P;s5`,%)r_NNl"QuF/U_"FiY;Y9rHEJD)CX8@.pKB"N>D4R;1g'k%R@9$jUiNHk?)u@'j#PQLcuO'VIZ!?,ii$U!).I90upWtbo0&52D'Z7drJ(ig=_d8;g(q46`fX%-q[&C\HsE)kUe7c$GtRS'@)NE0'SM[-MjrXQ&-s$ejS#pJ^\Jq_#>+77F\UU!Z0$c'E(sWHUOg-F`"CU9p-b1g_;BN@?W(7ahWhi+A,>=[OUR2Fggg4F\&m5:2I'aC@.o!h&G*/Q7mP/S9d/Ph.YT'\-PBf\093Y<t.C$#!uQ!%JIEK2D@.l=d?me2T[EN4D]pl43L]1/-PRuJ;;$XC18:m'>t,C@ontdFj[ReD#mRXkmrbM+U2Xig$mK\dP5Do'HCKR=6/`$':sgI2b&:Q$9'J!=$/_V%8<36lGqjcs!W](dked8d)ZRrf2!#X_OI!+JoO1(UG!]R+QubArr=^rC$d:>S&CWP/lM'Y13+6/3.GL2if]Zkf5q.12%L%'K1s:V6#P'o?oVDg?4F?I3]@.cO2"]Mi2,H*J7uq8031NokoC6rSXYBSV336!*t"cP0.qq(HPnks[#\KpK(eb5YY\)\^f,V#H#@FS<TZG]*!YGt*DlZV0UIHX[3c60<B;WL.!J5G*qo^a@?$mPbggAI7)Uc_Kd@uNc\nKE)ub/-+e1rV)aL_@$$4mT.3((?@F"hu1P#.b[e4u.80<:!9.Tr`c(o/-Y3G7FFeCD\LV.;,?Y4\pgK-gf>X7Q$n\sVL8*fM4r_#dXA<-\Rr/ILj)n(3D\a@!)eRAQidA;GGbF?bQXb%(+*8EL:UZ+9K<.0$eaBF$^JgPXk74"'8HZPpqYU3jUgs4ok>Wck+&kAYuOKoWEm)SWskf+]OjM&n2dWB1!$+e1G<I$UZ/.uVh'9Yo_J`8#.HR:Pn^>20&GVj@YDLb1K82pmlaHY.3ftqDl(>oR6&&Bq-=VNOO@P%_10+:R@1,!F>FG$`9IET0r[=JG4gi0_S9Ea,Z33BhJD:#c+ZalEI:aHS)4h`A-HOUl-]im8i&?Ki4g7/UMh6ARfjZS;I3WFu0i[\L2_n+Le)h\2M]tRIGfCIAHP^LC)]%UD`fNNI%0@coMfFP2_T5nq!K2X;rE4L]o'r/,4-@_[gL-o^aD`bZ`rZf]]q[.$d]a?'.n(QI4mRNsDQ2s0(,`RLJU"K;OcaYAb&PaDcKTn'AL8dTdMfar?rLen7IE=#UZG/haTt;+P0u?<Gl;WtBO`smAY!.<E2NaV\IVT6u?$>tjP2#JsM34JMDb",-f>O]YC*L-/hD4,f4K1jK5)]rB;+<JO&6]!.,^YudDgU0S:<a.B9'2MiUNp/WrLJ'=c;1&0Ld:q(o]oCOFlu#MFo=9<0i&ZLND.]J7pA`H[A<./!a0,9m`F\7+oiBT,,@MDT#DO_7oIMr'14/,V2?^*$XGeDf68mGAhlQ4d`'(-^11HRA$'RP]tU(mML')27mt<uhO:C'S++FLn(D[tAS@O7`E/rGKN+9UWO"KkELC)G\(VU`Ji8!Q`BHV^)hkdX'u."GgS-a6dQPe;^9q&Q'9Ws$6QDhrfiM59;so3Y'G'UDP@J]Q*f?iLS&p@b#_7R/;59BWCqpcC.uVOe_4R^+fc&H'-mQA^DRCP*%#$e*RaLENQjQRnlXFd\V3\'nh>)LZP<-?E&VOZ^BP>p_SCuTk8]*<DNpd<BeCLUe)0rh]iU+hULD>\Jh%<E7Q8-l4:%-2VA=>Vn:L4\"I/$HK*+[&bIsm(\N6M=VVdIf;EJuor?]e86A!mS,/<'_)W@)2SBGWPg.5=eC60dA,rS9k4ntC_$=_bIDIt,>kn(e^2=\`Q<Tbq2Tm!c-Z0\`Y=MUbMY#^SF^CgmCIWssc]E#4p`Ch6VE%L\t0G[TW1a4[eS,URF$X@!U*3h!g=F1a5'$2`SaVP<1?UVBjWH8I9B!TEY;Xf+e1QT?)sL'Jr?)f2R=.lHWPiePlQRsTF4hkF)/*=O^r:c22rm@L_cp7-T5W3E7[kD?MtMP(i3QAZrO7mF9`2[G-o<%Wm#31>fQc)+ng;.*a,?i1q`V:(2.<&H[X(\AT&cj*`>4,r-L.JeFkdLBqQSoo$?!hE?XS!JBu!/,?,S+i3([gNED-rWlGm*k-,qkhPiLCJj9?XC#W=`fWj\eR+N`<.\?r3%2"m.gZq,)\Bi9B*4"gW_rd"KAVg5tJ&eM/X"nECp'7=`qHMF,M,-kASa2HE0U+]St_]N#DXOU\U*L55WX;,+CU[ZK7H+pQrT5om7oOjGH,iVQQO\,N_R7`lJ>N6/97iTp>rq9)Nt.-S-eM?kFc7X)jTEW9[!2FG62UmqKtBC**8-0:oq+B&*PX#FS.t7Njk=cg;aNrTM*7dUb#j"]//3NHpDV7OCYN=f&lH-gI-!%7Q.>lQ9euNZr<YC8nE&igS^?A^M5^jBU[6FNpLm*u8:fB[&[r"P._5Z@[8>"<=D&o0ZMuRN&qj0bZ3k\@(K$dT+IYVr"\,d?F=-.IQrJmhmI(@6^/=jI2pRTg^K;F$%pOVC2PZQPLS`8]Nk\^F9\e>!Kitn8:Bs,K0'R#_UMa#siY[]\Bn2VIn**SW$+>AqT7+[3<:c^F6A[>!G?PHWP:7IF<12ltlbm5+9!?f>gB,1ot3u[-B"*dnY-=7]A]Q<8f/5P.p1?LYkI4pe\>%"!Qr+%IsbTgb_GP3_kZ8;-tQT*AgOWLlgXm-RMbG'WWJhN%M"&MFB`jcZm>C+pED`(4UdLn/6tBQUBZgV@%1X+O,j7]g3kWSPKIbEtPl7]a\^=;'1]T>\8lXa9.p\a=!*C?rr`aTDkmge?6+Q%7p?Qm&M_j`*uVc0FmNW3:<dDM96IT$S>fBf1eUFqL+`X`-i&`*q4$b)]oC`7p>`*\*ST?eM(War\oBOFDi@1J5DtnI8URW;HABl?)iSB-@Qqf30/_VoYh;:`'\4?O%ln4G+-mN+*mo5IGNsh]og]0IM+/8"LFCO%q8j$D"7NG+8[n~>
 endstream
 endobj
 31 0 obj
@@ -305,10 +305,10 @@
 >>
 endobj
 39 0 obj
-<< /Length 2386 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2432 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gat<BgQL="oj(q@lH,IaJcn=OKP/nSHs&BKVff>'-_7gZ>S<4P:o$EEegb%!6gt-gUpOn')38`]mWZHb<t"adE%jSLZW]"EB=#C6#Ck]>!&<K.d.<gYcM>eEeQ.(\glR%2+,=:g]VmV8G4FDjSdH?"NF>sQ5,Y,MWpETY(0WFVb=:E>S^lU6+'+<W(9Lcc:EQ,2NYoVS"oTk?6,/sX5Z=9Z"!e-MUOY?pk@*na`S4Bg?#?+J6I!KRnm.ZJAT:2B/Z"TQ:uFk,j\As;$%PJ.UZ_c7?<p9>W&qq*?JdL'7M\@]e,Md@MZ?jI*:\hlU$k6]kaRl0h'm+dRq?EnU2`4fo'a;o.T+A>P1!+@a/]&;'R'2lEX^VAEgc<99BnR]7K&`k]@]m@Z4Ks*PTS\-2AG)Jpb5_Y2WKafFKj$,mHGHW@H`bD?RiSq`tud5Q>H4K'tMu8;UcW7q*=m2T`D.=<!@LX_SA9<S]%E3_N$cI\r7d\Uu;<aVD`cBL)gek;r&)7L^btpS[&MP(6nZO0QNb=cJP5C;"uEC(6p9\0pD*kZAu7WYV%Hnhq/@[_>$j0XWZhHY%("*%Hs"q9Jee)ZnT?F^nfK]>+uW!%o;^*.c?SHI%R9=Z'eUu&4_.>b!M!&:e%&Mi^2cW77%OD!-dC^:I%UK#k<?``,]8$-OfnQ6+FosddgN$AXl*?j;2?:)F>#)Qo<9*=cYH(fid5kC^)"'*tqMn[N?@%I@U3RDZgtGIur^^Yrq+3)"]6CF);Mg)E,m+fL)9IK/$l\(n)1Ic7YDc=kFfC7Oj1R!pGDqpC9k,[4HM_!Ijk7P<Q???B'g[E?AZp7FM54\55jJ8(_HLW58`gpb2oC8iVlK%B<t.B!R8&<NJf\gV:E$kI]9Z5CWYJ6E_u-1-+]c=%7@dMO%Y;>oi=qTAP+oiLM<#hRN"Ja\KA6qpg$&I]r]15["K-2`pLFN',_jn;jE^E_%dHb&mH*cF71FVS,"'ni!B9;<SU*/j8K#`2T\O6l<;&'6"$5W(3)?bf/o)N4-kjrSD-T>\0YDF^(Y%W<%,!@.:We0=Ji1d&VN^hEI7iBjSE5TP1R>(.mOU)\Yg[0EZnd]>BTKbBC8:@.`Bn.=3#SNuB!1&a=02)g$?W+uTsKJ$t#G8D?/9_gP[:Y0-cqRBp)5\jZjr\J)AS,\ZY_i3<X/HX%KsI"QDK0"bCTJO(n+q3Sr6E47*a7rGPTKCL2h>H9oE6Dd\c93E38<KPNUM?Y^l99Y(KRS<2q$4WcJ3`Pq2E\$8NQ0[ig>nQ`J'gfM%>.X%*gk1Z*=p&ZXUZhGgs/*hBcH9OV9YKVHGR&uKZ^I_G'q4bIXg?o93aae=KIkr)_ZLuXp8m4:F><]k%Blhn$H$;!$%km*GAQE@T`uAV)3-i].EL/kEg7\0p(8CPcTRa>.TLmM5i1EG\'*<)<6>;2n<I-Nc=XI#c"Anfh2MWjAMn$"o(d@CV.$\>rlO)]l[hc^!&8X\\E%+<.;VWs>J^!jL.Q$0)`5g,2PCDJ&$E+gP7V1%>]<],V`9@CD*U85j]b[pehhQp4<QaSTf(Fc$7SKO_!JNt6a"qYd[f6CH+5[Z8/*6`kWsdXcV.tP\e>jRLd,OLRZ>Y+g!_"1)iou%0RaRF7R4s$_7:SUp_\kppJ3ifc+(;:CqFPj4$O)NH_8?80YS"J>PNX3Y:&+3r"U@!.^6@_:+nI5/d#5hkP=AZ6;JHbRf6DtaQ^N=[8jc.3;:O>=dZNYJ=QsMg^Jnr+uKo-2t3tF`htXNh9`7We&W)6.tbi\#A^IaBFYUe3Z;J$[e?T5[/9M3<)RWF"q9(>g&ffOO^rHLiPh;_jVZL]58\q0C12WB:j*8)/SXd?Mg?n,ZijRT6WB^1gIPPR]1c7^bor.K0sH`52b_45g,fEU"1r-gJ>a/@D)eIQOKjq3fO3?=_BF_ffu@MohZ?BQ+F:'ZX)9a2-;NV22]<,#Jtji61cUHd5eh`B0"$ll#aYp/"H"BPRhb^9H'%?]B_c8CQ!fu3H>kfDQuS^@-k&&?@<Pk,B<V]oiu<(ml;o*;R#/lD&KN;MX,W#tkO'u6TA3E](NgDJai&'WHJFn)NP8<WTL2:\.tGi7[Wfo4oM#%YVTcRldhh1=`:^5!`lXRuCb8KJnL`#si^UW.FPn&O8EAUtYFV<8GjR_EIF7;Gc7KuolP]X@pL_qVemH2(1pE?[N,TY!:=7QXe@^AAhNcXW>If01&$$2EhQ"Hq/.Cp^Q'ECMAH!G[Y(\k#?FYHe]>l-3[3N2._)7kW2QB4pX>`FH+WfFHRdsSTjah%j@IP*#"FZ:h6He>bNa6(=-mHkGN&NcPg`f)j-s6M!!W,f\D73>`qFUetVhk370eCZD-\Y\BBB[mr2j#;$hB/KD&Zu~>
+GatlRCQmM[p3V7Baesi,A4uJdS_a#5[0<Em@7,f3PRh))8UTjV_,`H5IQbaB6aH&h"*<4b:3:l*hG<h;Eb=3T(+.,-QE-E`X_6:,i%P!9TRaPnG?epo[=5koDYVi7Jp7^7f_9g[W_*HP7QU]sbXM.`KVd5gSFA!\dsIZ'B_h-KC5.4?bO9*4QEregNEFabn#[H;",%[%nknJ"Hs;MZUb;=d8-\X??=4eT]@kN:f?<T*\[Hen'bsHd2apscq$Fb^Q^ViC4?#CIG>)Ij!D)u<$I;Q4`)S`REI/d$b<$tTo*Q%=oH/m)>Q>B[6S)aaaP1(Pj@tNAC5(2j9bGopd4cP0nTS3%-*P5j6"pP]I9CsV\J]gi(db\.9Vf;Ei4;N:?9KUg2DToqaSApbBa=MnkS%osHl,KYl[D<ab1V+#G4u&sI,>rNI4"d@'X&"91u>0@_DAod"KrN<[=S6]5Q[7RWY09k\V>Ab4,HTB\/dYeZk5Ze:]2>T8T&].1d19PLUt<tB'Z"#4!ro(,UddI$-6fn.Xo"1R_Z]-'eahRo8/!q1h\=R(KNu(ll51afkV[eQ/Ml-c;aujWrQGPk^c4DJ`__)H'gED5Y9HfrpDMp63]PROB5#:k3GSnF+-r@\B"j"2.=FCa3R/V'Z>2,p2K?ckQmMh(a@P=K1PV;fSG(D+`Q%p7T(5sXG@K[S*UQ%9RUj]*o>/i8lS.a3cYG7ELR/gL<#[JU8\A9E#6K#U,>G.k]^K\4r!lF)1q:eH*3*!15E8Ya`gQ/)eViX1PDVcW3_IO>3+h$Ocn.c!scD$@\!P[I3jcQ$@q#_pn/*+PNRR/7a/h2J0aB.]q7ljPTfAtQ7q(&TF?.N<H@E>8O44%c9s?`/9=h6ErAm*^qt:@pBRX4T]"'7,A40pOK1ejh)Fr===qDcb84)<&e&WZU\iTrTAD.!qsg4$!Zc0nD2d:;55tET_fp%KH+pNM=7MU2p=n\5"b*NMd6egMSMsaA-]m&jhu,MnUm(MOXb:C=hE2C,h>)?d!+l;JHr;JM5X"D>l?"^7,mTJCk[>LsL.;P'9gi[TJ-[ISlTH@gOms6YP"cC"'mcG5;47"?g2<!!\HYmfHaDJUC`?'?TWkc<omMrBVkrtj@_KbrO)#u0Qr"V"'7(81([,jg?B9gXV24b5fpOg;=Q@2176=eiKcZsj7/EUVrW[EIC$JTC\1NT!Aaqu]F&FLO$XRa-HR)XEjA=q3(+Wg<LakTN<04g*Jm)J,0Orn^M;s[$FqtpU,#E%A15\E"6EmT"-E^^>F@-ChVSfN+1'9&*,Jai)d@D<PATfle#dJ_ogUja=O/`r;\ZhioYZF8u!uig1"VtKCoN/VNg#8Cqf'n2%Rrjt>UFdlT9kO71k9AWJZqC@MgKm-49$#eZ<nqhk=$NZDbUpR'Y8+7`p]ADXMZS&snWqDkD<rH9#E!#H5gTbP=S!k%*"P&Xo[tVP6\[(%*[8:clo%nB;.4RAhM"g$:.DW):.I/N4QNfkU71rO'`!u7WTTrtpm98PQT:DL1r\rukE<0sV6s_p_mp9DYB7Xl?<rL=nI]A/44fbYYn*Vd;pLXsSiSRYWLu7KjWuBb54\4irIBPb$B2^mSdR::"a[lL$Z[]ZU%\-@e(qQ(5lr-^9Jm.[IjQXd,<N!\%XgrDfc?d\+KR+LeK/MjL`7Io22;SFJl<=FJYA!F"5n4Kn(mXlZ>!t)p3b3:mp-^J>l3)*cg^ha/O.Ha.jQ6/9@1*qO3\LK<fJqrZKugJ>p'/AZL1OsM!85E3HNk*48Vm%\!YV"KCK6ee22`N4OF])2pa1<g8?4DbtnrAA'a(0/Lg@IV_'hg*bO+W^6C-6?&G*0I01,(LCF[sdmRbtWZ@/L-o:@eFnKPVC*#;j5ejdATFtcUJg,i:3+fhWE%VQRL@F+8W6-I8L2YCF/,=L`7HG*5\bcDkiJ2#25so$AMeN_?iOTMGq7nabEpO_^?\7-i^"V159ih?e-Qm`:ZA[9[%'5k#QS=(#,o>o@fFQNVn:05[YSX<"iO[T,p[bm[@;)//A7.*_^kUsTT*djG]Qt&=qNc@c*7082U0QH?0kUH/pVC1%;-qf@*B!2<,%fOk:s1Ba((-;QL'!0iG]PZZ43r_CXNB+'>2qj!:DhQlIa\il20pd5;NQY^g[g,Hs(T:a8.^]Kq0uR8anFG:r-[$%QqRr.+]D=X;q1,1#=s@DqHUoFQl6jF7<Ca`P64\?W7g*4PV92Yk/Ap23^A!9%sK]]1^@6D2EXR*I\muN<4(Cka$o0hC90]c:tX[($,jP(dgrXd\)OW?PP_b&T=]]ZC$Y/UZi16@QAJ+?/G%T&F(!%hF)KOi*1l3oTuLchk[V!^M@\0ICpVYX+UMCLHUYmG%dR><,O#.$@WsBPogU?%T8A?^'[f#jY?ke.qBRdGm0jGsI,G</lMV/QAjE^~>
 endstream
 endobj
 40 0 obj
@@ -349,10 +349,10 @@
 >>
 endobj
 44 0 obj
-<< /Length 3143 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 3431 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GatTKqet6/q02iRKMiq9@%DO4*Zmik,YjkI6dg4fgMN=4JL4/.=,KsK8rifDhtQX^j;gZ]b16WsmaHUQpSh6g-eJ)?^RWq)F><Kka7e!VnB&+d-\/rQ-Lc4OLkkoD.[fsKo%0)+qif^Rd)+&8qo+C$\Ce+G?Ym7R8%"J?Xo"CVcdUKQX6_$6YI!D+buX-]W`aIV9g-*S5-7r,iqd\Y'Mj!T6qK7_24;-<Zi4Ols.uRVGR[AVUOYt*ZT<ER=T9F^RsQ8X(ohot:f!"^J!2DEgDF?hh/(#/!Y/Q2!fUAi.<W8OAeikdnoD$,1H$*bcLWcb8r:,!<7LLnnrs2uo&b(\k!+&PQ6fa?:4@Q%.C25cDn$qE.,1t?Z.Lr"gH8Xo0^.h*6NmAjoEKS=MulN0Bp(=b4HA?/'`%ks0j>><(greN<Y):%T>%GU?T$R`l*`[t:U*XL=3[B5fm*gPq;MR(n`&[.N!FocI_H^5>Sts6#idfmFt>+*7gL=2BLgO5+O<9ld;NB7T\mABH',?,l25AebICZV=C*rD&'"qb#R^2`Mi79"T\$,<:e8>Ic/+Il(\JbYLZ>1RY_8t)6,^j;+^'Lr>mECh0g97RVSkcliN]D3c<.JbXB,(.+/p@l'hHAf6QZKM(!&=:'Q_%Zj9;`Yf#tEU!,:<ehRoJb7C:0O"4dcgP"O.8bZpCYkH0^%Nf8X;Ld90&E`Qa698[uCKLXHjXBEZF@T19SH@stNlI;X9#D#HiIThtjKMP6AZ7RR3D!hK[neC)-^TG]=5G/G5\5,E*5Ca`I4K-h"Rb-*f$k3f$G]FP(+,Zs#.gV4=s!SP)k:20fLt2cH)-&"Y@2p@_$EG@B(F`#NU"!Y<=&"Z0TO;9i*,hjg0X$;DAq3-dP;r>T\cnE;_#$SsDApo9\TP".n#[7i:dbUl#mq>JBa(,6k\a]7afMAoq::aP-i0r5/g%3ueLDc3WUH'#LY;C21jhSk]SGr.#np`Y;=$R`,3'qPH!=6Bi*3X?Ls0@?.=IMTd.1Jtdh(MZRjQ@<NeGq[R[LB(+,W\s?(skAH!J3tjAQeYlI<eKJije0cdfQ1M"3qqRDdNW42b"!SK;l2,2AhglD,1XBj40[/;E)C23?&,$>H_+GqI1EkOVQYekrD>`hQWV8f$YhUt&!M;<YQN6S6n!OY&o8Kb/d.90nSphNj&eOa8ioqCI.GbUg3iN\fK7d6h$PE!oT<;_uHb[)+:l?!)%Z'^6Na*D\X9EXq17H"DP8_pE0"UYH!<cUF!1(8#%@;PYV<h*t\,rYt/e0;GXm'(nnF0%j`<eZA*[Z7:`!cCVVbL\hV<6"GL,<)jO.@SBZBNM!5bOjHM4T@/&=S^JFa/Ii;8G8qgYQC;9iV]k%b?>mI7(MJ1Be;c]:)(LX/"t&&ST*P2.0P'ot;bbeT_l>JI42AaTpUM0:dep?PI/!0SmHsT&rP/C)jn&-r0(PHZX_4MA6`qHjq6K9]B\ZRqfCf1"H).4`:-")Wjb+,i)GZD7oT^)C?(&H&RM%[H-WfB(JT@iaLsI<e^ch/9bDOpXiiXU;$%cShpIUF7R,$ui2;9>\U&HZV`"W)s,fOp?<K9rZM5n4dh$&'VN']D+q+FN!$;+\<C52Yc"7iuIX2!ma(b],Oj6JU:(F.R%]3To!rGd)/:`)RMqP0:B-7mH:;Ul7KDS:>:dWh3-Q]pZMp+B[VfhBmCH/XD:UdMMVm_D%Q36c'e5>4,bcGh).FPWfSWn2r*a#AcOU$6`lFL#sI'hElQ5[OK?$V3J!O+`$lFVR6J=`X?;,<p)rQAe7:Pj!mN)iYr4O9DH1+D&8W9a;l`n)JqZ6(m1/[KP9h0t!\t6>`n728p7eeBn2ue:<rD$rguWgu'0;)7J#-Y<[BE&Cs^`"q,U&-nbi?;t].e8SJ![ESG=]9jjAfmikTO0.2D<j@lg(as779m=RtqHrkYj;<i6Pi")\M@qs$l"IbB*_V1Z'.k@+:oV.Jr`cHOr)ZV&>(t]ffY:JI3IEM9c\)$8o:$>*p4\T8*Ib?uqX%[3?N-b5+kV`Hks89tA1iIt/11H%+cJ'a?P7&%i,)5s<=\k[?VD#@roeZ]oj+f;Vn,IBKh7&;K@s)<Z'f:FZom1RrbkV8(c5&lWA]2_S>]!X%6=4P0O&;>RV'L^)L@+5`aC]^\YoumrgSa,!)H9LX#uX2iEN!uBKm$j2A%$9VU5L_>gH2'V!,F4'/dam9=L)dq?nbQ1A%&.mLh8(W<5XX-a^N/D3L`(i4Ei6A#XEufaG7Vk8tmms/ZL/`:Vs0M>Dqg`)AS\Hm>fYa\=%BdI)C'HaOe&L2:600Z1FY+"-\BiES/QrdNZ-mUNW?9.Q#pL[$l/<VJIEAn[<)p]f43F7CHdX`IZ\C#8F6c245+E%o!QDK!/.'%r6TAHs(;*VIkCiZ,RW_1la'*+1gPO[M"lR-G*O_)N8HZ>NG.4qE=no8UWjs9)Y5RD)**'Qjs#CI,E<>GYm=Sa[ph7NL+Grn^l2l;C@7lUB(_98O'44[s(D!k$2TDCZE#q.:+n;%&#N]Wm0+`4d+cO0ra@PjEm-%biiJGc>QQ#AVDaOg1BsHg=7%We`t2Zq'BJA23-sM]9l)b@+*L:q>0Vjht.ijaRsl32a:VsqXaT%OSW<#Phk:+4'Go/fNT[6EU@!ih-u<C0KCg?@B<IfRuBf4'JA5GLL9.j*f1_;"Q`?&BSKKi"W[1HW+]igN-DiS"5rD1kI<mplOgpmO'ja_-(s=8&N)TCFuepCK!9u;/1!am/2gslP^Aqr^&etUZg5#lGt1j*1slD+[)ED9o4mu$p)64qXNN`Sf\YK@),!uSqqKuSBm+qDWa?iK.?'>t$1JV%m;F]L+Fj+tVfg+iBsFWo:tNusd$'J6*n&S1l(m3u$?S4Krp$s6EGAhT[A.tq;`DZgTsU*gat[#?R\[@e]r@V$!<Ho-GIjp`X5Ym_@#6&q=J!@Ait/tNSg7][q/RKb"ZS!X'Fi;qqV)d"h.uomj+R>eg^a\-C/=l7P+)8B7I!o$?1u;PnX@qNC#XUdYo=]l=^J%<H++kn%qN%$Y]SA*\BuPe3+6#-=)Q`b3c(TkcTDOld^&pB0$NdBolHNb0'ePIS59Wl^hFS[ds#h`j'V>GQ$-aS/%7&qSVI.JEf*M7~>
+GatTKBlE%Oot,\WTabCV@?!+]gK6-&ntn!^ZWl0U>LZ)-P9Ytl74KQ/YFF[hpMg]6%7Nm(RfHd?j1KHi3Rk[QPO#iE?Vff0F=?gaa7ebEGa_jN*Pc$C1AEqBe0?-C8o?e^r;#F0h9#"nB[LGHh;VrT\C?tbs4">;JN>/B[I.)Hhp5WRlKBDOYKs>#=Ef70pG&T!a6"XdotH=(F^!l)SO*;uG_MjJq5qdlCVEtb;8#>!D"g7gR'3sYh<3A=Rl=fKXeIj_?;22L`[?DUGl]4O<h_5DH\A,b:Pl+eW0>i:Z8DTXj0:02ibJ&=Rn]=L5'\^_fgaYL:Q%ZNWT"dDIPlD77k6ck]m_hSLql5?DigkeM&.A--<UGe'*p3:JLqHjZUI`C!N,[)ot\cJZStn\04^Oth0+_R1HK0obN@.Lq*bNQIIVp%G]A%Z%Pi7TcgQSkQNhR\$2rF*Ft>+=c=VaXit$I]Lhe)Rcu366TRV0HH'.UnZhs@1QZ996n[rbr&,V/%1?)_,Mi79"i2O6f,6:4pU\-ZpSn`8G!Io>C$p-_sB-_T>8aTnW;*CDmN<gGc<>a8/D8PXLcCbd%[;FnA-W\dD)6]?rf6[J`UFSo'[P2[`54J\E,(Ik3\2cJq&9b"=C"9>S3:0a\Nq]4`$"$)iXR6(Z/;RDkQ=/^HI(j:U$[:ZA&8-&30P.?.Ga9'6VK%Nma]>a2=2h%q_<_B,;70[7aN]'Bn'?ls'CTYW9>9NLJ?bZl+caS=m^I=Ar!]#*`-Md5r=63%.ql&C1p<tWF#$/-LND%bIOLd+X<8WDr27fnXfE/++Bf_gAQ5'WKs?"Z.BJCP?)0U9LJjI9?8]jHJ:`?3FhF^=_V?=KRK3K/:#^,2dk.)F!PE4?'W.#C:ftcLq;+/PQqLZg<e:tf/$1ACF.cc`/L7Zko&X(Oeu^K\$FtPk>!'2]OK!0+.>QUM\28S!=Ls:V/dW2"A[tP67`t(ZB]X).Oh`o'!?RZLg/>H=]26Bcg=$W2EgnE2oT"UV;4<oW+s6AKD_?\WUmAkN@5IFZm?N"Jq4ra-($.+!"Th);JlX5'Zpos5b0fJTZ]XY['bZ^6Lkomo=n<K#4%:>-Rh\5n>I?'*ZKI-C[FS33,njUd(F>-H'PTGa75!(egNG0h%7hUI^]>7%*_Je[n_TQ=5*:.J@eqX+.J+\Q\MMNQLI;Y]"W]"u%7)[CU(p_(@U\5_+@FcAgN^L?QZHDoNE6l42@R870Zm+!GsWe,>)Drq+@KCrBK,0RoNuk;]Ss:4-1dIN0)9!\e\(5k.P&Y1cC_\eLV")Q6:QK3<)jO.Z9Qb[`(t%'88=mX:MIN/<bY:^qF1_5]#-kO4JaJQH`A4ueFp<bIY#@;6LNK)RA#i7TJ.<u"6Vef%pGHJ+#cWg4r[O&1#)dNT"F0_InK=Q%e/;p0/kiA[s.lM_jA^$Z_g`YMituM]]S,:R47.B)%SJeXnk2LYSe^.B=obZW3j7`_*`iU3m`Z%%N_&ZL0_O.:7>EKH=2aA9EXD/"(ON7qR@?4H<Ch!hV9ET+[IMuiBHR)PPn_a]]OS%@'78&)2X0a(l>ZVLfHUg5fDs:6[M+j9-[pUbj"C<?r2Q312P\BW>uVl)&^rK"8!VTmAb*F2J>T*Qq+>,8b&$X7?m-I5^'KUL1\EP"-?PmRd`:p8tA?a\b5).9B0`T>YV*%g"UbjB/>sSe:nKk'8@X%m_D&<43_Bh5>4,bcHIM5F<0AKUIhBDlN<hg4,bkj%bX#c$?cCU8T"LWF%F^&O19^KFmVN#R<umaUn0L[:WC%!9(6<I>iQ&7A:Z0e8=ApDdfp?Rq`&Q7+OG'S>Cp\ER+dW5+j!f?R^/J&Wbh]:BRl:5Yc?&h6=M#O):\(l=<Kb49'^.tK+Y^Z(`.8*]lOc2csUAMFrF#[cu*bk+I?G0#)C?hB$%DO#Y`tXK)i1l\l$l?F<TQQL&ciQMSY,W1nRT2;9*^P17M/>U63qP@XRVr!/$e1I3s6Q',B)B`IQmR'E*Ukr@"_%#qYnU)lRqF$*BOkD]a)Y-K))"5FI&a[\62\%^Xu;)eE`(Bu3cb8Y8$3l*K+9`R[0o'$sm4q""FPDdT^FG/60S,Km0=!4q@Z_;ScS##KN`0a8k=W/jHIXV+n&b7X%p8optrJqsoA?%%j_XB*J&eEU$1FENJ6391fF-V;RV_B]Mri88"XDQJFY(a&<ccouu*(XbJ:6-5DUK:n`L^bK=s7g)se37[MODfTMnH=ZHtj#hN7Qj>soonX-8Dj3YZE*?3dlVI(NLW>`nSmnCMcji.>M46+Vbr6UaN4QmlN[@r31O_(>@uqN)Q8jif7V\&qqb]`.=;DgX+t0A&.oX0D;gDTRE:$BkD38[\Fa9X(TV5#WX#.?lUE/V@)?a-BrZ:5!qY7GO(//7iHXiX%8nf8F>[2EP2,#;Y:J>plILX:ShA/+9UjbSJ7FUel6VD<4otPBZPMpc,D!7MRqjMugK*94g:?_+&?Lh)AY"`P#SK-)($c&,/)uVlugtjC"f\o/*?5r>KV7be-0E`j20']R$4d+cK0r\OgME/g!B!<5BrEE5k=b0"9];Qbl],F&H.";Yp?P+XBii(]mMg7"URe0E!?U%lbl[FJ:3*m-ml]:KurUG<f8H#^ob&6f>*L,.[k*?<u>hdk)\'U-:?uhoIU'tUlY8NC?(G7?HLTflg@T/'b-kWm9)F;hqH7e'R)aR1#M(i9#H45>!\"D[j!O#"Dg-/1Qirl`Z/L$@!Dj@*C>S9L3`_^,t^g\O882\GUpFFTfgUj@!2A_7^T4Z_aAQc[aO]V.pZ<%=#A6n=0@XE0CCCF4NW,I#gVj[?pW'<YN;J73m&o^UiD*Q%=L&(cp=6l#fdpc6!:fkqHckAm22sP^cFi$5)!o4@1?[q^1X6-E(/`f-chC5W:Q*h<&[D?%t,d#>cVL%N#!^WKg=P&4-ELB#[`/o0ocCj("R;_mZ$soXA_@EOL*#3+T#!0!YMtc@Ih2m;ARr-@7+L0^KJ*g)VO!&m$-dJtT):MhJhkC!g(-BT^2rjs.(e!""!@8KsELj7XQKGiJ'o(1s5oDZ(=?]b\F$&G$)A:X`CeBD:75[:6oGR<-""2[T]cM+>hYniRb0/O,U2!(IC\t/p*A/\dQ0>%-*\P&-N;Z!A,/=Mu_dY)`_k_XoReA-gXMB>ZYhCC2lsITA6]&^@0W@CWZBfi$Qtj3W^Ri@+mENXb[BGGW.1)MPa?57Gdqum?H`.7spnRZtMNU:R"2,KEGq+A;Ls4E?GoN$[2CS4BK9?H?;3T:KIhlIJi[^W30hh9=qN$nR)'ICq*q1S@TC"NMVYm^Q]ZJGF[heh/DmtpS4ijc[H'-J)5<aoFH,kceZ)HrJ&C-pDNf/5gQOu3&5Z*klmu-j[R6E7hNmp45.BET_\UlqjX0/&4/$ZEICL6OOb7i<<p`B_B4VR~>
 endstream
 endobj
 45 0 obj
@@ -371,12 +371,14 @@
 49 0 R
 50 0 R
 51 0 R
+52 0 R
+53 0 R
 ]
 endobj
 47 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 432.42 471.62 523.392 459.62 ]
+/Rect [ 432.42 481.48 523.392 469.48 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://forrest.apache.org/docs/sitemap-ref.html)
@@ -387,7 +389,7 @@
 48 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 551.43 458.42 630.078 446.42 ]
+/Rect [ 551.43 468.28 630.078 456.28 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://forrest.apache.org/docs/sitemap-ref.html#forrest_xmap)
@@ -398,7 +400,7 @@
 49 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 0.0 445.22 33.996 433.22 ]
+/Rect [ 0.0 455.08 33.996 443.08 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://forrest.apache.org/docs/sitemap-ref.html#forrest_xmap)
@@ -409,7 +411,7 @@
 50 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 382.692 224.308 463.02 212.308 ]
+/Rect [ 382.692 234.168 463.02 222.168 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://forrest.apache.org/docs/validation.html)
@@ -420,7 +422,7 @@
 51 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 57.312 123.908 137.64 111.908 ]
+/Rect [ 57.312 133.768 137.64 121.768 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://forrest.apache.org/docs/validation.html)
@@ -429,30 +431,20 @@
 >>
 endobj
 52 0 obj
-<< /Length 3242 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-GatU5>Ari;&Ur'0:kPLa=i@\G]+185G2&VU(0b2$Fg50CoKeUR>8p.U76-B4oY5SuOlB3#Q*_"k+HA<\c?qFD^>@ZCDKGE1)qT'Ml8X:m`jp)Glbm+'!]P'Ja7i/e%-u>]8J9%gg%jUh:H)X!DUtFHLO-b@fkD>KhRT=T^Z]5T,Qcgsjo"NF:@M2GZOb@=S]r6'Wbl=?4<j<Ind2r$HK?CnnRCrJ^U@&3+Zkb(Od/A[`8)/,8$YE`8AZZa'*7h(Ps]7X_J$bkD=52rlkM'i$XR0pFt=PrGofPCPYFQ)(dNa-.Dad4)HLB&hd*R2,ZZCP#[L=b'k&nKL_qltNS\+0^l!bK[&hE1f*i_BQJ*ITQF'@TfF4&*H'AHgH\+>`,(giC@h#Jo3cgkj^gJE4L5-;bb)8Wcf)&7UBp`T&K]69e8r!`qAAj]X5r'B*nnLLFdD6M9-/k58b=]4h=sf1K)CY7SOO[R6aM":SgcW>^9u0VmrUclo6Gu2,LkSV]lpBJFOtCpL&Dp.If>%(^gas>T%0I6'R@[$B58.a2..uKtaNS^seRjq\[qJY1p:qS6:oa2ob1bYI]g.b76QsZGJ]388r-T-Z=Zs#1D]%WF/-J,:X@0'_X?TlG6ILD4(iiD:IFC+k2^XY#FeN!d#Ss#\0]u#O'SsD;8$V5tM,4!Sr`Z>e*!RW3[km$2[4Q1Za'388%*e1+UWrK6GV;Zp&qj?q5LlkJF)$T_&aH9=ID!6NAC9J!\(Q5fFD9Ij3;O?kT0KLt<q:)(G^Ej#rO*c:dJ4e//dYHf`d2Ueb9<-!SW,rM!=m':Lr,QGRdFbJcl3Noio4qF=j7lSD<1;^D3#djCFMr=SEHEo>P:C.ZX8WV]s,(S(I36lN=`R#HjqKt394q?eH/XM)X.=Yl&&etkY'%9J[&7W6#\!cM$\+Do2EWnQFr+GRP(3F01EJC5#[^bXT>`g\YtG[8rcGuoT>5FemoM2]BW:WC*5Xq[[/4+Hi9+m-_P39]gH#K(u";K!/'fgFMO1`VE3*'?AX>.8PF,Ya\[q'Pp4*[cobRS`G%V])INgo</9]SX-Ks[[qqD%8lSdmR&dWRRkW%9C=\(mP!dh#<i`jHNW!4Lg'&kn8@TA(.HYhj?:;Xu!WM9Z^[dS>bB&6No:4>:HMa9LWaqA$J3*aG#<<nbYDRh8Kn`#pBN_bmo>S)dY/?LB[L@!4"ZFr5C<!^Ao7oV:m*K,YRii/38u#]pJf:=$4]#X>+r,#a3f!mtW=A^(CN@d!J:OIFMI<a2e<HY?3NlXfj0s1@YL!mp9Y_%hcnQ:6bcm>GD/5I.Zq&:@s0aM&h/%g'G$rg2U8IQ+*r&/38Q&m!65YLOfRaP/#p&LF4'?V'N0_5qhD/,p\Yr4P+b7DR<Im=lr2&%$1fNl^Aa6NLWiWb`)u6_&W;t[MkZKrG"g=^\$T[.m"B]KkLFYfWR7B84mS9\jjagreQBN))%ZaM$dT!rg3i/^*WiV<HQ,+kDk!J@2"7g>+<LM[6)8K3&ooa0MG4ao`QpVM&m#C[QTS+m[ZDK5+;SdWU6G0RRU1DjW^?EXuQR+ksO^:%H\'=#?6Y$2;6oPt&8.Q3?aZHB@!!"H>UEPPFL/F>ZLd'+])ZZ6i(#m.#k/W;_0T$t]3ZlQ\fHlc'2*9RIp]e)sluf:BJD^+@b!`"2ifh=T!t@AKYa#DHRg)_C)On[k,<hYuLfDk;0hZ.GBJuGpgC0WtXntcsT^0&u4c!$u'%pa&70B.Q%T&6MTC;TsX##tlbbWL8R9a'MO<e$)0E6aT5cd6(^D@<S!Gm!KD&GhRAIa\q-A!>TJK02^e"sW^D23s=;hdr!JW`</Xu[gG.-N[Hilntc)'h=Kb;+]^gcjX43*N\T4Y.78h]+N8S6bX=Qo/eaIk[7rX%V^aZM@=gd?"RY$:$s,dQY'l]mdQFl^T%M\r$]$2A3l5$dh`+_F)7,PSTA&HXh%uFjs6"=gF,a^?Z@qokf0nPcSHmkAZSjG=0AcgLpPt/bVm^<o"YV/Hh^q$+*gF-eG%4m-l6hiC`pJX32I?j*AaGg=<&MD^cI)M?8s<Sh8(dhD_R!QlV5Vi$!3r_WI;(#>glfgTGSTSC]i!kikj)!(bHE-dcRpIc!7;7onWjnmY\]jqh<nrMjY\qH;%"g2jts05VU'Xfk45;@8FYA,iZ>lC-!p2@"%2I`?\"@LEeXTca62@89/=!)sXF$D7]T_fUkdrJVk8ig<H6QQ__O7mr$9L56j.e/o2iakkC<3*0$3A3i.W519'@0LQru"P_WpA0^PlqVf&G9c6_+h=8UE`/(nbF*QHqa:A!/'hsO_ml#NuB!fs.i.7Lm<7!M3mK1Wh*1I=j?KCcqS\^?h'Q3EUf:Gje<ZIb(jHqLmdi+cVQj,3u4!DiB_TNa3<7\:7".8j^S4o`8JC\G79SE"U]9YB5C[9is3Z$6qE[2j*K<'Dsj2ACWd.$MWnYh)n'@^lBs'iYni-][i8jh(I]hiI"5Q1+6Z]KgLGX*`n,T\]V#,;r:!9mh7X8i,&M\W.ab9*O9Nsi^`L)ZS[ZKd8IY,_Bq`13QdD<A+IRXK[(4fA7Gm>%Icebu;CBD01.VlX7oot?hd6"0Whc.)KaG!tk<e9Lk,YBGU7:Nb]j[ge*$b+aJ4?9`ogl<SVL\+ZT>OD+^FgJa,rX.QS-XAn'kVOL/Pd"E*u*\k=b,*i,3j'"#1=I"-WorL3@X3cs38NO(lMj)->gMpn(%=)H\Oq[aI7Vj]t6JdWDnOXr<%BZ<'!+JKI5+$J)0?YCn%ACN@0^G61'o/#%g6&Ncet-#'DBNCIW"GMriQtEj2%6d,,jVV3NkB)pChgq"j"3Z1PIi'he&Xq"\[,g=51U)4/uuH;rBXaV%!.g4WjQpT.!6]ODt/k\,j_1m#ZX;fNo9jgT_=ZXp9+8s.R1jL?f*e1E'/Qp="=VG0@H3JJ3k>0/CA\<d.^rKICt9M$=-3;<b3jH!n6WVk'T@VZep1ZTkTsu+ZAYGrgGVBTdOtS(gmIB?l:POL@$%#$!I$&I>$/Z?."%=R/K_/BoQD]GY0J0`+\2hCSPoNPBQ)648s7#'A0Qh0WRa8]W7YO]!#YKG=0a/G1;N=hCLe-M+=MYlMc^G3gb=UWkRK]Du.'aGoH+W_j*0[O;g9P)q0hrj[Mj??Rbh8gEVrH/`%>D*0_%pK+NIRV]h!ROTR/7RXP?oeY^t@&28V-69-\E^:]9:s/JI0gqAPp<aKl,0M<#<hgYVKKt`W~>
-endstream
-endobj
-53 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 52 0 R
-/Annots 54 0 R
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 605.706 82.515 620.37 70.515 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A << /URI (http://forrest.apache.org/docs/sitemap-ref.html#source_pipelines)
+/S /URI >>
+/H /I
 >>
 endobj
-54 0 obj
-[
-55 0 R
-]
-endobj
-55 0 obj
+53 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 0.0 736.8 219.924 724.8 ]
+/Rect [ 0.0 69.315 219.924 57.315 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://forrest.apache.org/docs/sitemap-ref.html#source_pipelines)
@@ -460,11 +452,26 @@
 /H /I
 >>
 endobj
+54 0 obj
+<< /Length 2903 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+GatTJ>As,Aof^(,$\j**MO:^;;QpjKf6-E+!?L<r*L8iB&oFt;6r0'-Gf0OX%Rj5WP[u5sOrtm.aE,+Yr-EeOI2aj;J?0OPc-:".^$umhpkA_J8qW'JX(\c@(Os&lT,2uaXT&8>no9:bS<5MHguVmj6/LmAg_6=IM'EX/2a(6:GTi[qb90jXms\ej>gUJcBN_'$,J"n2/RT]<VD[`Jk;u2$\fI,\-<\`9dG.sIcNi.Vfe_B=QJpX0LHoKD.n!P^SgEi-:%o0N.Xo"Dq8^a;jH8o/TPcR^h2PJ1MI_X@=4P_p;N_0@Q7\\HrcIc)>&/TKC9c[XLEuT$#(NaGo`>4/af8u_:V2Xpc/Yp87B,GCbCLO`-&<8(<Ci8iUCi9YZY0h#?g_.,iGXdd[h^OLipi=P[k6@_*^/>SYFt[MA_F@]d.6`#`$G3A:"eal:@aLBq7q_DMY#rn9"mNjKd6gFdLU$MaM?'/Z[0t,,S:?e3k)2!/]]i4H.R39#L?>i,Ul,)6rUBm,20.H48-gc`o@&E,H[3>(M&4B#dMOaQ8T@\XIddRR1tFb?kQ;..OK@uFj^B1>fm/45q.[Yc'j[*am'M@-mDNKBGK6"#;V#8Gf^>3GW5(98JmR86qI$YV)@T8kSc-4!-l0D:4%_3rCX*m5Rj@%Y,c1PeMQ36RXTnoQumOI"53F#-N&\\55$\,MWrRGVcGNT`E.HW4<StXE>FbbW9G,AV<.4d[\8H`7?uH8SL_BF4'aIO7>TE[7-X^eX5I;lm-an2<!A9AR&&>uF.W"#D.-2fCe4=sGCL>4RkBaA-dO#S;!RG$*Oe^&!3Q=#*#+L>7EtkSXqWEOLQ^c)1*91kKF)/@mGboDT"qRRehC.IVp?U!FQ#_G\ln.5pCiN;6\Y#6D)5-n+@tTURZ=\<7"^')lAHW]PTY.R%1pW\OECu8.R_aj#-ZafU./(#0F8-N=>:'UO^TfPCn!$,@>h!&Ik1>,_ciC9T8\(l1_?eKEPLkU8ZEFN\>.:aF$R"#:]Wdh+Y+^Bd.CCA>/i$IVmWj%LnOACK;/+BGi^5=4b[R2Vs[bqe+Vi@o)>)UL-ASu^nEJNn5;i!`<QH/KC%];]tY+8e.+cojlV*Q:i+K\F]q<qge,9.QAYk5VE3a8kD3lqQ$^oU?t<$/EB%Re22Wl!h3eI`d&!/9P'<+T=4A4R,g%+<-;f@dpT3aA],#?OP*'.0J62*#_QO<P&QL-;]\+K;R]\f%W/6J-(cY)\)]@]^c9BTD7aQspnmqCPT:luH8u%HRmKNtK4@^#No+n6l8RO_S@8QcmYJ;>*T53*,2<-ct/PH91d=q_tK4\.ERNH&`ahf_eM$F&R`;jsfTQT,&+E<q<1L>c#]K&?#`O>ms2F69l%$fI$Ff%s-hKp,'8oqe2\7eLkK&iY%.#=Ln4#)l_#[n*(BmYQY?E[2S<X/@Qs+T8o/qMZiY;#01@.;*YEU3j^3>=[=#[rsrL>d%+]=ODq@n1&P_he[c-ktgTcQj_<N=-"eg7)WknD[+l$H9Ne`sW$=F:LNo9!4)IJK3n\YJse)QKa%<*+-BXT4PGB_D<.ei+5HP0a+J!/a:QQ:[Yk,qicl2&P+9?fGg15fdbcFN'P>_3EnF28*di[AI^(hgaQJ3"O_iOmuU.(jo,FRUqOLaGjDa2HQD"P>V>n0c?gEO$qOjS.[s[<mD)5Z\/R&RT3%ZA8Nm/caYR`LMlO@b\==>-/E_<:U2gn8]A,g$7&Els\-Y;O@<9CGoR.@?mGIT!'DR1[giR`B#SIGIE0/esb^)>j"Bil1/,4i8p595P4mPbJ)9Z/^>9QVGW+>+]NlGL#,m@n?rO7aM]L+5\]u)D[0r><q42>M1](J9dF'f/!OWS1!,Ye%O]5%Ps4b@d,dqqJGZ2bj+#`,df"_*$7oZ%uUfK1pES]c('<'[q"Qr&*\*28H$P*PG?3g&j.5C^Fk+lhh%5<_)rR-\\.>eU[*/3]Ap%HVG\]C1bD4$D<Y3cHGV'aj.o3-Tps%*)u*cpH.(`EA:U2ANB7_q,o+d+/8joMh<]m-1lPK:57Y`]G?Vmo<>jQmpapLG>3MkBSg]/4/apo79=is)t!FWUZL*)s:Jm?biEl;Efu<Q'u;;[ha_5e,A,O;Zh,.)\t=XL\'&I<Yf;7HhDdpr99:"gPK[`jZOg8+S=Tsckpn]"*"!\T)A'/(p,pihL?([0b&N4%6q=*Ab@j3]W04jUdD`I@7AqQ^:0]/^8K`Uk]GLLX4Z.Bg/Gt/nFf^hqKZK%J)?XU^=:[][RPnok=W/@N]r4;#@fZn1'idVNd//8)PE`!"289+RNg<*<L8IB4.#B=B"/i;'[D^&_tR$)..i>Oq]-l[NuaR/Tlj@DS"!`,c<$\^?c'0[[)C8Lm+Vdo;(['kVh4?m[LqiSSu[4c?9`^%P-G_b#7q9kra=p=SQ7dc>(F<kYk(32[/cQOh1X?8l]/&b2\<33e;+Jgl-Mcd2%8J\K'O)RpS.%=\^6eE_TQNXK)6eBo7Y*AEp">k`KVkE]<!Gol@V,`NIBIKWcd\A:shTI^V^i9+=uHt&IoCqFp-Dt5imttp7_?f5?`WiK]]ulJ^`LH?EO,J,glCQ!*SO%aX-(E+6l$HTT?S/=J6,e\%6>8")JmJ@?/AQ3JRLuMkB1C#J0HVju$`LTuUMo,`OJ_>$I<:Y%=*C>=(INVcDe`.?!o=@J67l-_!PtTReR9`)76kCcaVY!H%25S3@rY$b!6n4?J(>Hl(ZeqT$GYg*IuMkGmA/*mEc%1kRhsm^iEBSJ()ANbX@6>t&$KW8k+*O-R;5"R"DSk;Y+T]lW6[%gPEccn.k2WlA6i#6@mOK@<eYT!/)P+F196`[AU[^hL4<gE"G\:I2'#L+H:_nTS>?-k#c";5R>Ph(:H^`6.fr)qM;*~>
+endstream
+endobj
+55 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 612 792 ]
+/Resources 3 0 R
+/Contents 54 0 R
+>>
+endobj
 56 0 obj
-<< /Length 3986 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 3988 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GatlSCQI5inb`7loh`F^H:RN(0Pghd&17sV3d%T=JR23T`'&r;P,j\oSV<g<]sBB[$q89NV`(&aL7H<0c?!(EgfuDf-&Wo<r5Hq:Ktl8F":H=N_LDTOKs@!@n`$EKr:Ba]p;Q#P9RSQbdqnPZF=$A]Ae5+#pRJtS<]rb(EAm/FqGB\8*5nGk=RZ,Q1^)@d=)C0u,&dWPP`+07-G&`h#>HGs,;E0rDPG4:adqWV5*9)NrQnQFrD65@=7*qR-^Xh9`QaHcQ\*#2m4OCL-o0,pUF;E`42)b(GG+0Sk<8!_h==i+3e:jJjIYgQPl%AU^,F/<p>($$&"r'RpIcfVC$fN"-:^b)/-(a"E4p\Y;:TQCX#S=5<S%qklbieHU.B&VLU#Ur0Qu=nB"_dCL/0'iajf`"fffQiKm"L*`XS!W_Md=_ng'!R.U<Vpp]H)T"$>-pYX<NFiQY!6T0k(5Eo;CJZ@UIXZsBX\">KpoOIm4BY^7jOPn0r:fS3kS*<BCD877Vfq?a'_Qde]aa_GF3,Yu3oO*2dBjNH]gB8ni?Pt#(tWN?!YW>>dh3%;@Ih,(6J2='N0H-u/NbN0B_`!_,8hX2aj/QfPu2["L)HmQ^Z.)5I>p%@^1/+WOVbB<(i0dcjXYfgH"WZM^.n$efc%84P7Z`KbK@T0D$&Y.QQXA?7\;PO\K/mG0V&S"P_L=KMWKCRLp0<Z@Q[A<uD"7Nh$1j1W2j+7i;P2B7k7shs=^^g9nK7h;Lm#?iO>6HZT<(b]6n;8XEWYV19o"H,ha4<WNJ2eKTH\iJ_i3h2LND$NGWnt"0O9'M[?coPbR:A!WKX9;='=Ga9MH);`;O7stoMr5uFdX:XMn2Dt?/=6`qX3M*[gOd2naZLq7?E5-Poq,g@('_aTaqZJC(W<OQRCJGEUh5k?SB.(Z)$2f0rdIDE%?1fZMTLsOgs@hm+o]`8CMLr>);lT:CY[$O'L:K^C@ad,mJ:i*uT=HgGOFu2X^8B_Gs^^N`GK&^=L,</R+-'&&E0=J]g_cRjL.3Yb*tOVGIPV,5r4M3ZcRCAI"(ZKM:Jp3TN+J&,\Q7;@=S',CV!rWSq2c15d4@)$EKpP7Llrb.Xfm7>R\T+WaeT!7=f9Wb'nk"p^]\9SfO_kaJ9==55r+LP`anH.DuWTk-s+G)3l,H>/_M!k*ocp+lrW48,U_BND3JZ1;#I2=/G8)##fOXCkF?!_lO0m+8^_f5HAcB2P&=h@F)40$YW/Wp><h)BQkeg4_4DA6%H&,%Sgm2>!Sio'KI??;ZZa\X3ri1k^@[L+U@u$=;;F/MAO_3="Q^=)>@@39Vq!##T_)97OWaAkS5W@b/t!%dn7%7]uq%/F!bsXED;cATsWCB1inNI>)#<>KfR7Bst$]9p04Xe=UD$nV=ZAA\"p-!NJC,pMERg$:@gI\OUGZo*#=RD]BV#g`1M#VLgMnME%LZDU:sB=[o$-qf=PY&GR;?QBXmNCRFS%GRZs6s/Tl+251`c6"@UW&_<XW`]_>)+h)Q#e\a6[p*1Z6K*/qtL`c)Yl0o\PK<#tI;^#:JekbolSW$^)W7p4[$<NdClo@D:iCk_^$ZM@rk4/SZ0C4B]4Jd47##M.th7(;+Hb!D4@a42?JG(:E5;S^VP_EdJV`(u5VD$\]I9dK\d6VsKUPm:UN0rjaR,d$6Ki?)4&q&@'3Q#%eoGD$[ghX(YC44FO\OdphZo*!4;FAg?9K%2Xb6Oa.DXRjE-FOM8XSOM7ke]$*.RF]*1?"$FK.:I?"!".I']bmZ:7L$$,,H+-SFTtok^fFClE7(OkCZ!Rr$i?mYn;lm<:NPPOEQcm&C?1D:(nSg==qk$<pY&m[t@92jd,(39ro/<B@`E&?CI[SJ^S#,fdtH\[5`lsDaI,Qr(Q74,=mN;i%dF?nUKjrL*pKTPOa%d(LA"-Retu:JbF0:U5i'rL]%_!C^&;='g`c;2NY))(?2/_K_(`6n^F*BFB@#(jY62Wh2k-6&U[$56+0.,0pM.g-TtJ#1e*u<?3h:$E&&HlBE<R&%ISUWe@TF&e^3-oXDm6N;#rJW'iVLf[a8R`\Ju;pM&0>"2_llB./.b)lEO3KlsS)e_/_J6l?"Fa-A#I,of_D(`Dii>FmrEg<6f`gGX]T(S#K;?`N.HgbaX,L(KH7;cA#l9#PnJFpQ/`0X-="D!TS..[P+3(lZ<>%"#%c+\cZGs45MC,GlHoq?rF\hPE)%-^ceE&Ar+tB4@'Q)b/72n5=5=BJJn2'UX$%f/:9+l&h6JEfKuD#)g_SUj8_fHe;KK[ZGYkJ:+^HT.qQ"'G2d^7F-($@8GRM+?h.+YUCrZSj`q]r(2*oS:-!?o']`\0*`QZ!5hFAUk/!ePMj81UcEWq6&)\N@h`ZNMPJf.DLJa_cK"sp+!c_,VT:o:sa1'VeA%U/L%)">R[HB1s[_JV-/E-ZPR/R%u`$;WFU=$mr&Lr2+<#\FcKR!VBWYZ::ReFj(pe#"l\##YM4R%@+GB>h\.QL="MA./V7<nlR>lCnbh-M.@?X_G/q1*Sjgl;KFA&ni_UOI4DW38`]GXWqBn^B3,KN<3hPaBU_-3@+]JT:?;$uU>_%8aIa]:,i^$J['JfJcG98nN[HfS8!X;ou1hC'1aCR)aCfeoqN<P)4EM&+b6oO<$0oRYs*SA^"PG-,`pj%Idoi3f0D6G9XYZYb4Boo(90U)fr$/at[#SMb+dAXpD/)A_lf6d&kCeDGTqRHj]s?_sZ?'_q7\Da!_/Xg'32^E#9FZ]t2]QG?(;*or;HV!PRU\D-QtIkFTT)gY5q>%;SU5D=skbP0kM9&Sb-j^fm@0c;a?"P!>J(Y2_)*T[JBKU%(h<KFM8UAI]k2lm)ta:=tR5g6.1jodQS6KToV)/]gcr4m#!9J41WnSa\Io;;%'G.=:'Uf.f_OU4*!NjpZ1WYG+?f;;JcqF$Hi/e(iWiD5RiNo'`dgeO$/4rOEl;&14tCjId-sme_G0+R[@!F`^\u08_XZ[N.OfDF*[],!4#JcddRl1jkEK+*'&N:\[:$Dk(7hcqsq]XFUE_;ebGL:V%aS9TV`IWb*WiiQ^.4^(4tto^dY,pI&M<`8`O`$li\]ECOp9%V7La-e]06j;(Q)H6B;/p)%=.J8%0(d"Tff@GQYK;gVGKG+I:UDQ*?kZ]6N2D)PP;Ph2EGN^e^6HB#]Yf9cc58^*fdRBo]M[m*-/GW('&X"X>ibWdh=Qu2.Ij4!`=>!(ULMenM*a1`$K=U90%]r>o+5PFoGLqFig!VXYVeY^&YTk+[_IG#UaMbEfAjEGEI&$IXq]WT68Ru,*.`B93S6ab/<E..,phgP:pn[i.Grr'`iT>#AKo/d6\.<dVp4\%/).,*k84nJB@l9oE*":XjPFd6[4%-ID4?J>nbc4HC1qU]/Aqs-lT/sl0Gd`>'tatb^;R)fAof9_!b&(#[U#6.tto&coh`;A'6Vte:EbY>E5I4!9KT/jEuG&iX)][1:D7]_n:A1]Xgm.7*-(;:VEIO\,TeP=2D+3B[jeW.+Ms8#WrjN+<0l.\K@Hbm3dd%?+Q]kFqC$On?6LV6lk\$HE.YmJHF>&"ME?`FY8fSf^u6PB]CIcn506h"^@=&5lMr!S;1bZDd`lXn['`+MS?Log-piVtX3)Ek2#@P@bE5rFL!0;;L0B[S84i9P'AdY@BeVplChi(%BMeP0/>LC)^i)6aelC@rU:"jN)g/blb#Ddb^&dhP@)`nQ$Hog#/5raLQJ0DnQnYTaM/"#SO$7b&^MLblfY5toki@2LkO(0.d.H=*+J7a8-;L=(Vd_2-e!q5?Q"kpagKif)%B1>40fqBc&&=YdQ<*EB0hM>R\<bL6Q2!hEgHqZ,\7o_<M'/t=pCKZQ-u(Khf*6#M/+2-sX#3GG[:f=Oo)8!J7$@Tj:LSg%Xi%VF""6-"]UD3be,Zao;KP(F7GC2s[B8/58UZ`)PB)SfmLDoM.k<L`C6=P\^'!)O`9CK]J+RTJdt*l2+;(7455npfhSUYP~>
+GatlSCQI8Znb`9Bm@f&IoT$!H_lsS06(BoJlI<A="aWVR?1E*'PJiHV^%7u^J+$2Z`>Pe$I<M'Raj,_6i,G:KI<0J7Hl"I6J9d'B]*iP^\aUCVr"&c9W&0<4i^JcpHL]>En!b,OlQG_bT-W[\\SMZ$&kjqb\F0S!]Ic3s\.cO4[rbJ=KcK0Fb#n,E?If80h3UhpV'9jf7$NVb*@A@Sab%*ic&ijCIQLD;b2c=+XdDX3b-#[+e\3[am)s!M^6;e$fAbp_H:kot,'ur5)I\jc0+5Zga_\r-QgK?uDkD5?(j=)Hq<.sIFe5q`9.>(kV.J8]QYY7]pfGq&:Ol8NQe#u-B7.WR9G/+7RGPYc<3mP2.1#NI<Y`U?>1pfr.+6`V@Eb\oN&`eL=`8Sl&JL""ZJfb`9V:A`m)SJQh0@dbP-Y`!6&t#&8u4%i!I#Zjp0S%Ds)j,ue=p7YiTH;Ts#=u4.sN`2$=d/3$:.?N)ri<"o_b;<i5Ge:HG6(TGt5Y>4;-9lJo8H)&-Xr?@BuBU'?O_G*M5k6X,kSR_.tr!Q%\)^L<@#5O<lIKLY/E\NjjGIhH.@l%cfu-.\X:HO:X/MY!o[h:c2YBZIofUmIQU-pOQMm5'>ECM_"AoE@Z.n*&/f;N3Gr`,HC&?Q0>YC:^md]]!JK0<H;$@T+TjtUfa70]qn3a`E]]@i#p%&U(+/aV?>k\HVn$.'Q4<`a9U,$ARXq9BZ:K)7YS?&)hH:^MguiCK)c-Vq3R(t.UDf]9iQbFIa7L<dAl?Q0mO9iYN>)aHpF3]YJ%l34GZVtLrP-R,?=2Wf;em5R4m*j=QPnafAJJp5s1Yk\74,_N7:kG!*rar.UAmkca)gI>a>%AMS?^5q!CD+?$uR!ET*er*$pDr*1/AD"lsO_-&G&iTNi81MoWdi(Os-nk/NRmS&M?*aMR?&D8Yg8DFEK5_m+EDYE5X=b-dJYZ]5rs"s:CYb]t.L/IN!D>!Fe3<]"Uih&P5;$\U%8QlRiL]7$N.h-.7MNsrjC0nIMA;k(cE*3bbhUF&eCo/uj^UH0IA:dkbKm=`^"LGHqh8fmbQOsUr.&kDjpAQ$F\.TI6I3\q&'0I$rEW63pmh=:P7KgRunc2k4&2eBn7BakOj+dETHLX@tLs'?$+)]DDW9'9=Z'ShFpjk:lhP3SlL_@"p>Y1h2A]PdP?NhKU\ZGF[n<S)1:4_!3GXL"KiM/hg]_pIdT_fsp;%f%Xa'%QhE9\@TM6s[7'<(2F:]PX2ZVLttMRn\Pe7(7n/<(tk\jl7)pkaID9;,0LRa0OT#%&`#p"kiI0ifJ4(:1D1d4,S[IZKDe,=0qPN.rL@Mkp^6s*G==0-=laDTYR<$@*KVqXAF)LR<l:u$/UsBA&$!!FIM?m$J-PgL.V=MB+f]UYr'^ArUE_gqRCG^;HGiX.bt!0`]RU9+S/(:1!@gMGA\f7;O0fj-#n!$&u[S^]\T3L!IWd70N_3oV6+0tRs[$qNW-,md5Qk^8d(.H:.JEE4rO)3985LUI9H6p=P/\/mgfm2K->]<Kr0J_`!9@(<2N!f[_/*n@6,:4$!B1bW?&-Fq:H",i;K'C*p)<0^<5OkTS7>#(@dXCTc$+\Z?G.!rU/cf=iiP)[M%;\%/u[:oV3s*M`S8NrA/lT<pm#?^lJu2],t<X-"k.i2oGdlIOL]n;3TqUShE(S@].6X"6!R-?'X`&;9V`9;6$atS!=>4^>Z*>dokN<Cj14r5Vo[)n71-g#soG_&KDtt_'ftW3'4&_VD,e_3_i!2$0nn>bp-,3E@!#O27>kR,MFZJjn[hq+MXq06u7ON58j5A:ImQe#RKW]#cEN=<3-kuFt7d2R6/5EB:7jA<YOd&c'eOL!DDF*1)RB#C,X7V=Y37=pR;_X$pTr$UC^=skIV.`F8XoVP2XM"o;'#?Gr\Nl=EFMS.F;D`>1=/L7).V&R'0oO\j?\_hZhM/dR'ZF'&bt9J,JqO"Po?.DE/,Qp,(:D<sYkJ2TTkHQVU>jr1p6jPK&DfT*8&2#Ue(%NYW0RpOM[eXPS(/]8#`KAVD?6%!.eeXdHCSEJ,\)cfLfRNEKX,go.0-_Mi'DXiG%0A-ZnA%T]J^UeZ\#Ag4`"?f+dG<(o;oTFTi$R`ZL$'sFQ\E3l7&@I_6H/*9PkWJdcDBP0]<q#an&o0)0daY),`FhfulXmJb/p,\`F&td-G6r.47E5r1e):'7-'25G#HI<B]&%ICZbRCcQK#c49Gjqr2h]JQ[:rA6=O&>*7&`b#)e!Na*QaRGSqq>A,4?7rO0O\C[;0M_<fr6:DBJl/.Js5t8dHkKp$Rd)dqB_Fm*u0F81s:Kt[QlY4iKb]e8jONle3ufp!-AYZC?@0QYup6[l5\OrH6<+s`-5!":),KWd6Zt,AA2t-5Ckf>UX)aIA]M..6Y$"dEtGPu1UZC!0Xe`l7a*)!b*`.rBZ).&1SW:8(_J6FoMcbZ1B^hh+f[I6L77hX<qo;H6#TCXGBh:113W:J((>5VRcFdhQjY\ljLG%p_7RClhS-k*8$[ZS"Pf">[U[C*%&88kjCk,U/A.\io_@Yf8jY&_Hceum9bW)7[D9<L#R7ahT`up7lWqK]!X8"V%.'J'0dSVA:M_8UZ7]//4gb=D!R0Rc%-ohV$`QNVTndp.4fAjZ@*Q;&PqlsUaVLU-Ka)e-F.L6EmlOQU8!$ZD0mPN*r5ROWT5k?HF`LB7N%76\BN]QV%<O*M^Y;t@&&1F2;"K&.gb<o8j#)_1]!fEt2?F'eDI5"Rc92mNUO$)7p40l7osQ<!gC*._n+QJ&=2W`)<*Oc$NF[,:jFeFNn$1FkPquG<\e#B"VX#W>(fWQ#-8_<NR]sWO=m?Q5_N%Rpm"FbnTHgF]=e-0t74=Qae<91*csmQM!*J<^gBgW](mQ+5Og6A&H6#qk(7jd;Q/MG)I[)3?MXo'k2UCt50[6.OgLf/9&,mU1_6B'$It-ki-\.%k$ot8>Y5<\*4NMk)?QHfpg@p")]l!VlN*B-U=D3K#@JOjc#n:6TmtVn,RhPc4Wu#F$2KTWs0WUmt_c.O6b`eV(//+i,X0UU([XU)WNUMF%&RF8bm[e*.YBV&,N.E4T/'\Fgh5.2BkX7LaV)eZM68+!Lc<c-^#V[j*#[R4q*8YR$5IEH#A_5(qB_t\$QF0[8D6q>JVS)'XE&9$IctiF-\AgAh:1F3?bhRUj^\n0?`3]9O?N&O>@.B((`,&Ye)1R'aTsaJoOJe"IE9q?^P_DqXh:p<$HcJ>=k99FA'4A$!<Gg_).Q"dRY:o3oq/GT4']P/AX8_eR<`G?sHo&$03&&ZFkYNl&5?qPWnol0>If/W#Rt(J-iMZ,af)2(lJHg<T^H7!1%&%?a2t".g*m.MAk!d'.+*_"Yk/h#6YNN;fU$iDO.?o<&B">[j"Q4;\cR&s$Cf?XV=iWp9TY/#:j*uTN@2o,gC!%A6\e4Y8Y"nMJ6C=6SNVZ?)_`i-\M='AQlL7-`>`;c:Fi[a"WnHQ0#q^Ng*rK!/G,h*4%mPptnZ&-nMXL/6g<#IU7EW+<+Cb=p9[KEQ2k@%(m0a@JeVChA%UWi`KOPURLU>PL:0.o5]nf,6\Br11S)66/Ae;UhqUO%E+ofDf2>)^`s)k[5)<.ut.R_k_kj\V></hsMIM'c;A5J8\TbeSi&SofB>N"g\#GhmoQVOLd(r-O(OK+eS>RqLV%5VB81">DG2@Gtgjg<t#L4"^>jA/ho@2j+e]%-s8dJ_#iS+609!\;-L5<qSQ?W8W*N]?XblfDYA%)]%>Z`(04=8Tl4A^pXl.Mt;s&WE*JSW@eJQ_(Kf-dS`-*i#8mVI.4+ad1=Ql)8&_8^s@4^-"R:`m?`#WXh@$6a&_@mt-tn6'uJpClr<1o/$!I?/tNFRZ[:^GJ0K>q$:Jr`hrFue1Dm<Ck(T-(3EdiJ"(";rG3POZm7lOWg]FZ3HBp,PZ`ao5T.@JQ>bmQd$C/<mo\BMYn'YH%aVGlcSV8KPoYIqn60(iX2t;AVV._.~>
 endstream
 endobj
 57 0 obj
@@ -828,7 +835,7 @@
 1 0 obj
 << /Type /Pages
 /Count 13
-/Kids [6 0 R 11 0 R 13 0 R 16 0 R 22 0 R 24 0 R 26 0 R 32 0 R 40 0 R 45 0 R 53 0 R 57 0 R 66 0 R ] >>
+/Kids [6 0 R 11 0 R 13 0 R 16 0 R 22 0 R 24 0 R 26 0 R 32 0 R 40 0 R 45 0 R 55 0 R 57 0 R 66 0 R ] >>
 endobj
 2 0 obj
 << /Type /Catalog
@@ -871,7 +878,7 @@
 75 0 obj
 <<
 /S /GoTo
-/D [6 0 R /XYZ -5.0 89.772 null]
+/D [11 0 R /XYZ -5.0 683.4 null]
 >>
 endobj
 77 0 obj
@@ -931,25 +938,25 @@
 96 0 obj
 <<
 /S /GoTo
-/D [45 0 R /XYZ -5.0 264.68 null]
+/D [45 0 R /XYZ -5.0 274.54 null]
 >>
 endobj
 98 0 obj
 <<
 /S /GoTo
-/D [45 0 R /XYZ -5.0 100.908 null]
+/D [45 0 R /XYZ -5.0 110.768 null]
 >>
 endobj
 100 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ -5.0 511.78 null]
+/D [55 0 R /XYZ -5.0 524.98 null]
 >>
 endobj
 102 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ -5.0 395.466 null]
+/D [55 0 R /XYZ -5.0 408.666 null]
 >>
 endobj
 104 0 obj
@@ -979,125 +986,125 @@
 xref
 0 120
 0000000000 65535 f 
-0000135627 00000 n 
-0000135770 00000 n 
-0000135862 00000 n 
+0000135816 00000 n 
+0000135959 00000 n 
+0000136051 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000002701 00000 n 
-0000002821 00000 n 
-0000002852 00000 n 
-0000003049 00000 n 
-0000003236 00000 n 
-0000005631 00000 n 
-0000005739 00000 n 
-0000006942 00000 n 
-0000007050 00000 n 
-0000008775 00000 n 
-0000086942 00000 n 
-0000087065 00000 n 
-0000087099 00000 n 
-0000136068 00000 n 
-0000087238 00000 n 
-0000087372 00000 n 
-0000089786 00000 n 
-0000089894 00000 n 
-0000092240 00000 n 
-0000092348 00000 n 
-0000095248 00000 n 
-0000095371 00000 n 
-0000095405 00000 n 
-0000095579 00000 n 
-0000095774 00000 n 
-0000099504 00000 n 
-0000110212 00000 n 
-0000110335 00000 n 
-0000110390 00000 n 
-0000110602 00000 n 
-0000110777 00000 n 
-0000110952 00000 n 
-0000111144 00000 n 
-0000111322 00000 n 
-0000113801 00000 n 
-0000113924 00000 n 
-0000113958 00000 n 
-0000114167 00000 n 
-0000114362 00000 n 
-0000117598 00000 n 
-0000117721 00000 n 
-0000117776 00000 n 
-0000117974 00000 n 
-0000118185 00000 n 
-0000118392 00000 n 
-0000118591 00000 n 
-0000118789 00000 n 
-0000122124 00000 n 
-0000122247 00000 n 
-0000122274 00000 n 
-0000122484 00000 n 
-0000126563 00000 n 
-0000126686 00000 n 
-0000126748 00000 n 
-0000126948 00000 n 
-0000127144 00000 n 
-0000127335 00000 n 
-0000127505 00000 n 
-0000127699 00000 n 
-0000127902 00000 n 
-0000128887 00000 n 
-0000129010 00000 n 
-0000129044 00000 n 
-0000129234 00000 n 
-0000136132 00000 n 
-0000136184 00000 n 
-0000129427 00000 n 
-0000136247 00000 n 
-0000129591 00000 n 
-0000136312 00000 n 
-0000129804 00000 n 
-0000136376 00000 n 
-0000130033 00000 n 
-0000136440 00000 n 
-0000130298 00000 n 
-0000136506 00000 n 
-0000130586 00000 n 
-0000130934 00000 n 
-0000136572 00000 n 
-0000131265 00000 n 
-0000136637 00000 n 
-0000131494 00000 n 
-0000136703 00000 n 
-0000131643 00000 n 
-0000136767 00000 n 
-0000131806 00000 n 
-0000136833 00000 n 
-0000131944 00000 n 
-0000136899 00000 n 
-0000132309 00000 n 
-0000136963 00000 n 
-0000132649 00000 n 
-0000137028 00000 n 
-0000132870 00000 n 
-0000137094 00000 n 
-0000133213 00000 n 
-0000137160 00000 n 
-0000133441 00000 n 
-0000137227 00000 n 
-0000133643 00000 n 
-0000137292 00000 n 
-0000134048 00000 n 
-0000137359 00000 n 
-0000134292 00000 n 
-0000137426 00000 n 
-0000134487 00000 n 
-0000134734 00000 n 
-0000134848 00000 n 
-0000134959 00000 n 
-0000135071 00000 n 
-0000135180 00000 n 
-0000135293 00000 n 
-0000135400 00000 n 
-0000135517 00000 n 
+0000002371 00000 n 
+0000002491 00000 n 
+0000002522 00000 n 
+0000002719 00000 n 
+0000002906 00000 n 
+0000005239 00000 n 
+0000005347 00000 n 
+0000006920 00000 n 
+0000007028 00000 n 
+0000008753 00000 n 
+0000086920 00000 n 
+0000087043 00000 n 
+0000087077 00000 n 
+0000136257 00000 n 
+0000087216 00000 n 
+0000087350 00000 n 
+0000089764 00000 n 
+0000089872 00000 n 
+0000092218 00000 n 
+0000092326 00000 n 
+0000095226 00000 n 
+0000095349 00000 n 
+0000095383 00000 n 
+0000095557 00000 n 
+0000095752 00000 n 
+0000099507 00000 n 
+0000110215 00000 n 
+0000110338 00000 n 
+0000110393 00000 n 
+0000110605 00000 n 
+0000110780 00000 n 
+0000110955 00000 n 
+0000111147 00000 n 
+0000111325 00000 n 
+0000113850 00000 n 
+0000113973 00000 n 
+0000114007 00000 n 
+0000114216 00000 n 
+0000114411 00000 n 
+0000117935 00000 n 
+0000118058 00000 n 
+0000118127 00000 n 
+0000118325 00000 n 
+0000118536 00000 n 
+0000118743 00000 n 
+0000118942 00000 n 
+0000119140 00000 n 
+0000119355 00000 n 
+0000119567 00000 n 
+0000122563 00000 n 
+0000122671 00000 n 
+0000126752 00000 n 
+0000126875 00000 n 
+0000126937 00000 n 
+0000127137 00000 n 
+0000127333 00000 n 
+0000127524 00000 n 
+0000127694 00000 n 
+0000127888 00000 n 
+0000128091 00000 n 
+0000129076 00000 n 
+0000129199 00000 n 
+0000129233 00000 n 
+0000129423 00000 n 
+0000136321 00000 n 
+0000136373 00000 n 
+0000129616 00000 n 
+0000136436 00000 n 
+0000129780 00000 n 
+0000136501 00000 n 
+0000129993 00000 n 
+0000136565 00000 n 
+0000130222 00000 n 
+0000136629 00000 n 
+0000130487 00000 n 
+0000136695 00000 n 
+0000130775 00000 n 
+0000131123 00000 n 
+0000136761 00000 n 
+0000131454 00000 n 
+0000136826 00000 n 
+0000131683 00000 n 
+0000136892 00000 n 
+0000131832 00000 n 
+0000136956 00000 n 
+0000131995 00000 n 
+0000137022 00000 n 
+0000132133 00000 n 
+0000137088 00000 n 
+0000132498 00000 n 
+0000137152 00000 n 
+0000132838 00000 n 
+0000137217 00000 n 
+0000133059 00000 n 
+0000137283 00000 n 
+0000133402 00000 n 
+0000137349 00000 n 
+0000133630 00000 n 
+0000137416 00000 n 
+0000133832 00000 n 
+0000137481 00000 n 
+0000134237 00000 n 
+0000137548 00000 n 
+0000134481 00000 n 
+0000137615 00000 n 
+0000134676 00000 n 
+0000134923 00000 n 
+0000135037 00000 n 
+0000135148 00000 n 
+0000135260 00000 n 
+0000135369 00000 n 
+0000135482 00000 n 
+0000135589 00000 n 
+0000135706 00000 n 
 trailer
 <<
 /Size 120
@@ -1105,5 +1112,5 @@
 /Info 4 0 R
 >>
 startxref
-137493
+137682
 %%EOF

Modified: forrest/site/faq.html
==============================================================================
--- forrest/site/faq.html	(original)
+++ forrest/site/faq.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,22 +57,13 @@
 <td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Home</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Welcome</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
-</tr>
-<tr>
-<td colspan="3" height="1"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -81,7 +72,7 @@
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -163,40 +154,6 @@
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Getting Involved</font>
-<ul>
-    
-<li>
-<a href="contrib.html">Contributing</a>
-</li>
-    
-<li>
-<a href="build.html">Building Forrest</a>
-</li>
-    
-<li>
-<a class="external" href="http://svn.apache.org/viewcvs.cgi/forrest/trunk/?root=Apache-SVN">Browse SVN</a>
-</li>
-    
-<li>
-<a href="mail-lists.html">Mail lists</a>
-</li>
-    
-<li>
-<a href="mail-archives.html">Mail Archives</a>
-</li>
-    
-<li>
-<a class="external" href="http://issues.cocoondev.org/jira/secure/BrowseProject.jspa?id=10000">Bugs and Issues</a>
-</li>
-    
-<li>
-<a href="forrest-issues.html">Open Issues</a>
-</li>
-  
-</ul>
-</li>
-<li>
 <font color="#CFDCED">Related projects</font>
 <ul>
     
@@ -215,6 +172,10 @@
 <li>
 <a class="external" href="http://xml.apache.org/">Apache XML</a>
 </li>
+    
+<li>
+<a href="http://www.apache.org/~vgritsenko/stats/">Apache Stats</a>
+</li>
   
 </ul>
 </li>
@@ -722,7 +683,7 @@
          structure and navigation, rather than the old book.xml method.
        </p>
 </div>
-<a name="N1015B"></a><a name="clickable-email-adress"></a>
+<a name="N1015A"></a><a name="clickable-email-adress"></a>
 <h5>2.2. How can I generate html-pages to show a 
       'clickable' email-address (of the author-element)?<span style="float: right"><a href="#clickable-email-adress-menu">^</a></span>
 </h5>
@@ -732,7 +693,7 @@
        and edit the "headers/authors" template.
        </p>
 </div>
-<a name="N10166"></a><a name="CVS_revison_tags"></a>
+<a name="N10165"></a><a name="CVS_revison_tags"></a>
 <h5>2.3. How can I generate html-pages to show the
       revision tag of cvs?<span style="float: right"><a href="#CVS_revison_tags-menu">^</a></span>
 </h5>
@@ -745,7 +706,7 @@
 <p>This technique could also be used for a modification date with
       $Date: 2004/01/15 08:52:47 $</p>
 </div>
-<a name="N10178"></a><a name="ignoring_javadocs"></a>
+<a name="N10177"></a><a name="ignoring_javadocs"></a>
 <h5>2.4. 
         How do I stop Forrest breaking on links to external files that may not
         exist, like javadocs?
@@ -787,7 +748,7 @@
         </div>
 </div>
 </div>
-<a name="N101AD"></a><a name="link_raw"></a>
+<a name="N101AB"></a><a name="link_raw"></a>
 <h5>2.5. How do I link to raw files such as config.txt and brochure.pdf?
       <span style="float: right"><a href="#link_raw-menu">^</a></span>
 </h5>
@@ -807,7 +768,7 @@
          <span class="codefrag">src/documentation/content/tools/</span> directory.
         </p>
 </div>
-<a name="N101C7"></a><a name="build_msg_a"></a>
+<a name="N101C5"></a><a name="build_msg_a"></a>
 <h5>2.6. What do the symbols and numbers mean when Forrest lists each
         document that it has built?
       <span style="float: right"><a href="#build_msg_a-menu">^</a></span>
@@ -829,7 +790,7 @@
          Column 4 is the page size.
         </p>
 </div>
-<a name="N101D4"></a><a name="pdf_images"></a>
+<a name="N101D1"></a><a name="pdf_images"></a>
 <h5>2.7. Images don't display in PDFs. How do I fix this?<span style="float: right"><a href="#pdf_images-menu">^</a></span>
 </h5>
 <div style="margin-left: 15 ; border: 2px">
@@ -871,7 +832,7 @@
           Forrest</div>
 </div>
 </div>
-<a name="N10206"></a><a name="index.html"></a>
+<a name="N10203"></a><a name="index.html"></a>
 <h5>2.8. 
         The tab link in my site incorrectly assumes that 'index.html' is present in
         the linked-to directory. How do I fix this?
@@ -895,7 +856,7 @@
     &lt;map:redirect-to uri="manual/Introduction.html"/&gt;
   &lt;/map:match&gt;</pre>
 </div>
-<a name="N10224"></a><a name="headless_operation"></a>
+<a name="N1021F"></a><a name="headless_operation"></a>
 <h5>2.9. 
         When generating PNG images from SVG, I get an error: Can't connect to X11 window server using ':0.0' as the value of the DISPLAY variable.
       <span style="float: right"><a href="#headless_operation-menu">^</a></span>
@@ -912,7 +873,7 @@
           <a class="external" href="http://cocoon.apache.org/2.1/faq/faq-configure-environment.html">Cocoon FAQ</a>.
         </p>
 </div>
-<a name="N10241"></a><a name="catalog"></a>
+<a name="N1023B"></a><a name="catalog"></a>
 <h5>2.10. 
         How do i configure my favourite XML editor or parser to find the
         local Forrest DTDs?
@@ -925,7 +886,7 @@
           local DTDs</a>.
         </p>
 </div>
-<a name="N1024D"></a><a name="xsp"></a>
+<a name="N10247"></a><a name="xsp"></a>
 <h5>2.11. How do I enable XSP processing?<span style="float: right"><a href="#xsp-menu">^</a></span>
 </h5>
 <div style="margin-left: 15 ; border: 2px">
@@ -969,7 +930,7 @@
 <p>See also the 
         <a class="external" href="http://wiki.cocoondev.org/Wiki.jsp?page=AddingXSPToForrest">AddingXSPToForrest</a> Wiki page.</p>
 </div>
-<a name="N10284"></a><a name="breadcrumbs"></a>
+<a name="N1027C"></a><a name="breadcrumbs"></a>
 <h5>2.12. How do breadcrumbs work?  Why don't they work locally?<span style="float: right"><a href="#breadcrumbs-menu">^</a></span>
 </h5>
 <div style="margin-left: 15 ; border: 2px">
@@ -990,10 +951,10 @@
       </p>
 </div>
 </div>
-<a name="N1029A"></a><a name="old_faqs"></a>
+<a name="N10291"></a><a name="old_faqs"></a>
 <h4>3. Older versions</h4>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N1029E"></a><a name="unresolved_project.home"></a>
+<a name="N10295"></a><a name="unresolved_project.home"></a>
 <h5>3.1. When invoking Forrest 0.4 from the
         forrest.antproxy.xml, the build fails because
         ${project.home} isn't resolved.
@@ -1013,7 +974,7 @@
        &lt;classpath refid="forrest-classpath"/&gt;
        &lt;jvmarg value="-Dforrest.home=${forrest.home}"/&gt;</pre>
 </div>
-<a name="N102B4"></a><a name="odd_html"></a>
+<a name="N102AA"></a><a name="odd_html"></a>
 <h5>3.2. 
         After upgrading to 0.4 my HTML looks significantly different, and table
         widths are wrong. What happened?
@@ -1034,7 +995,7 @@
 <pre class="code">
   &lt;doctype-system&gt;http://www.w3.org/TR/html4/loose.dtd&lt;/doctype-system&gt;</pre>
 </div>
-<a name="N102CC"></a><a name="validation_error-doctype_root_null"></a>
+<a name="N102C0"></a><a name="validation_error-doctype_root_null"></a>
 <h5>3.3. 
         When building my project, I get an validation error: Document root
           element "site", must match DOCTYPE root "null"..
@@ -1055,7 +1016,7 @@
           listed to prevent an attempt at DTD-based validation.
         </p>
 </div>
-<a name="N102E9"></a><a name="building_error-custom_sitemap"></a>
+<a name="N102DD"></a><a name="building_error-custom_sitemap"></a>
 <h5>3.4. 
         When building my project, I get any of these errors: 
 	menu.xmap (The system cannot find the file specified)
@@ -1070,10 +1031,10 @@
         </p>
 </div>
 </div>
-<a name="N102FE"></a><a name="general"></a>
+<a name="N102F2"></a><a name="general"></a>
 <h4>4. General</h4>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N10302"></a><a name="generating_menus"></a>
+<a name="N102F6"></a><a name="generating_menus"></a>
 <h5>4.1. What is the relationship between site.xml and
         book.xml?
       <span style="float: right"><a href="#generating_menus-menu">^</a></span>
@@ -1090,7 +1051,7 @@
           See <a href="docs/linking.html">Menus and Linking</a>.
       </p>
 </div>
-<a name="N1031D"></a><a name="docbook"></a>
+<a name="N10311"></a><a name="docbook"></a>
 <h5>4.2. 
         How do I use DocBook as the xml documentation format?
       <span style="float: right"><a href="#docbook-menu">^</a></span>
@@ -1136,7 +1097,7 @@
          for configuration guidance.
         </p>
 </div>
-<a name="N1033B"></a><a name="version"></a>
+<a name="N1032E"></a><a name="version"></a>
 <h5>4.3. 
         How to report which version of Forrest is being used and the
         properties that are set?
@@ -1153,7 +1114,7 @@
           Doing <span class="codefrag">'forrest -v'</span> will provide verbose build messages.
         </p>
 </div>
-<a name="N1034F"></a><a name="how_can_I_help"></a>
+<a name="N10342"></a><a name="how_can_I_help"></a>
 <h5>4.4. 
         How can I help?
       <span style="float: right"><a href="#how_can_I_help-menu">^</a></span>

Modified: forrest/site/forrest-issues.html
==============================================================================
--- forrest/site/forrest-issues.html	(original)
+++ forrest/site/forrest-issues.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -55,33 +55,24 @@
 <table summary="tab bar" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Home</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="contrib.html">Project</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -124,45 +115,6 @@
 <div class="menu">
 <ul>
 <li>
-<font color="#CFDCED">About</font>
-<ul>
-    
-<li>
-<a href="index.html">Index</a>
-</li>
-    
-<li>
-<a href="license.html">License</a>
-</li>
-    
-<li>
-<a href="http://www.apache.org/dyn/closer.cgi/xml/forrest/">Download</a>
-</li>
-    
-<li>
-<a href="who.html">Who we are</a>
-</li>
-    
-<li>
-<a href="faq.html">FAQs</a>
-</li>
-    
-<li>
-<a href="changes.html">Changes</a>
-</li>
-    
-    
-<li>
-<a href="todo.html">Todo</a>
-</li>
-    
-<li>
-<a href="live-sites.html">Example sites</a>
-</li>
-  
-</ul>
-</li>
-<li>
 <font color="#CFDCED">Getting Involved</font>
 <ul>
     
@@ -196,28 +148,6 @@
   
 </ul>
 </li>
-<li>
-<font color="#CFDCED">Related projects</font>
-<ul>
-    
-<li>
-<a class="external" href="http://gump.apache.org/">Apache Gump</a>
-</li>
-    
-<li>
-<a class="external" href="http://cocoon.apache.org/">Apache Cocoon</a>
-</li>
-    
-<li>
-<a class="external" href="http://cocoon.apache.org/lenya/">Apache Lenya</a>
-</li>
-    
-<li>
-<a class="external" href="http://xml.apache.org/">Apache XML</a>
-</li>
-  
-</ul>
-</li>
 </ul>
 </div>
 <!--================= end Menu items ==================-->
@@ -263,31 +193,31 @@
 </table>
 <ul class="minitoc">
 <li>
-<a href="#Update+forrestbar+to+be+installablein+Mozilla+Firefox+0.9">Update forrestbar to be installablein Mozilla Firefox 0.9</a>
+<a href="#local+stylesheets+for+a+user+project+not+found">local stylesheets for a user project not found</a>
 </li>
 <li>
-<a href="#krysalis-site%3A+page+minitoc+width+too+large+in+some+browsers">krysalis-site: page minitoc width too large in some browsers</a>
+<a href="#Rounded+corner+colors+not+right+in+IE">Rounded corner colors not right in IE</a>
 </li>
 <li>
-<a href="#krysalis-site%3A+minitoc+config+in+skinconf+not+working">krysalis-site: minitoc config in skinconf not working</a>
+<a href="#Javascript+error+in+Tigris+style">Javascript error in Tigris style</a>
 </li>
 <li>
-<a href="#build+test+-+target+fails%2C+still+refers+to+old+dist%2Fshbat%2F+stuff">build test - target fails, still refers to old dist/shbat/ stuff</a>
+<a href="#establish+new+distribution+area+for+Forrest%2C+enable+mirror">establish new distribution area for Forrest, enable mirror</a>
 </li>
 <li>
-<a href="#InvocationTargetException+on+shutdown+from+forrest+run">InvocationTargetException on shutdown from forrest run</a>
+<a href="#Have+%40class+attribute+in+DTD+for+every+tag">Have @class attribute in DTD for every tag</a>
 </li>
 <li>
-<a href="#brokenlinks+file+is+generated+in+forrest.home+rather+than+project.home">brokenlinks file is generated in forrest.home rather than project.home</a>
+<a href="#build+test+-+target+fails%2C+still+refers+to+old+dist%2Fshbat%2F+stuff">build test - target fails, still refers to old dist/shbat/ stuff</a>
 </li>
 <li>
-<a href="#broken+links+building+forrest+site">broken links building forrest site</a>
+<a href="#InvocationTargetException+on+shutdown+from+forrest+run">InvocationTargetException on shutdown from forrest run</a>
 </li>
 <li>
-<a href="#linkrewriting+not+done+for+aggregate+pages">linkrewriting not done for aggregate pages</a>
+<a href="#brokenlinks+file+is+generated+in+forrest.home+rather+than+project.home">brokenlinks file is generated in forrest.home rather than project.home</a>
 </li>
 <li>
-<a href="#Creating+PDF+out+of+muti-language+documents">Creating PDF out of muti-language documents</a>
+<a href="#linkrewriting+not+done+for+aggregate+pages">linkrewriting not done for aggregate pages</a>
 </li>
 <li>
 <a href="#Fix+build+process+to+include+JAR+libs+in+WAR+file+again">Fix build process to include JAR libs in WAR file again</a>
@@ -295,9 +225,6 @@
 <li>
 <a href="#%5BPATCH%5D+Use+on+Windows+98">[PATCH] Use on Windows 98</a>
 </li>
-<li>
-<a href="#DTDs+available+via+Forrest+site+as+well+as+catalog+entity+resolver">DTDs available via Forrest site as well as catalog entity resolver</a>
-</li>
 </ul>
 <div class="frame note">
 <div class="label">Note</div>
@@ -307,31 +234,59 @@
        <a class="external" href="http://issues.cocoondev.org/jira/secure/IssueNavigator.jspa?pid=10000&resolutionIds=-1&tempMax=1000&reset=true">all</a> open issues).
       The listing below is regenerated on each Forrest run.</div>
 </div>
-<a name="N10011"></a><a name="Update+forrestbar+to+be+installablein+Mozilla+Firefox+0.9"></a>
-<h3>Update forrestbar to be installablein Mozilla Firefox 0.9</h3>
+<a name="N10011"></a><a name="local+stylesheets+for+a+user+project+not+found"></a>
+<h3>local stylesheets for a user project not found</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
-<a class="external" href="http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-180">http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-180</a>
+<a class="external" href="http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-198">http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-198</a>
 </p>
-<p>Firefox 0.9 will get a new extension install system, with which we must be compatible to be usable there. Being listed in the standard toolbars could be cool too.</p>
+<p>When a user project defines their own sitemap and stylesheets, then the sitemaps are over-ridden okay, but their local stylesheets are not found.</p>
 </div>
-<a name="N1001F"></a><a name="krysalis-site%3A+page+minitoc+width+too+large+in+some+browsers"></a>
-<h3>krysalis-site: page minitoc width too large in some browsers</h3>
+<a name="N1001F"></a><a name="Rounded+corner+colors+not+right+in+IE"></a>
+<h3>Rounded corner colors not right in IE</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
-<a class="external" href="http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-178">http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-178</a>
+<a class="external" href="http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-196">http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-196</a>
 </p>
-<p>krysalis-site: The page minitoc width is too large in IE.</p>
+<p>IE does not use the css for corners as other browsers do, and takes only the last declared value, thus resulting in wrongly colored corners.</p>
 </div>
-<a name="N1002D"></a><a name="krysalis-site%3A+minitoc+config+in+skinconf+not+working"></a>
-<h3>krysalis-site: minitoc config in skinconf not working</h3>
+<a name="N1002D"></a><a name="Javascript+error+in+Tigris+style"></a>
+<h3>Javascript error in Tigris style</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
-<a class="external" href="http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-176">http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-176</a>
+<a class="external" href="http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-194">http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-194</a>
 </p>
-<p>The minitoc should be configurable in the skinconf, but it does not work.</p>
+<p>HTML Code for tigris-style calls js-function &quot;init()&quot; in
+<br>
+the onLoad handler of the HTML body tag. This function is
+<br>
+however provided only in the file fontsize.js, which is
+<br>
+not included in the tigris-style. So, either the call to 
+<br>
+init() should be omitted or the script file &quot;fontsize.js&quot;
+<br>
+added.</p>
 </div>
-<a name="N1003B"></a><a name="build+test+-+target+fails%2C+still+refers+to+old+dist%2Fshbat%2F+stuff"></a>
+<a name="N1003B"></a><a name="establish+new+distribution+area+for+Forrest%2C+enable+mirror"></a>
+<h3>establish new distribution area for Forrest, enable mirror</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>
+<a class="external" href="http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-193">http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-193</a>
+</p>
+<p>Need to establish the new distribution area for Forrest at
+<br>
+/www/<a href="http://www.apache.org/">www.apache.org/</a> dist/forrest/</p>
+</div>
+<a name="N10049"></a><a name="Have+%40class+attribute+in+DTD+for+every+tag"></a>
+<h3>Have @class attribute in DTD for every tag</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>
+<a class="external" href="http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-174">http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-174</a>
+</p>
+<p>Add @class attribute to all tags so that the extra-css section in the skinconf can be put to good use.</p>
+</div>
+<a name="N10057"></a><a name="build+test+-+target+fails%2C+still+refers+to+old+dist%2Fshbat%2F+stuff"></a>
 <h3>build test - target fails, still refers to old dist/shbat/ stuff</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -339,7 +294,7 @@
 </p>
 <p>Runing the 'build test' fails. It has not yet been adjusted after the merge of the &quot;copyless&quot; branch.</p>
 </div>
-<a name="N10049"></a><a name="InvocationTargetException+on+shutdown+from+forrest+run"></a>
+<a name="N10065"></a><a name="InvocationTargetException+on+shutdown+from+forrest+run"></a>
 <h3>InvocationTargetException on shutdown from forrest run</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -349,7 +304,7 @@
 <br>
 an InvocationTargetException is issued.</p>
 </div>
-<a name="N10057"></a><a name="brokenlinks+file+is+generated+in+forrest.home+rather+than+project.home"></a>
+<a name="N10073"></a><a name="brokenlinks+file+is+generated+in+forrest.home+rather+than+project.home"></a>
 <h3>brokenlinks file is generated in forrest.home rather than project.home</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -365,23 +320,7 @@
 <br>
 Symptom of a larger issue - how to call the CLI properly and how best to configure it.</p>
 </div>
-<a name="N10065"></a><a name="broken+links+building+forrest+site"></a>
-<h3>broken links building forrest site</h3>
-<div style="margin-left: 0 ; border: 2px">
-<p>
-<a class="external" href="http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-156">http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-156</a>
-</p>
-<p>I removed the forrest site's cli.xconf since it's only significant differences from the default cli.xconf were ignoring ext:** and site:** which we didn't want anyway.
-<br>
-
-<br>
-Now there are many broken links reported when building the site.  However, it seems that there are no broken links on the generated pages.
-<br>
-
-<br>
-So there's a bug in the CLI I think.</p>
-</div>
-<a name="N10073"></a><a name="linkrewriting+not+done+for+aggregate+pages"></a>
+<a name="N10081"></a><a name="linkrewriting+not+done+for+aggregate+pages"></a>
 <h3>linkrewriting not done for aggregate pages</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -389,14 +328,6 @@
 </p>
 <p>site: and ext: links are not rewritten for site.html or site.pdf</p>
 </div>
-<a name="N10081"></a><a name="Creating+PDF+out+of+muti-language+documents"></a>
-<h3>Creating PDF out of muti-language documents</h3>
-<div style="margin-left: 0 ; border: 2px">
-<p>
-<a class="external" href="http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-132">http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-132</a>
-</p>
-<p>When you transform a document with other characters than latin to PDF, in spite of the unicode(UTF-8) of the original file all characters get broken and isn't readable. please, does anyone have a simple solution for this?</p>
-</div>
 <a name="N1008F"></a><a name="Fix+build+process+to+include+JAR+libs+in+WAR+file+again"></a>
 <h3>Fix build process to include JAR libs in WAR file again</h3>
 <div style="margin-left: 0 ; border: 2px">
@@ -448,16 +379,6 @@
 
 <br>
 p.b.</p>
-</div>
-<a name="N100AB"></a><a name="DTDs+available+via+Forrest+site+as+well+as+catalog+entity+resolver"></a>
-<h3>DTDs available via Forrest site as well as catalog entity resolver</h3>
-<div style="margin-left: 0 ; border: 2px">
-<p>
-<a class="external" href="http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-107">http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-107</a>
-</p>
-<p>Proper editors can use the catalog entity resolver (<a href="http://forrest.apache.org/catalog.html">http://forrest.apache.org/catalog.html</a>). For dumb clients we will make the DTDs available from the website by using apache .htaccess redirect.
-<br>
-</p>
 </div>
 <div class="attribution"></div>
 </div>

Modified: forrest/site/forrest-issues.pdf
==============================================================================
--- forrest/site/forrest-issues.pdf	(original)
+++ forrest/site/forrest-issues.pdf	Thu Jun 17 23:57:47 2004
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 2438 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2381 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GatU5h/hVb&V&D>_5ElCjogP!VilL&mcL%Ndl,H>8KW8,TI<@,9b@^4>#tY!J,i+k-rP6T\N-(i!#CLKhgU+R\=P9i!tU0#l)f09Ac!jI/\V,,pQkBBr0=A%a!caBDgh-SGOr_7eF1(2:/X)m;f^_+rndOe\,OG7o6U,2PS)q$N9%i$9lV:EG\li.Z+k\Tc2:U7*+AX^-*dB=qb*1M*[BNRp>bN"qPqo#e\:r7QgS1a1hi;254VciQ1(2Z?a)FlL"@+oDA1?'C7G(8Qs/B$6o`]9r&5AO)qTD:d.\3WqqG?DJo.Wfp#sU9U@b;5;^T9l$HsqC^%CD%Gh$!"ZsGfU[Dd"DV$<!rG.=(X#<l>M=;u0a&5HCW7]iY.1'S"]!.l-1C8uo&8+.i.;]@tYa.+3nH>bg&<$[*c<[APm$\[+6=hqH1(s6b6a!_7'FW=a0k9(u\4.JoH/P:EZjSbmV@TFu]Fqt*VHD@Ff9l2uEUtmrA^?qbQE$uomTT&BILgFAkZr^>5/:UJC*nPWZ]\O')hsOAF*f=&gaA8rY]%7cMm5=$=l1'DRf)b(bl,EA&^YWobjc2U'eR\l#);q@/GmOhNP^_AgW^\fRnAs+ai;!-i=k:/$i8'6G%B8OtY(sj!-T,>#'-J!*7^B\2e1G6jDunNK2);(+#rV&^Wi\tB$DXO]M%>jMq7)^e3^MU0hddkB"bk!I1!G>.@(*$?%-N,fhb(uo$C?_<k`]RKXA69/ko-a%XLu3)cr'qa0Noj%;.?*O-G\333Wi\J>fi.KOd]br66*aC/@=S::30%n/U9aKm2,LCb8-"C8ohLYLXA7LAq,.MkJ,gOn7D$cb7TganY+B)M79AkQ7EZ;;g-*YCm!:GHQk#'fuKPO/4#j1WHkIn?s(G.QD&rt"5HB\J1A\]P/KO+)@glAJ.\3mO-qDm="R36?t=/m1O!.k(dXJe89>C[ZEF?.H(:_Nb)V1.(kl6b&QuflfG5Zp<YDDTQ?(\YgMs_qIojqDB7i\503M_s3<he@^s5'+B:8?h[3ZjnR-h_=Z6GTdk*C!:\"[gu!;RgKHRH2e1T(I3Z=3CD$0,(g-qpm<>;h'oc>,`p9LG(Th\\^P3Y=_fN,=`KZE06os-T3_VL>GcmliskNA/-R8#FfI?@\"C202sib5I":AZ9Ug/Z5HgiL_O1dL.JrA5!.>\c;edo-t$e*^/cii=-?S-Qitr>.:Y=]j`j*>RU&PU(&n-BuI/L\(_er"-D(6/!o1>9492qiJcsH&k"0@]":Xli.`O?NH"1Z*"92V"[fo'X>j$]2B*B%DR'lek27:;(3%0n9ZRTJCbi8G_OB<K$Fk[Q?=G2R/\!jeCVUYfnp8hTdMp!`:P$^@\gdG^RbI#K*'h.Un]&1lc%5?OJ3Sp-$6EjD[LIdNA@B0igfmXa'80(nG9BYlU:Z8-J,6RHinKtEcP>DD;m:X[F^@1c=.DbI<EY_@Jk)scBeF`7>-AY`5<n8j-q`-m_Im13@S9LIZX`WHd;1k7lkS;a=XaCi72C(fk;BceE?JKFnBJJ4l4)K@AC/Huc?3s@*>H4,1W2Aq^VGSr"KU[W`e40:iXRlTj8^O!a<iti5o0:fLA_j;Z2R+NLNQYNEVh<0Hlp=iWVeKpMMs`\\gm"Nq"g\+Z8rg?\NRd)DiBS]ViQuK$9-PoH&mp@PIt*UM+BjrH$ohrBc+%iUG%P`C@tUe`mFo/rE*drPh6[=Bb5scQ*P&VCtQ)*42&NnP.]S8VEX]iBhpJE%!Del7Sef^*UMV<F&$"tZN:=e>TiZT",:MYN45EBr`3@qE^A@r\buI;j>D=`Jr.mHcL$Mpa%9,R)_L[$7r+Ls.d$bVB*k\0Fg`980=$7S#T,,s\&:"2fn%4\Ue@+frgfY%,@MZFVq*LO1iWSch!9<^T`ib,kr&TYg7'4P8F?#OK^(V]bc;@>Fe*G0]-9MjF]!b>fI#<I[Zmc6`^XJ3DKBn9F7Np'cfnKf:BR\XV/OhOdP!ipJ^EBh^LiF'qlFUCSrN+G-.=8tPf7OL[!).t8^)-J_B,QAG4t`*)bUmu,7l"n5Zr=s;(r(6D9JL:.7l,2b_T>K]3o*i1oKa,OZ3@V$o#s:UQ=i'O]NDR*6s<"=^tbf:Wgc`@SX!=K-bUf_4c-tE#HQ.eF@lnp7/jG:,78Z+-+4F5TS0mEr?"Y8mP>___Q/5!GCgsKmCuMc[4n3fbJ_]-I:W+_.a`[hW]sXOYE>M\eY=rg]G4Igc4[0Cf.cJ)D(%1\Q2#iUB*7h`8mXkYk4T$:c[<F[4XKlY2D$;iFRWZ7dsE8@D&JSbD*?AG@"Y8UY&RjYO?!68g5oh)CuJ\SF8j0ctq&DaIXV14mIO@CDHfaddK>NqbM>)aQc,-peVc8[#3Va:l,tY8_uO2\M&W$oG'kofK9UH^YX@9Z)3<+9FbaQ$%'%MUHIQ)fDkph~>
+GatU5gN)%,&:N/3E:V@81DV9epG>I2S"!s:VKF`_6er!'Jje<,U$s6prVGMCE^>PFCF9cW])ib+h6R=okfmp#\T07fg/Ddq*)4DUGVlg/,@jOE?iH7i!ebF2&$=O=qYT9qL??g`0b-PLa[KC!2(bG's&cU'U\D+B2f?ORJa;i_5o='dS$7d8F\I5^M`!i<MXP!QdgLR&F,Zu>Loc23o?eYT2m\];%q['cO&''<@qm-`]#[@'S;!&2p)\:ga?;\3EYV\iWa^iN0U9DUCL^ELo/B^tk@X?1(SSWZI^d]d:j:;cIPg#)mI7j;P9I`5mH@i#C?kaBn=[>7Bf5Qceg=Ii'l#j_fO6MWGE<hR?NkA6d#n_aH6UiTU]<`H!.ek*.]Iu8,;31#L=SVg2_eO7q5VmX1nt1+R\aRa(Vk:PZNX5W[it?tZ#9l-0=QT/G1O;-Z(]9ae@Yca46rr)MOlC%fL,jEBnIUR2mdC>&[AEaHJ(Y!DVmjt60[?:'<SlSC?ob;OSDS*ppe@-j'k#rHFZBV\8NS^C_WDlFR(ZKg3R#lH,eIi?NZrud$efAhcuCf-lieqeYrd`l/8P7\IT%?Q$-;nAOek)n<'EbMW<ieh5P!X&+;tVb\>(?E'>h=(!UGYMumEq0hUH$PHJ"bd'<`EleL('OG)mWK\Dtj?A*1!fa.^TB.PB4-^N:HULcc+2,s>RP^Q->#Fg>$dMTKZZO5Ebo>NtDV1X5-q_GQXc^o0!BSFNDkQP7("m_"=.bZu*ZF%T/+k1j5WbV-Q1/[;A@hpkd0Bgu!`G0F_(1]2r1Sq^Eia_koglS/rkl0\oQg6A`_B[-`k$@5>2#gW$6/`$<efDe.iTVU.Th`u=WREH_1<h,mFuiCAWB$10b_=3(<u9PWMi/.a0jQ[jqr[Laig=l;.<TS0QaX7<([5DV1WJk(hHXu*=(et>E@:p,"P`H`[pbM2i&"386cbfM$kB`h_J0)[$KG=6L'8I$,):E(=iQ>>@-o.D,s[-]h8f7;b.nIkA=Te4)U1VV_$s[AO,pCGJ"REZ+*[W2p,.#Fa@8An_dUe8VL_3*#UjH@+TR4J+]-*gc\CF'3'sL=2i@6<`XV\)bmUs1%jip]A^?Mj.HhtdlgKbng&B2Z1/di>^7]JcZ.lV!-!<qqqo7pXJt2i+9HPoQ/Pu`5?,?)sE:'<u>Y\]nP;im06_p(39#j@45:,u>`rW%.M/5a$([2-'!%eP&MSOh2V5jY=LU,-"e;+e6]T:++7N0N=C;f)eLslpN,AP.;W"CCR^.J2DB"rd13=<_3iWn&R>IL2Z6K>\C.iFk^NX>K2dq)PuRbMkqXRiqoAa@_-J,!'NlGk_WX.,$:B1ao`UuqFgoAZ&"6Xh[mo$<7G$rt11,bq7&CjFIO5qM/7Yr?<WQ#.p]8Qm0$ZQj.^#r)\d%XgE*EegJ7l5b&*K^Iu(OaF.h8+edj-U=`^V%,&G$gHtV.kfAQVdOdMVZ."u>T+^NP#O;apNB^^35Ce=X8<C!nINL[2EprZ9`Je+3HWnUgi_(8H3DnXl)@cdkfo,+8l,Kk7$+W6"2$IG=4MFsRJemK(ZSEJB;-_!8lFaNZI7=E;'uZgG0]dq%OX`q]Nhss(jX_.k58fkRe`J*9>Q3e)N'b<9.B6,q'c?5DPJ*$=+O#K7*\j6qcftUGR)n9F7-u:`B,tp1_4"nEOU"Y1Z8p^l3smG%[:ns;2?\%pk\5e%4s.KTl(&_=D18r?;(7DCNU;;/aD80$!bE;iD=3LUW(>m\!t$\erkV;?Tuk7ih+q8__6=8`okIET&R_B]K/qqfQXno=DVHP<*i;EJ.t(I4=nU"*l-tEZ3BanR5ZQ@m'\DZ,qoHCjmQgM#*:=uFUosd%)$1Bhkh"#Xh#(->4Wk1U+(#(grEkZ(cpVQW-jg&?S<2p.sd9f-%1@N_4Co@WtJ;r$!<t[X+H:?\7S<BP>5N"9VT2[-O@n^TFiGW/7dX4>ohh>MD;>bhVXsc9&t[gTt1p1!=n:8$G!o,?9H4]:;r)WH7*E-!^\H='S_m>*/1j[kWFJ*b$$9Y3>%P+)69+I'>R%sa#al`>HN,UCloBekN^*^((HrQ8^F4.lT-u]WXMul4d(Z"]m,1BI0@)OaO'm1%oYBan7@S1DJSjGQn0aKFLnY):HqD/EaYCueml-#:C%2\r4F.tS=IK3kh-HsI7sXMS8VP(7$Z"B(uKh(l,G88q#<+KX+blFBjt2K[DA=;ms?E9a.$GfK.dF4nIWq7_o29jrE^%/9m9\(g?.(>BDKu.WAsq92]2mGf#)347ueqJhhfL`qFV4)l,)hS8:8VOWtb&'P/f3\^A+EJ:e';^%(+>:b0gam\?U&;LnnCj<d^T)Os<UBdukL$Xp=#lr"&KUVj%~>
 endstream
 endobj
 6 0 obj
@@ -61,7 +61,7 @@
 /Rect [ 0.0 579.056 305.076 567.056 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-180)
+/A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-198)
 /S /URI >>
 /H /I
 >>
@@ -72,7 +72,7 @@
 /Rect [ 0.0 492.322 305.076 480.322 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-178)
+/A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-196)
 /S /URI >>
 /H /I
 >>
@@ -80,10 +80,10 @@
 12 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 0.0 418.788 305.076 406.788 ]
+/Rect [ 0.0 405.588 305.076 393.588 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-176)
+/A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-194)
 /S /URI >>
 /H /I
 >>
@@ -91,10 +91,10 @@
 13 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 0.0 345.254 305.076 333.254 ]
+/Rect [ 0.0 305.654 305.076 293.654 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-171)
+/A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-193)
 /S /URI >>
 /H /I
 >>
@@ -102,10 +102,10 @@
 14 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 0.0 271.72 305.076 259.72 ]
+/Rect [ 0.0 218.92 305.076 206.92 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-170)
+/A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-174)
 /S /URI >>
 /H /I
 >>
@@ -113,10 +113,10 @@
 15 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 0.0 198.186 305.076 186.186 ]
+/Rect [ 0.0 145.386 305.076 133.386 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-165)
+/A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-171)
 /S /URI >>
 /H /I
 >>
@@ -127,16 +127,16 @@
 /Rect [ 0.0 71.852 305.076 59.852 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-156)
+/A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-170)
 /S /URI >>
 /H /I
 >>
 endobj
 17 0 obj
-<< /Length 2721 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2477 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GatU5l#YT;(B<g;K%!:0Vdi*R,uWE$NjITP]9?i*Fn;<pA0;MJ:m2%"6aET<rS&.,5s2sG](V)<mt^5fh%+tD31-5TSfaW)[oaYE^%HsF:&-IBbFp2;ctjVGMphLqnGKh@*)7^mVdUEfLCG]cQK0sVD28Y&=OWA?Zb_rNjB68.=[CG8`i>:c[E>!kC$2X1<O$b7XXguW)6TL)F1PP;L@@p.4]W"Bn$u(d<k'fo#P#LfLH'+R/(W'^D560lHh"ua2MN_7e_e$YO1$Zg+%9?LK*:;I@.#8R9UrYefuAT!:$4@:Sor<u.3sH%C;7Z5A:lP%c0P7gO)/G2>_\6U!d9-X+(lhAL0]tb`X5mT[PlWsRPgWi5t_RQdUc44>Y<jbbm"B?3d:S=G%=77UDq];S#7[]lC^IonUM^iKTrS^]++0NV;rdk%#Kk0D^,9SO11H$X/ml^YpL3"Y`airC:klF1:5Wd:"7M5@J(Kt'Ee(*[3=aNbae[ug^rXf'#+lR17ap]Sfc)DA'&q\TK&H5q524K7725-m?C5NoRN<M<WPC/$j*n?Y8ae0,'"s)f_PF(i7ihD_Ya6Amm+)inL0cLV&)m:1ehR#-odu9S9R-akC\7+]Q6H>fV;Srp9gV3V2;k8VX*L`P6l*\Snf`a).QZA[YQg,amZUQPKA;&fprYkkkDO*D_B02e_*`jO8UJ(m(*4E('r2ZMuXZtJ5H_`k>pnhX:iTSb.WFnBaIkNd&&<$@&iX6SZhHYI6?]N1m#26"4a#%"P[,[o_o7=eH8k*b']P(7un$_Xa@3bBI-egP,c,epMo1;T:;NO^.'0=rAY*[W/^ZDl48MOe/u_o2mNB!'aU!@8n.7.c[%j!%B`m;]+SKgHu%C8BLfZD+P@;K!1dtGK<pRp/NdWt+V2Pb4ugad_0(#+88D[=;sCR`n<J,%*9o&CZ(,&=rj"LF:+r2'C_]ajCKfZu5V$$R)7V)48-<k!TXgAu/HQrTJPj!eh==.kWmn+u%Hht=&7GN\6#]JWTEQ"m\(0>mHQ0VO\H_n==VkJEAHhf>G+2S)Ghp*EcY'-^$>-9%K0KN5T@#0V3-ZnW(MXd?`*g"V$&DZ37@sZ?Im!N8A(Ir>F3XFq3)(o##Cek[][bc31u^An!5)S^O7DolNHt1:r)I\0dp'IJRRuASr`V8^Re*.NhRp7iL4&<$UP].0;<`B0YYC_2')m.&?"X]8a:d+4N@>U26i5$Z?DWu#W14S+X4G5J.:Y5X)0\m)`Q&6$CE&rVjn2K7D>"H8NhgVoZ(<l\cK_74lm!#uKd3aM''I!1\fkrZ4AlEZmR3-Fr<1Aig#F(W1M"l@fnkZpZuAAC(SY-ed>VHk,YQg_NL8Y]OPbQR=nal%U5^BZgrMbh'dY#qDKE^RX_7?Bh@=\FdHn9C]ae/>!L6lA]2eaV4]-r.E#oc7>ShFJRR1I4p5!t'pA(_^S#Zq*QcC%EedrBpfsL#O%BsAEa@9-'I4'&EP;R,[\h'AR=!D`Q5e*i5%;frM";hqq(,;:ZGlf+*P>*ebogsoXT"s%d[g."$au['$(ng>\:StL3OIQ.%LmP9D<Yh`kI"Xd+al==rpGk1&X=Nued*)Do;,@0f<fK#=,_(E1fsau_Bf.Fh(!+-s0MI&-]shJXH.hJ<W[$TL\lo!tVj#*aLYiO09++LKH1q]KEjc&dSYp\-X,r[B6ddjV8gBBg=!94l,Fu^O6FmMB8QT?eRhB/7d17KGR\o"O!!5&]Yg*HKCE!'0_PZ(VAA]WgCVqn])>Xb(;2sKHGN(1X5WYS?ki2)K9=f^d\2^caT)L[PV[+GCIf`k<#6:Q;aHfer4,oI7_Aib#@EC>6V;oqBZiE'%SM^CXUq5]Yi=JSgmduu71.Su054?_iNqG0d8odMI2m:@)V$__BXij[$+sWPN102u=B3<T6G'a>+3*(18TPT'nC9[edQ`LA7%SqX4P7MsHWc8->'(9bQ$fmnDIA's\oE>62XeXb7>95qo)!ig5piR_j&Prl2j$IKmVI'KkBSRH;):o=WD0"ilCo"1H?'EP<7uJ?!eQ#^mS=R6GAsYFJ_BsEJ]*imWZ44,`[T_LrlM@6a]T4IVk8(1Hd8+-+^NrdBq.c\^Y@Wi+OKTZRl`V[6A(R!a,Q#^TKTO7>J?/>l2qK5:49aAj]EkB3$BY`.emTf'RBe0QF!`o&B;.]js468lqN<d]06,&DX<oks.H#bgbU(u><EDeMqP!A?V]3LBl(a#.Y0lgS'HPC1UjLSknF1ns*qmuc9FJLdNT6=Vp=U]"n?)q\K<9<m-uL*JE/+f*.M86S</f<)5B"`SUq%`M#>p0:ggj.Yf>qImIh9jurUTa]5J?H$1'f.D@fK452]P]=cKBcJ4>)2TG"fQ>!&0VMOTBd]7MnAo-b)R&(2g:o$SWf7LgD(8`&F)@GPktc&+>-WIA_ao92/[OCdWl3'FWnPoXi]cS+grT?XGo;X>9?ViEU#igt,N^QV0SU"dO"m,9m-?1D3YhSgI*X#tK]nY$KH<?5r2\hWkhu`GH@<40l5A@L3ItWPG>e%*`@71](1.2i49c^D8\kZNm7>leB?TN5B;i-#%o-<8Hc9>!7\=o!rTkD;2\RZE0(A#JZ\Z;ae0NGUr/Nrq3U\&Btm6_]5&QH>&U7"d%34E^Gup8JD7KnV8KERE&C-#Q.M$mi/jpFCqG/+SIg\L6:\$A8mYu@V-!]hJY>WOs>%errN%<0Ac~>
+GatU5>BAQ-&q9SYi'Yp<1GL0F,#[h\N_a\Y[ZdSfHMl-31(XbKN%'>Z5g,TkqqDJk!3q&*Hg29jAGCS_/TqrB$g?^CAF_bfAg*TIbOrt6fUU0;WVht[9.CB\1nVe(EZ=rUoR&4rHPW-+8`00Ij&NFjnB%+S7_#Z2l^B1:M39\2>mOK'?@Z'k^NnLhK'jOiX9Ad\K$HH`_JT2*'&TeCG8=U@bM20Jk#bTi=^nf_imgaug)es#'o1\Z,6`B/r"1K0OBP8/=fet52)JZ.BG&LSL,*:pY8Fqs9jKVX@*WmpPM90nOG5G?8-,01?s:+>Ug#O(*)JtcL_B-bAb7e#c'VoUYEgPC:6b7aL]7Q+_[b*4R\mnZLo-%,QlDccqob-ZfEK$]r,VAVGEcMG[L$2UU`g(DV2S<.p1uK%eAtK^F%VpR>U.BLPKsu]PKEhSZ?t=bUX-Tlhd;NE\$(;\E&sI9>$Tr*kK+k"0`=oH7#$jUMW3RYCZ'[e\a$3+E%/NaJo!TQ-$co$#^:!^:Z4+dWkcjBAm;m,UU`m,=4LWLQ.NorKTXj2E*Nrkm<c<L<(qJ1Cl_j#d[RH#^'ORoN]>)X?3WbW7Z(*.Bd7=@ZY2>i5J=HiM,E^nK:B^ZAJ!3l$#W%e);YuDNB"6))nI9GKKZe<6['=4J0^aKjX1BAU249S!b:<U!lL6(eG$P+i]?t\lO)J/Zrt<'2$'F(b6mU5mojS`c5)Z^FN(`R]8tA%b[FPBk-Pt!(Ib#qQ7+>JJ]%VC-AVT$gGlUuK22'Jet#8cN,j`Un!]r0ZSi5$RahH9<qLQP^\>+ATZ#Gi$F']M_@;Bc&^[_[en]!I7bjl\faPi'NVY2GPu\Z65*lVb)%7('LDWgr+n?QCdU?0%a7<p"4V.7`fs+.o6`<5%K/qf"KV+545<@rJN;<&nn`tYY$G(@>\op$jTXmq.bb9cmi%V&=.b2php3U2QA<Dl)-9!tI//WKa)3\N&R#3u&6i]7!XK,7/;pN/k731'A_.51d.i"4m.Z:9&ah%PL6>mW/H6YKd<C=Uf"`;%al4f]sCc75gYQ4&BhXnAFB[0E5(o=NQYt<h,&'=Z>SCebDiFtMOO/2_"<3cu)F*SJFN`_@tLbi,7TYeRm>)mKcmKI<b.(EUsQ!t+@m%Cm@f(YOr?:]+.WEm`F_#CO<)rPgJau96f'@(N?_lCiEXoR5QiVWf5rsG'u@!@sARp2*9%ISQaopf,"LS8g!lT']FM!)^^?B!-kGduq\Z6PqS-VCgUI\WDE/`aZ?m@:d&,@<K7R1rstD=3P%0%?`\Bl?)l2Q?S1b@qXD7D$R/?G#Jn1u=%W2C>/Y>Ya%r(YiB>`5RkChDS8C-$)&hbIo9eV^^CXZtj]3`K`CK?'Wmm;qI)KgFmD]M=,AJU$67&iF3JF;On?83HD@8%9T\ogu<cMeb*<e9BM2#@V+U)q(;O091QtQp1eAIG*o6uL[FP?7!<dNOhppO4'EsBJZHd4bM@0R)_J%M2:u->htek'YR&gtK*6s%QD$/l8fk,Z;4OB"9TJCVg20RYC3e"N:3a_2`QH:&Z(a1uAPAA5(N]#]Q?$<6C2`D1&3:u.b!.<!:hp0Qe/f+]%AGI5jecTKb9sjMqEta1$%*rq_%b7(hD%:QV4V!scSC.K%ZMc-e?OOs_p\bn3D%4L&F\Q]9*]d?Mm`XLq@f1TIt8CMmpX89V9U$A2_Qn5HbfRE^'Z:2VQs%FcUi.5G4b7lc^,Gdrij=Z*39L>BJ/DcMseAM(YKhn.[&E653^dCAXJ7KX%:g:Th45C8%OS<UoPodCl,CGQd9=pYC>cVN=Q:2ejEF>#^%sUI^aF(IeUpo9<5j=Z$fdVj9ggXF=EDM!VQ!I$Vj)aAUXR5D0c&'d7t9?+.p*VIWPTabN-XV&Uq4J&I1)@'@9[D9!_>U*k&3TaMmYI#7)'D%M!.$7oEhYF(\)].$:u@@D@#n;[HMkp%kGtRjnY6V/Gt._iJNZY6PErF=V;)eZ,W"Z+'AYl(D+;>^9SM+4:kU;@\BIn&n_feUVBh")*Ve\*jJm:UXQ2D^T-!!(cQlGK$tKSgt4]*ocsgP5>MuPl,Eu/2K3q;K'd1)&X1@/]KF0?V4RX2c\TFiKBs+N_D_Fp\T1k$!-.h/p6;CPOe-N?BDgq/k+CXqaMS9H6M_ho%*5Gf&,]gbPuteW."<[A\Zrt,0)I2"PL5UcBZ?YN"jDZ'72)MP-I'4Apl5d[1><Z!B207iAAh&P69_o2R5e#Vpe;BPIJ&N,PY>M$?A,eqn%W.n-s6VD-G'pRnLtferLB<DE17JmS=`R\gRknr93Sk/o&eVVW`!CG"/S4*Zn,:+O*50bB03P\Q.1+RN_9tM"e3Zd?tcH8MD7K*&c)5YVqnlG.:QkTg^GB=P/Mh4l-a^<!Xe@lF`(]0T?a-2J;t?@NK(?mfF<4h6Uip$9Q_W0UYLs7Ia3kW.uSI2"]i/b7^=NgRioT(B4F0P(0q~>
 endstream
 endobj
 18 0 obj
@@ -154,16 +154,15 @@
 21 0 R
 22 0 R
 23 0 R
-24 0 R
 ]
 endobj
 20 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 0.0 654.066 305.076 642.066 ]
+/Rect [ 0.0 680.466 305.076 668.466 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-147)
+/A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-165)
 /S /URI >>
 /H /I
 >>
@@ -171,10 +170,10 @@
 21 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 0.0 580.532 305.076 568.532 ]
+/Rect [ 0.0 554.132 305.076 542.132 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-132)
+/A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-147)
 /S /URI >>
 /H /I
 >>
@@ -182,7 +181,7 @@
 22 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 0.0 493.798 305.076 481.798 ]
+/Rect [ 0.0 480.598 305.076 468.598 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-118)
@@ -193,7 +192,7 @@
 23 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 0.0 380.664 305.076 368.664 ]
+/Rect [ 0.0 367.464 305.076 355.464 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-113)
@@ -201,140 +200,121 @@
 /H /I
 >>
 endobj
-24 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 0.0 254.33 305.076 242.33 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A << /URI (http://issues.cocoondev.org/jira//ViewIssue.jspa?key=FOR-107)
-/S /URI >>
-/H /I
->>
-endobj
-27 0 obj
+26 0 obj
 <<
- /Title (\376\377\0\61\0\40\0\125\0\160\0\144\0\141\0\164\0\145\0\40\0\146\0\157\0\162\0\162\0\145\0\163\0\164\0\142\0\141\0\162\0\40\0\164\0\157\0\40\0\142\0\145\0\40\0\151\0\156\0\163\0\164\0\141\0\154\0\154\0\141\0\142\0\154\0\145\0\151\0\156\0\40\0\115\0\157\0\172\0\151\0\154\0\154\0\141\0\40\0\106\0\151\0\162\0\145\0\146\0\157\0\170\0\40\0\60\0\56\0\71)
- /Parent 25 0 R
- /Next 29 0 R
- /A 26 0 R
+ /Title (\376\377\0\61\0\40\0\154\0\157\0\143\0\141\0\154\0\40\0\163\0\164\0\171\0\154\0\145\0\163\0\150\0\145\0\145\0\164\0\163\0\40\0\146\0\157\0\162\0\40\0\141\0\40\0\165\0\163\0\145\0\162\0\40\0\160\0\162\0\157\0\152\0\145\0\143\0\164\0\40\0\156\0\157\0\164\0\40\0\146\0\157\0\165\0\156\0\144)
+ /Parent 24 0 R
+ /Next 28 0 R
+ /A 25 0 R
 >> endobj
-29 0 obj
+28 0 obj
 <<
- /Title (\376\377\0\62\0\40\0\153\0\162\0\171\0\163\0\141\0\154\0\151\0\163\0\55\0\163\0\151\0\164\0\145\0\72\0\40\0\160\0\141\0\147\0\145\0\40\0\155\0\151\0\156\0\151\0\164\0\157\0\143\0\40\0\167\0\151\0\144\0\164\0\150\0\40\0\164\0\157\0\157\0\40\0\154\0\141\0\162\0\147\0\145\0\40\0\151\0\156\0\40\0\163\0\157\0\155\0\145\0\40\0\142\0\162\0\157\0\167\0\163\0\145\0\162\0\163)
- /Parent 25 0 R
- /Prev 27 0 R
- /Next 31 0 R
- /A 28 0 R
+ /Title (\376\377\0\62\0\40\0\122\0\157\0\165\0\156\0\144\0\145\0\144\0\40\0\143\0\157\0\162\0\156\0\145\0\162\0\40\0\143\0\157\0\154\0\157\0\162\0\163\0\40\0\156\0\157\0\164\0\40\0\162\0\151\0\147\0\150\0\164\0\40\0\151\0\156\0\40\0\111\0\105)
+ /Parent 24 0 R
+ /Prev 26 0 R
+ /Next 30 0 R
+ /A 27 0 R
 >> endobj
-31 0 obj
+30 0 obj
 <<
- /Title (\376\377\0\63\0\40\0\153\0\162\0\171\0\163\0\141\0\154\0\151\0\163\0\55\0\163\0\151\0\164\0\145\0\72\0\40\0\155\0\151\0\156\0\151\0\164\0\157\0\143\0\40\0\143\0\157\0\156\0\146\0\151\0\147\0\40\0\151\0\156\0\40\0\163\0\153\0\151\0\156\0\143\0\157\0\156\0\146\0\40\0\156\0\157\0\164\0\40\0\167\0\157\0\162\0\153\0\151\0\156\0\147)
- /Parent 25 0 R
- /Prev 29 0 R
- /Next 33 0 R
- /A 30 0 R
+ /Title (\376\377\0\63\0\40\0\112\0\141\0\166\0\141\0\163\0\143\0\162\0\151\0\160\0\164\0\40\0\145\0\162\0\162\0\157\0\162\0\40\0\151\0\156\0\40\0\124\0\151\0\147\0\162\0\151\0\163\0\40\0\163\0\164\0\171\0\154\0\145)
+ /Parent 24 0 R
+ /Prev 28 0 R
+ /Next 32 0 R
+ /A 29 0 R
 >> endobj
-33 0 obj
+32 0 obj
 <<
- /Title (\376\377\0\64\0\40\0\142\0\165\0\151\0\154\0\144\0\40\0\164\0\145\0\163\0\164\0\40\0\55\0\40\0\164\0\141\0\162\0\147\0\145\0\164\0\40\0\146\0\141\0\151\0\154\0\163\0\54\0\40\0\163\0\164\0\151\0\154\0\154\0\40\0\162\0\145\0\146\0\145\0\162\0\163\0\40\0\164\0\157\0\40\0\157\0\154\0\144\0\40\0\144\0\151\0\163\0\164\0\57\0\163\0\150\0\142\0\141\0\164\0\57\0\40\0\163\0\164\0\165\0\146\0\146)
- /Parent 25 0 R
- /Prev 31 0 R
- /Next 35 0 R
- /A 32 0 R
+ /Title (\376\377\0\64\0\40\0\145\0\163\0\164\0\141\0\142\0\154\0\151\0\163\0\150\0\40\0\156\0\145\0\167\0\40\0\144\0\151\0\163\0\164\0\162\0\151\0\142\0\165\0\164\0\151\0\157\0\156\0\40\0\141\0\162\0\145\0\141\0\40\0\146\0\157\0\162\0\40\0\106\0\157\0\162\0\162\0\145\0\163\0\164\0\54\0\40\0\145\0\156\0\141\0\142\0\154\0\145\0\40\0\155\0\151\0\162\0\162\0\157\0\162)
+ /Parent 24 0 R
+ /Prev 30 0 R
+ /Next 34 0 R
+ /A 31 0 R
 >> endobj
-35 0 obj
+34 0 obj
 <<
- /Title (\376\377\0\65\0\40\0\111\0\156\0\166\0\157\0\143\0\141\0\164\0\151\0\157\0\156\0\124\0\141\0\162\0\147\0\145\0\164\0\105\0\170\0\143\0\145\0\160\0\164\0\151\0\157\0\156\0\40\0\157\0\156\0\40\0\163\0\150\0\165\0\164\0\144\0\157\0\167\0\156\0\40\0\146\0\162\0\157\0\155\0\40\0\146\0\157\0\162\0\162\0\145\0\163\0\164\0\40\0\162\0\165\0\156)
- /Parent 25 0 R
- /Prev 33 0 R
- /Next 37 0 R
- /A 34 0 R
+ /Title (\376\377\0\65\0\40\0\110\0\141\0\166\0\145\0\40\0\100\0\143\0\154\0\141\0\163\0\163\0\40\0\141\0\164\0\164\0\162\0\151\0\142\0\165\0\164\0\145\0\40\0\151\0\156\0\40\0\104\0\124\0\104\0\40\0\146\0\157\0\162\0\40\0\145\0\166\0\145\0\162\0\171\0\40\0\164\0\141\0\147)
+ /Parent 24 0 R
+ /Prev 32 0 R
+ /Next 36 0 R
+ /A 33 0 R
 >> endobj
-37 0 obj
+36 0 obj
 <<
- /Title (\376\377\0\66\0\40\0\142\0\162\0\157\0\153\0\145\0\156\0\154\0\151\0\156\0\153\0\163\0\40\0\146\0\151\0\154\0\145\0\40\0\151\0\163\0\40\0\147\0\145\0\156\0\145\0\162\0\141\0\164\0\145\0\144\0\40\0\151\0\156\0\40\0\146\0\157\0\162\0\162\0\145\0\163\0\164\0\56\0\150\0\157\0\155\0\145\0\40\0\162\0\141\0\164\0\150\0\145\0\162\0\40\0\164\0\150\0\141\0\156\0\40\0\160\0\162\0\157\0\152\0\145\0\143\0\164\0\56\0\150\0\157\0\155\0\145)
- /Parent 25 0 R
- /Prev 35 0 R
- /Next 39 0 R
- /A 36 0 R
+ /Title (\376\377\0\66\0\40\0\142\0\165\0\151\0\154\0\144\0\40\0\164\0\145\0\163\0\164\0\40\0\55\0\40\0\164\0\141\0\162\0\147\0\145\0\164\0\40\0\146\0\141\0\151\0\154\0\163\0\54\0\40\0\163\0\164\0\151\0\154\0\154\0\40\0\162\0\145\0\146\0\145\0\162\0\163\0\40\0\164\0\157\0\40\0\157\0\154\0\144\0\40\0\144\0\151\0\163\0\164\0\57\0\163\0\150\0\142\0\141\0\164\0\57\0\40\0\163\0\164\0\165\0\146\0\146)
+ /Parent 24 0 R
+ /Prev 34 0 R
+ /Next 38 0 R
+ /A 35 0 R
 >> endobj
-39 0 obj
+38 0 obj
 <<
- /Title (\376\377\0\67\0\40\0\142\0\162\0\157\0\153\0\145\0\156\0\40\0\154\0\151\0\156\0\153\0\163\0\40\0\142\0\165\0\151\0\154\0\144\0\151\0\156\0\147\0\40\0\146\0\157\0\162\0\162\0\145\0\163\0\164\0\40\0\163\0\151\0\164\0\145)
- /Parent 25 0 R
- /Prev 37 0 R
- /Next 41 0 R
- /A 38 0 R
+ /Title (\376\377\0\67\0\40\0\111\0\156\0\166\0\157\0\143\0\141\0\164\0\151\0\157\0\156\0\124\0\141\0\162\0\147\0\145\0\164\0\105\0\170\0\143\0\145\0\160\0\164\0\151\0\157\0\156\0\40\0\157\0\156\0\40\0\163\0\150\0\165\0\164\0\144\0\157\0\167\0\156\0\40\0\146\0\162\0\157\0\155\0\40\0\146\0\157\0\162\0\162\0\145\0\163\0\164\0\40\0\162\0\165\0\156)
+ /Parent 24 0 R
+ /Prev 36 0 R
+ /Next 40 0 R
+ /A 37 0 R
 >> endobj
-41 0 obj
+40 0 obj
 <<
- /Title (\376\377\0\70\0\40\0\154\0\151\0\156\0\153\0\162\0\145\0\167\0\162\0\151\0\164\0\151\0\156\0\147\0\40\0\156\0\157\0\164\0\40\0\144\0\157\0\156\0\145\0\40\0\146\0\157\0\162\0\40\0\141\0\147\0\147\0\162\0\145\0\147\0\141\0\164\0\145\0\40\0\160\0\141\0\147\0\145\0\163)
- /Parent 25 0 R
- /Prev 39 0 R
- /Next 43 0 R
- /A 40 0 R
+ /Title (\376\377\0\70\0\40\0\142\0\162\0\157\0\153\0\145\0\156\0\154\0\151\0\156\0\153\0\163\0\40\0\146\0\151\0\154\0\145\0\40\0\151\0\163\0\40\0\147\0\145\0\156\0\145\0\162\0\141\0\164\0\145\0\144\0\40\0\151\0\156\0\40\0\146\0\157\0\162\0\162\0\145\0\163\0\164\0\56\0\150\0\157\0\155\0\145\0\40\0\162\0\141\0\164\0\150\0\145\0\162\0\40\0\164\0\150\0\141\0\156\0\40\0\160\0\162\0\157\0\152\0\145\0\143\0\164\0\56\0\150\0\157\0\155\0\145)
+ /Parent 24 0 R
+ /Prev 38 0 R
+ /Next 42 0 R
+ /A 39 0 R
 >> endobj
-43 0 obj
+42 0 obj
 <<
- /Title (\376\377\0\71\0\40\0\103\0\162\0\145\0\141\0\164\0\151\0\156\0\147\0\40\0\120\0\104\0\106\0\40\0\157\0\165\0\164\0\40\0\157\0\146\0\40\0\155\0\165\0\164\0\151\0\55\0\154\0\141\0\156\0\147\0\165\0\141\0\147\0\145\0\40\0\144\0\157\0\143\0\165\0\155\0\145\0\156\0\164\0\163)
- /Parent 25 0 R
- /Prev 41 0 R
- /Next 45 0 R
- /A 42 0 R
+ /Title (\376\377\0\71\0\40\0\154\0\151\0\156\0\153\0\162\0\145\0\167\0\162\0\151\0\164\0\151\0\156\0\147\0\40\0\156\0\157\0\164\0\40\0\144\0\157\0\156\0\145\0\40\0\146\0\157\0\162\0\40\0\141\0\147\0\147\0\162\0\145\0\147\0\141\0\164\0\145\0\40\0\160\0\141\0\147\0\145\0\163)
+ /Parent 24 0 R
+ /Prev 40 0 R
+ /Next 44 0 R
+ /A 41 0 R
 >> endobj
-45 0 obj
+44 0 obj
 <<
  /Title (\376\377\0\61\0\60\0\40\0\106\0\151\0\170\0\40\0\142\0\165\0\151\0\154\0\144\0\40\0\160\0\162\0\157\0\143\0\145\0\163\0\163\0\40\0\164\0\157\0\40\0\151\0\156\0\143\0\154\0\165\0\144\0\145\0\40\0\112\0\101\0\122\0\40\0\154\0\151\0\142\0\163\0\40\0\151\0\156\0\40\0\127\0\101\0\122\0\40\0\146\0\151\0\154\0\145\0\40\0\141\0\147\0\141\0\151\0\156)
- /Parent 25 0 R
- /Prev 43 0 R
- /Next 47 0 R
- /A 44 0 R
+ /Parent 24 0 R
+ /Prev 42 0 R
+ /Next 46 0 R
+ /A 43 0 R
 >> endobj
-47 0 obj
+46 0 obj
 <<
  /Title (\376\377\0\61\0\61\0\40\0\133\0\120\0\101\0\124\0\103\0\110\0\135\0\40\0\125\0\163\0\145\0\40\0\157\0\156\0\40\0\127\0\151\0\156\0\144\0\157\0\167\0\163\0\40\0\71\0\70)
- /Parent 25 0 R
- /Prev 45 0 R
- /Next 49 0 R
- /A 46 0 R
+ /Parent 24 0 R
+ /Prev 44 0 R
+ /A 45 0 R
 >> endobj
-49 0 obj
-<<
- /Title (\376\377\0\61\0\62\0\40\0\104\0\124\0\104\0\163\0\40\0\141\0\166\0\141\0\151\0\154\0\141\0\142\0\154\0\145\0\40\0\166\0\151\0\141\0\40\0\106\0\157\0\162\0\162\0\145\0\163\0\164\0\40\0\163\0\151\0\164\0\145\0\40\0\141\0\163\0\40\0\167\0\145\0\154\0\154\0\40\0\141\0\163\0\40\0\143\0\141\0\164\0\141\0\154\0\157\0\147\0\40\0\145\0\156\0\164\0\151\0\164\0\171\0\40\0\162\0\145\0\163\0\157\0\154\0\166\0\145\0\162)
- /Parent 25 0 R
- /Prev 47 0 R
- /A 48 0 R
->> endobj
-50 0 obj
+47 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-51 0 obj
+48 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-52 0 obj
+49 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-53 0 obj
+50 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-54 0 obj
+51 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F7
@@ -349,155 +329,146 @@
 2 0 obj
 << /Type /Catalog
 /Pages 1 0 R
- /Outlines 25 0 R
+ /Outlines 24 0 R
  /PageMode /UseOutlines
  >>
 endobj
 3 0 obj
 << 
-/Font << /F3 50 0 R /F5 51 0 R /F1 52 0 R /F2 53 0 R /F7 54 0 R >> 
+/Font << /F3 47 0 R /F5 48 0 R /F1 49 0 R /F2 50 0 R /F7 51 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
-25 0 obj
+24 0 obj
 <<
- /First 27 0 R
- /Last 49 0 R
+ /First 26 0 R
+ /Last 46 0 R
 >> endobj
-26 0 obj
+25 0 obj
 <<
 /S /GoTo
 /D [6 0 R /XYZ -5.0 608.39 null]
 >>
 endobj
-28 0 obj
+27 0 obj
 <<
 /S /GoTo
 /D [6 0 R /XYZ -5.0 521.656 null]
 >>
 endobj
-30 0 obj
+29 0 obj
 <<
 /S /GoTo
-/D [6 0 R /XYZ -5.0 448.122 null]
+/D [6 0 R /XYZ -5.0 434.922 null]
 >>
 endobj
-32 0 obj
+31 0 obj
 <<
 /S /GoTo
-/D [6 0 R /XYZ -5.0 374.588 null]
+/D [6 0 R /XYZ -5.0 334.988 null]
 >>
 endobj
-34 0 obj
+33 0 obj
 <<
 /S /GoTo
-/D [6 0 R /XYZ -5.0 301.054 null]
+/D [6 0 R /XYZ -5.0 248.254 null]
 >>
 endobj
-36 0 obj
+35 0 obj
 <<
 /S /GoTo
-/D [6 0 R /XYZ -5.0 227.52 null]
+/D [6 0 R /XYZ -5.0 174.72 null]
 >>
 endobj
-38 0 obj
+37 0 obj
 <<
 /S /GoTo
 /D [6 0 R /XYZ -5.0 101.186 null]
 >>
 endobj
-40 0 obj
-<<
-/S /GoTo
-/D [18 0 R /XYZ -5.0 683.4 null]
->>
-endobj
-42 0 obj
+39 0 obj
 <<
 /S /GoTo
-/D [18 0 R /XYZ -5.0 609.866 null]
+/D [18 0 R /XYZ -5.0 709.8 null]
 >>
 endobj
-44 0 obj
+41 0 obj
 <<
 /S /GoTo
-/D [18 0 R /XYZ -5.0 523.132 null]
+/D [18 0 R /XYZ -5.0 583.466 null]
 >>
 endobj
-46 0 obj
+43 0 obj
 <<
 /S /GoTo
-/D [18 0 R /XYZ -5.0 409.998 null]
+/D [18 0 R /XYZ -5.0 509.932 null]
 >>
 endobj
-48 0 obj
+45 0 obj
 <<
 /S /GoTo
-/D [18 0 R /XYZ -5.0 283.664 null]
+/D [18 0 R /XYZ -5.0 396.798 null]
 >>
 endobj
 xref
-0 55
+0 52
 0000000000 65535 f 
-0000014241 00000 n 
-0000014306 00000 n 
-0000014398 00000 n 
+0000013042 00000 n 
+0000013107 00000 n 
+0000013199 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000002601 00000 n 
-0000002721 00000 n 
-0000002801 00000 n 
-0000003019 00000 n 
-0000003280 00000 n 
-0000003490 00000 n 
-0000003700 00000 n 
-0000003910 00000 n 
-0000004120 00000 n 
-0000004328 00000 n 
-0000004538 00000 n 
-0000004746 00000 n 
-0000007560 00000 n 
-0000007683 00000 n 
-0000007738 00000 n 
-0000007948 00000 n 
-0000008158 00000 n 
-0000008368 00000 n 
-0000008578 00000 n 
-0000014521 00000 n 
-0000014572 00000 n 
-0000008786 00000 n 
-0000014636 00000 n 
-0000009210 00000 n 
-0000014701 00000 n 
-0000009666 00000 n 
-0000014766 00000 n 
-0000010082 00000 n 
-0000014831 00000 n 
-0000010558 00000 n 
-0000014896 00000 n 
-0000010983 00000 n 
-0000014960 00000 n 
-0000011499 00000 n 
-0000015025 00000 n 
-0000011805 00000 n 
-0000015089 00000 n 
-0000012158 00000 n 
-0000015155 00000 n 
-0000012516 00000 n 
-0000015221 00000 n 
-0000012947 00000 n 
-0000015287 00000 n 
-0000013202 00000 n 
-0000013685 00000 n 
-0000013798 00000 n 
-0000013908 00000 n 
-0000014016 00000 n 
-0000014132 00000 n 
+0000002544 00000 n 
+0000002664 00000 n 
+0000002744 00000 n 
+0000002962 00000 n 
+0000003223 00000 n 
+0000003433 00000 n 
+0000003643 00000 n 
+0000003853 00000 n 
+0000004063 00000 n 
+0000004271 00000 n 
+0000004481 00000 n 
+0000004689 00000 n 
+0000007259 00000 n 
+0000007382 00000 n 
+0000007430 00000 n 
+0000007640 00000 n 
+0000007850 00000 n 
+0000008060 00000 n 
+0000013322 00000 n 
+0000013373 00000 n 
+0000008270 00000 n 
+0000013437 00000 n 
+0000008631 00000 n 
+0000013502 00000 n 
+0000008953 00000 n 
+0000013567 00000 n 
+0000009247 00000 n 
+0000013632 00000 n 
+0000009693 00000 n 
+0000013697 00000 n 
+0000010044 00000 n 
+0000013761 00000 n 
+0000010520 00000 n 
+0000013826 00000 n 
+0000010945 00000 n 
+0000013890 00000 n 
+0000011461 00000 n 
+0000013956 00000 n 
+0000011814 00000 n 
+0000014022 00000 n 
+0000012245 00000 n 
+0000012486 00000 n 
+0000012599 00000 n 
+0000012709 00000 n 
+0000012817 00000 n 
+0000012933 00000 n 
 trailer
 <<
-/Size 55
+/Size 52
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-15353
+14088
 %%EOF

Modified: forrest/site/index.html
==============================================================================
--- forrest/site/index.html	(original)
+++ forrest/site/index.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,22 +57,13 @@
 <td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Home</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Welcome</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
-</tr>
-<tr>
-<td colspan="3" height="1"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -81,7 +72,7 @@
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -163,40 +154,6 @@
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Getting Involved</font>
-<ul>
-    
-<li>
-<a href="contrib.html">Contributing</a>
-</li>
-    
-<li>
-<a href="build.html">Building Forrest</a>
-</li>
-    
-<li>
-<a class="external" href="http://svn.apache.org/viewcvs.cgi/forrest/trunk/?root=Apache-SVN">Browse SVN</a>
-</li>
-    
-<li>
-<a href="mail-lists.html">Mail lists</a>
-</li>
-    
-<li>
-<a href="mail-archives.html">Mail Archives</a>
-</li>
-    
-<li>
-<a class="external" href="http://issues.cocoondev.org/jira/secure/BrowseProject.jspa?id=10000">Bugs and Issues</a>
-</li>
-    
-<li>
-<a href="forrest-issues.html">Open Issues</a>
-</li>
-  
-</ul>
-</li>
-<li>
 <font color="#CFDCED">Related projects</font>
 <ul>
     
@@ -215,6 +172,10 @@
 <li>
 <a class="external" href="http://xml.apache.org/">Apache XML</a>
 </li>
+    
+<li>
+<a href="http://www.apache.org/~vgritsenko/stats/">Apache Stats</a>
+</li>
   
 </ul>
 </li>
@@ -369,7 +330,10 @@
 <ul>
         
 <li>Multiple task-specific source XML formats can be used
-         (<a href="community/howto/index.html">howtos</a>,
+<!--
+         (<link href="site:howto-samples/overview">howtos</link>,
+-->
+         (howtos,
           <a href="faq.html"><acronym title="Frequently Asked Questions">FAQ</acronym>s</a>,
           <a href="changes.html">changelogs</a> and
           <a href="todo.html">todo lists</a> supported natively).
@@ -404,7 +368,7 @@
         </li>
       
 </ul>
-<a name="N100AB"></a><a name="Static+or+Dynamic"></a>
+<a name="N100A9"></a><a name="Static+or+Dynamic"></a>
 <h4>Static or Dynamic</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -430,7 +394,7 @@
 </div>
 
     
-<a name="N100C3"></a><a name="History"></a>
+<a name="N100C1"></a><a name="History"></a>
 <h3>History</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Forrest was started in January 2002, with the major use-case being to
@@ -450,7 +414,7 @@
 </div>
 
     
-<a name="N100D8"></a><a name="Project+Status"></a>
+<a name="N100D6"></a><a name="Project+Status"></a>
 <h3>Project Status</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Forrest is currently progressing rapidly through a series of 0.x
@@ -468,7 +432,7 @@
         adopters make, and will not make capricious or undocumented
         backwards-incompatible changes.
       </p>
-<a name="N100E8"></a><a name="website-status"></a>
+<a name="N100E6"></a><a name="website-status"></a>
 <h4>Website status</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -489,7 +453,7 @@
 </div>
 </div>
     
-<a name="N10106"></a><a name="News+and+events"></a>
+<a name="N10104"></a><a name="News+and+events"></a>
 <h3>News and events</h3>
 <div style="margin-left: 0 ; border: 2px">
 <ul>
@@ -508,7 +472,7 @@
 </ul>
 </div>
     
-<a name="N10116"></a><a name="Help+Wanted%21"></a>
+<a name="N10114"></a><a name="Help+Wanted%21"></a>
 <h3>Help Wanted!</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>

Modified: forrest/site/index.pdf
==============================================================================
--- forrest/site/index.pdf	(original)
+++ forrest/site/index.pdf	Thu Jun 17 23:57:47 2004
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 4240 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 4205 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gat<DflH+BmbM6Db0,%0Cp)F'PGahmcKqEK9O]C&Xn=lb`KnH0A8?Elj1esn`C<cO-#]WC#U"*u%A3`Dqu-KDh`_5p&pilorUstXrjTFAYBF"HC(:3YIfYi0`!bRHF^M9MF8[I:2nWU<=19GHiSeq"mI,6(]%Nik+*l>>[X5X_n*9lW&='>E/IM*1_mSY4Z/Y5!Jij\@l[RJk_t/?+'tbT46n;*sP_YlW@A6j4;K%11o?n`e<nBe+J@'L8J,T#7"1K;QF5#^B/T1tsG:[qZkBt`[J>PpnoOQ_'MB.!6jBs'D45qq<)sh06ht%<?oo4Sc2#Oo*MgFP9J+r"%8Gea:[<op)nOMcrMN6fLO[le?>0s"<XcuH=&el):Z.?dTLB2Y/B8m)2ke(glXS"+SXbB+6/S54r>)#;&\^`_&hX/^KHGL;gUfr#\@Dut,Z`#TgC4@;X@p=&2oXUW^:K>7*hNgUTDC-nNA`/BuEXdNZh2QP_hUp`8rle_a=qr!7!"I;5LI53\UfVhS@O?t\03f/:S=l8F]k,IU<d8If^75Lu#[AT/JS/&A`1`Mc3bAe^ZaSN:dZ"_$=EJlmWWb.Sc&N']<GsSS)?Ei8k8o5)l8P(^gMV:he_3s'f8eJ,iN2U4iD#qD\4eCZ!<qnKg$pZVc"bhFE]>'&lpiO,ZHG/3GSFePU/KV.N4)B['P3sS8%qW+j*41T>Z_VcOa4VlW^FlDKEQiB^rm58\&8+B["NSeA\NWhJWOP2,<qFrR?Sm%mQ,Nq0'b1S(1pk]>E;/MXX1Z13S6".:8lVAW'cpJc$"'uGcgNAA,2St*W.bd_D)uDlcS8;mfPfH-']pu4P_5)0,h:`Gk6MBJ;tiP2M8thk]MJ4:tNL3fJa)4;R-LKmVBKllPF/qQb6r/_CW-b[(CeJr;&G'B`6fLVn-*N,;KqU$PS?MP^Lq`87`KP6eX`[[Kj5i[`&HQdfGcjm+Sp+laqn;p*jf,B8r2i07&o2J0:=>>&]&?0_MK;hOui&^ZagB0AYD,`4iA&+a-#]GTt>hLN[ahLi(&1RCH)52p`YR.<s`&YYld-KcdIiC48Q75gdIbp42kq/UH'Rd<;Zn/&k0SR2.)s/D89QV"JS[^ILm^O"&N>&Z5X&bY!=l\ad,Chd:e_dQ8dI(kJ/&BhAG'C";QN;s<+&Xfdo";$cJU<`'J3FR--De6b(Lom$/qebf54[M/9sr!UHt$]#H^*/:%\La;S?/boHWZ(WaJb@"KmfA)@O-ql`fd:LYM]OTj17a+3V:KHWXK+Uo+eqdKCA&Q_e0=@K1"%g2AHq:&H0=Sgu8$)@6Zr;l1Jics:`2t!kDhS4>@?_6JTCpBbj%ZAK+_+KK_(eA1qMiWd6NLIk=cQ%COF\km72'LLUMPH];JIbLM>4?B`)?+_-sf3K]#KO=lk:]ElF=E(T<Dt*WJ41jGRP\oM03Q#R?m+F&Q6`Fe5HQ^`#t)QOG*3F#%]CJT^5rS)qfp;AXuh\PC`,jqQ;Jlk+/LN__o@sENB*u14pm@(I?4]6HY$XGD&kpCZ1Eu?,S\(:prTufF;c2Dd3tjkA8)LkXKO:e/jTLC0X.o%n5o\FH3JF21_"L\o:l)bDoE'dDue7iJu:J1)JIUeHhpUh'*p;I)ih')'DTk$>mrLbB#kp@0W.g-"`!K/pKg#iq[SaJ@ndJhI;.5[n#0;6HMFda1^i+/V8C6Ybn@@V2-2jZ?<ql[+6^?Od&"O'ksX(KgetBg[gr%I.uW@PC'$X+'gYTrlP]a$0)LtdUqYT5n!E'PglJSpc%D"A^;Xp,%FF#8V2*EM>iUab!J*i_[6RH"Y]pT,96sd!9JfdP]^-2L(Xh@^",;qB!m?b/40G77?jVe^hAG3rS=r=ToN7$@da!SYqq57W)=.Z'_K7h$\2H!^^dre1Fh!T-A42k(_`K?lqY,n,6MkAM;352PP6_'AT[)1ld-qkfmsWMGt9-gGL-V$Cha6BrX3G&pnB8_Y.,FpAf/>.C.scr@bPC5U7H#ig825?$+tC=;J*K6&"ot]7MP@V\&YB03pC]h^+NIL4-2;i831Mk]D65q*#7_qIEfLuOITj/BH6E:]HC>2%>`P2D!NAV8*us=*98f@26B<hkg7(EXu-a`XCs.eZ*pJaF(b^FdE>aoi^e^rqZ;U.hBqt[6bRWl"J'9q@J2Pf,%E&)qmp3D*rKaI3t=CjU>;FZnH;[<-?bA[&p0RP4JAA8q&mBQk\(uS%jKK=C7t",jkK2oEIhfom_deKV-nfp,9HG07&$Yl17EFd2,q=7&i&@T'q:6d&jrei'(>LmKiVQ?[HHYLYnsU]Abd*dl1WDAJs@o#VGce\@joEi:k?;C2tnV4,-+55:OmcRchtkQD-rk`qEu&:A7Rgn%AV,lB&m`X/T!2;'<26cqYd6D2Ga+91ld.XU?Ptqh"%a0iM9=t;#Zk?*^ZFFmBJ<:r6SlM7`#877=^gf(^TiU14OrPQAk)2(5#K=oC-I;6pHg]8-B*PZ0ngu[l6*;7N=\_Od0%b%&g1+Q?cUq^nO1eUL^X9)-A#tjtpdMVCSBm<gtY_*7Ku*#6p9t84M`%%(XAS,$!/Bf0ihQ\Y?Q1r#PONB('7TfU21sM!!"t'!p>@2L)+[b[&oRY$i'_3U\Xie::Dafno>14j_6D/@pG(*P)mId3:B[E9;pS6YB,TRBQXi0=sPGng=[53*GS=0KWOGJ84C')-$8\[bepp>c4)(aHS.;)L.,2Lk$`lJI^7=0(EGp"ar,$KoWVUhI._'\*'J:!&^uATO@-(p(4r16-BFgr:o^38bE;eQ`(,u4BA=_KuB=1\Q>ahE'Y[,HWom2a4X09)3Rfh5nnKH*NL'4:_@.]L2lQKg$;[a@"LdiHt[q(A<'&WE^[MfoTVd&As&sb2ONS[kW2NaAKgu`8RlAH@Z'#ZqnmucWJq4Y)E&(=3aWrbNk6JMm]c2;+hnsbnO_XSoqq(sL/1a&lPBp-.aCR]depm>ml>ld.qAQ0Sr+2,B62cf[1h5OEZ,KWo/R6eo0_CeI.gt!)s8N;b%]tAeC0JX:]C:N,>N6,4$O;c@TZi*:s^-db)t8h(DD_;/5.o7A:qkgH7YkTA%P17V_#\>$Rh(r+J*4#\Fi+Eo_nR.kK.gTGbS9AT?k'/T7K:7j$%pH$J;sT5,$dD*E@Oe)*LeT8Xs(5H)Z554-1>6DS@qEOek]3?nPUIJI0bKEN-uFK\0s@lm[j+bTcPQI:l[k)t6+MoR.8Gl=k"s4E*_B5J6q)7B*e=J;U>=iTTbESJsU_ka^Yl9Eo&e0PCgVoPrkEh$NKNV3,7bU-]?V3QaF&QDX%KEqWF2M1U5Jp$=Yd?*Pa_L<\a"3oou7*I$ljYs?<IkKd5nDV),Kps<X=<4T*0nYru=ZCkH+(/Jum)@us-&1fmW)nM1>"%Wt*ih@,H0L;?.gYL\U9NQfW))$k0AIsn>,]^)[AM>NI#a(]_`q%6/cgX?kSop,#K'-,D!X(l9nF"NEiP=3VGf8@pkb?18*eN5'$Uj-76CGqa*m3Q/!e\$3r=*"ndS@DuR_2lS+;`8+./3A8OGm=qd-j:92p9'uILRaS=.BFooIuO2#JTDEk8Kq==bV#ug]FmN0>0=hQlQWdA'"&eIS&c#hU70QL"a<F.1&^7K+:)94ktiYYN)2nhc5>AqRP64V]P6X:/+?qS+8AeQU>6*"Qc\qM+6_<cPtu^)6H!5WU(OPFNf\^I2H>/0=PVKmOgSM('D>\qE@.9FnHH)\:mu6?nPW>JID>@`Fp)]&TZ?3\Yh",0oHJ2PAp(Q(5'='.FRr8UZ1FhAH0"02.Q9mBU37FFD#[Pp3:LnHfq7:hS*;PC[k!mb/0<P\F=Km+4uXm;'-.&dsDYI#K7RABOG]cW%edVcu?EsHTQAe7/5@&ke=U4e4U26#of/Tkj_`828i?9=t/`Q'DUheNn._dqm!8]7%Tl#_":W2]Pu!8%o*on>C1o=DrX%d\.bKqVHhbS+3_.XjhDB-NsIM[qtI[P$k+,-86q8m#P]%;GNu?B7>cG/[*^3epliGnY`Cijob"@GTmQ8EBeIoC/m@*s(pR%5MtNehWD,TD4S!CS&4p.,'$#p_.O'R*FJFR)9@o?#L's[2_6e<[1*,%`\G;/HE_!t1D^YPh-&BKfl<$YaMm5@XgGIMPJgR0DcIGLYrYlPu]9j$$arp#lRoO.Y*6I/]3aCnKSf_:-@^keWV[!h8ZeJGai)s@#dhbO8,Pbr0?mbS;kDnI"!<!2KOT~>
+Gat<DCQmL2mectj:VS0Cg!s5DWVr'gQell]8A!XMDJnnFf:m,)-.*=$Fo:\=I#4LIakiL^)?UTn!W`i4R1BfeJ,:(cK#h0"*k""Cn^lo8^"V<;X#9e[rs)Ng#@<d.X+u#oT=9<uC;Xf_DKQbk)*E<$1&LkHJSb&DfgjW%P]uRss'7ec!2@o,Y=2n!8[S3h0N%ar:QWTus7W'Zf<V..F<t],*q9Te3To@6?BcoTK@ILebe5P9_q!M)4!85Wn6\EYkeOhU9gRKbhm'Vc9h,TSEPXP]%;;IM6Vk-BWTfPQcOTZ*n.CEffjHasqNbt8CMk0JTk,lg;)UL;q>26U7bXIab4h-Dj,Yh"'ckK"@kZ2pj.Jh8\<IoQ,q*Q7UYN_LLB1MdVl^-=kcA\]P^=1$ej:O+NnFF8:(bQ$\#-sr]01I;0:2g*<"!U]XB:*cQ47G"m*?o)iamm9?V5qGe2;XB>u`fTG/A9>%Z[J>f<QdTh-/EAXo1u\cf3H9]%gBjBRjDO*3+$(]umqu1NDE$d5k+@!u*Q+F5#JfL"@*jksEb8i#8R$4M+KW&p\2mA&\KPjlNY-DJW.iZJ-U#/WbN%H:/=GHAadB#cPqDn.>Lr^VOaNG0='jet-9_G-%AIB9eMdDt:!HAQhY2-u`83NbpLhg<^V$_r3jm5>o%T?+,m7j!9BoQ+9qnKJ0H*S4?luq_!kfj!c^'@=uLVc0N$D%i&@]&r']u00;R/&+BDE'%WJ;qtfEp+G^gjnhWk!9.?%^^7tr!ZMoGn;=5a7of1H.>LJ;U_1#O97\,5u*P'[<[Y(>&CR%+4/`&&Bi+J/gNS0t,=!"8g+5!9jLeK8[koKjog!WU8g(VU/3f<Ra'Gelcf*TSb>mpO<h]e:WaVrO:O*_\o0?RcXIEhUWH"&^HGQ!-:lfV*>om:&9lY[;1a@rrh9d"1LZ44:)asbtuKKnAa"5T3rEeDs-!6]8'mCS,H>tZ[E'Xj6a7`tidI[/<2+J1PqG_OO!orFY?Tf,Z\kiT-'h:s0l^9,j-G!3K_,0So"G&u2iD9M44\5:1(cl]&8=jImdW=m7gO)LX0G!nMZcpJ:i!.TBO*k$0tSZC:5E0>VmAOW1?H92pW4n%n781EaW6/"H['L6#=`=B7/hY-]!S'OoW-UAZii+?\h"X0hOC3Q^-oP`WjDNq_P"R?c'i\U]"c<kpd^M<#ul/pTe%hFS7-g6!R"2rqELf6SZ7@kS(P0E[.j=?&*L:0c-K5#1-F#R9s./!L;QT[R>Ndg@60op]H?(&G4,G(U2&[`t*Lln$0CI;fj+S.qk+gIcTh?s9)Z-lk*:+`%CmS"K0[rR%E.gk5Cj(p.>XC'NeD^o<#)5B)!N[\_jDcA>-$L!qYC..'7$rhd+RUFkjAHT<&;Id72JY.1$+r+I;i\bhYCQ,4-5&okkNiRO"q3k?QCA@FPa7/WVdnXa.do'Hp6>E_Qope<%@Z\N7'L_O4#%]CJT^7(s>1nU%AXugqdXgfTqQ;IZl<U@fUG]u>i)]krA-P\J08>cIJs6_8mKfXif>87a\qmQ":prTufF?ls="Xi;F#mc:FsFMiC6-@a[4\1"LU(kr3lfg_RR##6?'s7%Z6L'"1pR3Q\0LXVe4"Lk4i1l6[tprrf[4SQ"pgEY5asP*nq'SXQsoE0WEGsM$"!-_nGFP'6!gB]D_XSV]-H:G:pLW2nK@^?MkFDeZn6'!.A@'^C`RHsXgJL>,\9bV76$F,Y_\`kHWIA.m7o8m\L1SUaX*/<YO!s*0]mm#Bm20AZuCL\8Nlp/ItQTVp.R7q2YM6`,[@7=kRT,A/Q=D]XAG!^!!?%TdS\@%:bGj@=dM$].%tV.CX)Geg/pnl1)'^g6rg2eN)kbfh`XI<Fi8SAo<:`GSOo&4<I,d`TG-WC!,f=J46YtTW8((7&COZo9R'UC46^(2%(n#9EnAi85+Iq]khPd]O\<LSJIHC@'Z=nXTFncfe.=82(XcdNMlnII`SFu]_Z4RTiuj=)VHjsMg6jj[0=BnUkcOH=1<[@\#[L^uU4?%S418_P8Y=K&Fg4!bJRl#%A@$H`S%hG6;3Ck62tV/%a[sL-`fY/]$c9=-J7o&([U.Bqe.-635n8N]b:Q=UL]4DrXa..KAS],NE_^0-cj83tQa]B%OTlp$,naY!:%!@_HL%L93]2`1lt[M-`_m*=AOF9rps\_V*-s:Ahd75jKM[/qG)^&GFIH]%Tq:`K+ML2+BH:uO,1FACT^J;UD0I885W!c\n_NS10L1\]N;8ead53TrbrbqDWa??pQuLi<c,W,35csJfn+EZ6<aUiokN-?5Q`Qrnq%br4HY5<(.uo:^<'/VI$F4;D?uI^CI=j)9eYCVA6p:,hG,4N6Y:^N;U'_A$?p+">inOpcaO^DrdUG`p<"0K4qf?+^T(+UN*!6pegRSo"=k0!\d\o;Ws$Bp#Te>R&e<^o!kcdu1i;qXV5YW7-"T)\/]YStG9(W.B_5QaHpbY(,T?(\3$jDHlm]ZfbgR0B5#pK(qPutjBW9RBSH[.B^U-m#]FKr.i=<PHB1hfjb/#%c!4'7_-VB<J^$m9<hGqdQQa>J\bWN&_(-JBB]'toUdn$k#0HRBcK`f)93Uj+&ER,.2:`A8fQmRk69/ZgJIH&!Q;#)p^K:8DgLJNT2tfp23hco$=p/N2&cB7;ftFOgT*q>-`[W[m0VIr`nmPI3RbZbnX.W4)\o5ul79oc?P`G&5`r__C]aBNkT64-bg<-9`^6BY[m5cB\k7n;m$fjV'7Uq4i.HeUoat.oWXG^mF)b=/e,t5pA77dd3WjfM*e$XgsaL..$(R<\oW+m_VGPP/N:MjAf@n9T[>U%1VHfb`R]b%RLtcT!QMY/@%t9^p>!b>mEut/-K*7C!>@69[UJb59-&ZN>P`6+?`)-GC"WqmQFNG_8<+)r-f>1BAl]GS#S+i5-l(Y3@OZ\3/Ko"krZ?L^tA6`Z1)E%>b9'LQoW`cSU4\.3Ii6DcQ#d\*r9d5ZNmhn3\THF8SX$WShWoenu(q?i^D5dq70^s^tNCnIO`MTE29o1-%X$?(T*W-ZGGOt3#5E8iRjmWEu*/j"VdY%R*;lRgj1)3qL8A(dptKo4OL4\cfa*(cbUa-E?@D8A`EY1hkN=>*=.)i)*Lgj24V@"H)Z554-1>6DS@r0+:Ej=^g+4q!u%L!i_khk#dNp*fQ.huQpp43qp)JaqOrHSl2(MPeaq:(GMn?bIXLl!MGeH$O%P_4Aa"p^S^'5gka[pt9ErHf0PF,BN,R^sg'R0[V3,7jTlLGU'?WCUQ6pu/3Vs\opV=NrH?PIbY+u[5_rgIhI40mEhO.foN6gZ_1!"7adbX\3AF%a.Zu,<cZ6!SM>[!E=Eul5(!RsB=lqhN^8h(/k5n&RM;W,=nII;%JpN&)q#sr1...Wlo11H?f]m?!\TVs#%H>Y/`-7_9t'>8b?6"1+k=#gNt%->>&$_@6IEF(ifD/aTf@l=k6DXN3&F2a9cj<>,ro&/A4Y"F0G(SnFe<1PBi<sm"P1G$[35EQ>n/0a:-To,=N@0`lg'^7,C>\\;Hb('S$oX]+sc+O`V3[3uq>0Q/9%-$H>(,2B5:@4B9^@*Y%aAf)I9TYFa'X[(KdFlEs#kU1GD"3KMBN\]b%<^s`NpbCZns_'mF+$%UCmgrD<O\tVS`-Q>4J!`kLGtK(bDqUNn_FQ4C\VJ$<p9Oo6XDKZbG"Cr,@=MJTnqHG2IN[kM1H'2m)<WT9+c3NA\$tTZ8%7Wnrn%`3>R7]""D[m,:2>uf4=ofp,-@P^1`gEC34*0htD;5k.Pi.#&dkPR:u@]p<(6-aDp2!N#8c@M$#UL'^)q7O:R54'[a_OPu(s17%rRU[It*oKSf3SgsN6AA#U,soRr2rB(Yl!`u<qc&Zlae[L)kRHkU6MP5W>M73^&P(L[)+.pf`-jbN",Q`n*L%$C(Fqg7l/BU4<goprY+]R1A74<huan)'TI1,*YQ@s&)`*0]!Ufr5qL(+F-^O]IqWiQlDqgIE8oqOl?tcu!i^1tU<gMjEQ(,F3(YZ!Lrd[I$J?-e9jieVHk!iXcW)7ATF=Ct+PUl1-LWE$<^mR$N\1-6mjHpWF.HmO1'nmGu%S#\.ji3K[4k@^qD9&C'm1TLkr;F*4(Os.tLa_]'#n[ik"Yqb(V&)p8h42I)aOQ5r_;\_D=odpipkZb&n9P?GSIYHMT[8+KB7?n1k?k9f$b!9V2'/c~>
 endstream
 endobj
 6 0 obj
@@ -33,7 +33,6 @@
 16 0 R
 17 0 R
 18 0 R
-19 0 R
 ]
 endobj
 8 0 obj
@@ -61,17 +60,6 @@
 10 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 292.608 243.188 327.276 231.188 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A << /URI (http://forrest.apache.org/community/howto/index.html)
-/S /URI >>
-/H /I
->>
-endobj
-11 0 obj
-<< /Type /Annot
-/Subtype /Link
 /Rect [ 333.276 243.188 361.944 231.188 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
@@ -80,7 +68,7 @@
 /H /I
 >>
 endobj
-12 0 obj
+11 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 367.944 243.188 421.932 231.188 ]
@@ -91,7 +79,7 @@
 /H /I
 >>
 endobj
-13 0 obj
+12 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 445.26 243.188 488.94 231.188 ]
@@ -102,7 +90,7 @@
 /H /I
 >>
 endobj
-14 0 obj
+13 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 364.98 216.788 426.636 204.788 ]
@@ -113,7 +101,7 @@
 /H /I
 >>
 endobj
-15 0 obj
+14 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 166.32 203.588 231.972 191.588 ]
@@ -124,7 +112,7 @@
 /H /I
 >>
 endobj
-16 0 obj
+15 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 322.272 177.188 371.94 165.188 ]
@@ -135,7 +123,7 @@
 /H /I
 >>
 endobj
-17 0 obj
+16 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 172.332 163.988 249.996 151.988 ]
@@ -146,7 +134,7 @@
 /H /I
 >>
 endobj
-18 0 obj
+17 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 372.636 163.988 411.96 151.988 ]
@@ -157,7 +145,7 @@
 /H /I
 >>
 endobj
-19 0 obj
+18 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 317.976 150.788 398.964 138.788 ]
@@ -168,24 +156,25 @@
 /H /I
 >>
 endobj
-20 0 obj
+19 0 obj
 << /Length 3820 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
 GatU6=c_T&%XtTgOm/5##-'MoO4gEk[cbHM@Wo<u]ti2_.#sI(b"#XD/"M1)e7DL;>ucOE"q'L*M52PWV!*2MJ+N>gF;%+hf\Gq6K$E7$g][*grW8<S"j)@,F5Lg5o8]D;26Z5Z]Ctssjt99fLj,D/ca7oBr;\&m>1XRG$.eO3?os.6k^iEfrT:kaqd4`m5u&%Cq>SG]k8:EOKh8"ci]Dl<MI4ikLrd9Xcr*"K(a9Kb3tKAMn:6(I!R]_PO5Dk"+tU4Zq/]uh\#\sXB!o7X[,DbNPgNnRhRXcbNBP2UfA2"e\,PreR;j_-pUiZI;.=>HhQR/NB4XCRCZlcZ.,%m8/5%]IWhZ?B:d)H]RkN.@Y!p9h+s1J9gT_b31)sGX#$80S`"p%Z<Ris$#:a0fg*5,HR1Ig[<fWPkmeP)8i51KY?>RaVZ90Ib[E'G"gDZ)t7Z'0cXd_E#UR[PT3^,X!Tmu>`jPK?sBKO#OnBfu>k)/NX'<A`D_qO&gmmYd7"+WS4%6MsATD_p^!Tr26ROIoQ2!e4(#<Wosn-SI$iACDR4E5P1UTTTKQDBll:>L$*3fIK<Ed<1=3+D9J@Z&&76.%LT"JW>DdbuSd"R3.b<;?@hc0$%J`TE4'2`G05P7Y`EW=FI'-AiJ"PRaZYh'1*&kKV&:J)5QsDeG!GAm1;VJeho<A5Vc"MNh>,.*gE*?F0,K!/i$E72`56Ykkr18Detua-M2rD=G>$+tA*fm&)dn[<,X=-tWndTbA!gL:8"04$J$DQuiIa<gTguLfW\_g-Y^L:]!FJ7Q^65Yp[V#!Ub;9o6)kT-(2qmK:m'7"0"n13-o]>Pb#PfODi!(k=L_5R$&)@VDom?c2NRo6ROM8FI-V0oMiif>gG<O;C<bi+j396ct$*a@\3jLl^iU"m7>48!DsCr[tk]!8^UB.fIF`A+@SW6\Z9D)#&K\:4J@\4qRI6#Zd;O+??L)q(9h4<^M]21Cqo-J=76sO6;kfK%3r(g`8_j836e*C-n!q1-d_C&<rUOsKUuk"A>Blo"g:\mJE0;]9nG]?4?;60rIRhA74@h,iunm3aXXjn1s60C]L2oKR8J;Qe/REJl;;'7V.8A.@*K5&iQU@irro1rj_j;M>5H/JH=P;QHKdn+,J>1ZmKYIIZ3DHnr,_2Mg;2H"<M2^Mo:j3$J$I.=*4]YPQ!`8[p:N(;rRd+(@UP2uK4Fk9C'/*cS(hWbq6Mg$k>!h54!6eYC,JD)pMr5G+A.1YJ;Tce^c73CPSFsYN<`30gcE/LcF5!<-:5l!Ss=TG+Ib)VT4_OhFVC=G5E=!&iIo,\n)m%[hEc-XThR7-`ftnY6.B,.&K]d^<FBO81c;\UMY]n21AO]]][b[3:k.PQ*>uP1_?ZT`,#BX(8"Tp&W8P8(E:A%J"SKk=CRNPW]E<ANW,s\^<'7-cm3<?6Uhr8Ydd;Io@8&b`#L[dmX=UW'ia^k%0i1&46a3$$;KHO[ig:umZ0[n-[AObC+Y5<h#P>/%;\h+VG&Rn8.CZ0?"Ed//eOWPTrI(is7kjPe^Q<4E#gf8>eL9*;?)/sl*YHp.Y>)!10egO3kfX]-"[2CH2f:TA[Q#6=6I@SgU"2gS:tofCJ:,2G@>>sApB4nhYNr8Kg!aO!NF,h]mEUN6J4i:[ZM-IC!_^$W9Y"HYoFhnOEpkLh8g$#cF\t]DW1uOn(L%7]nj`%-9$M^icVri:Wn:g;)/0:a1QmCCAeX;eM';UtjAcrl`!%U9^/14Ieca=;JD_Vr?LS\ff`W_VK90V8Z-HfVGaaL(2H@b>\K3#N.iQXdWZHAUaa_b_`DAHuiNBt*cR)5jZAPca).GS?W<nWm^3'^7=jr[6UlN=g)/:QVOL;d8pDW,a80Q8`*2'(&IKjHI#:0,h9tNkl3f<69<M%pVWkk-!TFngsF^e2+ERN=k0f12D4Dg[1>?X1]WS$lfZFk_/^Qh+TZ=khGYc5%]^E=rg/e5ND<&O=;mKE2HYK!"<SW;L;iRmhILJ/_F&4i!PfD(`g]7unhU261=%=<bt[VG5<nCW`nCuBK6"[,f#k.8uLNprG<F.,77ooh87;kVkUP5jnWg;BIl2j_VJ6W@;rg6N!SPhd+2K_clsW19:!4>#37e6Pe(DIlhj4D6ht"I7#bGjrDO`WYpuX)=:lc9<J!3XJi,?-PI`/BK=FpK]tMSEsXSo%bkI"SC?joV&nb1`0kq^kP$.?V+aLVmJHt';1PFcXP#O61.W+'L>PanSU`P"R[q(Xf\S8(>s;s+I&9m=6#;b**Uj'<jbDE>o^coa.job[75tXeL,cb6QtqVeOH(+UaT\W`^XN2;XK&,l4CXte&-Pc.U=$=G"Oe,r1%L<`r*Capm^!X#ES^\i?c#-U]4dQ$G9C+?]a!BlePhG;[9Ag`.dt>5(VUCGd61)E>"DXg)[0P$4-Nf90cF4:di-BH)6fIHS8a#%h_M]:#/gVG3%3!RfXLT]!"YSJcN#VpBuV@AK`/o!Hl!2Y'!_7&cuGA((*V7(2>aA(m$"^aK'V:',P3B]f"oGi40[R3.>3'22c_)+tD+jU/_t-5A-FB'Gb2jeG>SXU7lMQ^*"qqeto)8Ya"5/8F,DI^iH%J_FL$3k^Z'ID&E?D"MCb^@!NlO+.h@)?O02Vj7SAXX81WAAlE:e/D$dq2E'$GSl>!eg(676=Ys?J^@N$V8OAt^Vf+m8f#W$5q=Ze!e=VN16qu>0aE?ceLejJ,k@)8S1FEQ1qpF(&r/cS7nX"FMEC!&J#B&9*$W]ne\3:&[CkfZt?fhaIht/5uK%Y%C=T?MiWa8C8U*XCo]I]XoKS:^5/kBD36N-2`+tngTLC@pR5[,&75RP!9WXJ)pKi1^UGL[.6Qp+)e`[hQt1gYLo9?iA#$ApB.on3a-l@6#oDN_B*Q3$Gh#?P#\MhOSF:Jb#Z[TaHBcP.R3@4%41kuAoX)=XZXF2T0n<F(W#0,tM3%&tuY_:Cc`)7n:&/W\2Hom<MImF>Jmq%no[0**0+DW``PD&TLQ.M,\PF$R$6kgiduf3)msl,#-&9st:>_+]i4J%"5pWlrP^b8/?E1/0Z@A5/b$CoD;YE<j!EL4@;cjNZ.+m)fD3P+kt9AJlF0c#N[p"[RMPP]pR&YWHBZ&XuFC]gLWN(?a+oc+`s1r'7_A`WHmJ.]pGchZi\+;G26N$@0*d2Y?C2(WcKH2:`:Doj-04,%fk,2@5J\:]->>pYH0D/,9'u&'1L1><*TdZZnjJr3T85:-5Umm1')=c!Hrc0lhtZ%+S.Pf::ksR]JtCT_Lq:7I7&kY!HJ+TFHO&&)Oqs4*j]5Ql>Gu"95n(&T\%[B/=\B-PgMVA*U6&hLu/KCZ<,(GrALV$kVp,];c-^GW1&#YT4Y28oi#Fn\NRk]L8gT/e7gRDnjRurbXa@OItrjqfT?SRIKZ0I[nY;^ZB]X<@[-;e[/agOMYn6lGi5e>#%&/_gJl1,=]66>?u"YZIY,0-1&*ULZfgc+i*1LLRJ(64l=((^c@M&6rKY1QiWQ!9$lko2uh,VQYLi$#Vjq#Ut@YnhVS83>RtYj<SQ?W41=<(HU3`Jg=r#Yp7qQnN'Pq#^Y[*]JH9@5fB^?d2EXW?FA*kqh/&amKW,XSWp[O]JL%sl^NC0:43B3dD\gL)U,6o;Um(Uoe\]Sc>2D[5G5>?t$_#ICS4bV>7$2<V+sLH(H:XZ1D%!)NE!J`p3sX@/i_Ag5bM-!FBuuU`5lR3JYg$M/BW37Jo9bb&kQj%QCfL5drg6C$MXX4>4WB>%j[k?r(8_ZmZV<1QUuD4=F:n(&#EI8#P_MF<EMD$[:T8f>7eVXM4VLWZP92@GIk3,XN;~>
 endstream
 endobj
-21 0 obj
+20 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 20 0 R
-/Annots 22 0 R
+/Contents 19 0 R
+/Annots 21 0 R
 >>
 endobj
-22 0 obj
+21 0 obj
 [
+22 0 R
 23 0 R
 24 0 R
 25 0 R
@@ -195,10 +184,9 @@
 29 0 R
 30 0 R
 31 0 R
-32 0 R
 ]
 endobj
-23 0 obj
+22 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 202.362 668.0 289.338 656.0 ]
@@ -209,7 +197,7 @@
 /H /I
 >>
 endobj
-24 0 obj
+23 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 497.796 602.466 571.776 590.466 ]
@@ -220,7 +208,7 @@
 /H /I
 >>
 endobj
-25 0 obj
+24 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 286.62 576.066 356.268 564.066 ]
@@ -231,7 +219,7 @@
 /H /I
 >>
 endobj
-26 0 obj
+25 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 136.656 476.132 201.648 464.132 ]
@@ -242,7 +230,7 @@
 /H /I
 >>
 endobj
-27 0 obj
+26 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 473.928 350.879 529.404 338.879 ]
@@ -253,7 +241,7 @@
 /H /I
 >>
 endobj
-28 0 obj
+27 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 22.534 329.679 96.19 317.679 ]
@@ -264,7 +252,7 @@
 /H /I
 >>
 endobj
-29 0 obj
+28 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 366.756 329.679 413.412 317.679 ]
@@ -275,7 +263,7 @@
 /H /I
 >>
 endobj
-30 0 obj
+29 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 554.09 329.679 619.418 317.679 ]
@@ -286,7 +274,7 @@
 /H /I
 >>
 endobj
-31 0 obj
+30 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 0.0 316.479 46.644 304.479 ]
@@ -297,7 +285,7 @@
 /H /I
 >>
 endobj
-32 0 obj
+31 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 17.664 132.611 86.124 120.611 ]
@@ -308,114 +296,114 @@
 /H /I
 >>
 endobj
-35 0 obj
+34 0 obj
 <<
  /Title (\376\377\0\61\0\40\0\111\0\156\0\164\0\162\0\157\0\144\0\165\0\143\0\164\0\151\0\157\0\156)
- /Parent 33 0 R
- /Next 37 0 R
- /A 34 0 R
+ /Parent 32 0 R
+ /Next 36 0 R
+ /A 33 0 R
 >> endobj
-37 0 obj
+36 0 obj
 <<
  /Title (\376\377\0\62\0\40\0\125\0\163\0\145\0\162\0\55\0\146\0\162\0\151\0\145\0\156\0\144\0\154\0\171)
- /Parent 33 0 R
- /Prev 35 0 R
- /Next 39 0 R
- /A 36 0 R
+ /Parent 32 0 R
+ /Prev 34 0 R
+ /Next 38 0 R
+ /A 35 0 R
 >> endobj
-39 0 obj
+38 0 obj
 <<
  /Title (\376\377\0\63\0\40\0\120\0\157\0\167\0\145\0\162\0\146\0\165\0\154)
- /Parent 33 0 R
- /First 41 0 R
- /Last 41 0 R
- /Prev 37 0 R
- /Next 43 0 R
+ /Parent 32 0 R
+ /First 40 0 R
+ /Last 40 0 R
+ /Prev 36 0 R
+ /Next 42 0 R
  /Count -1
- /A 38 0 R
+ /A 37 0 R
 >> endobj
-41 0 obj
+40 0 obj
 <<
  /Title (\376\377\0\63\0\56\0\61\0\40\0\123\0\164\0\141\0\164\0\151\0\143\0\40\0\157\0\162\0\40\0\104\0\171\0\156\0\141\0\155\0\151\0\143)
- /Parent 39 0 R
- /A 40 0 R
+ /Parent 38 0 R
+ /A 39 0 R
 >> endobj
-43 0 obj
+42 0 obj
 <<
  /Title (\376\377\0\64\0\40\0\110\0\151\0\163\0\164\0\157\0\162\0\171)
- /Parent 33 0 R
- /Prev 39 0 R
- /Next 45 0 R
- /A 42 0 R
+ /Parent 32 0 R
+ /Prev 38 0 R
+ /Next 44 0 R
+ /A 41 0 R
 >> endobj
-45 0 obj
+44 0 obj
 <<
  /Title (\376\377\0\65\0\40\0\120\0\162\0\157\0\152\0\145\0\143\0\164\0\40\0\123\0\164\0\141\0\164\0\165\0\163)
- /Parent 33 0 R
- /First 47 0 R
- /Last 47 0 R
- /Prev 43 0 R
- /Next 49 0 R
+ /Parent 32 0 R
+ /First 46 0 R
+ /Last 46 0 R
+ /Prev 42 0 R
+ /Next 48 0 R
  /Count -1
- /A 44 0 R
+ /A 43 0 R
 >> endobj
-47 0 obj
+46 0 obj
 <<
  /Title (\376\377\0\65\0\56\0\61\0\40\0\127\0\145\0\142\0\163\0\151\0\164\0\145\0\40\0\163\0\164\0\141\0\164\0\165\0\163)
- /Parent 45 0 R
- /A 46 0 R
+ /Parent 44 0 R
+ /A 45 0 R
 >> endobj
-49 0 obj
+48 0 obj
 <<
  /Title (\376\377\0\66\0\40\0\116\0\145\0\167\0\163\0\40\0\141\0\156\0\144\0\40\0\145\0\166\0\145\0\156\0\164\0\163)
- /Parent 33 0 R
- /Prev 45 0 R
- /Next 51 0 R
- /A 48 0 R
+ /Parent 32 0 R
+ /Prev 44 0 R
+ /Next 50 0 R
+ /A 47 0 R
 >> endobj
-51 0 obj
+50 0 obj
 <<
  /Title (\376\377\0\67\0\40\0\110\0\145\0\154\0\160\0\40\0\127\0\141\0\156\0\164\0\145\0\144\0\41)
- /Parent 33 0 R
- /Prev 49 0 R
- /A 50 0 R
+ /Parent 32 0 R
+ /Prev 48 0 R
+ /A 49 0 R
 >> endobj
-52 0 obj
+51 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-53 0 obj
+52 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-54 0 obj
+53 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-55 0 obj
+54 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F9
 /BaseFont /Courier
 /Encoding /WinAnsiEncoding >>
 endobj
-56 0 obj
+55 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-57 0 obj
+56 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F7
@@ -425,145 +413,144 @@
 1 0 obj
 << /Type /Pages
 /Count 2
-/Kids [6 0 R 21 0 R ] >>
+/Kids [6 0 R 20 0 R ] >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 1 0 R
- /Outlines 33 0 R
+ /Outlines 32 0 R
  /PageMode /UseOutlines
  >>
 endobj
 3 0 obj
 << 
-/Font << /F3 52 0 R /F5 53 0 R /F1 54 0 R /F9 55 0 R /F2 56 0 R /F7 57 0 R >> 
+/Font << /F3 51 0 R /F5 52 0 R /F1 53 0 R /F9 54 0 R /F2 55 0 R /F7 56 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
-33 0 obj
+32 0 obj
 <<
- /First 35 0 R
- /Last 51 0 R
+ /First 34 0 R
+ /Last 50 0 R
 >> endobj
-34 0 obj
+33 0 obj
 <<
 /S /GoTo
 /D [6 0 R /XYZ -5.0 656.0 null]
 >>
 endobj
-36 0 obj
+35 0 obj
 <<
 /S /GoTo
 /D [6 0 R /XYZ -5.0 577.266 null]
 >>
 endobj
-38 0 obj
+37 0 obj
 <<
 /S /GoTo
 /D [6 0 R /XYZ -5.0 302.922 null]
 >>
 endobj
-40 0 obj
+39 0 obj
 <<
 /S /GoTo
 /D [6 0 R /XYZ -5.0 105.388 null]
 >>
 endobj
-42 0 obj
+41 0 obj
 <<
 /S /GoTo
-/D [21 0 R /XYZ -5.0 631.8 null]
+/D [20 0 R /XYZ -5.0 631.8 null]
 >>
 endobj
-44 0 obj
+43 0 obj
 <<
 /S /GoTo
-/D [21 0 R /XYZ -5.0 518.666 null]
+/D [20 0 R /XYZ -5.0 518.666 null]
 >>
 endobj
-46 0 obj
+45 0 obj
 <<
 /S /GoTo
-/D [21 0 R /XYZ -5.0 392.332 null]
+/D [20 0 R /XYZ -5.0 392.332 null]
 >>
 endobj
-48 0 obj
+47 0 obj
 <<
 /S /GoTo
-/D [21 0 R /XYZ -5.0 293.479 null]
+/D [20 0 R /XYZ -5.0 293.479 null]
 >>
 endobj
-50 0 obj
+49 0 obj
 <<
 /S /GoTo
-/D [21 0 R /XYZ -5.0 209.545 null]
+/D [20 0 R /XYZ -5.0 209.545 null]
 >>
 endobj
 xref
-0 58
+0 57
 0000000000 65535 f 
-0000015214 00000 n 
-0000015279 00000 n 
-0000015371 00000 n 
+0000014966 00000 n 
+0000015031 00000 n 
+0000015123 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000004403 00000 n 
-0000004523 00000 n 
-0000004624 00000 n 
-0000004824 00000 n 
-0000005005 00000 n 
-0000005211 00000 n 
-0000005399 00000 n 
-0000005591 00000 n 
-0000005778 00000 n 
-0000005957 00000 n 
-0000006138 00000 n 
-0000006328 00000 n 
-0000006541 00000 n 
-0000006744 00000 n 
-0000006940 00000 n 
-0000010853 00000 n 
-0000010976 00000 n 
-0000011066 00000 n 
-0000011271 00000 n 
-0000011447 00000 n 
-0000011623 00000 n 
-0000011818 00000 n 
-0000011986 00000 n 
-0000012163 00000 n 
-0000012363 00000 n 
-0000012548 00000 n 
-0000012729 00000 n 
-0000015505 00000 n 
-0000015556 00000 n 
-0000012919 00000 n 
-0000015619 00000 n 
-0000013083 00000 n 
-0000015684 00000 n 
-0000013266 00000 n 
-0000015749 00000 n 
-0000013460 00000 n 
-0000015814 00000 n 
-0000013648 00000 n 
-0000015878 00000 n 
-0000013796 00000 n 
-0000015944 00000 n 
-0000014025 00000 n 
-0000016010 00000 n 
-0000014196 00000 n 
-0000016076 00000 n 
-0000014390 00000 n 
-0000014552 00000 n 
-0000014665 00000 n 
-0000014775 00000 n 
-0000014883 00000 n 
-0000014989 00000 n 
-0000015105 00000 n 
+0000004368 00000 n 
+0000004488 00000 n 
+0000004582 00000 n 
+0000004782 00000 n 
+0000004963 00000 n 
+0000005151 00000 n 
+0000005343 00000 n 
+0000005530 00000 n 
+0000005709 00000 n 
+0000005890 00000 n 
+0000006080 00000 n 
+0000006293 00000 n 
+0000006496 00000 n 
+0000006692 00000 n 
+0000010605 00000 n 
+0000010728 00000 n 
+0000010818 00000 n 
+0000011023 00000 n 
+0000011199 00000 n 
+0000011375 00000 n 
+0000011570 00000 n 
+0000011738 00000 n 
+0000011915 00000 n 
+0000012115 00000 n 
+0000012300 00000 n 
+0000012481 00000 n 
+0000015257 00000 n 
+0000015308 00000 n 
+0000012671 00000 n 
+0000015371 00000 n 
+0000012835 00000 n 
+0000015436 00000 n 
+0000013018 00000 n 
+0000015501 00000 n 
+0000013212 00000 n 
+0000015566 00000 n 
+0000013400 00000 n 
+0000015630 00000 n 
+0000013548 00000 n 
+0000015696 00000 n 
+0000013777 00000 n 
+0000015762 00000 n 
+0000013948 00000 n 
+0000015828 00000 n 
+0000014142 00000 n 
+0000014304 00000 n 
+0000014417 00000 n 
+0000014527 00000 n 
+0000014635 00000 n 
+0000014741 00000 n 
+0000014857 00000 n 
 trailer
 <<
-/Size 58
+/Size 57
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-16142
+15894
 %%EOF

Modified: forrest/site/license.html
==============================================================================
--- forrest/site/license.html	(original)
+++ forrest/site/license.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,22 +57,13 @@
 <td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Home</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Welcome</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
-</tr>
-<tr>
-<td colspan="3" height="1"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -81,7 +72,7 @@
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -163,40 +154,6 @@
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Getting Involved</font>
-<ul>
-    
-<li>
-<a href="contrib.html">Contributing</a>
-</li>
-    
-<li>
-<a href="build.html">Building Forrest</a>
-</li>
-    
-<li>
-<a class="external" href="http://svn.apache.org/viewcvs.cgi/forrest/trunk/?root=Apache-SVN">Browse SVN</a>
-</li>
-    
-<li>
-<a href="mail-lists.html">Mail lists</a>
-</li>
-    
-<li>
-<a href="mail-archives.html">Mail Archives</a>
-</li>
-    
-<li>
-<a class="external" href="http://issues.cocoondev.org/jira/secure/BrowseProject.jspa?id=10000">Bugs and Issues</a>
-</li>
-    
-<li>
-<a href="forrest-issues.html">Open Issues</a>
-</li>
-  
-</ul>
-</li>
-<li>
 <font color="#CFDCED">Related projects</font>
 <ul>
     
@@ -214,6 +171,10 @@
     
 <li>
 <a class="external" href="http://xml.apache.org/">Apache XML</a>
+</li>
+    
+<li>
+<a href="http://www.apache.org/~vgritsenko/stats/">Apache Stats</a>
 </li>
   
 </ul>

Modified: forrest/site/live-sites.html
==============================================================================
--- forrest/site/live-sites.html	(original)
+++ forrest/site/live-sites.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,22 +57,13 @@
 <td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Home</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Welcome</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
-</tr>
-<tr>
-<td colspan="3" height="1"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -81,7 +72,7 @@
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -163,40 +154,6 @@
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Getting Involved</font>
-<ul>
-    
-<li>
-<a href="contrib.html">Contributing</a>
-</li>
-    
-<li>
-<a href="build.html">Building Forrest</a>
-</li>
-    
-<li>
-<a class="external" href="http://svn.apache.org/viewcvs.cgi/forrest/trunk/?root=Apache-SVN">Browse SVN</a>
-</li>
-    
-<li>
-<a href="mail-lists.html">Mail lists</a>
-</li>
-    
-<li>
-<a href="mail-archives.html">Mail Archives</a>
-</li>
-    
-<li>
-<a class="external" href="http://issues.cocoondev.org/jira/secure/BrowseProject.jspa?id=10000">Bugs and Issues</a>
-</li>
-    
-<li>
-<a href="forrest-issues.html">Open Issues</a>
-</li>
-  
-</ul>
-</li>
-<li>
 <font color="#CFDCED">Related projects</font>
 <ul>
     
@@ -214,6 +171,10 @@
     
 <li>
 <a class="external" href="http://xml.apache.org/">Apache XML</a>
+</li>
+    
+<li>
+<a href="http://www.apache.org/~vgritsenko/stats/">Apache Stats</a>
 </li>
   
 </ul>

Modified: forrest/site/mail-archives.html
==============================================================================
--- forrest/site/mail-archives.html	(original)
+++ forrest/site/mail-archives.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -55,33 +55,24 @@
 <table summary="tab bar" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Home</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="contrib.html">Project</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -124,45 +115,6 @@
 <div class="menu">
 <ul>
 <li>
-<font color="#CFDCED">About</font>
-<ul>
-    
-<li>
-<a href="index.html">Index</a>
-</li>
-    
-<li>
-<a href="license.html">License</a>
-</li>
-    
-<li>
-<a href="http://www.apache.org/dyn/closer.cgi/xml/forrest/">Download</a>
-</li>
-    
-<li>
-<a href="who.html">Who we are</a>
-</li>
-    
-<li>
-<a href="faq.html">FAQs</a>
-</li>
-    
-<li>
-<a href="changes.html">Changes</a>
-</li>
-    
-    
-<li>
-<a href="todo.html">Todo</a>
-</li>
-    
-<li>
-<a href="live-sites.html">Example sites</a>
-</li>
-  
-</ul>
-</li>
-<li>
 <font color="#CFDCED">Getting Involved</font>
 <ul>
     
@@ -192,28 +144,6 @@
     
 <li>
 <a href="forrest-issues.html">Open Issues</a>
-</li>
-  
-</ul>
-</li>
-<li>
-<font color="#CFDCED">Related projects</font>
-<ul>
-    
-<li>
-<a class="external" href="http://gump.apache.org/">Apache Gump</a>
-</li>
-    
-<li>
-<a class="external" href="http://cocoon.apache.org/">Apache Cocoon</a>
-</li>
-    
-<li>
-<a class="external" href="http://cocoon.apache.org/lenya/">Apache Lenya</a>
-</li>
-    
-<li>
-<a class="external" href="http://xml.apache.org/">Apache XML</a>
 </li>
   
 </ul>

Modified: forrest/site/mail-lists.html
==============================================================================
--- forrest/site/mail-lists.html	(original)
+++ forrest/site/mail-lists.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -55,33 +55,24 @@
 <table summary="tab bar" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Home</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="index.html">Welcome</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
-</tr>
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="3" height="1"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="contrib.html">Project</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -124,45 +115,6 @@
 <div class="menu">
 <ul>
 <li>
-<font color="#CFDCED">About</font>
-<ul>
-    
-<li>
-<a href="index.html">Index</a>
-</li>
-    
-<li>
-<a href="license.html">License</a>
-</li>
-    
-<li>
-<a href="http://www.apache.org/dyn/closer.cgi/xml/forrest/">Download</a>
-</li>
-    
-<li>
-<a href="who.html">Who we are</a>
-</li>
-    
-<li>
-<a href="faq.html">FAQs</a>
-</li>
-    
-<li>
-<a href="changes.html">Changes</a>
-</li>
-    
-    
-<li>
-<a href="todo.html">Todo</a>
-</li>
-    
-<li>
-<a href="live-sites.html">Example sites</a>
-</li>
-  
-</ul>
-</li>
-<li>
 <font color="#CFDCED">Getting Involved</font>
 <ul>
     
@@ -192,28 +144,6 @@
     
 <li>
 <a href="forrest-issues.html">Open Issues</a>
-</li>
-  
-</ul>
-</li>
-<li>
-<font color="#CFDCED">Related projects</font>
-<ul>
-    
-<li>
-<a class="external" href="http://gump.apache.org/">Apache Gump</a>
-</li>
-    
-<li>
-<a class="external" href="http://cocoon.apache.org/">Apache Cocoon</a>
-</li>
-    
-<li>
-<a class="external" href="http://cocoon.apache.org/lenya/">Apache Lenya</a>
-</li>
-    
-<li>
-<a class="external" href="http://xml.apache.org/">Apache XML</a>
 </li>
   
 </ul>

Modified: forrest/site/skin/images/external-link.gif
==============================================================================
Binary files. No diff available.

Modified: forrest/site/todo.html
==============================================================================
--- forrest/site/todo.html	(original)
+++ forrest/site/todo.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,22 +57,13 @@
 <td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Home</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Welcome</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
-</tr>
-<tr>
-<td colspan="3" height="1"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -81,7 +72,7 @@
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -163,40 +154,6 @@
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Getting Involved</font>
-<ul>
-    
-<li>
-<a href="contrib.html">Contributing</a>
-</li>
-    
-<li>
-<a href="build.html">Building Forrest</a>
-</li>
-    
-<li>
-<a class="external" href="http://svn.apache.org/viewcvs.cgi/forrest/trunk/?root=Apache-SVN">Browse SVN</a>
-</li>
-    
-<li>
-<a href="mail-lists.html">Mail lists</a>
-</li>
-    
-<li>
-<a href="mail-archives.html">Mail Archives</a>
-</li>
-    
-<li>
-<a class="external" href="http://issues.cocoondev.org/jira/secure/BrowseProject.jspa?id=10000">Bugs and Issues</a>
-</li>
-    
-<li>
-<a href="forrest-issues.html">Open Issues</a>
-</li>
-  
-</ul>
-</li>
-<li>
 <font color="#CFDCED">Related projects</font>
 <ul>
     
@@ -214,6 +171,10 @@
     
 <li>
 <a class="external" href="http://xml.apache.org/">Apache XML</a>
+</li>
+    
+<li>
+<a href="http://www.apache.org/~vgritsenko/stats/">Apache Stats</a>
 </li>
   
 </ul>

Modified: forrest/site/who.html
==============================================================================
--- forrest/site/who.html	(original)
+++ forrest/site/who.html	Thu Jun 17 23:57:47 2004
@@ -21,7 +21,7 @@
 <table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <!--================= start Group Logo ==================-->
-<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/group-logo.gif" title="The Apache Software Foundation"></a></td>
+<td bgcolor="#294563"><a href="http://www.apache.org/"><img class="logoImage" alt="Apache" src="images/apache-forrest.png" title="The Apache Software Foundation"></a></td>
 <!--================= end Group Logo ==================-->
 <!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://forrest.apache.org/"><img class="logoImage" alt="Forrest" src="images/project-logo.gif" title="Apache Forrest"></a></td>
 <!--================= end Project Logo ==================-->
@@ -57,22 +57,13 @@
 <td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Home</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Welcome</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
 </tr>
 </table>
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
-</tr>
-<tr>
-<td colspan="3" height="1"></td>
-</tr>
-</table>
-</td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
-<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/index.html">Community</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="contrib.html">Project</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -81,7 +72,7 @@
 </td><td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
 <table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="community/howto/index.html">How-to</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="docs/your-project.html">Documentation</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="skin/images/tab-right.gif"></td>
 </tr>
 <tr>
 <td colspan="3" height="1"></td>
@@ -163,40 +154,6 @@
 </ul>
 </li>
 <li>
-<font color="#CFDCED">Getting Involved</font>
-<ul>
-    
-<li>
-<a href="contrib.html">Contributing</a>
-</li>
-    
-<li>
-<a href="build.html">Building Forrest</a>
-</li>
-    
-<li>
-<a class="external" href="http://svn.apache.org/viewcvs.cgi/forrest/trunk/?root=Apache-SVN">Browse SVN</a>
-</li>
-    
-<li>
-<a href="mail-lists.html">Mail lists</a>
-</li>
-    
-<li>
-<a href="mail-archives.html">Mail Archives</a>
-</li>
-    
-<li>
-<a class="external" href="http://issues.cocoondev.org/jira/secure/BrowseProject.jspa?id=10000">Bugs and Issues</a>
-</li>
-    
-<li>
-<a href="forrest-issues.html">Open Issues</a>
-</li>
-  
-</ul>
-</li>
-<li>
 <font color="#CFDCED">Related projects</font>
 <ul>
     
@@ -214,6 +171,10 @@
     
 <li>
 <a class="external" href="http://xml.apache.org/">Apache XML</a>
+</li>
+    
+<li>
+<a href="http://www.apache.org/~vgritsenko/stats/">Apache Stats</a>
 </li>
   
 </ul>

Mime
View raw message