You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cr...@apache.org on 2007/03/05 07:34:19 UTC
svn commit: r514567 - in /forrest/site: ./ docs_0_80/
docs_0_80/howto/cvs-ssh/ pluginDocs/plugins_0_70/ pluginDocs/plugins_0_80/
procedures/release/ skin/images/
Author: crossley
Date: Sun Mar 4 22:34:18 2007
New Revision: 514567
URL: http://svn.apache.org/viewvc?view=rev&rev=514567
Log:
Automatic publish from forrestbot
Modified:
forrest/site/docs_0_80/faq.xml
forrest/site/docs_0_80/howto/cvs-ssh/howto-cvs-ssh.html
forrest/site/docs_0_80/linking.pdf
forrest/site/docs_0_80/sitemap-ref.pdf
forrest/site/index.xml
forrest/site/pluginDocs/plugins_0_70/index.pdf
forrest/site/pluginDocs/plugins_0_80/index.pdf
forrest/site/procedures/release/How_to_release.html
forrest/site/procedures/release/How_to_release.pdf
forrest/site/skin/images/rc-b-l-15-1body-2menu-3menu.png
forrest/site/skin/images/rc-b-r-15-1body-2menu-3menu.png
forrest/site/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
forrest/site/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png
forrest/site/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
forrest/site/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
forrest/site/skin/images/rc-t-r-15-1body-2menu-3menu.png
forrest/site/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png
forrest/site/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
forrest/site/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
forrest/site/skin/images/rc-t-r-50-1body-2menu-3menu.png
forrest/site/skin/images/rc-t-r-50-1body-2menu-3menu.test.png
Modified: forrest/site/docs_0_80/faq.xml
URL: http://svn.apache.org/viewvc/forrest/site/docs_0_80/faq.xml?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
--- forrest/site/docs_0_80/faq.xml (original)
+++ forrest/site/docs_0_80/faq.xml Sun Mar 4 22:34:18 2007
@@ -19,7 +19,7 @@
"Find in this page" facility to search for keywords.
</p>
</section><section id="overview"><title>1.2. Where can I read an overview about how to work with Forrest? </title>
- <p> See the <link href="site:v0.80//your-project">Using Forrest</link> guide. </p>
+ <p> See the <link href="site:your-project">Using Forrest</link> guide. </p>
</section><section id="requirements"><title>1.3. What are the system requirements for Forrest? </title>
<p> Forrest includes everything necessary to build and run, except of course for Java. In
addition to all the Cocoon JARs, Forrest includes and uses its own version of Apache Ant.
@@ -34,15 +34,15 @@
<p> Forrest switched from a CVS code repository to SVN (Subversion) code repository. The old
CVS repository is closed and not kept current. </p>
</section><section id="svn"><title>1.5. How can I use SVN to keep up to date with the latest codebase? </title>
- <p> Follow these <link href="site:v0.80//build">Building Forrest</link> notes. </p>
- <p> The <link href="site:v0.80//your-project">Using Forrest</link> guide provides further
+ <p> Follow these <link href="site:build">Building Forrest</link> notes. </p>
+ <p> The <link href="site:your-project">Using Forrest</link> guide provides further
step-by-step assistance in getting started with Forrest for your project. </p>
</section><section id="older-plugins"><title>1.6. How to use older versions of specific plugins? </title>
<p>
Sometimes one does not want to use the most recent functionality
of a plugin and instead need to use an older version.
Information about changes to each plugin can be found in its
- <link href="site:v0.80//plugins/index">documentation</link>.
+ <link href="site:plugins/index">documentation</link>.
</p>
<p>
In the forrest.properties file, specify the version of the plugin
@@ -132,9 +132,9 @@
<code>forrest.jvmargs=-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</code>
</p>
</section></section><section id="content_faqs"><title>2. Content Creation</title><section id="edit-content"><title>2.1. What tools can be used to edit the content?</title>
- <p>If you are using the Apache Forrest XML <link href="site:v0.80//dtd-docs">document format</link>
+ <p>If you are using the Apache Forrest XML <link href="site:dtd-docs">document format</link>
or DocBook or other XML document types, then you can use any text editor or even a
- dedicated XML editor. You must ensure valid XML. See our <link href="site:v0.80//catalog">configuration notes</link> for various editors. </p>
+ dedicated XML editor. You must ensure valid XML. See our <link href="site:catalog">configuration notes</link> for various editors. </p>
<p>There are content management systems like <link href="ext:lenya">Apache Lenya</link>. </p>
<p>Remember that Forrest can also use other source formats, such as OpenOffice.org docs or
JSPWiki. Use the appropriate editor for those document types and ensure that the document
@@ -149,7 +149,7 @@
defining the navigation menus, and as a method for defining references
to be used when linking between documents.
This file is fully explained in
- <link href="site:v0.80//linking">Menus and Linking</link>. Here is a precis:
+ <link href="site:linking">Menus and Linking</link>. Here is a precis:
</p>
<p>
The labels can be whatever text you want.
@@ -216,9 +216,9 @@
...
</about></source>
<p> In this case the menu labeled "About" will have 2 new items: "Full PDF" and "Full HTML".
- (See also <link href="site:v0.80//pdf-tab">How to create a PDF document for each
+ (See also <link href="site:pdf-tab">How to create a PDF document for each
tab</link>.) </p>
- <p> This assumes that you use the <link href="site:v0.80//linking">site.xml</link> method for your
+ <p> This assumes that you use the <link href="site:linking">site.xml</link> method for your
site structure and navigation, rather than the old book.xml method. </p>
</section><section id="pageBreaks"><title>2.6. How do I insert page breaks into documents?</title>
<p>Page breaks do not make a great deal of sense in HTML documents intended for display on a
@@ -282,7 +282,7 @@
</map:match></source>
</section><section id="tab-site"><title>2.11. I need help with the interaction between tabs.xml and site.xml </title>
<p>
- See the <link href="site:v0.80//linking/tab-site">tips</link>.
+ See the <link href="site:linking/tab-site">tips</link>.
</p>
</section><section id="defaultFileName"><title>2.12. How can I change the default file name that Forrest will look for when I request a
URL like <code>http://myserver</code> or <code>http://myserver/mydir/</code> ? </title>
@@ -293,7 +293,7 @@
<li> Edit that file to replace 'index.html' in
<default-filename>index.html</default-filename>
with 'overview.html'. </li>
- <li> Edit your project's <link href="site:v0.80//project-sitemap">sitemap.xmap</link> file. </li>
+ <li> Edit your project's <link href="site:project-sitemap">sitemap.xmap</link> file. </li>
<li> Add the following code just before the end of the pipelines-element:<source xml:space="preserve">
<map:pipeline>
<map:match type="regexp" pattern="^.+/$">
@@ -310,7 +310,7 @@
start-up-page for a CD-based documentation project to be named 'start.html'. </p>
<p>To change the start page of a site:</p>
<ol>
- <li>Edit your project's <link href="site:v0.80//project-sitemap">sitemap.xmap</link> file.</li>
+ <li>Edit your project's <link href="site:project-sitemap">sitemap.xmap</link> file.</li>
<li>Add the following code just before the end of the pipelines-element:<source xml:space="preserve">
<map:pipeline>
<map:match pattern="">
@@ -488,7 +488,7 @@
<p>If you have:<code><version>$Revision: 1.30
$</version></code>The '1.30' will be extracted and
displayed at the bottom of the page as "version 1.30". See for example the
- bottom of the <link href="site:v0.80//your-project"> Using Forrest</link> document.</p>
+ bottom of the <link href="site:your-project"> Using Forrest</link> document.</p>
<p>This technique could also be used for a modification date with $Date: 2004/01/15 08:52:47
$</p>
</section><section id="cli-xconf"><title>3.5. How to control the processing of URIs by Cocoon, e.g. exclude certain URIs, include
@@ -516,7 +516,7 @@
<uri src="favicon.ico"/>
</cocoon></source>
<p>This is just an example, and you should modify it appropriately for your site.</p>
- <note> Wildcards may be used. These are a powerful feature of Cocoon's <link href="site:v0.80//sitemap-ref">sitemap</link>. For example, <strong>foo/*</strong> would match
+ <note> Wildcards may be used. These are a powerful feature of Cocoon's <link href="site:sitemap-ref">sitemap</link>. For example, <strong>foo/*</strong> would match
<code>foo/bar</code>, but not <code>foo/bar/baz</code> — use
<strong>foo/**</strong> to match that. </note>
</section><section id="ignoring_javadocs"><title>3.6. How do I stop Forrest breaking on links to external files that may not exist, like
@@ -575,14 +575,14 @@
</p>
</section><section id="catalog"><title>3.11. How do i configure my favourite XML editor or parser to find the local Forrest
DTDs? </title>
- <p> Notes are provided for various tools at <link href="site:v0.80//catalog">Using Catalog Entity
+ <p> Notes are provided for various tools at <link href="site:catalog">Using Catalog Entity
Resolver for local DTDs</link>. </p>
</section><section id="skin"><title>3.12. How to make the site look better and change its skin? </title>
- <p> There are <link href="site:v0.80//skins">default skins</link> provided, which are configurable
+ <p> There are <link href="site:skins">default skins</link> provided, which are configurable
and so should meet the needs of most projects. The aim is to provide many capabilities so
that extra skins are not needed. </p>
- <p> See notes about <link href="site:v0.80//your-project/skins">configuration</link> of the skins.
- Some projects may have special needs and can define their <link href="site:v0.80//your-project/new-skin">own skin</link>. </p>
+ <p> See notes about <link href="site:your-project/skins">configuration</link> of the skins.
+ Some projects may have special needs and can define their <link href="site:your-project/new-skin">own skin</link>. </p>
</section><section id="xsp"><title>3.13. How do I enable <acronym title="eXtensible Server Pages">XSP</acronym> processing?</title>
<p>First consider whether your needs would be better met by Cocoon itself, rather than
Forrest. </p>
@@ -592,7 +592,7 @@
<li>Download <link href="http://svn.apache.org/repos/asf/cocoon/trunk/lib/optional/">jdtcore-*.jar</link> from Cocoons SVN tree, and copy it to the $FORREST_HOME/main/webapp/WEB-INF/lib
directory (or lib/core/ directory in the source distribution).</li>
<li>
- <p> Add the following generator definition in the map:generators section of your <link href="site:v0.80//project-sitemap">project sitemap</link>
+ <p> Add the following generator definition in the map:generators section of your <link href="site:project-sitemap">project sitemap</link>
</p>
<source xml:space="preserve">
<map:generator name="serverpages"
@@ -681,7 +681,7 @@
files. However, Forrest first checks for the existence of a book.xml file, so
backwards-compatibility is preserved. If a directory has a book.xml file, the book.xml
will be used to generate the menu. This supplement is useful in situations where
- <code>site.xml</code>-generated menus aren't appropriate. See <link href="site:v0.80//linking">Menus and
+ <code>site.xml</code>-generated menus aren't appropriate. See <link href="site:linking">Menus and
Linking</link>. </p>
</section><section id="docbook"><title>5.2. How do I use DocBook as the XML documentation format? </title>
<p> There are two ways. Forrest has a <code>simplifiedDocbook</code> plugin which can
@@ -692,8 +692,8 @@
<p> The other way is to use the full DocBook stylesheets directly. The DocBook DTDs are
shipped with Forrest and automatically handled. However, you will need to have the DocBook
stylesheets on your system (they are too massive to ship with Forrest) and configure
- Forrest accordingly. You will need to create a <link href="site:v0.80//project-sitemap">project
- sitemap</link> as explained in <link href="site:v0.80//your-project">Using Forrest</link> and
+ Forrest accordingly. You will need to create a <link href="site:project-sitemap">project
+ sitemap</link> as explained in <link href="site:your-project">Using Forrest</link> and
add matches to handle your DocBook documents. Here is an example. Note that you need to
change it to suit your situation. The match must be very specific so that only the DocBook
documents are matched. The rest of the documents will be handled by Forrest core. Powerful
@@ -726,7 +726,7 @@
html, then uses a Forrest core stylesheet to transform and serialize
to the internal xml format, then the normal machinery takes over and
does the output transformation. This use the Content Aware Pipelines
- (<link href="site:v0.80//cap">SourceTypeAction</link>)
+ (<link href="site:cap">SourceTypeAction</link>)
to peek at the source xml. If it is DocBook-4.2
then this sitemap match is triggered, if not then it falls through to the core of Forrest.
</p>
@@ -771,7 +771,7 @@
"document-v*" DTD and DocBook. </p>
<p> Ensure that the document type declaration in your XML instance is well specified. Use a
public identifier. The DTD will then be properly resolved by Forrest. If you need to use
- different DTDs, then see <link href="site:v0.80//your-project/new_dtd">Using Forrest</link> for
+ different DTDs, then see <link href="site:your-project/new_dtd">Using Forrest</link> for
configuration guidance. </p>
</section><section id="version"><title>5.3. How to report which version of Forrest is being used and the properties that are
set? </title>
Modified: forrest/site/docs_0_80/howto/cvs-ssh/howto-cvs-ssh.html
URL: http://svn.apache.org/viewvc/forrest/site/docs_0_80/howto/cvs-ssh/howto-cvs-ssh.html?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
--- forrest/site/docs_0_80/howto/cvs-ssh/howto-cvs-ssh.html (original)
+++ forrest/site/docs_0_80/howto/cvs-ssh/howto-cvs-ssh.html Sun Mar 4 22:34:18 2007
@@ -113,7 +113,7 @@
<div onclick="SwitchMenu('menu_1.1', '../../../skin/')" id="menu_1.1Title" class="menutitle">How-To Samples</div>
<div id="menu_1.1" class="menuitemgroup">
<div class="menuitem">
-<a href="../../../docs_0_80/howto/index.html">Overview</a>
+<a href="../../../asf-infrastructure.html">Overview</a>
</div>
</div>
<div onclick="SwitchMenu('menu_selected_1.2', '../../../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../../../skin/images/chapter_open.gif');">Committers</div>
Modified: forrest/site/docs_0_80/linking.pdf
URL: http://svn.apache.org/viewvc/forrest/site/docs_0_80/linking.pdf?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
Binary files - no diff available.
Modified: forrest/site/docs_0_80/sitemap-ref.pdf
URL: http://svn.apache.org/viewvc/forrest/site/docs_0_80/sitemap-ref.pdf?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
Binary files - no diff available.
Modified: forrest/site/index.xml
URL: http://svn.apache.org/viewvc/forrest/site/index.xml?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
--- forrest/site/index.xml (original)
+++ forrest/site/index.xml Sun Mar 4 22:34:18 2007
@@ -210,10 +210,10 @@
<img src="http://apache.org/images/ac2005eu_135x50.gif"
alt="ApacheCon Europe 2005" width="135" height="50"/>
</link>
- -->
+
<link href="http://apachecon.com/2006/EU/">ApacheCon EU 2006</link>
- Please make plans to join us for the conference in
- Dublin, Ireland on 26-30 June 2006.
+ Dublin, Ireland on 26-30 June 2006.-->
<!--
See our <link href="site:events">events</link> list for the schedule
of Forrest meetings at ApacheCon.
Modified: forrest/site/pluginDocs/plugins_0_70/index.pdf
URL: http://svn.apache.org/viewvc/forrest/site/pluginDocs/plugins_0_70/index.pdf?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
Binary files - no diff available.
Modified: forrest/site/pluginDocs/plugins_0_80/index.pdf
URL: http://svn.apache.org/viewvc/forrest/site/pluginDocs/plugins_0_80/index.pdf?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
Binary files - no diff available.
Modified: forrest/site/procedures/release/How_to_release.html
URL: http://svn.apache.org/viewvc/forrest/site/procedures/release/How_to_release.html?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
--- forrest/site/procedures/release/How_to_release.html (original)
+++ forrest/site/procedures/release/How_to_release.html Sun Mar 4 22:34:18 2007
@@ -619,7 +619,7 @@
<versions tab="docs">
<overview label="Overview" href="versions/index.html"/>
- <v0.8 label="0.8-dev" href="site:v0.80//index"/>
+ <v0.8 label="0.8-dev" href="site:index"/>
<v0.7 label="0.7 (current)" href="site:v0.70//index"/>
<v0.6 label="0.6" href="site:v0.60//index"/>
</versions>
@@ -632,7 +632,7 @@
<versions tab="docs">
<overview label="Overview" href="versions/index.html"/>
- <v0.9 label="0.9-dev" href="site:v0.90//index"/>
+ <v0.9 label="0.9-dev" href="site:index"/>
<v0.8 label="0.8 (current)" href="site:v0.80//index"/>
<v0.7 label="0.7" href="site:v0.70//index"/>
</versions>
@@ -657,30 +657,6 @@
</li>
-
-<li>
-
-<p>Adjust version-numbers in site.xml</p>
-
-<div class="fixme">
-<div class="label">Fixme (fso)</div>
-<div class="content">This used to be the comment: 'Do global replace throughout docs_0_80 to replace the string
- ="site:v0.70 with ="site:v0.80' but this needs checking.</div>
-</div>
-
-<div class="fixme">
-<div class="label">Fixme (dc)</div>
-<div class="content">Perhaps you are talking about something else.
- I meant that when we copy the docs to become the next -dev (i.e.
- this time docs_0_90) then we need to replace all "site:" references
- (i.e. ="site:v0.80 with ="site:v0.90'). If you can see a better way, then great.
- Maybe dropping the v0.x prefix will cause it to use the most recent doc,
- e.g. use site:buildPlugin rather than site:v0.90/howto/buildplugin.
- </div>
-</div>
-
-
-</li>
<li>
@@ -758,7 +734,7 @@
</div>
-<a name="N101E4"></a><a name="BuildDist"></a>
+<a name="N101D6"></a><a name="BuildDist"></a>
<h2 class="underlined_10">Building the distribution</h2>
<div class="section">
<p>In this phase you build the release candidate to be tested.</p>
@@ -1038,7 +1014,7 @@
</div>
-<a name="N102DA"></a><a name="Testing+the+release+candidate+and+voting"></a>
+<a name="N102CC"></a><a name="Testing+the+release+candidate+and+voting"></a>
<h2 class="underlined_10">Testing the release candidate and voting</h2>
<div class="section">
<p>Get Forrest developers to test the actual distribution on various platforms.</p>
@@ -1096,7 +1072,7 @@
</div>
-<a name="N10316"></a><a name="FinalRel"></a>
+<a name="N10308"></a><a name="FinalRel"></a>
<h2 class="underlined_10">Finalizing the release</h2>
<div class="section">
<p>When a good release candidate has been achieved and affirmed by the vote, we'll finalize the release.</p>
@@ -1163,7 +1139,7 @@
</div>
-<a name="N1035C"></a><a name="UploadAndAnnounce"></a>
+<a name="N1034E"></a><a name="UploadAndAnnounce"></a>
<h2 class="underlined_10">Upload and announcement</h2>
<div class="section">
<p>In this phase we'll upload the new Release, wait for it to be available on most mirror sites, then
@@ -1319,7 +1295,7 @@
</div>
-<a name="N1040B"></a><a name="cleanup"></a>
+<a name="N103FD"></a><a name="cleanup"></a>
<h2 class="underlined_10">Cleanup</h2>
<div class="section">
<ol>
@@ -1415,7 +1391,7 @@
</div>
-<a name="N1045F"></a><a name="conclusion"></a>
+<a name="N10451"></a><a name="conclusion"></a>
<h2 class="underlined_10">Conclusion</h2>
<div class="section">
<p>All done!</p>
Modified: forrest/site/procedures/release/How_to_release.pdf
URL: http://svn.apache.org/viewvc/forrest/site/procedures/release/How_to_release.pdf?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
Binary files - no diff available.
Modified: forrest/site/skin/images/rc-b-l-15-1body-2menu-3menu.png
URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-b-l-15-1body-2menu-3menu.png?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
Binary files - no diff available.
Modified: forrest/site/skin/images/rc-b-r-15-1body-2menu-3menu.png
URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-b-r-15-1body-2menu-3menu.png?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
Binary files - no diff available.
Modified: forrest/site/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
Binary files - no diff available.
Modified: forrest/site/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png
URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
Binary files - no diff available.
Modified: forrest/site/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
Binary files - no diff available.
Modified: forrest/site/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
Binary files - no diff available.
Modified: forrest/site/skin/images/rc-t-r-15-1body-2menu-3menu.png
URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-t-r-15-1body-2menu-3menu.png?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
Binary files - no diff available.
Modified: forrest/site/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png
URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
Binary files - no diff available.
Modified: forrest/site/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
Binary files - no diff available.
Modified: forrest/site/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
Binary files - no diff available.
Modified: forrest/site/skin/images/rc-t-r-50-1body-2menu-3menu.png
URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-t-r-50-1body-2menu-3menu.png?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
Binary files - no diff available.
Modified: forrest/site/skin/images/rc-t-r-50-1body-2menu-3menu.test.png
URL: http://svn.apache.org/viewvc/forrest/site/skin/images/rc-t-r-50-1body-2menu-3menu.test.png?view=diff&rev=514567&r1=514566&r2=514567
==============================================================================
Binary files - no diff available.