ai4r 1.4 → 1.5

data/site/build/site/en/svn.html

@@ -155,67 +155,59 @@ google_ad_height = 125;
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
-<a href="#Anonymous">Anonymous Subversion Access</a>
+<a href="#github">AI4R at GitHub</a>
 </li>
 <li>
-<a href="#Browse">Browse latest files</a>
+<a href="#download">Download the source code</a>
 </li>
 <li>
-<a href="#moreinfor">More info on Subversion (svn)</a>
-</li>
-<li>
-<a href="#softsizo_report">Source code evolution</a>
+<a href="#moreinfor">More info on Git</a>
 </li>
 </ul>
 </div>
     
-<a name="N1000C"></a><a name="Anonymous"></a>
-<h2 class="boxed">Anonymous Subversion Access</h2>
+<a name="N1000C"></a><a name="github"></a>
+<h2 class="boxed">AI4R at GitHub</h2>
 <div class="section">
-<p>This project's SVN repository can be checked out through anonymous access with the following command(s).</p>
-<ul>
-		
-<li>svn checkout http://ai4r.rubyforge.org/svn/trunk</li>
-		
-<li>svn checkout svn://rubyforge.org/var/svn/ai4r/trunk</li>
-	
-</ul>
-</div>
-
-    
-<a name="N1001F"></a><a name="Browse"></a>
-<h2 class="boxed">Browse latest files</h2>
-<div class="section">
-<p>You can see the latest ai4r code directly in your browser: <a href="http://ai4r.rubyforge.org/svn/">http://ai4r.rubyforge.org/svn/</a>
+<p>AI4R Source Code is stored in a git repository at GitHub:</p>
+<p>
+        
+<a class="external" href="http://github.com/JadeFerret/ai4r">
+          http://github.com/JadeFerret/ai4r
+        </a>
+      
+</p>
+<p>The public clone url is:</p>
+<p>
+        
+<a class="external" href="git://github.com/JadeFerret/ai4r.git">
+          git://github.com/JadeFerret/ai4r.git
+        </a>
       
 </p>
-<div class="warning">
-<div class="label">Warning</div>
-<div class="content">The latest code in http://ai4r.rubyforge.org/svn/trunk will probably be a work in progess. If you
-	want something that works, please download the releases.</div>
-</div>
 </div>
 
     
-<a name="N10030"></a><a name="moreinfor"></a>
-<h2 class="boxed">More info on Subversion (svn)</h2>
+<a name="N10029"></a><a name="download"></a>
+<h2 class="boxed">Download the source code</h2>
 <div class="section">
-<p>If you need help about using Subversion (svn), the (IMO) best documentation is available <a class="external" href="http://svnbook.red-bean.com/">here</a>.</p>
-<p>If you work in SCM, you may find <a class="external" href="http://scm.jadeferret.com">Jade Ferret&rsquo;s SCM initiative</a>
-      intresting.</p>
+<p>If you want to download ai4r code without using git, 
+      visit 
+      <a class="external" href="http://github.com/JadeFerret/ai4r/downloads">
+        AI4R source code download site</a>, and click on the "download" button.
+      </p>
 </div>
+
     
-    
-<a name="N10045"></a><a name="softsizo_report"></a>
-<h2 class="boxed">Source code evolution</h2>
+<a name="N10038"></a><a name="moreinfor"></a>
+<h2 class="boxed">More info on Git</h2>
 <div class="section">
-<p>
-<a class="external" href="http://softsizo.jadeferret.com">Soft Sizo</a> is a report generation tool that extends the concept 
-      of Lines Of Code (LOC) metrics, using changes information stored in a Subversion repository.</p>
-<p>You can access <a class="external" href="http://softsizo.jadeferret.com/examples/ai4r/index.html">AI4R Soft Sizo report</a>
-      for some AI4R source code evolution metrics.
-      </p>
+<p>If you need help on using git, the best documentation is available 
+      <a class="external" href="http://git-scm.com/documentation">here</a>.</p>
+<p>If you work in SCM, you may find <a class="external" href="http://scm.jadeferret.com">Jade Ferret&rsquo;s Agile SCM blog</a>
+      interesting.</p>
 </div>
