You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by sp...@apache.org on 2011/08/23 15:51:42 UTC

svn commit: r1160690 [37/39] - in /xmlgraphics/site/deploy/fop: ./ 0.95/ 1.0/ dev/ dev/design/ dev/svg/ skin/images/ trunk/

Modified: xmlgraphics/site/deploy/fop/trunk/output.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/output.xml?rev=1160690&r1=1160689&r2=1160690&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/output.xml (original)
+++ xmlgraphics/site/deploy/fop/trunk/output.xml Tue Aug 23 13:51:33 2011
@@ -17,7 +17,7 @@
 <document>
   <header>
     <title>Apache FOP Output Formats</title>
-    <version>$Revision: 1066078 $</version>
+    <version>$Revision: 1095882 $</version>
     <authors>
       <person name="Keiron Liddle" email="keiron@aftexsw.com"/>
       <person name="Art Welch" email=""/>
@@ -283,6 +283,7 @@ out = proc.getOutputStream();]]></source
   <optimize-resources>false</optimize-resources>
   <safe-set-page-device>false</safe-set-page-device>
   <dsc-compliant>true</dsc-compliant>
+  <rendering>quality</rendering>
 </renderer>]]></source>
       <p>
         The default value for the "auto-rotate-landscape" setting is "false". Setting it
@@ -315,6 +316,12 @@ out = proc.getOutputStream();]]></source
         the particular postscript implementation issuing unwanted postscript subsystem
         initgraphics/erasepage calls on each setpagedevice call.
       </p>
+      <p>
+        The default value for the "rendering" setting is "quality". Setting it to "size"
+        optimizes rendering for smaller file sizes which can involve minor compromises in
+        rendering quality. For example, solid borders are then painted as plain rectangles
+        instead of the elaborate painting instructions required for mixed-color borders.
+      </p>
     </section>
   <section id="ps-limitations">
     <title>Limitations</title>
@@ -780,6 +787,29 @@ Note that the value of the encoding attr
         <source xml:space="preserve"><![CDATA[
       <images mode="b+w" bits-per-pixel="1" dithering-quality="maximum"/>]]></source>
       </section>
+      <section id="afp-goca-config">
+        <title>GOCA (Vector Graphics)</title>
+        <p>
+          Not all AFP implementations support GOCA. Some also have bugs related to GOCA. Therefore,
+          it is desirable to have some control over the generation of GOCA graphics.
+        </p>
+        <p>
+          GOCA is enabled by default. You can disable GOCA entirely in which case the AFP support
+          falls back to generating bitmaps for vector graphics. Example:
+        </p>
+        <source xml:space="preserve"><![CDATA[
+      <goca enabled="false"/>]]></source>
+        <p>
+          Some AFP implementations have trouble rendering text in GOCA. You can instruct the AFP
+          support to render text as shapes (i.e. use vector graphics to paint text). Example: 
+        </p>
+        <source xml:space="preserve"><![CDATA[
+      <goca enabled="true" text="shapes"/>]]></source>
+        <p>
+          If you disable GOCA or let text render as shapes, the size of the generated AFP usually
+          increases considerably.
+        </p>
+      </section>
       <section id="afp-shading-config">
         <title>Shading</title>
         <p>
@@ -928,14 +958,19 @@ Note that the value of the encoding attr
       </fo:layout-master-set>
 ]]></source>
         <p>The no-operation extension element can appear as child of