+    
   
 </div>
 <!--+

data/site/build/site/en/svn.pdf

@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 580 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 527 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GauHH4`B(/&Dd"03%@29O;+[Td4T1,!BR%-<d0YeP=n.a'2il/Ip\'K6J=]i/1reNG<EV"HT8]MSNNu/`&K*BmLh:gg4Z,I64n2J7FdXG3Pej)UA>c+9%W+s!6.X5ma)bNP\r]Cn=m$)ZoNkGVbIF8a^+NXeW1Nf1^hBoFC>C,a]:<J3;Qnid._PkWeCu1Iu`:Dk&/1g=;?Y;K[+lM?=KAbVd=MPm6-u,[Skq8moI&\C9[/O!`<uu7gYXbSSl)"iR,0(>u^^]EV2Y4FaVc8%:.:k4lmGr$eEl'!8hP%INlhcZkuEgFkS+]CaR$%duLGp7_dVIotD<Z%O(7N%l^E`OTmYC]EnEk)Xu/ahTRI]W^0ng6^pUIWB)%oU&+LGCf5UVe"GT#Th159S4;L:C?-*^B7Bci)H$02O/@X+hqLR3*-=CT?@r2<'CH&N^SLn3:0tUkH8D7j^kG&/?^+qFO9*iW:W[X_<;%pY_'LVAL`DZq"BVEb<JJJo_H6\V1iiV/#aVo-Jqf'n;M8]mAhS:_<tYoiHQP#(bqAS0'c7#bp7dW7eb?JVQ!5pIf\o*m0.)3K$i~>
+Gau`P_/@+D%))BcHn<\]Ou-mr&[nrq[)8QGYsTrh7-Y\V(+0$0BrOWgRb3InLW5AGCd1!&-!l'@!+cF'P'a_7AKHT67f]$>^nB)/%&4r(+o-e8J%f.TKs%4$HZ2cUfUVhBCfMcsV%6Un.rBu>1*_341;,q"JONo?6X@l?Ahkt)eO`o%U6'.fB&XX!fku(;oK)pL3!.MSFQSLf(m,q'qF]1IdDGG9aB,q.B?GHMlfs/DJ`(T3JnY=#G[o,5O1<d5_RdGK=q;usAf[bVh*9*ZA[h"l/"i@b'1cphd]="-HCY*W,2+>3Y>a@]5H=1X;!H-"?>l?c<,/<ei>,uNDT.M'8f0Ron.u^>Cq?iD/%A3'C]19?PG9[Mjg8QDeeS57&kre!??5S#G[Kj*BHJ#+&W/QP2HGbb#;%(mhRl]A?Kd5'N+*\[mS"E0@5Nd#$j+@/8flLUT]LJugZQ8CS61VW**Hu.oNE^pO/:3tXR<0%R]`0k0c!q##CBQ4USd]g\RV`SH7r=?VYpU6EZA-~>
 endstream
 endobj
 6 0 obj
@@ -25,13 +25,12 @@ endobj
 8 0 R
 10 0 R
 12 0 R
-14 0 R
 ]
 endobj
 8 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 102.0 532.666 262.652 520.666 ]
+/Rect [ 102.0 532.666 187.328 520.666 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 9 0 R
@@ -41,7 +40,7 @@ endobj
 10 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 102.0 514.466 198.656 502.466 ]
+/Rect [ 102.0 514.466 237.632 502.466 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 11 0 R
@@ -51,7 +50,7 @@ endobj
 12 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 102.0 496.266 257.984 484.266 ]