-        simple-page-master (appears after "Begin Page" BPG),
-        page-sequence (appears after "Begin Named Page Group" BNG
-        and declarations (appears after "Begin Document" BDT).
+        <code>simple-page-master</code> (appears after "Begin Page" BPG),
+        <code>page-sequence</code> (appears after "Begin Named Page Group" BNG
+        and <code>declarations</code> (appears after "Begin Document" BDT).
         Multiple no-operation extension elements inside the same formatting object are allowed.
         Each NOP will appear right after the respective "Begin" field indicated above even if it
-        is specified as the last child under its parent. However, the order inside the parent
+        is specified as the last child under its parent. The order inside the parent
         will be maintained.
-        The name attribute is mandatory but will not appear inside the AFP stream.
+        The "placement" attribute can be used to have the NOP appear before
+        the "End" field of the object rather than after the "Begin" field. Specify
+        <code>placement="before-end"</code> to do that. Please note that, at the moment, this only
+        has an effect for NOPs that are children of the <code>page-sequence</code> formatting
+        object.
+        The "name" attribute is mandatory but will not appear inside the AFP stream.
         </p>
       </section>
       <section id="afp-invoke-medium-map">

Modified: xmlgraphics/site/deploy/fop/trunk/pdfa.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/pdfa.html?rev=1160690&r1=1160689&r2=1160690&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/pdfa.html (original)
+++ xmlgraphics/site/deploy/fop/trunk/pdfa.html Tue Aug 23 13:51:33 2011
@@ -11,7 +11,7 @@
 <link media="print" type="text/css" href="../skin/print.css" rel="stylesheet">
 <link type="text/css" href="../skin/profile.css" rel="stylesheet">
 <script src="../skin/getBlank.js" language="javascript" type="text/javascript"></script><script src="../skin/getMenu.js" language="javascript" type="text/javascript"></script><script src="../skin/fontsize.js" language="javascript" type="text/javascript"></script>
-<link rel="shortcut icon" href="../">
+<link rel="shortcut icon" href="../favicon.ico">
 </head>
 <body onload="init()">
 <script type="text/javascript">ndeSetTextSize();</script>
@@ -92,7 +92,7 @@ document.write("Last Published: " + docu
     |breadtrail
     +-->
 <div class="breadtrail">
-<a href="http://www.apache.org/">apache.org</a> &gt; <a href="http://xml.apache.org/">XML Federation</a> &gt; <a href="http://xmlgraphics.apache.org/">xmlgraphics.apache.org</a><script src="../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
+<a href="http://www.apache.org/">The Apache Software Foundation</a> &gt; <a href="http://xmlgraphics.apache.org/">Apache XML Graphics Project</a><script src="../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
 </div>
 <!--+
     |start Menu, mainarea
@@ -176,7 +176,9 @@ document.write("Last Published: " + docu
 <!--+
   |alternative credits
   +-->
-<div id="credit2"></div>
+<div id="credit2">
+<a href="http://www.apachecon.com/"><img border="0" title="ApacheCon NA 2011" alt="ApacheCon NA 2011 - logo" src="http://apache.org/ads/ApacheCon/2011-na-125x125.png" style="width: 125px;height: 125px;"></a>
+</div>
 </div>
 <!--+
     |end Menu
@@ -422,7 +424,7 @@ document.write("Last Published: " + docu
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2011 <a href="http://www.apache.org/licenses/">The Apache Software Foundation. Licensed under Apache License 2.0</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/trunk/pdfa.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/pdfa.pdf?rev=1160690&r1=1160689&r2=1160690&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/pdfa.pdf (original)
+++ xmlgraphics/site/deploy/fop/trunk/pdfa.pdf Tue Aug 23 13:51:33 2011
@@ -126,10 +126,10 @@ endobj
 >>
 endobj
 24 0 obj
-<< /Length 2635 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2652 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gatm=h2g=#&V'O^+m_jGJX@4PmhC3>h.?'KJ2D!"+qNj(6-HX;M_(ij]USlg4/=9E.*K4lRKSGgiG^WDYMYH;Bf0,M7h53Kl`>7cf@eKKj2,0g6k!a;PS!,6cKaWkED+EE1M;7Ho\0n;U41>)e"-*.Zhf+DDDh=[bU#!?;<Yf6a<D^T':/FCEU(5YH1B@ec:i^\Y(]X/8o<^T_S<Kt2R@nXITgl$TLut+21L]qr\,ZRia:IG%V=J$lm)<LnY>M?++Lh./E'F!)p1NZN>ZdnCg(.]H+c)"VaHakbd9O`"kj;]Oj'OOOjq7,DaZ5+[P!Ih28j@"SrTOY%:tmf!mSmaaBNFt-@&b\kH1\Dg+2m-4c_:Fm]%$3plDme=klQOqJJ\fq8_`918d$-=U*.*K<PZoXDV42<:P9&.<hsd6'au>TY7F$D_s32/*ubIK/dHSGt^`&(PND,.K]Q&,a:'g'%e[SNfG1d`:s5%ONYEK,3R)Dgr7l6Ben=f_],Spp(*c[>d'Ep"DF(93oo<IXf`4L9/ns56q<EEM^!q_$ldGoB]?V>SA&S(ZbCjs^=+IIFi;?[qoE;u105ru(qu7-=&WqX_Ml+rA;6b/TcYN!W\4#Wk%IcWc'=#r4t%Gl:.V(Y81QDC:7h)g8,0f;(o3mi/fu.k:KVK/*b(\I>*(.d'Z2SuanEdYI9rj7J&.XeRW>dD&SA[+:FZ`"7,3:epbuaF0A4rnRSfpY[?1t7/V`j%$"U@L;_KCn')%"Ibf<#L0cF/%8Ui?#<EY5Zr3L3.1DRr:U(oA//%uh5="oZg*Wfk]0'd[7KV8ps.Mictq$_pTo)k+4!2N:NFu?Q0IVeTX@Tq+s9g`^S"XN<D"cXar_*$n*9Nad=fX(>:I#\I?+JF,qM(PGO6ldTZJS&*e8M@/V"df0%JecP!;cT**gKYGZf"sDE,:O1njqaMjNMTF7f%J&@5JuIh*8%-!9N>;%AuG7XV5?UaM+2pLo-fG
 Ych!^^"+M"CAKsTO;^tYfkZ:A#1>h]):oKD1J,NE."a9["#g7(q)=]9,]%le;/FYi[Csr1R@kDkL[Qf^qGGcXMSljk^H_L$Z,&Bn,Z9_?r;l90H#f9i9mZH\cQFBJ'T;c!rb2@&(rbQ8h,TU;"-(n6!:D:>%Dcj,VSjBDG%.08:9j+,0VrDJh4r&gV4WuCVXQslOe$!A\!jUA#%!SU37pE8u'[92*KIJ+;7(k&CU.(`3i'aplRSa1iU97MrBcsl:dk\C)i`)W@"7N<fnCJ#$Df8Qs_K1pTg"Z"n$Xc>"H&LhSV0Q.*0NEl],&F_5ffW!&PK5XbT!co<dLHW&W>;6<CFCe"L4Fu:GZK4,+);9'l2X>%L[e5s9)t\tc(n]pf9?mH#k$`B*5VJMefM+O7/)m-4(_u=ZKp3D"nA/l8/6bY^$^o+FM,sFTcXf0mfWAO/jB0\p>E>.NYIX+L+fTPNR2Vq1erkiqNlmG8*dYDUWFinU0edk@bt1U'jjC/gi7\>=o!9:51<<ZZ900gmKrKd&Ant88$jj35b"+Y=19cQ]V-2ACEE\l#`;:4T<67Uk-s$=L'9)%([$K_=-lFHd\RU$BVWhKXkq]'9dS5(2l\Jho4kmiZDnuI-<.L#\]A`:$?pN>"AGjd2<J=kVKa\i$B!&`\2RI?Wl9obJHcHEIa#r^-le],ohGC\&=8])$0igZY\]5t:V"95mN+[jRBk$UX;TkV5aIu`Te,EKeeIFLlD::p56lJgMu&%/<1tc7PLb@[$%(tqD-8`[4e9V+iqI6n*iEngU6#O!A`;e)N-.Z?AU<&YU9%QVjYs@Y#R8nQ#b!6>S,ZB;&4_8-Xk<X"R_U&drQr<j-Eno'pn_R#CT7Gg;X=%1nB4,*bUeVX%H7$6?R(;NkE99-+5Q(a7<%H_+j2Fjmf:`n;cQ*g2oP_]IkFOJ>i4:kH.00?7ZP/3j+?G0XfTf317IJn+6KsZ[SS:8#r.XW#R_KZ<Eo
 *)drB+*l6mgO$Ik%"MdNr(.eAlE<2**2.YAdrlu/O\I_*=U+6"6+mJgBPFofP;!5^Lc?6nJm1@<-$72*:^!$O5<U3@B1M*p*u:k\6qTfV;2I?r;2"PWKDg'&QZX06H8H)sd.qXt,VI*UoqE[u$<.1G#bq$5DOhu.uO7l5tO7=XU:XN]69T)?L#hh*H%qO&&W$+?pRhe,IL1T8cC\-nMp&+AES#JQ,G(s[(l$Q$Z/d9?H6aIb+j%FbTN0Z'1e/VRbb'S=U%/O57#,6n)TD$Up@+F9)10?EG9dh!rID<\i5Cu<lU?CXSRY>Xi'V4p$&BWW1nL]Xa-A>IkgALWj2[l;g7;pg2t#19_Q:LQqDW8W1dM,Z<f8DMD#a*5?@;;N/<?`0d/')b/^2Jm:ueppLd56rpYnL\9q^1$UoSB76He]i)!7dB$[RIN'"r:%TXNQO3AjD%5\DM6YjMgKHiS='*HR"=Q8E4ZeZE4KA5r?#ATHJ]tTR>`Ea&qqb!eS,0CTSLr=U9`P<<,gq\(9"J'<M3tS!5%DSJUBH-$F%?$CaaU;+YZ`C?bnlPL&4[V(`bHbJE,qX\H-;tm\_!W/"R64j_E#J6C9K"_Dm(C()56g%rGOa>qE]1o6nla6^BW`.m]u4pC!pC$Y,:u!?ab,M#~>
+Gatm=gQ(#J&q0LU#lV'b5YR(MFj"594>Z5i*[$qgi^Fp.K*<jS...@0I9>\UgJlUMNfcQgRG]eBF^O<-rF!+AR:8mn^H.3'9%Lf-86\Ste<FIo#K]mj=P-CfK<]U#R7s7#j%oig$@J6"Ds6Te]'l3`Z^KYm8q45uW4'KPSmS>c16A(UC?paq&hmHqOQS_BL"8$mY,&'[-`EJ4I7^mD(sWfp.WlL3RmM$Bb3%,](?\u?1tk!lP1Rk"qD-n$*):4OLg#V-KX:7aGe*r%pC(o8-4>sCHaT<[+[ShY?<C47]KOop0lD0@U,0Z8[(o,#WMRgCnIG$KOcX-8LZ)%lTb55rg2nsA]Y2Et#mqmE"+)(gI=q_:LFFAjhX@2o]kGK/Yk<>uAuYf8n/V9H#P_Z*b]]UeY(03/GD\MZJ<iD`Jl[8.'qM7B@R5n"6O.-d>KSBkgJ:@/R&<Zd\ap;ke.lI3fq%ub4"CH,+l^?6_jW"p).lpgT:o._R8E[/o%VrB^)`.rja9Z0j3Q&Ia^Nne<E*.jbdh3'CG-9/'RC/8tX2-kQ+>gdS>3'ANYCjn50F_r^Yg8)i6QMR!u:=Fc28j['s2:Lo>r4?'4BH,gNeNFG
 <aR_OZg`G,n[uh]oV2a!;&`,1+1gkK7=XdM0!<;ntRL8EWf`9T;[@<+X-V_!Y'3T;N.(#]8mDjtMoB^FdN8:,K7%D3h%bVm$M&JW_nVI^tWgbdbNC%T*A\(BtB.</Bg6BZ`=:+0VGlFd!_^%CLL(mJ+oV[5Rp`"SGL1O1r+cUp0XK>*)`i8l><_oOrdZ^AYoQBhtZfJ0)8Ojcmd\$D8Sf:V6KU;'ohM`mMMSd1D#Mp>oC![1T(_i_L%Ig6Wor"\BY"G_L8r7VGK)4>,U0t/N$>NA#H,=X_U"J,)[Wc*gaga4^YgTgQ8LCImf)X6@,+Bkb<"dk:bHpWimb1$[3&Q(=@10&'h@N@(P;+#"3(u16%@)Pbj,VTjNgB_JbM(WjV63Q<lk,8=m;dj1T<dmP9dtC%jB7U>\]N-0rtiY$/hg9.Vs<r!beilO%g=d.OmaOj;6IJ([=*YYW]3jHW#31Ki\a&TWR*%_SkC^E*Odq#27FoiOI:E+'P`YV[90-NUS<4EB+ulrDWNW@F">[K_9A?%cUpCX!.I>h6@mk'34c\;n\bl*O2(BS^^D<r%/&;NRRVam4XsX>_K9pl8G5bXfLR)Z#,$p`'Xi<tGI9;(ZMc&\gaqc5%r#$,!mIT^o5^"&Fqa<)X8l"2-9:3sJ#7J.k7WZ.LhJJC?`HNtKt\`<p&17Xq3X,Uf%3V`UZ@cQ<!jNhosAOnC/-cJQgPq]L6f3j)cJP6mRUK\>sMRiSuiQ>=7W1u-pL4Iks^$ZXCS%S&$si>8-oLd[9ZeAZSe:D@RPu[RNCX0]Y"pbh2&r(Zi3uX-']@PM+:^XC<UR%9b7H159U_@;E+GMK&?gZ7*<t#RM,tF3">*%3Iujg2-sCN?BZ*0Ufqt5KO9bFA0t`<DudAni>OGZq]cuJ_q+30[Km(;.7BSXr=0NY&#sEDi(!_gn`T1J[FMs=Cq"g!VrcRE_Co#/@9%`aaJ>dTI;CjT9Hd%c1Las3&`OH`<b9
 [:7E;Ch7R[V9<>r...@CEGp_t>kNV+'(K'Gp##)(,pTD"MUa:+-Np1entGCRc'A3:f@=e@X)CFUBNT],Oqoc$#Z],X"o3,6:%gf8kH-Z~>
 endstream
 endobj
 25 0 obj
@@ -218,10 +218,10 @@ endobj
 >>
 endobj
 33 0 obj
-<< /Length 3180 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 3195 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GauHNh/h=/&qBX_U!$*"R2RFIc+G?:P0;\BRPpa4DpJ(WOcY5H7B.JA3WK%0#_6/VUa4!K-=_rA@2IS"*u7Ma\\!03GP1,6?**#J_c>\0Dio;0GN=JIqo4[q'%2KpMriJB=)[N0DVmqlW[?N'Y.Te>KE$&@Z,UKM@P;!AD&<5_^>!VK?\4*X,>#8PAhJe/X8R4`,oW^`LhJ`A=uX_,CD",52jdk0<Q_oPK,8dc<U6_3n4I'R4eA+OidnLYS,W?7qqK_YhT:'i8l!a[a*HX,k?L-.AH-jnpQ(G&PDFnCTWmG1\m!X)bGq)IHd);g'm92E&e]IDqg-/e856AJ;:ttud14Li#'$a0ZE+REDT!tB2#I9`WY&Bb(/;]B.)-7EH+i$*^>W&o$JrOFAb<Q^:]%qIFc6rrUdiCOhiE)<k_LDR3eimoegR0C+%Urp0<kQ#&o[_epFieO<SO1GR#aTo('QA40Vi!RT8b3UZ#:36P$s6&Zch0W?1GZ/cH?ILMO`WW3pTaMa0G/<4Zq?>QANb(]+[`hAmn(iCU6q"i#Tl,dYWc3P#`;B_p$AI2.@:-M&Ktuf,3Rb=9Oik:C7J;8?Ib6e^Y2tN0bZJO@iM*^NOljS/FAs2-JGAEPsSs-3G\Ld"\EN5"Q]NT_+I,Da43tT4f`Z[cT!b%\he/Hb=J8.3IH]`G&Q9.)9fq9h*fn7gDRSns^ZCeOCoQeO,_eK\u[!59kH#.='HQjJaY'JHe1gnOU"Dm:qLLcp>G/f+2dpmh]3'jA)u_/oiKZA$!$*/r).O9\CQ2quPfG(9G;^0t1*%NQ,lRC.>Pe]o?_Aa#?2U(i@oq=`tF08n'UFgDpbQ;75><Gr1r24L)cSS$YMF%A5SqOE6oD@""?2=4id#(Ft'!%-+7liuAP6Z//,c&E7et7re/XbYeic@9-B02ojn19Pa.Z[gut:5`tqtD385R1j_D,"U[=dj32e$7/kYC:GH)WHga.J)2P\2]8am
 EpV*Y7nOG#*.TYDn\]>o^]&VWJX#&2/Z/(d:P6qe2:_!Y>0cA_32P=;"TV.bd8I6jk*&rUNhh\+BE?HpL3auu6T6HD>4g"X>r-6#S=mZ4mo!sY>J]e8GBgtUO$_7V`FF"6tTGQd6K[K!T3mqD$Sq!H9"1GWTL@"$>iljuYiK$&K]te(O:iap'b?J#O(00eqnp`c?EW1DJRPV\b>KKWqD@U:rL2+elWDF&1C]LF=)+/rfGj'l&SFW*8PaWV%,&cSQnpluN\8MRnJ,f0:fHf%ih1ZSe#MB4Zi%sdb(NR3V)ZKEIi_"![%[0<epK>#W;NIXK<dRI&&N>Cc?sT=99e@%'3\F%LZ5<"";0n],p3j6>SdjQLaCbf*INQ<VJ)sdnA0Iek_L>Bm^#S(fH?p[QI""??$a$=$&-aE.>54e'^"`\H`2bi!=f8p01-['T?&U=2Cp7g>a.k7VS.OrrD2b'>P=%c"/+KS!J*r$O>Ae>,G$JOHV9B+hOp@il(e\YcZkT^rZIG:YLC?4!4Ec4&a4BROH1rru*kC#2G@(if@hS4(qi[B4\_kcR;;E@bc?/tQ]fNu0YnkJ2a''diepF>C`o*V_iPD=7i\nTpmR1ssmWfMZaedXLYfFT4UOm/ab"KIc&<BVi:)BEk?Bh<NKUr\\'>nIE`*oD3`_S`!#7j427KUqE]*Ne_lI3*^.=iX7ki/iAU8)a0SdK1IQ<l2Pbj/MV@\=Vf7Jlc;/WMcc[MYUmi[$q/Yu%BAK$9i'C/sS&Z"glo12s5t+k8pL>fY4qS/e7k74LQ+3)L]LJ>.mc&A'mX',N1LkCVoe13mW9P/_q`.QmA);(]l7I&Tf;\)[90N+1OmV$=F`eiNc`+JX11&<_"0?gDAG,_1@HaFRY`*"W2gLba98B]t-OT&4I<=2*i$0@1Lr5FlM=:J3h3rjm0uGRf)Jh*lZV&oYip]&^25l0?,`bIXbRHZG&rg&Q*u4tsc]91]7>F4EkBgn.
 cTj_#eh!2iYLeS_Jl[h[lQg9iB^G7UGKlMAa!0+T;[3M)k],e>Ca4A)?CdkXQWbF;_GU$OYlOA3F-F4F9;DsmjAN%Icqb0\-?L8r$&?!deq)$H=s5IBc7/ZM..?4MahB%]m]C+*&Jp1(;HolFah5dV$pFRKsi)CMg98($tEUgQrqfPTl6)As#BgVZ",Z>f(njS,T7:-A$Xmq_^f*4MD."E=)Z#dT*fM1Y\:30knE9GPVr78P9S9HfGoN]HV%-8(VBBCU%3BK_<-....@jGj_.>^t8HVCm/;EJn5K(&B3L>rM@R/YWhSLa)0P5]u7KH01th2ImuaWZB0`$9$3P^\iIH1XCtsk`6sE0RJhqlLon`2u4Xp-a[aTki^PdXfqJRb[nK;#F-?$aQ%ZB43%3L6pKXm9,!jC?$JO\d@VXMlX;&4l/<t5&<l%Xj?A^XcSYUrD"pXSBCbnEr_(O=s$U1'=$.Y00q6=$)UXeFW`7Vp25I(\"4Rt["LV2\`EMIe^)_fiT$ClF]0)S)-KeC&*"?%SeG4RJ]rdYp<Q@;\R]7`oHss&'1j\SXr%&GN*`g/R</&Kf_K5MG7'8`&p?*[u0/9$CeRpos3Fi%%\Vbftf2D1P4dE$5"LhEe8S)WJUbLROWZeu:2:"<X/]%$Q"VlGG%&p)BRTIIW3t0Qr;'"'u8PHHu30(UE\%1g:o^#e8Y4/?G![(G:S%g(;$0qF+C<]sNR6J/.\<NkeU$2e_$Fk62QW8bB4V)Jq2;S!X;KTT,6siYjH71/b868RqbkN^dr]`8!,%p6?4)dpJQf*U&'SoXG_=#X^VQN]Ob"-3JG`['Ueud.is,C%U6\@q*Jf1iJ0VlLjSSqPF?aa'Yh^"cN>_tu"@l7UoGSAZ2Z^XRp>n(r/LjXhgW;dc+""^NLVL
 AYRK.!`:`l.?CVp=U"eL=d1oG/Do<o<kmM:KA]lVkZ-W;IQH6kX*bqH<jd:kreKO=YsHqYIqP2*96_Rq`DkG<]m7LPf'1YPT'+MBhku2RP`e>FLr@"12-f7ik8#,`GQhd0J;,d85-dT/uF'2'1hAgV2''\IMs!TR+;p!QR\o^iZ)9$`HqNKK;WTj0l=5SdF]cFbeVLhP&EartV_Mli~>
+GauHNh/h=/&qBX__95KBR2R:E9tqulP0;\BRPpa4DpJ(WOcY5H7B.VE3WK%0nNecU;Ng'6PHi)\YRBgL%u[:AhI!t.^\[PZ3c"NdE#!`<F^hiW*P):L^@@qN"OsE]Zb6.rlL"Q#idL%;DSlA;b*?cqr25QcNKSr_DW';gSc;sPDg9N6K8A#'ETgX`RmPH_I_4Yu)Q6\mBK)Yj2q@tE&\6^VQsAWNMQ6N*kBPZ[CTSlO8meV^Ssm(HOgT8"rqt7B`>_56l=qUP:=.A.H/UX,\9K"8ri^DCO-)`gO9ERrYi8qgY,Zfkb)F)^b4r+S<V^,P,]mJgonFoXMIOJ5B*\&t4$9tk`3H>"U,mh8&Z9<hm"ao46=^C+1_$KSnT>\mWpQtO)dYFqi5=kbXk2Pqm/tD[0oS\oBH80W0C0Rn,DO^5$jlH_;*M6LO93\@`Wdgu]_0$&]Z-t;D1e]p4q?P=k<(-0OE.1Det,jZ^-R]NL++%b0)#?h`V]Wr0-5Bh15<8OX]'6Ta4b=Zn6@PL-;)JK<Zii\"X.lFbmKSaG:^M\<^^bdZn`^@Ao=KJ&M$^L<%tYeNBtjEKhmR*XKV\Z`2NH0<W:@jGR<pHWDmL&=.)RsR\=b+Oa4nb9-!9GA0Ahpg<bN"B5'^FPb-=cmaJrNM70^$CQ8J`+PKPta'2&ro'u,XVeq![!5mJK).b=i/0GhPDg!\t2EDGM0#B_$r8.JO)9LXb2(r0m4B74ecsXn04OWS?];ikrBVAf)l\DsIpPZ.NE%BTB(HIe>1"P'fbTVp-;`4n[Dh,?p"Y6f<TA-@,7dW,C25AjnmNS)hd>^XE7N46uQ<aqc<F[iRgDpbQ;7>D=Gr1r24L)cSS$YMP%\P\rOE6oD@""?2Qe7Qc'.\Wr%-+7nisZE&Z/4)+,K/gt&#8W>R+3orKNVkdhAh;`1TeK[h`cu2!CcDm[RGd:e*QmP'QhuI)J@>7,kRZ5HQC!mYkRSWQ[r8jCpt#
 0m+tgo/UrAhY@PV3Sr4$J:*0-F=IkS7NGZ]mRZqkAK/+hto?#YYdfJPK!<q;<84l\r@DO+_qF3#)MZ\8#eIo35F5B>lpq6/JoV)AUB!hjTaQ=t<7p\-9:,=q?>`^Gjd-2iMJY&Lc&OsZNkt(aRH2`N+%bTKE(c%EgK/4lPL-P'uoE'g,6ch[</T4e;>#`%6bQ%+6`VKDqB[6N&9I2b@\f%#H(oe`LVF!.2dfH6_A;h"_^dC'I@$T&Sf;U22'6u+GPm=BiKDT7Gp\.IUO%j)R/2+*/43/K<#G7.VFR$7i2>lbFk=TI9*@=M]pK>#W;O8[(<dRI&&N>Cc?sT=99ah\0,o<D(faE&B0KICjGTT#s28QmGq(/D]lf5J9\!H\X)Gh>6k*'QG*=i\3;u=r(o6_0VBK]pY^aGi(_@%(DjVIV<?F=Ld3p!b%o+Q/o`CTrf%G"7eB[k"W@R@c%NR<r/EcdGh$9VM`5PLo7>HVmmAmAc6U%AN7O9_Wi(dfgp1__UrZ;?s*L,:qH4SE`BcdqEWGn7(b*kC/6HX@Pr@l<%1pBB$rF2+E.V7K,UQ0J(%C3>-/A1a$EQF.'#Y4kagN58"E_hC\0`,1#>njIC"mWmm+a_J("@?6,I7g7;MPcsli6TdQCUb4Whgb;;^#X&\2-A##XNe1BpNL.-X%N^GCPk^off'to%lBA"c.=`S#WH3$mW2Q5Of7gRd9.q)ck"XEL@\=Vf7/QZ:/WMd>D)"#``CkjgA"c`bpo-2*e>Us)@b#WhADgG["0.%6\X'"33&sBXMH#,5@%o[f!(CBB+gQ%!-SAG*T*qB3b2eDf8eQDhd,Cr/Lh]1uk0)%lC-/RgJhSr#=K6o[A$+:boi$b2qZ."8qR)X?ILQ!1J/me77m>=>JLIXEK8*]T_"7G_J*XYJrsF1Jo$a$3pp@t<*j2>t`cKc_Go,iOeTaI$dKQ7K92ud_>#qs*n&[;i-j)j<pcnq>.4#S=bZ-$MFan
 /FQCj-j+.PY@<omL>DC`T+<OO@/G7Po?lMB$%/e92Z3M%<_,ePOc>Y;l.dkZoZjn131;s#"$aemeO\_U84DsddTN%K2D9%2K+ROZ,eZ7gjM1]g@r+'SAq(1l?n?5A;EBA%E1W[Uo6p1&$\os;":+I[sHeU*"V`epjdUM+sa[:!%5fP]r7)As;JgVZ",,.Hi%jS)Il-SG2Mo+ZS^QJ6O-!k>ic"BeFs\:aa)30knE9GPVr7F4dtO?ae2P1fTZ-8(VBV9qq)-p=qj.6ZbZdN)nL>ScUl,gb5XC"qJ2@W=@I#SUZ?Wd;A2jX[bfRt\r*VVN"dY37(njh@+Fnm#gT#?-B6GAq5CefFaP4!YTprhu,W<Uc=7(;Z@gn4;WnCu%alOG9PuPe,QYPWWUN1Y2f9-M*\.g4>JgY^ZTHjl[SO\o)a[IiLb-hK&s'2^cPX;$TsB6CX:$H@D&Zl?]YUXKIlSTMbkHH(%NNbF%1UkU/K5Bqj'YL?D2Br?WYP*a6FF*d2T$&b.MImLsmE6IVRQL;1ZI3j2oQ^\Ec\:ZOBV`A@''ZZUOf6^j+4.i%c`L,?8"5RjD^:d\6j=:98l2a`\Te!UVeQYS?ZkBp>ZLI7Bi<OUf-[hWt`C>%cS;tYg+02,B7KJ,KP?R.u'@3h@=<N'.U4GO_#EqP-p59Jj6M<S!B^<hH$)=sKA<U>XFWb\36Vc)%UiRV`uFd_Ol#n6QbW_&VVqH9Yo+aCFETqX2pTl+SLk%29a%YJkJlji9:,c7P**60h`:%$^Q4o6!\(B-/Y!([q*qCbAPJi\CM>4WM,\kfI7?IucbU$,!I#e5#EQW9IV4V)Jq(#AU8&p1h76siY*H7105Lo_s.B)EBms.AKoOgXl]*Om<<95r--E^Y%/62>/";qEB8VBdir4OdBA<isSFrJahS6\@q*JfZZ$d%nI`X`%6V?aNpWh^"cN>_siaA(=qPGSA*"Z^XRO>r?cWLhq]WW;dc/""^NLVL
 AYRK.!`:7)\EgVq11UY#DpEkUebhXM4Rc'<?VDf;F;bFSRf>Lc@p3p!WiqTaK=0-><l9p%:\ECM#u3>Lse1ms`ja%i&fV^?Se0>o_OA[AigBhNHMB0DgW?/cW4'[92Wg+":\"b9_u]#9iA"H@W'#2Ul?gUXi(8"W1Ce9k.n3Sd2`A:dHau`,_RW3$'B>"%>lr;sS7Hg(ri$1gs:D4QTVo%NTKf#M5VdD#~>
 endstream
 endobj
 34 0 obj
@@ -436,58 +436,58 @@ endobj
 xref
 0 53
 0000000000 65535 f 
-0000012568 00000 n 
-0000012640 00000 n 
-0000012732 00000 n 
+0000012600 00000 n 
+0000012672 00000 n 
+0000012764 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
 0000000870 00000 n 
 0000000990 00000 n 
 0000001071 00000 n 
-0000012866 00000 n 
+0000012898 00000 n 
 0000001205 00000 n 
-0000012929 00000 n 
+0000012961 00000 n 
 0000001341 00000 n 
-0000012995 00000 n 
+0000013027 00000 n 
 0000001477 00000 n 
-0000013061 00000 n 
+0000013093 00000 n 
 0000001611 00000 n 
-0000013127 00000 n 
+0000013159 00000 n 
 0000001747 00000 n 
-0000013193 00000 n 
+0000013225 00000 n 
 0000001883 00000 n 
-0000013258 00000 n 
+0000013290 00000 n 
 0000002019 00000 n 
 0000002201 00000 n 
 0000002387 00000 n 
-0000005115 00000 n 
-0000005238 00000 n 
-0000005300 00000 n 
-0000005555 00000 n 
-0000005751 00000 n 
-0000005965 00000 n 
-0000006137 00000 n 
-0000006319 00000 n 
-0000006505 00000 n 
-0000009778 00000 n 
-0000009901 00000 n 
-0000009942 00000 n 
-0000010112 00000 n 
-0000010294 00000 n 
-0000013324 00000 n 
-0000010480 00000 n 
-0000010619 00000 n 
-0000010850 00000 n 
-0000011072 00000 n 
-0000011271 00000 n 
-0000011464 00000 n 
-0000011718 00000 n 
-0000011906 00000 n 
-0000012014 00000 n 
-0000012124 00000 n 
-0000012237 00000 n 
-0000012353 00000 n 
-0000012459 00000 n 
+0000005132 00000 n 
+0000005255 00000 n 
+0000005317 00000 n 
+0000005572 00000 n 
+0000005768 00000 n 
+0000005982 00000 n 
+0000006154 00000 n 
+0000006336 00000 n 
+0000006522 00000 n 
+0000009810 00000 n 
+0000009933 00000 n 
+0000009974 00000 n 
+0000010144 00000 n 
+0000010326 00000 n 
+0000013356 00000 n 
+0000010512 00000 n 
+0000010651 00000 n 
+0000010882 00000 n 
+0000011104 00000 n 
+0000011303 00000 n 
+0000011496 00000 n 
+0000011750 00000 n 
+0000011938 00000 n 
+0000012046 00000 n 
+0000012156 00000 n 
+0000012269 00000 n 
+0000012385 00000 n 
+0000012491 00000 n 
 trailer
 <<
 /Size 53
@@ -495,5 +495,5 @@ trailer
 /Info 4 0 R
 >>
 startxref
-13375
+13407
 %%EOF

Modified: xmlgraphics/site/deploy/fop/trunk/pdfencryption.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/pdfencryption.html?rev=1160690&r1=1160689&r2=1160690&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/pdfencryption.html (original)
+++ xmlgraphics/site/deploy/fop/trunk/pdfencryption.html Tue Aug 23 13:51:33 2011
@@ -11,7 +11,7 @@
 <link media="print" type="text/css" href="../skin/print.css" rel="stylesheet">
 <link type="text/css" href="../skin/profile.css" rel="stylesheet">
 <script src="../skin/getBlank.js" language="javascript" type="text/javascript"></script><script src="../skin/getMenu.js" language="javascript" type="text/javascript"></script><script src="../skin/fontsize.js" language="javascript" type="text/javascript"></script>
-<link rel="shortcut icon" href="../">
+<link rel="shortcut icon" href="../favicon.ico">
 </head>
 <body onload="init()">
 <script type="text/javascript">ndeSetTextSize();</script>
@@ -92,7 +92,7 @@ document.write("Last Published: " + docu
     |breadtrail
     +-->
 <div class="breadtrail">
-<a href="http://www.apache.org/">apache.org</a> &gt; <a href="http://xml.apache.org/">XML Federation</a> &gt; <a href="http://xmlgraphics.apache.org/">xmlgraphics.apache.org</a><script src="../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
+<a href="http://www.apache.org/">The Apache Software Foundation</a> &gt; <a href="http://xmlgraphics.apache.org/">Apache XML Graphics Project</a><script src="../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
 </div>
 <!--+
     |start Menu, mainarea
@@ -176,7 +176,9 @@ document.write("Last Published: " + docu
 <!--+
   |alternative credits
   +-->
-<div id="credit2"></div>
+<div id="credit2">
+<a href="http://www.apachecon.com/"><img border="0" title="ApacheCon NA 2011" alt="ApacheCon NA 2011 - logo" src="http://apache.org/ads/ApacheCon/2011-na-125x125.png" style="width: 125px;height: 125px;"></a>
+</div>
 </div>
 <!--+
     |end Menu
@@ -264,14 +266,78 @@ document.write("Last Published: " + docu
         supplied, viewing the content is not restricted.
       </p>
 <p>
-        Further restrictions can be imposed by using the <span class="codefrag">-noprint</span>,
-        <span class="codefrag">-nocopy</span>, <span class="codefrag">-noedit</span> and
-        <span class="codefrag">-noannotations</span> options, which disable printing, copying
-        text, editing in Adobe Acrobat and making annotations, respectively.
-      </p>
+        Further restrictions can be imposed by using the following command-line options:
+        <table class="ForrestTable" cellspacing="1" cellpadding="4">
+          
+<tr>
+            
+<th colspan="1" rowspan="1">Option</th>
+            <th colspan="1" rowspan="1">Description</th>
+          
+</tr>
+          
+<tr>
+            
+<td colspan="1" rowspan="1"><span class="codefrag">-noprint</span></td>
+            <td colspan="1" rowspan="1">disable printing</td>
+          
+</tr>
+          
+<tr>
+            
+<td colspan="1" rowspan="1"><span class="codefrag">-nocopy</span></td>
+            <td colspan="1" rowspan="1">disable copy/paste of content</td>
+          
+</tr>
+          
+<tr>
+            
+<td colspan="1" rowspan="1"><span class="codefrag">-noedit</span></td>
+            <td colspan="1" rowspan="1">disable editing in Adobe Acrobat</td>
+          
+</tr>
+          
+<tr>
+            
+<td colspan="1" rowspan="1"><span class="codefrag">-noannotations</span></td>
+            <td colspan="1" rowspan="1">disable editing of annotations</td>
+          
+</tr>
+          
+<tr>
+            
+<td colspan="1" rowspan="1"><span class="codefrag">-nofillinforms</span></td>
+            <td colspan="1" rowspan="1">disable filling in forms</td>
+          
+</tr>
+          
+<tr>
+            
+<td colspan="1" rowspan="1"><span class="codefrag">-noaccesscontent</span></td>
+            <td colspan="1" rowspan="1">disable text and graphics extraction for accessibility purposes</td>
+          
+</tr>
+          
+<tr>
+            
+<td colspan="1" rowspan="1"><span class="codefrag">-noassembledoc</span></td>
+            <td colspan="1" rowspan="1">disable assembling documents</td>
+          
+</tr>
+          
+<tr>
+            
+<td colspan="1" rowspan="1"><span class="codefrag">-noprinthq</span></td>
+            <td colspan="1" rowspan="1">disable high quality printing</td>
+          
+</tr>
+        
+</table>
+      
+</p>
 </div>
     
-<a name="N10051"></a><a name="Usage+%28embedded%29"></a>
+<a name="N100C5"></a><a name="Usage+%28embedded%29"></a>
 <h2 class="underlined_10">Usage (embedded)</h2>
 <div class="section">
 <p>
@@ -291,6 +357,15 @@ document.write("Last Published: " + docu
         
 <tr>
           
+<td colspan="1" rowspan="1">encryption-length</td>
+          <td colspan="1" rowspan="1">The encryption length in bit</td>
+          <td colspan="1" rowspan="1">Any multiple of 8 between 40 and 128</td>
+          <td colspan="1" rowspan="1">40</td>
+        
+</tr>
+        
+<tr>
+          
 <td colspan="1" rowspan="1">ownerPassword</td>
           <td colspan="1" rowspan="1">The owner password</td>
           <td colspan="1" rowspan="1">String</td>
@@ -328,7 +403,7 @@ document.write("Last Published: " + docu
 <tr>
           
 <td colspan="1" rowspan="1">allowEditContent</td>
-          <td colspan="1" rowspan="1">Allows/disallows editing of content</td>
+          <td colspan="1" rowspan="1">Allows/disallows editing in Adobe Acrobat</td>
           <td colspan="1" rowspan="1">"TRUE" or "FALSE"</td>
           <td colspan="1" rowspan="1">"TRUE"</td>
         
@@ -342,6 +417,42 @@ document.write("Last Published: " + docu
           <td colspan="1" rowspan="1">"TRUE"</td>
         
 </tr>
+        
+<tr>
+          
+<td colspan="1" rowspan="1">allowFillInForms</td>
+          <td colspan="1" rowspan="1">Allows/disallows filling in forms</td>
+          <td colspan="1" rowspan="1">"TRUE" or "FALSE"</td>
+          <td colspan="1" rowspan="1">"TRUE"</td>
+        
+</tr>
+        
+<tr>
+          
+<td colspan="1" rowspan="1">allowAccessContent</td>
+          <td colspan="1" rowspan="1">Allows/disallows text and graphics extraction for accessibility purposes</td>
+          <td colspan="1" rowspan="1">"TRUE" or "FALSE"</td>
+          <td colspan="1" rowspan="1">"TRUE"</td>
+        
+</tr>
+        
+<tr>
+          
+<td colspan="1" rowspan="1">allowAssembleDocument</td>
+          <td colspan="1" rowspan="1">Allows/disallows assembling document</td>
+          <td colspan="1" rowspan="1">"TRUE" or "FALSE"</td>
+          <td colspan="1" rowspan="1">"TRUE"</td>
+        
+</tr>
+        
+<tr>
+          
+<td colspan="1" rowspan="1">allowPrintHq</td>
+          <td colspan="1" rowspan="1">Allows/disallows high quality printing</td>
+          <td colspan="1" rowspan="1">"TRUE" or "FALSE"</td>
+          <td colspan="1" rowspan="1">"TRUE"</td>
+        
+</tr>
       
 </table>
 <div class="note">
@@ -379,6 +490,14 @@ Fop fop = fopFactory.newFop(MimeConstant
 <li>allowEditContent: true if editing content is allowed</li>
         
 <li>allowEditAnnotations: true if editing annotations is allowed</li>
+        
+<li>allowFillInForms: true if filling in forms is allowed.</li>
+        
+<li>allowAccessContent: true if extracting text and graphics is allowed</li>
+        
+<li>allowAssembleDocument: true if assembling document is allowed</li>
+        
+<li>allowPrintHq: true if printing to high quality is allowed</li>
       
 </ol>
 <p>
@@ -398,11 +517,19 @@ Fop fop = fopFactory.newFop(MimeConstant
 <li>noedit: Boolean or "true"/"false"</li>
         
 <li>noannotations: Boolean or "true"/"false"</li>
+        
+<li>nofillinforms: Boolean or "true"/"false"</li>
+        
+<li>noaccesscontent: Boolean or "true"/"false"</li>
+        
+<li>noassembledoc: Boolean or "true"/"false"</li>
+        
+<li>noprinthq: Boolean or "true"/"false"</li>
       
 </ol>
 </div>
     
-<a name="N10137"></a><a name="Environment"></a>
+<a name="N10236"></a><a name="Environment"></a>
 <h2 class="underlined_10">Environment</h2>
 <div class="section">
 <p>
@@ -431,7 +558,7 @@ Fop fop = fopFactory.newFop(MimeConstant
       </p>
 </div>
     
-<a name="N1015D"></a><a name="install_crypto"></a>
+<a name="N1025C"></a><a name="install_crypto"></a>
 <h2 class="underlined_10">Installing a crypto provider</h2>
 <div class="section">
 <p>
@@ -470,7 +597,7 @@ Fop fop = fopFactory.newFop(MimeConstant
 <font size="-2">by&nbsp;J.Pietschmann,&nbsp;Jeremias M&auml;rki</font>
 </p>
 <span class="version">
-          version 638396</span>
+          version 1154998</span>
 </div>
 <!--+
     |end content
@@ -488,7 +615,7 @@ document.write("Last Published: " + docu
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2011 <a href="http://www.apache.org/licenses/">The Apache Software Foundation. Licensed under Apache License 2.0</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/trunk/pdfencryption.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/pdfencryption.pdf?rev=1160690&r1=1160689&r2=1160690&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/pdfencryption.pdf (original)
+++ xmlgraphics/site/deploy/fop/trunk/pdfencryption.pdf Tue Aug 23 13:51:33 2011
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 648 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 647 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gb!$DcYo:,'Z]\?'gD8O8=RH1S_dDLO]H12<jC,ZK*)TL$\fO`XoJ>.'MQ)/oTkpJq!n9ihoF&lGB"1s$,@6E+Pm?#qauGGA,uaoHOpb@fsot%E!bM*r)dc!YF"/l(=N.`BTq*3Wl[m9Qf'6I+.OAR#krZ.,"OsEBeOMuUec:'L>@/-:*`t^hnL$D$!:IEA<K;J?<4I\p&cDp-J(t_*"$9$LP];@?0&$ZQEOLZWVr*C1C8TqV5^tT%&&-M=RD-[eR0u47Ci0M8SK)[RX3In!(H'sZINTP5Y5+^LSiq3aK=rIn&LX#Vd07)Jo4'QY*pToiZi:B$Tq&_1WY?]n199mp\.j&P<IPZnqGice=2K/dG*cj.Co*o/it9L/OUc`kn#)-,r5/mO,,E33_aaCI0cDJmW7D_fg4^,iZU?Da5Y>?hOJUjR_g)aG7sf**!F9-$65RSnO3]b_.X+4bsIeDIkc)@Np[`p4tG.DWbV"ide>7rT(5k8Wr[!s$Gn$V@E7isi-/7b\r52E.%![*Q;%K:"'1&&n1D.c$Q1!'7SmRQ5kmBp$#\Re]>qmE3gNmM)P)2l[%;ZF<-$@"^OFtN/8eG-#]e#eF`e>knqX*ADSts^EQkMa%XCr>e`jltB&UJ*66G,M;@\iR~>
+Gb!$D6#W5H(l%MW$6ORbUs3:WA#He9CSXt!RSE.Um,3C]X9HKM@dCe$%1OY$,^N,.!VlHfg@'[]mk,'dFUTsT&P2X^jDJ*3JKd?%Z53QNgK;<*(ag<!-2>%'HsSJB8'JLAY`Ln%:N`]f%@>uh80=oS!XK<_k9>^J`5s-Bo3HO>Z/'<2(.+7e<nmpt7`cLK/gsVh5SQFYC\QmO5/</@D3Gu4U%O14>T-`pdJ1f7D+oc]Xi?J?5ig?i$%iqc@Am/lNm_W<#Ad9)rGu$(<pI+2odE)Q\K5tkPf/Xs3p<8Op'Ysmr%e/SPGV:Lmh57;_KXN]$0s6f%4q!""\`?FnqC^*9XB4*U6tk2XX.?.^Rb8K;/*RH?CR+K%n_(BKY3"0`#q'cN+[u@ZX4<,j\FsKbc_PnZbXK4Ggkq#Hj0&^*LUDWQ@5quAL_!>XnYZ(O3L"aFJ+_GF'BG(0Ee/7/NO8JRf,Z6XZ5$O;#"$6-:a=_\1@ScS#TDt1fjeA[L0mTd+kP8T=uTD#I-/-W*T1Y9a!0S7Y6'X/\#ke%$(fAa>("DHm-B^G3RMJj6T)UbD[.;b^El&:Hm;Q4%TCcIb[%]DH+X^-Cb-H$RHkT%rGP.L>fo<=;XmW<7X=^lbLXWiP)<ZDt$!<gl`W~>
 endstream
 endobj
 6 0 obj
@@ -104,10 +104,10 @@ endobj
 >>
 endobj
 20 0 obj
-<< /Length 3287 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2962 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GauHO968iI'#+6EY]<@9CmkJ553D"L`)E(mh.1.\]8)q?5S@V4/.l-MZD7BkM^QoF.$65AG,f"p")%]5pppLS5<`?.hPXZsqgnLG^'_NnX3_7L^X,Uck9Xj1LJd%om(@h_&,d$q%Di//^]3julfWl6I.7-q4oB?nl/CpB=+Qut@@DH=GCn81s3=I_LRqR3HD_^3qq8U0F,@?D_gtq79c3I$C[*LSrc.VkK:3sJlhaiZa19Y`aSZk`\@ophLt'/o4iN7"VeSm!?bVC\EIPiU]_B[bW`\(8%[34%qG=R'.igNP465"cmbR#R>OC0\LY$E7q;_m$R4EuuFg6=7GTV?hr)Lg_Tlo\,+#\g'GtglBYGoG*F]l$+Ng8@O_q[1mV9S;j/W+qOod3bbmHES(%&n"<9Zu#Gm7Xa'2lnY2-cCQ?iAO.#GhnQ[PjK'LY)6`OP#Vb4FEfD9k0C]Dg!8uiTanbFbPeTYAl>dXS`E0@\j/@bZn=mPZBbdjBS8eu/DTdokLMgiXm9W*D4%.Lehk?T9.d%FXe^4D%3*ZPgShR1RK8!?l(i$"=M4bd.IAp0J3r24.^B:l?F$luC4fah4)<dZ2P_?m=ciEHEM!\?NlaXJ`Bl"2-*%.+cu2A%!kR2%EZ^%=8DV/^UoLlB;HX%)?T,lD"6_$[!O\XWYb;odXQ,nhH$,>jnHJ[V4VU05g_d34Q*\jiHPt6Ac6GQYg9En9\3)5\Q1%DM7.OJLCUMu6bER;f"!!UQ<qNYoJ6!5YSu\<LEG86EnJ#6,kA@IS\1[]qearf&8<qJf,dEsj(u!SN=UqV`q'(#N:M0E5TsP+q.hHLODCS=AR^W[S1rb:[O/-)rYirU>L6f:CIdQX6N'4`C\ndM0*DcsL[D>Fe1;q]na'H)$9aa1keD6!6J<B8c2-Z.X=KObq?>dMPaeN5O/3^]Hq!<h#c2BsFQ>!f,NVR#5i9hXtIM*d2I0;$S58s(u,l]<WO,4A6@3tm
 D_Z_OtbY^EYd,^&c#<D.3pjcmI71n_8cV9\saf-&9j+s"S"$YB2iW)s%l]:GLnI8BJFr7HDh<;YU2;OGH`=.s,NkI>G@m;ht\<CVN`'31J`El0%-Su:=MIrgjVhp/:JC:T;8/j@op\Bq0;2kH1O5._0Y\qCar_X=(3HkO;K\E=7VU`Z5e1Hbn]B<"=!%_+bfcIB0UO9t,U'J2[^I^KskWK6#C_kk_[M=C6d+'j+fIa50bL.B<Q^$)5dUOh4<=YqGZq;E*Nn"F!`>inu1^[(8WMG#I)M#*106Y"\U$gQ>(Zj&Xbmp['c?P^'0#A)[26Z)Pj3)'I40aZrP1aL.hjO\:d%$(P[O)cSQBm^(>#<Rk+VU4ieF>j=02N'9&005PonZN.!2a-cC+5P8Y/(t%K4Cp[I0[+k7M_k/#ipOf:/hL46MS/'kg(Ot[/1\\8K%rt[&8S_`H/lhN=%5c@4-t@;[&X.(a,L3)."uZGLGD)<Nm;IL<>$eK"qGDN5IrBMYMb4$eIH@X_D\!9sqkm._^)9^h#(G'EB.`!_t*1@W(la0Sr0XNaQ/;!uJ9!3fGB<2tV?/J2RX>6Z[$C>B4[Ac.;7iWI'5a6Rp;@4c_QHoJA+-D88\6@KAgm.`u4W.^9ZGJ1Ebfd,oQU=DG[<f#K&g6`o#sb]0U0HTa+mTGh?jmYr`D$Sj=o[T<W$J74u=qKRW?i[)I(KiY)cd9@ZpIeZbX(+:Ye:Rio/.("5Ah]3ps4uhLc7i5VQe1o:tZD=n(9gt_u_'/P6V-;1?Ll?S/-*b)CS!(m/NAGPlUX2NE@Fo.hM5/_dl0i:,E@5dE)K+!)5O@`!H0,>k3LWHCaIJY'@p]*-eKAZ*P;=X\LDd&b8d;FtcHI&]bK2;Y8*_'p3&6MUbe*]]5a*1ZLrqTD!O&(Ob?co;L:CRlmJ:/31*h,.B6/_]A9WFM%''n?#6D9[]H^4c6U7Q2CF=Q\EFaQrgV`6kN$"2W5q,b'UN6
 Yr\m*P3MQSRX(.0(*ELolgM]n%MrnOhH4QS8O@cSbT!<(M=<bkPNas(*@@tmmXM'gHD@65H$\,d<C(sXeqRD9=+"q#;[C_*J-3YSG97hbaOe4g/RmF-Tl,8G$MSb6ijVJ9<*1e-dsJ41m\"/DlO%;k%:e&b6.I7HJ?Yl)?1QR#<.bZuA$UD/RB.H_Ot3ROf("nT.l52?,\pCtj=T8W+/*9QT%"&cMPXXB#<K+K[E"ltQW.+G;b/:uoG(cP*Bg5-CrY`mgg%YfOk"oAWSj97b;Ht^NX599Q,oJuRWL'f^f]kF:>L;\JCW@jlWPU@9O2hpW8fLo;/LV/A&Z"oo&BX=du$^q@_kp:pq8BggskS!0?KDYd_:.O<C/*`kYc]arWr^jPFg0DWYZ&IDieeo+l^"0`IAhf_bR!LD!X:rXbT83C?=d/fmL"69)7GmC6c73I-2_h@d=l>)2]W<kaL>5?J@ULS/`rLt_SGC6*ORguhCNm?Pf(T^g^-4R$deG-<V9j"\fe?[O);bq1>kS:-J'cdj)8*<*A9Gm%6ZDer$o#j7QdDGCWO]H27sr(p!(#7]r868_?AUY1*eLQHU\QH8?U@Bmc"C3QmcBt9O"oAUrE>.$ST=j%A"I(?<rV]$W1=b;BDb`fF2Gc/A3t8N3"F9@FZg4KDke`j/Meu5iB#!;)=#t-kO)?c7!,#;L2fV.)\m,CR;'fcU=X1&L1V8ikLl;qLhM:KQ8CYKZ^0=g),1X7Zd\du$N/M+o@T9@^_p_>.3h1YX0?l0#dk0f@2,0je5&dB+[6&*$Jl1"!V8uBO(6k4BLu^V4Bl7(MK)UMWkK.HDJmFa^O5>&K'EqF@S`*JD#gNBfClb/-uV=G(kVCJ"rp.L2po?oWd-di:(.kskKnbJ*e+"HdlUqGOB:>qhu3D`BKQUp1MnfX+9-'ZC8db97^\Ed2MgJ<UHoih\5RCD^,@4+=k^fQ^n!W\QOr:MOLm1J7ajYjfE7s<VN
 7f>Ho*M%:F:d`RN@74\'U@+V0UY/?k)-6!GZsb7L64M.E0Kg>@,4VF>tX!:Rc2,qHf^"AsmMMdM7kg1OM587W]]%At,+lAf>%s4l8SS.LjTWU"mZk"6_!aA,uRj!V409>JX*"`9XKUn^9Dk6^4W;k0pP6I%uVXLU+Yc!ejiO^6%J:SmqZ@5B'CSiZ2Z]9&;^g4Il4MW[C2BJ`_r*i+GTnBX>2$Lhi"YO#+Mucs<W.kaIqNV\MRIU91$U.^F_-T_t\&_%=NoQ"8O*`#lX*q4"gpI^m)i[bF!sUtQO+`[=ZGcg&R*261Vs6N.KM[73U~>
+GauHNhfGPP&q8/6_;e3hJjK;Gls'1,ZSbg.2g\WZVql]]Z#!@DOU(AdI"2)d8@#gD0TJ_9[qao?6qdK$J#sLUoCLf)M0`Us#N#(C0(;ncTbkfM6]VkZ953gL;<g;...@Fpg>6>EbnipXWEiQM+A[r:_tY$JC!"WM@`[_gb0/7+G+Da"g6TkqC4]#EstFbq\'3G\@H8%Om-L"L93[5fAk^>TG5<fC5sq8D4BX]i`l:GR(9Y3+VeeKWh`@f(=#lLKGI*4VZiVQ<hm-Pjk)4k&sjH*/^:mN@ccfCC#.p15haGf6$qGp/(Dp2nQ\>+?#d-L/F!8/<$n=B13DWUsk'7&!)Gj/4Q4qq[r`I^;`nS?rr(;pI>WBj,J@2)!n))N9h6Wh$L25[_AgCRS=%0>L10pKLsS7c;4RftB0XU1tujd+*W&(-8[3D(fEcl=W#'em'T"UbGLW-oGXq"46NZA^^^k?'h*(<o1*mL#^j([j_\*"e^<MQc0la"fm0\i#T(r)0jj(T#5g_bH:S<B)!Dci(FprCiP"Gh2'ZHFHScW;hpA`ZqT36.T*$TAgO!Sm!,Yg]m%U/=*4UC3FTa*2$^E>@J]`$Q=2=\Q.%d"0(eU,\Lf*CIdcR`^W2Mk-"EC`I\t<8^/iED]!@KWgbL[Re$HSS'AT^J=G)BCRN?$c>uaT<I!B)=l@gZ&8$.fFP?iUO8,A2V06gg9[LV"40P%8%S[;CO@9dC"eVc2gas/8s0#S_4l*72+S@'JSog!b5r77-D_$3<?If]$t13#)D/"\nsOn#p>LKt#USn*9g&FDX^*Q&s.>62osFdnG'LWQcXs7Q1
 .4,QF,kpR`WG8*W1_sn>`I!SLW&a,"CgFh_le1I3^Lf[7cI,O_r!$IU+a6%nmK2phj,V4fln!UTG)qO#;@<\^BXGpr\;sV>2[nVO4:Lq]_YEdrlN!snFUXC*O&K9L-aeZ?[*G8t[q&,VH:4/L#GVK`gGfMiD,`V_,-3:\Fqrr`I9lkEY$`n%9Z;_or8p<^A"<<H;\&oM9J1LD-(WRTPe'LnW_HS0Ab&@t5qj<E1:=chrag,Xt>kS_7`]1Bo*/;_F)@p5r+Tb+>,VI5/(K<LsQ_."W`>Ij_X_`/?^@u/ocKGpSHQ\5&8^eATf`%\4S_Wc1njROGekE#qqebrZL]@aV=a.\?_OU5?8KD/2%L17k%Eo+SG[Z8,BLW13hUR5NW)i$\V@Zu",e2C\K6tB>=]8>hgOhs4\M==;O9]'4U+'IQQ1$nu^JmHPl!q\a2&t=aLQ%,dpJU>s9e8A6gGQgU$aqhs+Mbq%\s#;WBFQRmPJp.U.Qu\mJL_i`%sp)^OpBtk>p!'\V7AZHeOX*l^.2@g1/;O&J>;+]3go!H4R>S\A.fN&LH+uiE$:\[;A<s)nFNIWfcGOC/>KW-YQK&P/DF6,T,823e2;#d*d'k16+AF\4[D\==!12>Ot?%$8rOSsZsDeofcH3)8h\i=k*Q9AkVYGU4YE;X?B3eFWZ"id3Ou=S=cc@o0jf&P!XbE]pZE"rn0L[N='AHO@U/?iIcO?D2CP$3"/h#)$=1>k3Z]NeGpNTW1XH-<:=a8H4`/fb5qNmnB.;>u%:(o`l[rqScap0LE!)TL1e;.q9#HGtop8:1D.!T$RKb\?,.W3"Z6:M^2mBi-,u-MRMc97M0hq0.C(m9r+nt%G,MgTi1on.?"Nf-72RFjO7%Yj5VpGeR>P?inbV5;PDsF;c/5FF"jK!"GhBPiBVsb4s4u7*deU-5EOS=Pi*=8#@:*aV74?_Zer5+qt0$cieNbYK3De@"C-!n\%P,T4<)De8DkWH
 *sqO*HfR=Ut!GB:s6/$\:1LIuY!@f'R%$gR,)4ph#Y5Y^G;eEG:Wk[@=D3?NpP\BC1pl2I$r9L"KbO2D4o+&@2ura/k*[J;J&X_d"B0[5@G`0_CbJ"6Bmp@H5a^3[+>SGJEm+&A5a!R.A=`5'bte-Ano_L@gI.L7i`[^JG6?F=@C]c:Jc>1:a?\DZ&Jb_X_c0;$1A8N*q'`l-W!Oi0Ee]7P>@GC^W1+Wo%-NrdHY@q+B[.-cH/J?YY#_n6G$$@QI8^Q/onNG)Z;%']r;mq.kjnFBbKOEC'8@[[bnM)"NYQ:/"D=sZhWS)=ZbR>UoeJpe&FL+F"u7n:B;,R["iS1JUi)$s8<7bl4L$a*dYO<C*C_O+k$HX][]N?M_h:)D)oZdCFU0/6ueo&EmG0t8*U9T1&6"b2UW&H+D>kZA70-\ET-ab>Kun8G#?"eVrn7OU>i]2M5<^P*Ph9QY_c$Z@4YQq-B(_$]jQi^.S<QNqF6IQX)`"?0&6M:&)nfFRKRJa[gq.Vg:8_W1B$5bl(n!/ae$G3cGIYZBU^1]-_Vkg/-cR&+?3FaQ4Vb'CNHouBeh@DKTXc`W&fLf([)X1EuG[="5;ldTNaRLSY@1%@.kV?Ai!9uFI*9+=`,o5QPVj(\EG\/@b2N#s&DIuog)rNiWK_uf=,p(c6a>+h/99T';X>Y>IXWD;j=VV0=f(_^h_782"!&$N`RTYsgZa4'6^0Jer\(csbcr#d:.nn41hQ`INX^?sUqSq.t+%t:Yt#1TPbVC.3QIBFq(a;55u3.@P[HQo'Xj;s[^_Si?TlHqTc6]u5cpA4ii51CeGCFL@=JWj6d/P/ip-KZ8[!!BC>3h8$ll\cu@ao%+O)9pTj;j,I5kJb[C9n3Vl2^<c@BUjVI,=FF9Er%bZ^4b,Tr?S]2pA6nQR"GB$mT?^un`i:A64EpWl',e:(THktNW""SmXCVLIV^sO^$o0;a;=Ma[M6?AKC&W4YR[T~>
 endstream
 endobj
 21 0 obj
@@ -148,10 +148,10 @@ endobj
 >>
 endobj
 25 0 obj
-<< /Length 2800 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 3407 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GauHND0)4,')q<+6-Yb&X)&4HJKS%g_=;i[P.b\EM=YGpFbOIq0m*nD]\#=Gr`Urt#oGHQ]5]<1e4?_0Vq$jX)Sa$O]=gH+h\ikGnGhZ-l6+iU2Z*,_!hWPI&4Ea&`n'2'DeJNorB9A*i=f_pH0*cLg$<K"T2=:KCdbO$*VPtS`3ROV2,o-8>#;Fd=TKK&;]CIrTroUK3-dUrR%lGOE"D%)&J(0XCgm&.IX>[Jghcb@/aBZN6&8dd]&-`,T1<Ua^YE^iqBjPR33+^65HOaC-K$lQG_G3%51K,9OO&[*$2qD#o99D'5-uGB^t1J@^1Jcpb=tlS]IShZDZC6.9uVW",*HKK$gYrD;X6I&Wos'F:cT\iSK(!;h]&TK8/"(T)f,:bI^I2.ge0e0Mu,0bDAO5\V0ZILY5eHc]c7)LGdbj!I]2:RJY.pkkKG20iPRMA"I!/P[(m3W*H9gR$3.M8V\6]_aJ!Mur3n0f*f0?ii$o#hUF>=>r,n=eF]9`6<ZNR`GplH#j:?c4;U:juH-1_QP1PdZNT:DuG7)G^YD6maE,R'!3T6Ed[Nqq7nYR\qKd:sr>dK68*q3)Rq#bT"6pDo:_M:_@-..bRYHW_PLtM2!^O?*N:GF'mo!<HSnqeA&.,qSZ.ki7dPRC!G%RuLF5<`$l0W#,2Hk^fWVEJ@hk68%"?ERsc@`R2Z?.s'=LC![(c0P.qJK>.)`meaQ@u9&=XO%W([."YAS;<be!-62H??frCkm4q9X>!fd*K/Wlj]TF(g'M%KN2"\h"aIN0\i^[c<EZVS9^R+'WTQ7!*n,A/"HiD`b4T3>RllV:``>7S:N<5G.O:^Kc!A:GP&Y(4@&I9=EbFP=1'M;W\Iu&&CZ7RRI?A8CeTp%&e\:opV8""$7!nnM4\)N[c8Y^PpBjJ3IE>NaFNA&E;&9.>J:)2[/m"a4'06OC6rp%Dm#/N0@d"0MMr=+GMMc*G'VfMOTOP5ri3*Lc>uX;jlCYc
 G=f?K!mPt&)6@Xsf_(Ln/C%_:+'pmN6?Al5?2ac!-e0A)&MUloV*`*WeBF5g++"kQMZ<]kpX%[`UHD=bNIu1L+>fPl<Z)3li<&C7]Td"e_E+]uRao[r22+E+A3:BuN><G_.Uf%a0/$^Kr22-r4WiDDuguu(\UU5ncC"HqFDa%DG6%H0qTo@,D0+9O1!BDeSc9EWPp]aQpUTCWFV[oD;rr]uBNeHee&X4F)&!k5_6m]Wl\4tKM-S>.=8E)Z_[FF)k_ah`bHG4sXA]).uB:+emC)g5sai\OT7P,p*HtcY!IZ8n<$a]7A"#8<nAGG&]Btr4FS80dC?lpCgj&'lYXeeSk*K&Y'5\Je9kY>=ao9\f6=9pu:DCot./VNOuCE]krm_G8p1QUXM`l;2l$eA5l%DscN.q@>cKY=VP_q&-LD(jdkFaJ&tiZKl_:U59Ur=,O6/$'Up\,c`Dotm3j_@<l2lsG+2jFpX<rInPXZ#o6n:O<,u_grV-D>uLiN,!Ff)q+mb9=X:%Qn8D7cZ+8=q1T-fp&`jRc4>21$J&'d$K)2#$=_Z.:!%I@Ej(F!N)OMZd$,n@m=JFt_5F4c"\"hD-Q@O6e"i%[;7DCJ`S+(9A8g&O7:Vd`1;[Eqs#+MW)t3eG+0%n!G9(%%pGASUN*^Wn^FG96jlFX)2PR**[EE74@-SV.gY+8<9u3oXQUY+ao_A0/Su6S(*J3t?GJWibZ!?cSc!ngL-d[%?Bs)%'WA9DEkMKedeb6(Yp12uBAJZSQ^WA*8gRG)9d.+NW.EeJ`,(,;o:b\(fo3?l\>>;DB[VB]dkG6>.IIE(3Fu+]K&!]rK",<lqGG$!qbG-:8]CO$o>UH'"ejii.]godPL&OnJ)uTm"Qke/6o;]^BJ!Fo"&4h)fANpST+>ZqAX37[%a==Y4ZmB<3:drL&q-s$mc4iC_b51=4O1i*Tq7]DRWkFV1,kY*>+#>%sPu7'n0],i(_2:co8oL0(KQ)fs9ZJ
 AN%q^c;0*k[&lc=%VWlk!B>R70iA$[RfH`20T&3?p9A^U7NojW=a+ZcW_hbM@^.BP(9+)c%n<Q6u3/@l\D5(W(?GBF_Q#BPWA^;h1'b.0Q=clWO_DJ`!j?)"Cpknd9K&a@QGii/j_ii#P7\/Zos/pl1Ajq_S99u'he5(HX_WE:LYqq^5)B:11%FG3GPp'/E[@3&GJRskAuK\;]R7noQCJX+e?5?iCcB((+^SSt/4>h>5aPJDD0U5UVDT%FTDfu@\umn?G"$!#`il;;$$!_e#HdtYN8P/ig=lq3_aH)5m[Wh*q%o"'*'235Z:4,?G;N-prc;.t%__5QJT)`,$1iZ`t_7`.A8gc&5/!q`+S'![$f>6LZbXOf(obS8RK5";F56a$m@Uh&;W;0ghnhD]s,:J4V9/e@RlT6c6A\KRhXSJ4kJ2+QZCDTX9D=WD?*9t2>Z>kfn'l0B\V)0BT*P%Jh'WkG**,.Z48[dINNjMuMqr7Y]]W(\dpB"Bn)N7$MCEM`-i^&=!t(c[29Y3,C--P&NlYcg&RRVke-\=7/[fG[I]&?5A`QTqJjNCJS,f?6b[5X*RjWu7r$TFT.p`Vh?r.I9R\JKeW'T5[(8L5<;)\%(CpZ3te>QZ2MYXXH90L:.)X6tWVNK;8op<<kD%$4n'l5Y6d9'+,-.@>*I-;r>uJ&/e<\[ODDj6p9ciCr;k79`lH-c[u[mb3<0U[dK3\:]Mk*:YV6Wf3t[N!-Vi#:@VCLAIM/<;$'TRMW\c(_6)Gh&7qpXa2,h-4NmE60WG)OY)@MIje)F7o45/0g7.ZGgb$!\YuG]?+">A#;?~>
+GauI;d;l!A(5D;L'ND5uWX2.F&G4O[A@ggSR@<!X...@8>6RV'5_b
 D<YD@;X<\,fQ0?J)g*=?:L#Xg&0_48CP6A`?a9IWEM/asDDah+fYC$&''\Gsb.HHVA7Ti]5UKcYtpqhI"ZIa'.!U'tTlqJU%#h]S#_+7pqEdb37aG7PIWNcb5P=VM=JMW18/Bm_i3k+<WMZ+Cd,3:aLCD-"K>]:1Y@A@)T(W^Nh02gapeG?6-;=I#B,l>ukYQhj]kE0se9EuQQ?Z@BB]:4D/+?Q7u)!O]8nX:ZYDNgE60f69Sj;Qg4]nM&9(b_!1#Ke;!E\O7)LjWEaSBmLj]TPA.hCG;6F1gL-91(16*)Do&c1;""r;P0X#MV6$N4>?DGJtkmpMALK:t,]p>s<Z7rU(<N!352Cr:\b"au;DEN`1EE$NFT&'[e`8a_mKrQT%$Kl?D%UBZ1r!rpIFRK&:S5E]4d3L^::".Y&-/Y&h5oX@Vt<8RF\/qh"S%+"+CWRo@D(0SH`hJfN#0#>u)M^Cq[7'c4`QR5cWK\@qqo\h2C8DD_)BQJi!Klp@,cL.r/sI:*qQq`+8.^mm_Q`I3\pZ5[EK(&'TNGB"_E]^^j'`dkfcZ%:j-BrGo)q4:4;NC:ZPW&gURR(2U?@Jb`XDRh4?gdfM',j#dr8Ij^\U.l+emR*rYESkEqGhUJt/b6!8KL*^4q4VN9EP"o9\3<Fp1t?3#,u8MfEBsA8`9J&>8Aa=T"rfCOA9!.6iedh9I3Vdjcq[UHP^c[lbj*C2TMrV#35CV#Y6heH)Hn$6^^`&""Gd&`#I;%J0)5'`c?ZK!\,1SO`9OD9?*s^2Z3dKDaJ9)p0o@k,R*,P-H<=>>r8ua/a0MAK(5VkT3iCccb5mQ-BXJS\0Rg>oo0UhGfS-%_:3[Et-dYSM*oWXUK2HjsHB%E"TEcX\K"a%AJY;`]W[cptcm&Tk4](O*TGQVa&G5S=G5Ll[Sn,GsaJ0G-!HJ6u,^*!2d3\rOjFPJ:OM;,#Ei5t'OM:N9n0EVG*REd)pE`mH7\+%+1u8g6Tll
 Zg6939pbm&lG?ka+>.,dm6S3T#iGDpTC+3_SP]PE2h^cMsM6Tt>5QZs?,%`Q&i4Hm?Q3f[M+"3;P)p*RG!U"_bl^KiC8Sf@.fi&!@.E<;7...@qf>WW+mW)/Isq9/Yum*j4Tr:QdLrkd`;pK)G0s&$@];%;</AkOo"UX*7ifdNI!@@>!CgR#HB-tn3p%$$S%VU=(#!3RC$e1F0/]+/%!XRiekCKR37/%8Fc-+$3t>)W+lVkopkJ\EUa-3Q&<DIGljJOGEP*kRnA-YHX*ob/nicdU89kncAR"&/@`2lCUG]p>SGK*Y?(c*M1:S1EZ'E(aN8/"RdKBA"jNMT8\fDT`0f7^,g4Zaf)plT2igV;\H6;N,cXkqU/4P,AgG[a&XX4s"qnHjZMGhX=0;[,/m.('NO-#5Vt&c7gT)U-e)e^frG@M.O0a(ts%Ts<).CcaL-KMO:[L?qZdg]"0>H[4]3
 SLi@.iIhk:ceIGq(S<a,;.`?L9n*!<F7F*j>5sq4@!Lc&X=6Ec6<LMm$kq27]Yd?3[X_K*ZQ*ek\l<c<gLsA0;B:ChSKI]K4/$P^)`VH+"g;/G=kd('M:OIpWJBZAQ+On(B>!_s-=DFdE0k+pk[<8_OeuLr`0aGkH?giu`tI7D(9oqt&.+n,=j6re&5!XsAg9Zf#Y5FA>e4mo\)@C=c.Paq7tL%*X*EO&rg9h4i+R4-Z;`"%M<YC]1mVa$a3!8H15:<o,HP,FPLi!b6DlK]2t@G.V"_eU!,'pY4caFkXS6/6@PS*D[B#OO]+"A%?_En(Of4SuG3eP-6kg9"eH3@+J02($@2eq&MZH&^p*'r'#PKA$o4->+Z"hA)C=_BXXtl)-cgHi_1d,`HcJH10="<M^&*RRsj12l[/LdEWgf&@f4Ih^&AP_FC(=~>
 endstream
 endobj
 26 0 obj
@@ -167,23 +167,11 @@ endobj
 [
 28 0 R
 29 0 R
-30 0 R
 ]
 endobj
 28 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 557.012 210.256 577.016 198.256 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A << /URI (http://java.sun.com/j2se/1.4/docs/guide/security/jce/JCERefGuide.html)
-/S /URI >>
-/H /I
->>
-endobj
-29 0 obj
-<< /Type /Annot
-/Subtype /Link
 /Rect [ 232.25 719.0 361.75 709.0 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
@@ -192,7 +180,7 @@ endobj
 /H /I
 >>
 endobj
-30 0 obj
+29 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 221.685 707.75 372.315 697.75 ]
@@ -203,36 +191,47 @@ endobj
 /H /I
 >>
 endobj
-31 0 obj
-<< /Length 1958 /Filter [ /ASCII85Decode /FlateDecode ]
+30 0 obj
+<< /Length 2916 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GatU4968iG&AII3n<RT3JHuf4U!E:l8"GL+:=<6-FaAQd87FoJ/0@pB?f*.q&dqm-RFiS(=qLT+Y`!r!c$Jp7HL^HU3d^XK^Bb]sS^;4;I@%k7X$@6T'[#)[r`m*=0:"Q26^u-^h84#s>kk-jb8:LN!gc"7U\"6OlCcQAc7A%hnDsC*Wsu>YdV"gg&+X$E$MY$l.^`8\6c\GoOC_GA;,nEi]Q!jif!ckKJroKYM"O%KNAqu\L^-/iF#fsfFfu.?=DLcW4K9T_8'<[Dg9a<9eB+FLjXkqfE0o*DA1Pu;oM+aRBe>ndEHJFo("n#J[9:8Wjht>ID6q_:S@A&q?9Bj4'@n7,I*<7H<,!YZ3,?2DHGgPia5Q5TRg,XrFekR<<]B2:8K1^g1LCFM\:d]t#4ULX"!0MKQhSdW0qV:h&%nS8kV2E:f[DK!YZpmrF)p\jkY2C7p<J2f(Q(J[Rt-rCPANZs<(L7IS@30m9NqW*'bj]]BqYWtJJI/>W:m?7k!Bt8CXdFbd3h5c-%O&O/@\cO2^%BG&YNr!+3[8OUH'U6\8mmVK\@W1NX%!Cc@,tfJJI.CIN[RgRMt!GnJQf`TWnb6l8&u,_`rkj!IBs[Bf,j!O-MTf"%'0pr#DE=#S8I,&NX;<=:qF>:e$W):UlQ*Z"Q(a%t;J'a&do"'aZmI@U:"l,,>.Yrelt.c8KNU$/"CV2nF<m?cF9TW8Akj/,?$^A69GBgUk'*:>pYCn&;5/N@L)2=0/c,`D3j!(G/_ALs78FW."F*@]AFq"a$G;p@5E##p%02HXu_G3&NA9]KS%jc%i[-A<OmqhQ0<?2(Hn^2H\F6.o=kn(S+o$^d8P2=-+f/%\Uq!NUsMk9tM2EID\PU,\m)q[YOj>>5Pk7(iY7D*J#;e,R@7A*\chbV5&.-1,O@h3YK-?/$e1G<:tdC63\2."P1-k#bLAuI^7K@U`*K&QmkOK1kp]c%@\RtZpf<5\k#bfqgA[oFHU2
 &K?a6RCA0,ZSl&.A!]\d$DCu?gLmF]bW?kKLqdF<Cg...@cYHRoOCK>\LWk(j\:3):+,&<d0N>M$+t'IU;VO29BKC8#4QVKR\b>69WQ"eicm5R'CSV2VHJc-.<Xm(E+*OU!4)IV<VY#B4,Jp\NL2L@/A^RK]+N/R!SK<<4C%ZF?Cal<l1P1EK_87jLL3f4\>fIl#?,^7>'ejp-6KInO/&WsQ.S[[h\E<n9TRPO6mjjPf)``I3uBZhtR1"t1]Ad+arQ_Aih5.nRU+#t<d*HpoGfBdo\3h6bX9#b?7VRS;=B73.hW3:OY2eP/X!GEWGgTARjI]7,d6%ogDhJ-4aS_G27E##_pW02;XD>!@ftk-7B89M1OHgJX`OV34jQ.TQ,+^An0NqELNb2;L/8emU='8H@Qm<(mmInde`cs0>mY5:3M)j/=6/'h"]o/`F('k!8nNr5hiW~>
+GauHN>Beg[&q9SYi:0I2F'P.6!FGWb3,pnAp*:Th:YU;J.7iGI74>h$ec,Cc!$lQhABL6TF".Pb@.4U0R/$s9qqI<q[jU'/:p>QOIm$AC(^4V!5A<ODo4OS++UK&.gn"B/jSeJf`AJ!aI"&[iM:AI0rh2T:9QD,IN!-VZi88/qHl)].\GZh'kVQi:Sju0B,T=8g/T8A/[XA_3ig4jC0pQ%iDRu^H=6E&W@6;rJj5t^E=4K,PH8MB$QtBbj!lX[1dl\m#5k.\N57f.u9Ljd+4Mi?MnVE9,Q$E'2BK?N-fCTi3EbW7+AP[ho4`/GfV2R'>nPU@T&MKQm9B.^Hn6Ut=mRktL58&)>r>j7=*rJ&Li]N/i/*OV\colHOpp_`ak?,Qos4^b/'6F)7Gq5P7o#Q^3\eZ=P8l<&NZ\02"YHnG/dofE.X[03PX(mOXZDp+=f:pq<B?:e_]>pVR*_J:cg(VaL7.]1Rm;1XP..WDlAPqs*IF^=R]5(O-qPOFhmB)(VX;\NQQc8:g7^L$$KRD?ER\a=Y\85B`\Z>K1;=p>f/S06iA*IH!n2bX=fRsGCc.`@!Zc<[R+5^EBP<33eYKPJM[(c:9._FLkf!uPnleGiJ*H,[PY4oT_aWuTH9u2=!*1ZCamg9D&]7Q>mY(3ifm7QeLV2TOdD-=b;R*_+bT(['h%K)c6?,<r]pZ4`1BhRo<Hd*m<J@PUL#Om_r($ps"`Og'$?LW\.?a_G%rH\,"4"H"h9AI"ZF4QX!QU7jcoDC8UPHeb4LLD^pca+sUXctJAe'Hc9Uh"X\A0p\i3^f*q]G2H5q:$\!1@@9NOklp6<K!tLEo%1$EFso?d?sC#o!k5sS1[spo$^`LR?^2'$'";C(grMtr#f7DPn)t+$;%AU?430tIh45IA[Qg35nY]KeUm1")fH%D=P7AZ71`p>UKV>'Yk0?^>Jc<#lnZlnA9[>V0LZ8)7tfeP!TM0?L\Ya=]3E<aaN>JXnIL3
 f-0A/HOe#(.g;cP!OnJHM@S6ekp0`fb-qr[>7$:Ela83Md7'3GFd\2Qf.*N5pP5tS/3$n&Qa#QFOd&_i:&&8&]kd!@+:Qcu5iJnIsR_&H;R3*ftkq@<ai`,c8f2)u'=W"!hXA=/=BGeqmjD$t%F[ZC`RG*b.>f##&f<0YU7C,p\ptU::rT1(1=L7_camQgP$F/9M'jnK!LU(-2r?MB:q!cRWde;FtBY)QU?M."pmaMrn?B;\O\NZ$eQ=4_S*o%X2#t_ND.?)HV$l1f/ZS^;7QNTU77mSH7:Xe5F\BuoiW(l]Id:YqLESKZWNruCPG;sS9jBS^S,*XhK%quH?Cfe$)/Q_4RJNj_@?KXr!dSo\p2cg!Ke!oH&*CWW:=]:TuH).B%pX"/+CDpspe1S!2e85En>&=r-r/%n/aDTV$K"Jau]YQj5A[(%39Oj$uA6<m'G@CX\Z%2Z3cAN8DP6@JK/U5<oY'"9m_GBQ9_co)`g_&faca3rC>YY&+R^P5/Nd01WY.g`j6*tJ81&p$k$D>Pd6eQe4>if7@kA&kg>Yu9"@C_p"4;@2A^-NUQ)]f2h\VE84K`QcC*V55/e$knO_S:%9H3]kHG(`*(CH$\/$G(8q6W`p%lQT,&=nEGEc9:8Q!*'moY&l*TJM(=]_7(rS$Arl9p=8O($`'UJ^snl-L+jdSel43u6P?B$YLNq?G9.2IVKU-@gWC6?>CC8@##7Kb6(6q1?iSWe>'-."g(7hcp-S9"cKeg9,8bS9+g.f=H\-B267E4u4^rs09FU7TY1BMIe'te8Bs1LtD;&g07t>E:Z$ZYiLTRXu[:MEuV[^`SP".n`NMHj4K`#W6ah``G!Q">Ef+89;fN^J"#:S:n-SV5lPt$%FV()O3.BgM9V4<EL6]9JVe$+#2+;p3C0#7c1/F;U7rm;92J41@WCdj9\l"-LTPNndAbG7#-\!GLR$IIPb%SFp![D3iAY&F+7!!Q4O))+<>Br!YM9^_
 T-/\gHXWuN"q_@:F@dM(s9Dmc.eP!:qn03`#%&_r2V.GW%SXS<13;X4T1etotSZ+<ZagrP4eD?Q<oOP[>81V;PVZVaI@(_&#b`X5;7foW?je@ndlLksRc9T-X3XteA:j#J$t1k]$X-h%Za)MXmj?&&'r#hl6*=JY`1Z%*es&eXX.3'@Q3(laO[:mjU$!T#f3E\_/DBMA4L?R_lmCQ1E@S/W:ZHAseB!`0/0iomVi-=b&8`YQ[!O0ulr78Bn$-XUA>X'l[[&BeJ'k:N)+)H44[lnE?!3ACsl-EjYmdf:jH"s*;A0a!CemmUS"a.HaX.QM\cU*mDD0e+1QTJCjtj^cXnd$SkXM5'!VatogBF:O?j43)Bk"Hbsp9*p&QkaI_S7)+Z[Q;tna`oZ13W&q-fjf`WYVZBap)-%/:Obp/6"-#I9Df5:DJl$a,1H,hi\VBpjW:"o:A1F!N@XVfr%<J$8h9=^qQsj^RSfATm>tlJE&.4=Z>pbV#jcchVh&!ZbX1f?(D*u.rll$6t5/Y/hO1iP"0t-u"`;@*f!Qp0o#1PW;o'KtOjrd#a'9J'k4e`k4X.MjtSrp:A0F,Pc"Np^S9QC`5,VS3jP?uG>B*LjJa[R#j:LZCTC$I.,d>UteKu]4>9nsr=NZRr'hhlI*=tfL6SNL/7beD"c&IL6eNdY%X]-ehd&)s:c"LI@pVeERjCXuVW(*uogj^%=l2>]]YaqLhPMqap+og.ns!Z]9gE`iAkP4'ET+=2;hE3:o*Qa%u=X_ECSHQY8t^oH]BMkMi$_r1^\;gJ)&k,2\fPQ\4Q32"\aj,??*3_]nq\[(.&pe*1P`X3?e$\T%*q&[^=5Qd1#/]b=Ge"M]+DBSpNTO7$Mn!?l!BNOE+\nH72/s^^')%C&#'0GDbGMVtZMi5>/ebI%=O=<VlBN>pBZ+Vhap-2:Op[n~>
 endstream
 endobj
-32 0 obj
+31 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 31 0 R
-/Annots 33 0 R
+/Contents 30 0 R
+/Annots 32 0 R
 >>
 endobj
-33 0 obj
+32 0 obj
 [
+33 0 R
 34 0 R
 35 0 R
 36 0 R
 37 0 R
 38 0 R
-39 0 R
 ]
 endobj
+33 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 557.012 356.266 577.016 344.266 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A << /URI (http://java.sun.com/j2se/1.4/docs/guide/security/jce/JCERefGuide.html)
+/S /URI >>
+/H /I
+>>
+endobj
 34 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 226.208 662.4 385.856 650.4 ]
+/Rect [ 226.208 203.606 385.856 191.606 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://www.bouncycastle.org/)
@@ -243,7 +242,7 @@ endobj
 35 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 395.457 662.4 453.801 650.4 ]
+/Rect [ 395.457 203.606 453.801 191.606 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://www.mozilla.org/projects/security/pki/jss/)
@@ -254,7 +253,7 @@ endobj
 36 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 246.972 585.866 317.304 573.866 ]
+/Rect [ 246.972 127.072 317.304 115.072 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://www.bouncycastle.org/)
@@ -265,10 +264,10 @@ endobj
 37 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 90.0 489.466 158.16 477.466 ]
+/Rect [ 232.25 719.0 361.75 709.0 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://java.sun.com/j2se/1.4/docs/guide/security/jce/JCERefGuide.html#InstallProvider)
+/A << /URI (http://xmlgraphics.apache.org/fop/)
 /S /URI >>
 /H /I
 >>
@@ -276,7 +275,7 @@ endobj
 38 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 232.25 719.0 361.75 709.0 ]
+/Rect [ 221.685 707.75 372.315 697.75 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://xmlgraphics.apache.org/fop/)
@@ -285,6 +284,51 @@ endobj
 >>
 endobj
 39 0 obj
+<< /Length 1130 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gasao95iiK&AII3nCA&1clse$;4r\=[okP)Z.Y+`.XIaug1FA$<Jc...@oa>NJ(?TE!l^9=AN0=[lFJEa&=Mg8W\9(T3$Aj[FK@0-'L;c<t3Wn".TM&JlKWHs1Q[4h,0kD_(sI`[:L^[G6QmT5uLk,#a__c*2:BDWfBEAC*b[9/?UB+S!Hcer!Br7-*_.Ou4'5V'+*V(=P]d`PC*GgpR6qe@TM",=pM!Xb!\I^90n+`mgU*.G)Ek%8+31?DW;IZ>?_9+m,0K67esjrMB;(aJ\?1\-8=;V'lXLBq=U*U1G^-7hUkoK3QY=]=ttSSS[nlkk6/QTm<.LZHJ%`KXVbko,22CG8;`)&VrlNu^20JlE4(]0;>j5K7b8/pk=Lk_TUUPU2\b=(HC%"SjlP:GW9Jgddi!'VDbi0FW@`3e-Oc-nnf1,RF7!e=jAL<B(Cn[LOnG.T)\A1j?nK;K!Sq+6m3SZ>bTnq#'L*I94\*RMs^sL0i]c]\9rk;q'U7gd:MMNO)NBFr8XRqage/j7IOFb#14(<HVql%:DL:k14%g*/Y0ChORJ_QsrD2_8Og#LJBpkE>h?S)gd"1_kdY^g$J^29Q84qS";nglgB%
 6Hd=e:c[[<u-[0q_*.R;Zomnd92Zpl0J%RVtKZ5/;!2KY_I"qo\PdlPq_djKe%l8-3A?Gh0BPrgI<$(9&#3/[O;M(Zs+`kRKnS!EQFnOd(n[9ro&BMN#]JkMg_6u$ZZ*<ot&$Bu2bl~>
+endstream
+endobj
+40 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 612 792 ]
+/Resources 3 0 R
+/Contents 39 0 R
+/Annots 41 0 R
+>>
+endobj
+41 0 obj
+[
+42 0 R
+43 0 R
+44 0 R
+]
+endobj
+42 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 90.0 634.8 158.16 622.8 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A << /URI (http://java.sun.com/j2se/1.4/docs/guide/security/jce/JCERefGuide.html#InstallProvider)
+/S /URI >>
+/H /I
+>>
+endobj
+43 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 232.25 719.0 361.75 709.0 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A << /URI (http://xmlgraphics.apache.org/fop/)
+/S /URI >>
+/H /I
+>>
+endobj
+44 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 221.685 707.75 372.315 697.75 ]
@@ -295,80 +339,80 @@ endobj
 /H /I
 >>
 endobj
-41 0 obj
+46 0 obj
 <<
  /Title (\376\377\0\61\0\40\0\117\0\166\0\145\0\162\0\166\0\151\0\145\0\167)
- /Parent 40 0 R
- /Next 42 0 R
+ /Parent 45 0 R
+ /Next 47 0 R
  /A 9 0 R
 >> endobj
-42 0 obj
+47 0 obj
 <<
  /Title (\376\377\0\62\0\40\0\125\0\163\0\141\0\147\0\145\0\40\0\50\0\143\0\157\0\155\0\155\0\141\0\156\0\144\0\40\0\154\0\151\0\156\0\145\0\51)
- /Parent 40 0 R
- /Prev 41 0 R
- /Next 43 0 R
+ /Parent 45 0 R
+ /Prev 46 0 R
+ /Next 48 0 R
  /A 11 0 R
 >> endobj
-43 0 obj
+48 0 obj
 <<
  /Title (\376\377\0\63\0\40\0\125\0\163\0\141\0\147\0\145\0\40\0\50\0\145\0\155\0\142\0\145\0\144\0\144\0\145\0\144\0\51)
- /Parent 40 0 R
- /Prev 42 0 R
- /Next 44 0 R
+ /Parent 45 0 R
+ /Prev 47 0 R
+ /Next 49 0 R
  /A 13 0 R
 >> endobj
-44 0 obj
+49 0 obj
 <<
  /Title (\376\377\0\64\0\40\0\105\0\156\0\166\0\151\0\162\0\157\0\156\0\155\0\145\0\156\0\164)
- /Parent 40 0 R
- /Prev 43 0 R
- /Next 45 0 R
+ /Parent 45 0 R
+ /Prev 48 0 R
+ /Next 50 0 R
  /A 15 0 R
 >> endobj
-45 0 obj
+50 0 obj
 <<
  /Title (\376\377\0\65\0\40\0\111\0\156\0\163\0\164\0\141\0\154\0\154\0\151\0\156\0\147\0\40\0\141\0\40\0\143\0\162\0\171\0\160\0\164\0\157\0\40\0\160\0\162\0\157\0\166\0\151\0\144\0\145\0\162)
- /Parent 40 0 R
- /Prev 44 0 R
+ /Parent 45 0 R
+ /Prev 49 0 R
  /A 17 0 R
 >> endobj
-46 0 obj
+51 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-47 0 obj
+52 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-48 0 obj
+53 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-49 0 obj
+54 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-50 0 obj
+55 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F9
 /BaseFont /Courier
 /Encoding /WinAnsiEncoding >>
 endobj
-51 0 obj
+56 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F7
@@ -377,19 +421,19 @@ endobj
 endobj
 1 0 obj
 << /Type /Pages
-/Count 4
-/Kids [6 0 R 21 0 R 26 0 R 32 0 R ] >>
+/Count 5
+/Kids [6 0 R 21 0 R 26 0 R 31 0 R 40 0 R ] >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 1 0 R
- /Outlines 40 0 R
+ /Outlines 45 0 R
  /PageMode /UseOutlines
  >>
 endobj
 3 0 obj
 << 
-/Font << /F1 46 0 R /F5 47 0 R /F3 48 0 R /F2 49 0 R /F9 50 0 R /F7 51 0 R >> 
+/Font << /F1 51 0 R /F5 52 0 R /F3 53 0 R /F2 54 0 R /F9 55 0 R /F7 56 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
 9 0 obj
@@ -407,86 +451,91 @@ endobj
 13 0 obj
 <<
 /S /GoTo
-/D [21 0 R /XYZ 67.0 290.732 null]
+/D [21 0 R /XYZ 67.0 123.632 null]
 >>
 endobj
 15 0 obj
 <<
 /S /GoTo
-/D [26 0 R /XYZ 67.0 250.59 null]
+/D [31 0 R /XYZ 67.0 396.6 null]
 >>
 endobj
 17 0 obj
 <<
 /S /GoTo
-/D [32 0 R /XYZ 67.0 626.2 null]
+/D [31 0 R /XYZ 67.0 167.406 null]
 >>
 endobj
-40 0 obj
+45 0 obj
 <<
- /First 41 0 R
- /Last 45 0 R
+ /First 46 0 R
+ /Last 50 0 R
 >> endobj
 xref
-0 52
+0 57
 0000000000 65535 f 
-0000014642 00000 n 
-0000014721 00000 n 
-0000014813 00000 n 
+0000017633 00000 n 
+0000017719 00000 n 
+0000017811 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000000810 00000 n 
-0000000930 00000 n 
-0000000997 00000 n 
-0000014947 00000 n 
-0000001131 00000 n 
-0000015010 00000 n 
-0000001267 00000 n 
-0000015076 00000 n 
-0000001401 00000 n 
-0000015142 00000 n 
-0000001537 00000 n 
-0000015207 00000 n 
-0000001672 00000 n 
-0000001854 00000 n 
-0000002040 00000 n 
-0000005420 00000 n 
-0000005543 00000 n 
-0000005577 00000 n 
-0000005759 00000 n 
-0000005945 00000 n 
-0000008838 00000 n 
-0000008961 00000 n 
-0000009002 00000 n 
-0000009225 00000 n 
-0000009407 00000 n 
-0000009593 00000 n 
-0000011644 00000 n 
-0000011767 00000 n 
-0000011829 00000 n 
-0000012007 00000 n 
-0000012206 00000 n 
-0000012388 00000 n 
-0000012623 00000 n 
-0000012805 00000 n 
-0000015271 00000 n 
-0000012991 00000 n 
-0000013130 00000 n 
-0000013352 00000 n 
-0000013551 00000 n 
-0000013723 00000 n 
-0000013980 00000 n 
-0000014088 00000 n 
-0000014198 00000 n 
-0000014311 00000 n 
-0000014427 00000 n 
-0000014533 00000 n 
+0000000809 00000 n 
+0000000929 00000 n 
+0000000996 00000 n 
+0000017945 00000 n 
+0000001130 00000 n 
+0000018008 00000 n 
+0000001266 00000 n 
+0000018074 00000 n 
+0000001400 00000 n 
+0000018140 00000 n 
+0000001536 00000 n 
+0000018204 00000 n 
+0000001671 00000 n 
+0000001853 00000 n 
+0000002039 00000 n 
+0000005094 00000 n 
+0000005217 00000 n 
+0000005251 00000 n 
+0000005433 00000 n 
+0000005619 00000 n 
+0000009119 00000 n 
+0000009242 00000 n 
+0000009276 00000 n 
+0000009458 00000 n 
+0000009644 00000 n 
+0000012653 00000 n 
+0000012776 00000 n 
+0000012838 00000 n 
+0000013061 00000 n 
+0000013243 00000 n 
+0000013446 00000 n 
+0000013628 00000 n 
+0000013810 00000 n 
+0000013996 00000 n 
+0000015219 00000 n 
+0000015342 00000 n 
+0000015383 00000 n 
+0000015614 00000 n 
+0000015796 00000 n 
+0000018270 00000 n 
+0000015982 00000 n 
+0000016121 00000 n 
+0000016343 00000 n 
+0000016542 00000 n 
+0000016714 00000 n 
+0000016971 00000 n 
+0000017079 00000 n 
+0000017189 00000 n 
+0000017302 00000 n 
+0000017418 00000 n 
+0000017524 00000 n 
 trailer
 <<
-/Size 52
+/Size 57
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-15322
+18321
 %%EOF

Modified: xmlgraphics/site/deploy/fop/trunk/pdfencryption.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/pdfencryption.xml?rev=1160690&r1=1160689&r2=1160690&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/pdfencryption.xml (original)
+++ xmlgraphics/site/deploy/fop/trunk/pdfencryption.xml Tue Aug 23 13:51:33 2011
@@ -17,7 +17,7 @@
 <document>
   <header>
     <title>PDF encryption.</title>
-    <version>$Revision: 638396 $</version>
+    <version>$Revision: 1154998 $</version>
     <authors>
       <person name="J.Pietschmann" email="pietsch@apache.org"/>
       <person name="Jeremias M�rki" email="jeremias@apache.org"/>
@@ -66,10 +66,45 @@
         supplied, viewing the content is not restricted.
       </p>
       <p>
-        Further restrictions can be imposed by using the <code>-noprint</code>,
-        <code>-nocopy</code>, <code>-noedit</code> and
-        <code>-noannotations</code> options, which disable printing, copying
-        text, editing in Adobe Acrobat and making annotations, respectively.
+        Further restrictions can be imposed by using the following command-line options:
+        <table>
+          <tr>
+            <th colspan="1" rowspan="1">Option</th>
+            <th colspan="1" rowspan="1">Description</th>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><code>-noprint</code></td>
+            <td colspan="1" rowspan="1">disable printing</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><code>-nocopy</code></td>
+            <td colspan="1" rowspan="1">disable copy/paste of content</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><code>-noedit</code></td>
+            <td colspan="1" rowspan="1">disable editing in Adobe Acrobat</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><code>-noannotations</code></td>
+            <td colspan="1" rowspan="1">disable editing of annotations</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><code>-nofillinforms</code></td>
+            <td colspan="1" rowspan="1">disable filling in forms</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><code>-noaccesscontent</code></td>
+            <td colspan="1" rowspan="1">disable text and graphics extraction for accessibility purposes</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><code>-noassembledoc</code></td>
+            <td colspan="1" rowspan="1">disable assembling documents</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><code>-noprinthq</code></td>
+            <td colspan="1" rowspan="1">disable high quality printing</td>
+          </tr>
+        </table>
       </p>
     </section>
     <section>
@@ -86,6 +121,12 @@
           <th colspan="1" rowspan="1">Default</th>
         </tr>
         <tr>
+          <td colspan="1" rowspan="1">encryption-length</td>
+          <td colspan="1" rowspan="1">The encryption length in bit</td>
+          <td colspan="1" rowspan="1">Any multiple of 8 between 40 and 128</td>
+          <td colspan="1" rowspan="1">40</td>
+        </tr>
+        <tr>
           <td colspan="1" rowspan="1">ownerPassword</td>
           <td colspan="1" rowspan="1">The owner password</td>
           <td colspan="1" rowspan="1">String</td>
@@ -111,7 +152,7 @@
         </tr>
         <tr>
           <td colspan="1" rowspan="1">allowEditContent</td>
-          <td colspan="1" rowspan="1">Allows/disallows editing of content</td>
+          <td colspan="1" rowspan="1">Allows/disallows editing in Adobe Acrobat</td>
           <td colspan="1" rowspan="1">"TRUE" or "FALSE"</td>
           <td colspan="1" rowspan="1">"TRUE"</td>
         </tr>
@@ -121,6 +162,30 @@
           <td colspan="1" rowspan="1">"TRUE" or "FALSE"</td>
           <td colspan="1" rowspan="1">"TRUE"</td>
         </tr>
+        <tr>
+          <td colspan="1" rowspan="1">allowFillInForms</td>
+          <td colspan="1" rowspan="1">Allows/disallows filling in forms</td>
+          <td colspan="1" rowspan="1">"TRUE" or "FALSE"</td>
+          <td colspan="1" rowspan="1">"TRUE"</td>
+        </tr>
+        <tr>
+          <td colspan="1" rowspan="1">allowAccessContent</td>
+          <td colspan="1" rowspan="1">Allows/disallows text and graphics extraction for accessibility purposes</td>
+          <td colspan="1" rowspan="1">"TRUE" or "FALSE"</td>
+          <td colspan="1" rowspan="1">"TRUE"</td>
+        </tr>
+        <tr>
+          <td colspan="1" rowspan="1">allowAssembleDocument</td>
+          <td colspan="1" rowspan="1">Allows/disallows assembling document</td>
+          <td colspan="1" rowspan="1">"TRUE" or "FALSE"</td>
+          <td colspan="1" rowspan="1">"TRUE"</td>
+        </tr>
+        <tr>
+          <td colspan="1" rowspan="1">allowPrintHq</td>
+          <td colspan="1" rowspan="1">Allows/disallows high quality printing</td>
+          <td colspan="1" rowspan="1">"TRUE" or "FALSE"</td>
+          <td colspan="1" rowspan="1">"TRUE"</td>
+        </tr>
       </table>
       <note>
         Encryption is enabled as soon as one of these options is set.
@@ -148,6 +213,10 @@ Fop fop = fopFactory.newFop(MimeConstant
         <li>allowCopyContent: true if copying content is allowed</li>
         <li>allowEditContent: true if editing content is allowed</li>
         <li>allowEditAnnotations: true if editing annotations is allowed</li>
+        <li>allowFillInForms: true if filling in forms is allowed.</li>
+        <li>allowAccessContent: true if extracting text and graphics is allowed</li>
+        <li>allowAssembleDocument: true if assembling document is allowed</li>
+        <li>allowPrintHq: true if printing to high quality is allowed</li>
       </ol>
       <p>
         Alternatively, you can set each value separately in the Map provided by 
@@ -160,6 +229,10 @@ Fop fop = fopFactory.newFop(MimeConstant
         <li>nocopy: Boolean or "true"/"false"</li>
         <li>noedit: Boolean or "true"/"false"</li>
         <li>noannotations: Boolean or "true"/"false"</li>
+        <li>nofillinforms: Boolean or "true"/"false"</li>
+        <li>noaccesscontent: Boolean or "true"/"false"</li>
+        <li>noassembledoc: Boolean or "true"/"false"</li>
+        <li>noprinthq: Boolean or "true"/"false"</li>
       </ol>
     </section>
     <section>

Modified: xmlgraphics/site/deploy/fop/trunk/pdfx.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/pdfx.html?rev=1160690&r1=1160689&r2=1160690&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/pdfx.html (original)
+++ xmlgraphics/site/deploy/fop/trunk/pdfx.html Tue Aug 23 13:51:33 2011
@@ -11,7 +11,7 @@
 <link media="print" type="text/css" href="../skin/print.css" rel="stylesheet">
 <link type="text/css" href="../skin/profile.css" rel="stylesheet">
 <script src="../skin/getBlank.js" language="javascript" type="text/javascript"></script><script src="../skin/getMenu.js" language="javascript" type="text/javascript"></script><script src="../skin/fontsize.js" language="javascript" type="text/javascript"></script>
-<link rel="shortcut icon" href="../">
+<link rel="shortcut icon" href="../favicon.ico">
 </head>
 <body onload="init()">
 <script type="text/javascript">ndeSetTextSize();</script>
@@ -92,7 +92,7 @@ document.write("Last Published: " + docu
     |breadtrail
     +-->
 <div class="breadtrail">
-<a href="http://www.apache.org/">apache.org</a> &gt; <a href="http://xml.apache.org/">XML Federation</a> &gt; <a href="http://xmlgraphics.apache.org/">xmlgraphics.apache.org</a><script src="../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
+<a href="http://www.apache.org/">The Apache Software Foundation</a> &gt; <a href="http://xmlgraphics.apache.org/">Apache XML Graphics Project</a><script src="../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
 </div>
 <!--+
     |start Menu, mainarea
@@ -176,7 +176,9 @@ document.write("Last Published: " + docu
 <!--+
   |alternative credits
   +-->
-<div id="credit2"></div>
+<div id="credit2">
+<a href="http://www.apachecon.com/"><img border="0" title="ApacheCon NA 2011" alt="ApacheCon NA 2011 - logo" src="http://apache.org/ads/ApacheCon/2011-na-125x125.png" style="width: 125px;height: 125px;"></a>
+</div>
 </div>
 <!--+
     |end Menu
@@ -374,7 +376,7 @@ document.write("Last Published: " + docu
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2011 <a href="http://www.apache.org/licenses/">The Apache Software Foundation. Licensed under Apache License 2.0</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/trunk/pdfx.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/pdfx.pdf?rev=1160690&r1=1160689&r2=1160690&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/pdfx.pdf (original)
+++ xmlgraphics/site/deploy/fop/trunk/pdfx.pdf Tue Aug 23 13:51:33 2011
@@ -115,10 +115,10 @@ endobj
 >>
 endobj
 22 0 obj
-<< /Length 3198 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 3215 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gatm>lYkS"%KGk263pE;!Gkp-7uDb7dQ#LZ\YQLZ]Ae2dB!nC>+^.If_p7+G?d>,cCY*oMS0/SsRc0>J%`tF8qX3_8-?]7-opiYbb]>[T^>m$OhampcOu.C]0QHN(c7e@pqpN"`@Lqu"Nt8UIW9E87k?$j7LU4I6BE(!`gs#NA`.?f;O@J_$&+[ecS:9K<Ieif1F!fLJmh.#AQo(/D&-)@Q=e5NOm.HoO_<:C&PN1[CO3_;pnE1HI2t>g]X!GYL!*_Ksl6K6H=[bp%QY+)ubA(I_'Y-=a/^)hS&;J43T)ab+eW*C_j6W1ZHm:eZOZqJi.AuY2T%qDZ8DdCkjqZ`8TC#/P>GQc?AJ\`a2(=Ki>3';A)GOle"E'm>LrHGoPlJGGKTpN.dLKR=`(p$Up%+9kbM4obKZ.i,Y&!p^pj^ujLA:D-S#`.j=UjM]4HQQiX-sr?75n5alu/Q;C>9^7Nn.%7N<-ie+Zaso>J*9oaZ/s8H232c:b>>H2T1XBdBIf4nsO.JoDW-rU>9rL*U/9/p2i]ch,([hOlG]40TWRF%b-b]a,KHlb$S#mM0!j;K]/21j4JS9/;tiE6P>:q7So9?CC>OF<lNWV8lAW277M%`l?Wee#9-oLRqa4VNKMUpQ[UHnUtJQPS-H7?"p&RG$[=K#4`/2bIpp01;t$QJCs-@oRpaEEL9C[)$Xn&mqV^Ma4IT[T[=\YH)PQOT@]Di7\>>#8O_0ZqF]F`lM2SUD-4fLn%u2"%rDRgi[q/Rg_4?WiemuT"n8BRHY\o@jCSr/TYu?f%B3>5N/!/F39Tr!O0gCQO*):aK_LdWNF8R;,_]ViBc&u(s3fhRg#T!`Va[jOM1gH$5mr(F^/sS!kP:AXDeL<%*RjGC@SfQmj<RLDs.XmnChIXP_li-hLrCa+,Nh;cRR>-=3LXq>`:"^El8%i&)/I6ZX@oV,V33Zg,gmq6JHPEAq%XCA[.E[&t:]=..0O0ShUgg7EAW+C
 cMN5i%$HpM&)+3g%o&Nr/0GBF(@KTD*B!r7T3BatE.4ipcb:l%n+/OpaBTsC7OY/W#@;1"o9OjrK[NcNO>e5FkciJBpU,!Ug1k,nK1jm?$RY`$i_9!ELN4$Ym8Y)L\>gpZFmD1@t=NjDC1VF<QF-P?V7Bqr-D?rJult,[k[7Qsr%)&O-T$l:'10VK<a%mI6M#)!Kb.-Z7hD#K1Cj1+6'cIK:$&>7Y<\q.*k-AeB_'\4Dc6KnY'9UpQS<ZQ]Wb,NmM5)W]lU9O2TI\uH*5PJIN."\s%FGQd,,0dO#Ui(Uo4/TjbON2QcB6=_PIe2RVX8S<L4+OFH6u0e\,D9[d*\R;.rK/S_QpQ_.)D/(I_PdXjUF"j(jW9V^lPLh&TIWnGI%lD]-3iEj_,l;,HA^#.jbn+AMIeI5q%['Y4-7(7uH!4qu9NY<QhQl=RtEROiV"b(.G<hOG3qXWa>NcX".mUVKt(LdRo[-U\gC\6120XL]29I5h"`G%D"h3Cdd`KH$o5B?[k/O/6_\W*k1ODfqK'FGtD#RiYi!"X&Vr?&6lA3(n:;u"\9:c'6/lNE+)%t#UZ!(0ZcYi`1B=I$J4s,9D+e!":f-eKT!.tmh/<"bm^m&?g07KQd5BcrPd29QoFM/oW6eUi:e+fcncCj&2/^;ZXF'$fnc)[fb!R]Ln:&*U2F9AKd[>C0((q.7D=I9aoGgO%PpB*[>rJHhM6*!DD`Vc"9C#FQXchXRG7l<\Qp_rqmi2P(a-C7#hW)(%i7.Top*$Z)JId3h-`V!0L7>Dc_j\1=;qq92mh5kf`GV!d=TdT#(c@,3+(q5[N]d@kEE\Tl\VOj`H3+eP1OF29/BU"d6VX7VW(@RJt5<PWQ#%iackdnH;tU:M+&#^oT@Y;SIkHr=cBiNJRUoK4LFLj,-la:7JShZ?D=?/(?uL22I?j:g;sN+7^N]VRdKZt]s7WL'6J_7dDJe5eJFFL$=ZA"a%Jl=FWhc>Zc4R#EFb
 Cp%dF3<^@...@kA>0ZrsML`X$^-.'<27Sl:`=S&^$[cn3'Sm0.aCG7M92G3ed6,lrKXH&2frgf4W>C1gVLFo<NbrNWiWih*fC]do@pCb2h9b`2*.?bbG)P:UmE#HSoC32*kZXE$n[-PQd%AQmflf;^XL@#u%=LVQma(?/rb6AM_@Vro.r+3!<0a*;SpqI/bW*,g"Ird`VRZPI\SKgh`J%IlKp=2!/Jj)%+dIXrB8M(p8o8d%rW2;?2]rb!r!i(LpE/8k)qM`*0[_*nr"+I>Pi<M2rUm]3\N0Q\OeL8>60Xd6r'ht&$jL;GA=([D<iSHqau)\6WD?(kWb,0tEhr"/)^`fC:1
 -Fi]9B+bDnd$oHRdE+n*koRa<%B6R'^#S^gY81MnRL1e(dM>ee6<rn)$D<[S2m80pc0RNUTF,/;6?>k?@pD&mV<PH1KU#<W&I2r$N\mOt(RHjN(4J5_&u<LC\D9Un/EQnI+$"Z>^unEe1D?QZ:?8X`GNMfa#1'H+r];Td-H_;hsI`5ldl2MrD5NJk>srEU7";?%(JXS"=_@K,@k1)7aV!\H;fG1'[P-Xk.[f~>
+Gatm>lYkS"%KGk263pE;#&IH27uDb7dQ#LZC!tYu?#`%BZeEg0E*>i`_p7tZ0B^TB[HkLa:>fFW1rCIs*0N\bc2H>gD<gn...@I>>!Kt;Z+*WbS.+0"*LHp1#r.^nlHNIigcPg@<cA;3;2/f$R<d@OMmlJ&X4R>g&dnT<O&rnOq^o%OceA1\t6e=_$8NAVA`$C@q;suV;I.^Bf=HBVa5.)5sQC@!o?\#:ReWG?WqF'e9bmUgG2pu-J1(TiTn;N6C8aI5.J-[O!`M.m9ft+7VFlCQmr\&DCM<'UtHu5?'Q^IiZbJ*a^[F*_]abLrtO;^D->D2E9C_s2-DU6r/RQZenm-Um?GLGG"V>b/.3SF"Z#t.BbJN1k!u\G_[2B&=>4`<Nh=7-(dn_0=gEo`kK17JiSkt=)(E+\L8tpY_qh6>V6Ye_;Ir@p3e_-WZXgMeZ\'7*.XI[``K0W;]1Vj14e096\<)U,po2r9BdcN"CoqC$Pc^Wue=/nWJtQa97[<@o!ukjgh>'IN7rdhVO=.DtU>0tajT"iV_q!C+.X%gs[MV]
 @kbqaaY`*Ca1$%aF:L8,K1XTk\2Xj+GAdbl/e"\Fc_D7[e%)\k6;9G8_7[]qgl%28AQBk%a1hQ#c4&SAdV$i(Z*InYM.[/7Po611._fr2\RFlKjS6Sq/=DL$`e-VSZ2-io.*o%B[`Op:He,)s$8!uM?'FRLrL@@"F?3VKUS)cTQctg5W.@gnkUBTG%qJ=Q3W:,J9N/O:m*Rc.WG),6WTtrFHE%(Qt2,d.\0$C[8CdK3$4JHUI&W,>_=_ZroC=WiX36EGZ:;lN,\e:UT&IarNfN3dV&3\r$,$O2dJ3m3icW7<a*'YD)*6E"TWG<Gdg3uP(fU)>NAqIC4gWt*T*A+:sil8t^/6b2e&kq!GVn9]Mh(jV<OluQIr2:MP!I+Qg59%GF)ZjbXN]&XMU0=(l@No5a(1ROcKYe#R$I8p!UmTDRp`EL=[JX3[,p-G-M(Fs0;8c'5Bin35lD<sU\rr@iW^d.>XX)"GHFRo'Ekd;ho_3t=RMO4ecj`TT,C3,/f=)k%q3U-bU.'"cESF6X/K,dsQW,gnY#1:l>4mORYm%amZ&*s6J2D7%&XSjnQPNPW@%ulfP:U6;loE"YE*\O7<<'4k^`dQTE)F(A9nK@FR6c#W=$"RVV),i1J$Cg<jpc\O4mR8.pjE>roLoDs`!bPhCm]ca2PR'Z2MCrEU8R.1W10,>+j,D?Mu/Q$O`+Zg1&r/W_[I*#XWoX+pL.=!>E&n16,8B+jV[5n-F^d=DV%MKIdSO,#)M[Q!qqlN_ki?8I3l%Z"rape2qZJ69TTYUo;NEdf#EC=%5##3[Xd"![%K7.6(iTcc<'kQXiOc)q'7ZCHK(oH0jTQrjE92Pg5Hb>FASI<WOS.m?mh(WWpp(3ng$5_?Bmp'@Sqe0I3c4=-U^*t(?6ulUf`]o%rM2N&Qup.U3rF=0@A6($h]<TS$.NXmGrk&,ML1Qc$"BK?<Mfa$+`@,k[CF+lAJ56"gOc"j!>q/\r_rZ=lYg"33p
 ^H#PEZYhtKr4WR-@#-R`u''\1SPcH&b^+s=07<ATR<\669k`8INVgD*$#;qH(h6U%#iL/UrNRk5OW6E.f6:1d9&riI1Q?WA$qMY?6W_8L*B+SD$.W%^h<^bm#uXKf_H*R[9,-4=Lc+<oA[W$M$U+uSV/K8im-:!4^b+mar(F60T;]L3FL*erBHG\B=."-!.+K.MaiHE'Z9JV!1OU(p$p^5j#sR3&kSL@!%uB4;'_(4R@G#'oqFCZ=c`:2jJr<4?k]a0d^RBU38`ak+f<WcBp;4NP6Z*bZ2lE5)q6rVE)jJLor3DRg\jR;\oe9?:CnP+*[%Br!7kRnEjA]>WP+YHGHZ.=7N,bIp5_%HtG"g6!H3@&3a1KF-Y^op(gbGe/q<Q<$n)=:HIc^R?D`oiSW0\r7N6[<]1i4n_tn(ksEf([L6Xql-I$.'b,F1q1l//Zm9MpAJgQNXjL,%r0>bpU]7A33SriZ!clGiiQEbfbCZ^oq#b4Tg!bl/-^X1[OGi&*BT1$\"[ZZ2;e0'GmT.UkiCdEg,sVm#:rY2It$OlM$c7-DIn.;fKCq=AVR)$m7<F5F*ikjJi#(NE!uPo4;*!;f@<lpq_B(Vfj<.5IB;[!'EElKrKJ=EhJP#LgHAbO7]Q6dkaiM%rCd=0B(;&.qX'ENBJo6g.fp>.HM7[de_j=0'gjqj0(?\k:`qNT+clT./j7`87.Zsu,HSlUg329t9"c(S1A/PLF_k"*'0l7g]<7dA(upKNmY7#Tk3)t-[T`knD,24_gJ;1m5W@+BM5P2KKDoPuQ>LgR`bPCagX%=di8OUmiX^r/'o&B?>Z!;$TrS#7p\^6-B#_[S-K+M'1<%eQX'N?7Y:e)RYH28SBXo7=%&jqW4%o3E<,0%#o8c^<]EOF"kAP<(Ie`^+?a07cJrpO7iJ.t\U_H&*mOp6,aN`DMNsqkf#YN.mk;OTIB.u"Y+M3R:YYkqI<N\@!9>*qa:c4^dOs=7>g+[64E<
 7)bg7:&(IJ9k:h/eDoG_[(T62"Dt_5,<W#7`gR=mUjFTB8leZ'KWP^]+dAY[s7+N4J9VCP4WuB.3rb4Pp4=Ol.u@cBH:TX5Z?mn=POKJKmRV"#WT7.LBY2d`Ve1%X47Tq&(BAeFA4Y"N`+4mfZ#OB,FAH@5.2YDDEtnZFR.0!IMep2rAO7;WucualHnkBFmEab$qlBJ`N!oFr\-Gf@So'oqj)WgbB#"E(4a"Dm&&P>T8n*(Q3QcUA~>
 endstream
 endobj
 23 0 obj
@@ -183,10 +183,10 @@ endobj
 >>
 endobj
 29 0 obj
-<< /Length 1747 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1758 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gatm<>Ar7S'Roe[d/)/n=D1QUjXj&fZlP$9M(s+>pE3,99iM`_8rDYY^S@9@W(=0L$pe]l,!V[BG:rO\@WoANrA15&#6+((Y!I0SeZ2JM\)?kpTZ#2&doNg4B@i'pr6El,om3m7l1HADrhrk9F?GUD\tptkmB<k:1+dafDI5_r'jRQXo5d1'F]`k-oDZ;Q9!M%2\b<M@p^6f!7]cl%`O9(3RneTQPCEPLVn;a8"J,84=(-5jMd5SI'9?&CdGWb6>RS8o_mcSAac/4Wo'p%%/E9hrE?(m_%AiRIgZGmi*Rds<HT#jjN2\:BfYh_J>o-]l=f%=c'A(g\!d00fdkY&\M'g.Z%>l`52n:[U'PNku3?G?m.BsFK=bMiA(Wo;hT<oC\?4'GP%Z2^/&+45RR1sEX1P2L<9S5tR1B'DOY2-56Za+Ue:H7i5Uh_-;+:W[Drn>h5)`3Aq.-Ma'1S>Nf-8F5Z(3(mK?u<97k@jPZ//;icJeE>M8076sa\X7NA6YA^T\o><ndlmbS2.Nk&^,&k>T/?F=T=h!^>?$e>*F=AINn=R;I]=Z(^p<N%carf$P^\`hT(/);8aXmWJr!hkLPX;TZkg'<IdThRQPHo<lK*/B(7Z-GSjg#Q#fjSOLXtOkb#ho#]SoCZD]LG7u>]`/ES+c7WH"=k`?pk1`G"XC8Iq,O<Qjo==I6SOJA=b4JKTG'<p>.(&T?*O2Zd1+G>hCBdi^u#Yc].8?c?M$`XIu8c&WrCuFW+FKt]WqN``mhu<N_$'GE1L,cX%`E&4*E(#jB2`E^&A'=qC`r;/n')nV9O9'g%"^r_@#YV9`f."qUqu2-(8h!nHi/AmY49>[A-Ljc9Asna7;S$l%GeCe?>?k]tcXOqdR7'VJ$.L!9=_Bd3o8JBN]cT+ai>qJn0^&OZg[bh%mm^OL:"KF"f4CO?V)Abn[_#P@-Q4l0)Qb(#<Gu9Wg.m!0.ek8iePC;XoU*<_5cUpFeZ!"d.4V%
 (2hX3qc;WX@*sA+P46Y)[lEuH#1ZZC$[8>/"F!7jH3;3P@"X)3Ob0onb9tGbd.W)u0]&;/jd+oJE?bM+<;F8<rn-Gn38rKeC^Ze,tL!Z7W9dt]\5#m5NVrk=VOJjbqg;S4[:Cdq5j+H'@@`F=eq5>JLca,Sr8p1[dk_A)!l"k=Ilkk3Tl?FJNDC=m%"L.liU6^]/icPUOa.;qra8N5U+E'CH#m077?K.tK-nfM*U8-kTi6M"e\nHBg8TjRsiMdo8A<:YR3%=Z,>d>0U&Yq^?dB5q#\?/t$V4&Dja/2n+%=E/S(c9;Wgao0SITrsr."c@JN$;//@D52<+h)j<$XA'[HNe$\j2/GcFPT(I-HC@4HX<iKqA[Vf"eb#eVb/15f=\iqN[i3'j*HZVdp:q,UUP?gKKQ@UNSG#3Yk]Hoil_h-]G6KQZ2Yp7l]shn?R>O^n*:b>nTkkO<2X!Q:#@7?pY3W\cKD(n'AG<;X&C$5[-Hi>lj)m4&*gc]Qc$dD(N_N>-jPNOQAsQ0`3@P;BOW:Q#fe_gN/e[+ks?EB"n)&Sh"77?G=Kc@N*6*se5OW=i)]Ekk-!eZCA<PiBmORH-,/[^e`H;Dds#AXg:jOf72W9;I,BJ%lF2DclTejiEr*@g3ZUB@Y*sq8GSA1konFSS9&QM)qZtZLTIg]8VFkC2?6'03[Dm#1RUjl0?U4eM1^_L;DWV\/)SgJ#.Y6i7?nMAd.'h%lr$@33*(tl%L^:PZY=1A<c1*Hhe<0(~>
+Gatm<>Ar7S'Roe[d/)/n=D1QUjXj&fZlP$9M(s+>pE3,99iM`_8rDYY^S@9@W(=0L$pe]l,/836q0Fd-?-N;9;/HF8pG:DD]&r;.Vla1mH!sNYBTd)1g$c95`GC!9CUAE$=O6X9Oq)t@X"QN*7i^@5(5_b:fjgEc4CP]P+j13FdcL9bT\2Ar46(Vd>\p7hV;tnY>?cIYHrm(DK<Jb=0(DZ6_6upbs5DG_r!.gKqrb#a,2=BoEpCT<e9*VCFpuuSDr:%9WbHLK9tu(gf,DmnQ;8L@l#]9AI.k-sX\$S*Pk1J@S-`c,_AY<egd]l6Q:Y-!jQjal[Bi,(U$&dV<_T4sYssX\bL91gC]joF-=r4(.nh6)i[9X<fl`ubigA/#PkZXDiAi<`Qp-n@?"[':H-?QJqD&L4=igC0!4t.uWm=;\XZh<oNC_Yf-:&RDmeLYe2VXljCfWk%=K)>7.'OA[)f$&+@L(UV2gLEY0@*OIQ73*%kCM^a^>B>fP"E)nBb'\ccS#h!6-!9Np+9b,NJL6FYRfo(]9oe2kIjnBhh%JVrOe@sr&D]Ts+8.5/^a\hEe*U5nAQeb&W5)XNm2W\`b&*1ki+)-.r%eA>Com1hk+'LbR,BqQpl^(ar2XFD'o*lYpogF3JLkiW6D$TBiPr?&58i9>q59(+L![@k[j%T.Su3NIh6QsWk'<CIDYN1rZ7\^o2[C"-]rj/-;4OcKEOn7\Z\A63[mRNjU,6h70lN>-cfbL^V32R]2,,=a`@"?cef9Y8[)XEa*,,JM@q_*SE.l<%?B$WHN6fNs%+LCIo.uB!'ee]Y[V^m9<CD0.@tbXr;ja";R3[F)+UKI"Ti4.igma+1*I%%FQ9auG^oZM]1<g3`K!);M3>"SW&p$Gc?._$)%67d5H4q*463kYci`L?k8@+QNOIW3XoiQKQ[&q'g,(q%mT-TaB[jD)[!ETk]n,Qc470#Hi0.8C5LK#MA+hI);e;5$S]V`1U128
 lK;hf-49a%#J\apjK,j9\?AaP%6QS?q$AAu:Kue^qmKnCN5b]-]VWeDMFSC)Yg44$O_6'i5].I]GH3m0=KSW(U&PV;N(0TmOdto1STekYs;?hc$WWq'Mc"B*];-VJVMsWs)*Xnja#IP)]N#*T-;*cCtB5rHTljQ(>%E5U#g#-]"H2J8Qj+X.p:>SnTi;>#m/J[NhlP,YG)sumNqdIl;ep7Z9"O-JM`)V4^?J[;'8(D%abk7R=BR0SKFn,1aWF'IPODT8&an]+FZ58l6dNH8;cQ[MeeubTCc&SH,<@c;u*ZQC/%<;`<75X/aQKoO5?lK6DLm2#o?R*N5[sZ.&>^TS!"_Rbo_Rq^Ih)oR%a*:[4?CgieM.KoocuXq?V%K_C?4XfGK(ATE*92.P&M?+*V->;-C#*ItG0#?^&%NGd4-9#64QaW^J"5+BK+bpkoI%rM(=hr#'1T!#`c]aSM;A+gZ)I9)l2/Em9[i8p7iST*\[qY=gYme]Y49]oiN!?t)BP+Figj[kFp'P$F#DZRM)rNDc4HalMnsS1Y3Q/`H6tR6W7@HeE[>3r^DljKAnWl`][F?+q1K[c+[VXSg3&8@3^ttHIX1dmlqlFqor89BmfM6&@'odtTWpO;Y[&,ph&2cDd^Q8hTHau8>+l+><!tI"^J,s^eJf##Y6Ci3EMHq\'lD+r_5J"CY#e,MA?E;pN@#T%cWAJ%2k<@CY.K*NlNRKE"/WkVJFaP+>85cPI/];I>nSJM%7Gm)bh"&.p\O_&g)l]!~>
 endstream
 endobj
 30 0 obj
@@ -387,53 +387,53 @@ endobj
 xref
 0 48
 0000000000 65535 f 
-0000010911 00000 n 
-0000010983 00000 n 
-0000011075 00000 n 
+0000010939 00000 n 
+0000011011 00000 n 
+0000011103 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
 0000000835 00000 n 
 0000000955 00000 n 
 0000001029 00000 n 
-0000011209 00000 n 
+0000011237 00000 n 
 0000001163 00000 n 
-0000011272 00000 n 
+0000011300 00000 n 
 0000001299 00000 n 
-0000011338 00000 n 
+0000011366 00000 n 
 0000001435 00000 n 
-0000011404 00000 n 
+0000011432 00000 n 
 0000001569 00000 n 
-0000011470 00000 n 
+0000011498 00000 n 
 0000001705 00000 n 
-0000011534 00000 n 
+0000011562 00000 n 
 0000001841 00000 n 
 0000002023 00000 n 
 0000002209 00000 n 
-0000005500 00000 n 
-0000005623 00000 n 
-0000005671 00000 n 
-0000005925 00000 n 
-0000006100 00000 n 
-0000006282 00000 n 
-0000006468 00000 n 
-0000008308 00000 n 
-0000008431 00000 n 
-0000008472 00000 n 
-0000008657 00000 n 
-0000008839 00000 n 
-0000011600 00000 n 
-0000009025 00000 n 
-0000009164 00000 n 
-0000009395 00000 n 
-0000009617 00000 n 
-0000009816 00000 n 
-0000010009 00000 n 
-0000010249 00000 n 
-0000010357 00000 n 
-0000010467 00000 n 
-0000010580 00000 n 
-0000010696 00000 n 
-0000010802 00000 n 
+0000005517 00000 n 
+0000005640 00000 n 
+0000005688 00000 n 
+0000005942 00000 n 
+0000006117 00000 n 
+0000006299 00000 n 
+0000006485 00000 n 
+0000008336 00000 n 
+0000008459 00000 n 
+0000008500 00000 n 
+0000008685 00000 n 
+0000008867 00000 n 
+0000011628 00000 n 
+0000009053 00000 n 
+0000009192 00000 n 
+0000009423 00000 n 
+0000009645 00000 n 
+0000009844 00000 n 
+0000010037 00000 n 
+0000010277 00000 n 
+0000010385 00000 n 
+0000010495 00000 n 
+0000010608 00000 n 
+0000010724 00000 n 
+0000010830 00000 n 
 trailer
 <<
 /Size 48
@@ -441,5 +441,5 @@ trailer
 /Info 4 0 R
 >>
 startxref
-11651
+11679
 %%EOF

Modified: xmlgraphics/site/deploy/fop/trunk/running.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/running.html?rev=1160690&r1=1160689&r2=1160690&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/running.html (original)
+++ xmlgraphics/site/deploy/fop/trunk/running.html Tue Aug 23 13:51:33 2011
@@ -11,7 +11,7 @@
 <link media="print" type="text/css" href="../skin/print.css" rel="stylesheet">
 <link type="text/css" href="../skin/profile.css" rel="stylesheet">
 <script src="../skin/getBlank.js" language="javascript" type="text/javascript"></script><script src="../skin/getMenu.js" language="javascript" type="text/javascript"></script><script src="../skin/fontsize.js" language="javascript" type="text/javascript"></script>
-<link rel="shortcut icon" href="../">
+<link rel="shortcut icon" href="../favicon.ico">
 </head>
 <body onload="init()">
 <script type="text/javascript">ndeSetTextSize();</script>
@@ -92,7 +92,7 @@ document.write("Last Published: " + docu
     |breadtrail
     +-->
 <div class="breadtrail">
-<a href="http://www.apache.org/">apache.org</a> &gt; <a href="http://xml.apache.org/">XML Federation</a> &gt; <a href="http://xmlgraphics.apache.org/">xmlgraphics.apache.org</a><script src="../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
+<a href="http://www.apache.org/">The Apache Software Foundation</a> &gt; <a href="http://xmlgraphics.apache.org/">Apache XML Graphics Project</a><script src="../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
 </div>
 <!--+
     |start Menu, mainarea
@@ -176,7 +176,9 @@ document.write("Last Published: " + docu
 <!--+
   |alternative credits
   +-->
-<div id="credit2"></div>
+<div id="credit2">
+<a href="http://www.apachecon.com/"><img border="0" title="ApacheCon NA 2011" alt="ApacheCon NA 2011 - logo" src="http://apache.org/ads/ApacheCon/2011-na-125x125.png" style="width: 125px;height: 125px;"></a>
+</div>
 </div>
 <!--+
     |end Menu
@@ -374,6 +376,10 @@ Fop [options] [-fo|-xml] infile [-xsl fi
   -nocopy           PDF file will be encrypted without copy content permission
   -noedit           PDF file will be encrypted without edit content permission
   -noannotations    PDF file will be encrypted without edit annotation permission
+  -nofillinforms    PDF file will be encrypted without fill in forms permission
+  -noaccesscontent  PDF file will be encrypted without extract text and graphics permission
+  -noassembledoc    PDF file will be encrypted without assemble the document permission
+  -noprinthq        PDF file will be encrypted without print high quality permission
   -a                enables accessibility features (Tagged PDF etc., default off)
   -pdfprofile prof  PDF file will be generated with the specified profile
                     (Examples for prof: PDF/A-1b or PDF/X-3:2003)
@@ -621,7 +627,7 @@ Fop [options] [-fo|-xml] infile [-xsl fi
 </div>
   
 <span class="version">
-          version 986315</span>
+          version 1154998</span>
 </div>
 <!--+
     |end content
@@ -639,7 +645,7 @@ document.write("Last Published: " + docu
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2011 <a href="http://www.apache.org/licenses/">The Apache Software Foundation. Licensed under Apache License 2.0</a>
 </div>
 <!--+
     |end bottomstrip



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org