+/Rect [ 102.0 496.266 191.66 484.266 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 13 0 R
@@ -59,154 +58,136 @@ endobj
 >>
 endobj
 14 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 478.066 217.316 466.066 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 15 0 R
-/H /I
->>
-endobj
-16 0 obj
-<< /Length 2040 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1458 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gatm<>Ar7S'Roe[d+_G@A]1&jI7o3h8C=SE'5SNJ4ifNuCR)ktP*9LmIYYKU.[I(Kh13#2Gj^peODjS'5Mn'l?2,\>1^lMA%9P%:2eK=fSnE6'prC_L]LD0#h[?61^I$Y(^S[/j/j,oAe`+'WgUkGDFm)\Li,60r^"n9d55\3iRT+5c*dDl6n#nN>??r_W`THMBfD3l]+,bU6p:,EFVFYiiNigp5J2;\%GOK<OBI2YDUDXl@FjTCh"=/"EP9+;CB!,0n&eW\eh<e.:_nFItW-.nL<pTKeqLqf@\k#J2T)--CJeVN?oO4rS?dtt1d)WG!P^B0d]7%GV4EjBFR,>%gdrLL0W5^WrFac_\A)10uR=7j$*R[P%%S=B;Se]FMUnPQ5VPcR'iGTiS?;&:KGQ,-c.>YA7Pk^7-iZTC'_f<K+/FVJ$>U6:&`#MiS>A\P@^n1uW]I;#Zs7/nW_N9QiW<WRR4S@VgB]gl=OI/X#X0\S[O!le5"60's4BZ@#(PF'XB=1_J("lfd*t+<p=]27$RCGsI2-sON#:/H5eH\2QcoKW&)(2_lq*4OlUf%Pr#,s_^VY)jmh[MWY8Ia0bL<;5>17n+M;6DBmQoAp,Hl5?]_SM]1n1]CL:kaT.ecPqT`!D.UK-u*"@8XLtfm(ZdHh;2kYDi%Y3RG@:kDMG[>n4$_JIhc\baR<R)clJUfmQ.Q)o*q=?;m>F."J4@SK`cN[WL8<]$Q$sbeZNFU7elU2b@XF3DET:^#(0jDG\_)#%**Zo)Fi>*1G\&2lEA!"9bLsD.><UmQK1%ds)A>'[1N$ja\I#]J5(rRV\#_0-tE+CrfA*ajt+s*0r%]a$^%sACNs(7.IhLL5ThJs6c""b8cmT,qE6.(cN*rVTkIVdXf@IYRu#iS#oWaLe3ci^9/!HgcLU"mZZ(a=e$"a[;fD!U"gTrh.J4Rh0#J7o1UO$Ofi:qFhSt_&2JnElhJ4/1'I5md2Kla'0g6lKR9cIpk%:NC04\DbZqk#"Vecs6DLL0<_B9i7e+DDG8N7R4rWKeiCRggZ?qg4.gOagKbOCk;pImB\NIM"prQ^nV_>3@NF!\;.PI"6@>Y<7j<7)N-il1EN+u_pYQqm%5XO2HN-.5>LI;SM8n@8G]eZ]bDVJjDTsNh0prT:7U$6NU(\[7Ha7Bn;6\7A=2U+1eS]:e6!cIT`-FE=cMeHZu]CUIMlhFqah^=oh@3+WA2&"H-c!`(+9K?@'/52'Zm4<!DYsm9e(feG+c&2>7dm0YX5tpSuLT)+GKl#[(ppOTO.5hTtD8&:<8QIaAQ9C!P+#8g%M5+a=5qOND.*^3rKtd.tWebp?eZ<&6dQmPYQM;\eM*k^m^=U\$-8&a?1/[?a&2N(Y/AK36CM,=u%luf'm</V\\:@5e'I2ftZi>%]<!,DAIsk[G43tcsnSEY-L1Xo@2VG(=jm;UZ.V)Q?djiXOb(i[$+FJcR%i?lE2CSN"T)ofMei_>W#;"[9(k\K)VfH>Q3*U-g@Go/CSbcNiHrH!^qHE&tFcVPuKO5hL>Tps[kgPf\Mp&F;T<>aca:0f`HoF=-*,<oEEBZFOXS5<#__UUAAe"oaM\9X1c"Sk#Si\gloZpYfTq&qVW4O@7hrKu6O*&i2AT,=L"Pd-;K0i=93H3_hGJ4TGHbN&:b8]ts^1II1XCf;UAoj=D"/_%2SR@t%B2M0V/:(/l(lGW9j([InR)VLj_QU3:Rhk[mfV6)1bRcrLAVK_iiH(CW+k)O8J427Fl:@%+D3oS"knmYJCUWF`e?jQc7IT,6qY&fY6=;`+f,^`<k%.je"NF^$OSgO#6>4u8`D&Uf<Y:'o@).MXhq`INI^a3elai);fqg.HD7WK+bkZ4AQR^0Vki&pLUF\VO=&88'dQ4f$;>/ZhPRXW[E2E./6AP8,Y`hT4MkLZ:NOceN4'+O3rb>f3+T*qX8;p^qA7?fI(mlbI26/6Us('R6^4MG#WmH8fg96n4L]-L=R9ciiolUVNYIm>XHDeJMFPj,Z]O,$sO"0gsP$=Te.[53T)`6.E%nrJ5a8~>
+Gatm;9lK&M&A@sB&:7$"/1jbq7-uRq2JEq/TM9fLHB;uH-<?F;I3cnKn*#r[XfX;1,(QG^a>`Ps3A]1:e`->RinoGW'k=sJi4m<\!WN6C#Y%?+POgFLm`6SkW'`Zri)e"rq(n5!\UrlS=YKbXHsJ=i[m"6nK[ju!OEeTt"+Q9:98*c&4gI,1^FpG;,bK>aF)cU]*fLi"k4qc=IoP`,ndelOC[&/0or]P"$6\X,F;.h%16O?JOr4qlN!d>]1%tR5<V[ssp._taQ7gC&;.b*\7IO-M^c]UTWQCoF<bPV13iDZZQ4)_N.1R<5]8^fY&%J)<O[25QT,\+QMRm'c"%g1_dO-^/Ymn`VW-[LEnSqr3(S?+Y*ks7mTOV?2kpAJC^P1G+2TkWi>_ZGC*S[30>P\eg#%Y,3;*7nF6uS$t8[9&DY4;]cr4UL>*qbt887g"PLkV'W<LjO(_JCW6ZeLl80;Y+Z6%V,Qmn5R\IEESe''C[rI`l'G,R`#I/b/6CP76)#)/pr&,Z?O=H-[&-;:ss%F<m-"+h6DIB<PHLN0c4e\PZu$H2EeYp)oAU%lge#=bWNK6Ds?%7B_[CXGc<icC?oH$R"U8-kb#570hfVOp4Mf,9K!n"rB_./QK7'-9Q$TC7^h&W1&5D(FD*tTS&tI.8nY;2G6bCB=3)1hRsAs3sCl\3`!DjaXflLV?o'II,_/LY3);0J>rpSF?I\JDP:`GMA2J#ZW&f)<tbl%$.sb4;c$d*mqkp6,sHXdN)$a_!>A2@lK4(@Qj@rs[@%W(>MRQsk(b[toLu+[eAq6G)-^0RRAKP*Ca-aZTS-N,Og.04;9r1C5Sl;>mr7g5pRYZ6>3t(TNfG$5OH;JRl<+F2f/SG6hnH(\D&d8C04t)03M%QWgBU2P[>p+W\"?B;Lse%0229#X_sf\98[qOP;$l1!H#T>X1joN?Tb;=c,,gn-aN$?`J;Ze(O7H5)J+/9WdZ^T$[@H+;i*$$]T+lCn^A35#B$hbi\)X#SmE6"6SE9l(QqtCBKNu>2Q@'PF=9o?g&m\lCm$URmeBGin1E0.F!HmA5-LbY5#=ZO.Uo:uJ5&njUqch(YA'I<`F0GZ[;c(Ti6i<6(ZP3_XNqGIHEU'Uu0'9k%J;Pd(Hl`I66IE"M.>%2sf/%RQSe[mjC]QOcJ5TCV?tQ`0rCS>ISRh8i@c[;)-CV!a&kZ5&6K.@uddi\;"mlEb$Fand.Ngor.H<]1ZYKFYj[E7VI36aka/@hU_sf;%7s=o`0ap0M>j%s?l&?1:d>N@EQm=_Qde5K^/EB1+IXSdIm3B\jat!S]^?iEUCk8[Wj0!<\CoUQg:04tO&Fc[Qao+#Sa6ksF(N[0k7]PCt+ApXV%p'#_#o!Zb=UTA9*FEk.n!b*Vf:US0:L#YbEQ@U/obceqcA[1P@E[*Yb)E^8F*QTl*FiG(M(op`"gXmIb+GF\\g%(X,uP25~>
 endstream
 endobj
-17 0 obj
+15 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 16 0 R
-/Annots 18 0 R
+/Contents 14 0 R
+/Annots 16 0 R
 >>
 endobj
-18 0 obj
+16 0 obj
 [
+17 0 R
+18 0 R
 19 0 R
 20 0 R
 21 0 R
-22 0 R
-23 0 R
 ]
 endobj
-19 0 obj
+17 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 366.936 531.732 506.928 519.732 ]
+/Rect [ 90.0 608.466 248.328 596.466 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://ai4r.rubyforge.org/svn/)
+/A << /URI (http://github.com/JadeFerret/ai4r)
 /S /URI >>
 /H /I
 >>
 endobj
-20 0 obj
+18 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 90.0 409.788 110.652 397.788 ]
+/Rect [ 90.0 566.066 258.0 554.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://svnbook.red-bean.com/)
+/A << /URI (git://github.com/JadeFerret/ai4r.git)
 /S /URI >>
 /H /I
 >>
 endobj
-21 0 obj
+19 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 260.328 388.588 395.988 376.588 ]
+/Rect [ 369.324 513.732 525.96 501.732 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://scm.jadeferret.com)
+/A << /URI (http://github.com/JadeFerret/ai4r/downloads)
 /S /URI >>
 /H /I
 >>
 endobj
-22 0 obj
+20 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 90.0 336.254 134.34 324.254 ]
+/Rect [ 405.636 448.198 426.288 436.198 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://softsizo.jadeferret.com)
+/A << /URI (http://git-scm.com/documentation)
 /S /URI >>
 /H /I
 >>
 endobj
-23 0 obj
+21 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 166.968 301.854 272.628 289.854 ]
+/Rect [ 260.328 426.998 404.316 414.998 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://softsizo.jadeferret.com/examples/ai4r/index.html)
+/A << /URI (http://scm.jadeferret.com)
 /S /URI >>
 /H /I
 >>
 endobj
-25 0 obj
+23 0 obj
 <<
- /Title (\376\377\0\61\0\40\0\101\0\156\0\157\0\156\0\171\0\155\0\157\0\165\0\163\0\40\0\123\0\165\0\142\0\166\0\145\0\162\0\163\0\151\0\157\0\156\0\40\0\101\0\143\0\143\0\145\0\163\0\163)
- /Parent 24 0 R
- /Next 26 0 R
+ /Title (\376\377\0\61\0\40\0\101\0\111\0\64\0\122\0\40\0\141\0\164\0\40\0\107\0\151\0\164\0\110\0\165\0\142)
+ /Parent 22 0 R
+ /Next 24 0 R
  /A 9 0 R
 >> endobj
-26 0 obj
+24 0 obj
 <<
- /Title (\376\377\0\62\0\40\0\102\0\162\0\157\0\167\0\163\0\145\0\40\0\154\0\141\0\164\0\145\0\163\0\164\0\40\0\146\0\151\0\154\0\145\0\163)
- /Parent 24 0 R
- /Prev 25 0 R
- /Next 27 0 R
+ /Title (\376\377\0\62\0\40\0\104\0\157\0\167\0\156\0\154\0\157\0\141\0\144\0\40\0\164\0\150\0\145\0\40\0\163\0\157\0\165\0\162\0\143\0\145\0\40\0\143\0\157\0\144\0\145)
+ /Parent 22 0 R
+ /Prev 23 0 R
+ /Next 25 0 R
  /A 11 0 R
 >> endobj
-27 0 obj
+25 0 obj
 <<
- /Title (\376\377\0\63\0\40\0\115\0\157\0\162\0\145\0\40\0\151\0\156\0\146\0\157\0\40\0\157\0\156\0\40\0\123\0\165\0\142\0\166\0\145\0\162\0\163\0\151\0\157\0\156\0\40\0\50\0\163\0\166\0\156\0\51)
- /Parent 24 0 R
- /Prev 26 0 R
- /Next 28 0 R
+ /Title (\376\377\0\63\0\40\0\115\0\157\0\162\0\145\0\40\0\151\0\156\0\146\0\157\0\40\0\157\0\156\0\40\0\107\0\151\0\164)
+ /Parent 22 0 R
+ /Prev 24 0 R
  /A 13 0 R
 >> endobj
-28 0 obj
-<<
- /Title (\376\377\0\64\0\40\0\123\0\157\0\165\0\162\0\143\0\145\0\40\0\143\0\157\0\144\0\145\0\40\0\145\0\166\0\157\0\154\0\165\0\164\0\151\0\157\0\156)
- /Parent 24 0 R
- /Prev 27 0 R
- /A 15 0 R
->> endobj
-29 0 obj
+26 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-30 0 obj
+27 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-31 0 obj
+28 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-32 0 obj
+29 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-33 0 obj
+30 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F7
@@ -216,91 +197,82 @@ endobj
 1 0 obj
 << /Type /Pages
 /Count 2
-/Kids [6 0 R 17 0 R ] >>
+/Kids [6 0 R 15 0 R ] >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 1 0 R
- /Outlines 24 0 R
+ /Outlines 22 0 R
  /PageMode /UseOutlines
  >>
 endobj
 3 0 obj
 << 
-/Font << /F3 29 0 R /F5 30 0 R /F1 31 0 R /F2 32 0 R /F7 33 0 R >> 
+/Font << /F3 26 0 R /F5 27 0 R /F1 28 0 R /F2 29 0 R /F7 30 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
 9 0 obj
 <<
 /S /GoTo
-/D [17 0 R /XYZ 85.0 659.0 null]
+/D [15 0 R /XYZ 85.0 659.0 null]
 >>
 endobj
 11 0 obj
 <<
 /S /GoTo
-/D [17 0 R /XYZ 85.0 561.066 null]
+/D [15 0 R /XYZ 85.0 543.066 null]
 >>
 endobj
 13 0 obj
 <<
 /S /GoTo
-/D [17 0 R /XYZ 85.0 452.322 null]
+/D [15 0 R /XYZ 85.0 477.532 null]
 >>
 endobj
-15 0 obj
-<<
-/S /GoTo
-/D [17 0 R /XYZ 85.0 365.588 null]
->>
-endobj
-24 0 obj
+22 0 obj
 <<
- /First 25 0 R
- /Last 28 0 R
+ /First 23 0 R
+ /Last 25 0 R
 >> endobj
 xref
-0 34
+0 31
 0000000000 65535 f 
-0000006211 00000 n 
-0000006276 00000 n 
-0000006368 00000 n 
+0000005075 00000 n 
+0000005140 00000 n 
+0000005232 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000000742 00000 n 
-0000000862 00000 n 
-0000000908 00000 n 
-0000006491 00000 n 
-0000001043 00000 n 
-0000006554 00000 n 
-0000001180 00000 n 
-0000006620 00000 n 
-0000001317 00000 n 
-0000006686 00000 n 
-0000001454 00000 n 
-0000003587 00000 n 
-0000003710 00000 n 
-0000003765 00000 n 
-0000003949 00000 n 
-0000004128 00000 n 
-0000004307 00000 n 
-0000004487 00000 n 
-0000006752 00000 n 
-0000004696 00000 n 
-0000004947 00000 n 
-0000005165 00000 n 
-0000005439 00000 n 
-0000005655 00000 n 
-0000005768 00000 n 
-0000005878 00000 n 
-0000005986 00000 n 
-0000006102 00000 n 
+0000000689 00000 n 
+0000000809 00000 n 
+0000000848 00000 n 
+0000005355 00000 n 
+0000000983 00000 n 
+0000005418 00000 n 
+0000001120 00000 n 
+0000005484 00000 n 
+0000001256 00000 n 
+0000002807 00000 n 
+0000002930 00000 n 
+0000002985 00000 n 
+0000003169 00000 n 
+0000003354 00000 n 
+0000003550 00000 n 
+0000003736 00000 n 
+0000005550 00000 n 
+0000003915 00000 n 
+0000004087 00000 n 
+0000004334 00000 n 
+0000004519 00000 n 
+0000004632 00000 n 
+0000004742 00000 n 
+0000004850 00000 n 
+0000004966 00000 n 
 trailer
 <<
-/Size 34
+/Size 31
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-6803
+5601
 %%EOF