Update site documents for release 1.1.1

git-svn-id: https://svn.apache.org/repos/asf/incubator/wink/site/trunk@961438 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index fa0efa9..cdb08b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,14 @@
 		<artifactId>apache</artifactId>
 		<version>6</version>
 	</parent>
-	<properties>
+    <properties>
+        <!-- Wink 1.1.1 -->
+       	<download_1_1_1Version>1.1.1-incubating</download_1_1_1Version>
+       	<download_1_1_1Name>Wink-${download_1_1_1Version}</download_1_1_1Name>
+       	<download_1_1_1MirrorUrl>http://www.apache.org/dyn/closer.cgi/incubator/wink/${download_1_1_1Version}</download_1_1_1MirrorUrl>
+       	<download_1_1_1DistUrl>http://www.apache.org/dist/incubator/wink/${download_1_1_1Version}</download_1_1_1DistUrl>
+       	<download_1_1_1File>apache-wink-${download_1_1_1Version}</download_1_1_1File>
+       	<download_1_1_1TagUrl>http://svn.apache.org/repos/asf/incubator/wink/tags/wink-${download_1_1_1Version}</download_1_1_1TagUrl>
        	<!-- Wink 1.1 -->
        	<download_1_1Version>1.1-incubating</download_1_1Version>
        	<download_1_1Name>Wink-${download_1_1Version}</download_1_1Name>
diff --git a/src/site/apt/documentation.apt b/src/site/apt/documentation.apt
index 502a56e..4662948 100644
--- a/src/site/apt/documentation.apt
+++ b/src/site/apt/documentation.apt
@@ -25,11 +25,11 @@
 
 Apache Wink Documentation
 
-* Wink 1.0 
+* Wink 1.1.1 
 
-  * User Guide {{{./1.0/html/Apache Wink Developer Guide.html}HTML}} / {{{./1.0/Apache_Wink_User_Guide.pdf}PDF}} 
+  * User Guide {{{./1.1.1/html/Apache Wink Developer Guide.html}HTML}} / {{{./1.1.1/Apache_Wink_User_Guide.pdf}PDF}} 
   
-  * {{{./1.0/api/index.html}API}} (Javadoc)
+  * {{{./1.1.1/api/index.html}API}} (Javadoc)
 
 * Wiki
 
@@ -49,6 +49,18 @@
 
 * Previous Releases
 
+** Wink 1.1 
+
+  * User Guide {{{./1.1/html/Apache Wink Developer Guide.html}HTML}} / {{{./1.1/Apache_Wink_User_Guide.pdf}PDF}} 
+  
+  * {{{./1.1/api/index.html}API}} (Javadoc)
+
+** Wink 1.0 
+
+  * User Guide {{{./1.0/html/Apache Wink Developer Guide.html}HTML}} / {{{./1.0/Apache_Wink_User_Guide.pdf}PDF}} 
+  
+  * {{{./1.0/api/index.html}API}} (Javadoc)
+
 ** Wink 0.1 
 
   * User Guide {{{./0.1/Apache_Wink_User_Guide.htm}HTML}} / {{{./0.1/Apache_Wink_User_Guide.pdf}PDF}} 
diff --git a/src/site/confluence/1.1/release_notes.confluence b/src/site/confluence/1.1/release_notes.confluence
index ec4326a..de8acc9 100644
--- a/src/site/confluence/1.1/release_notes.confluence
+++ b/src/site/confluence/1.1/release_notes.confluence
@@ -1,73 +1,73 @@
-h2. Apache Wink 1.1 Release Notes

-

-h3. Overview

- 

-This is the third official release of Apache Wink project.

-Apache Wink is a framework that helps you to produce and consume RESTful Web Services. 

-Apache Wink is TCK compliant implementation of the JAX-RS v1.0 specification. 

-The project also introduces Java API for writing clients that consume HTTP-based RESTful Web Services. 

-

-h3. Complete list of issues fixed in 1.1

-    

-h4. Sub-task

-    * [WINK-241] - Add Documentation regarding client side Basic Authentication handler

-    * [WINK-271] - Add code for mapping RSS into Syndication Object Model

-    * [WINK-272] - Add an unit-test to verify RSS to Synd mapping

-    * [WINK-273] - Add an Apache Wink Client example to demonstrate RSS to Synd mapping

-    * [WINK-274] - Create documentation for RSS to Synd mapping

-

-h4. Bug

-    * [WINK-226] - need fallback for Class.forName in J2EE environments

-    * [WINK-227] - need fallback for Class.forName in J2EE environments

-    * [WINK-229] - JAXBXmlProvider should tolerate user jaxb contexts

-    * [WINK-230] - NullPointerException occures when Content type in MultiPart isn't sent

-    * [WINK-235] - Fix issue with using Locale objects inside ResponseBuilder

-    * [WINK-243] - Unable to inject fields once ResourceInstance is initialized

-    * [WINK-244] - Wrong log during servlet startup

-    * [WINK-247] - Fix issue with wrong informational message given when no Response entity and wrong class used when trying to find media type if not specified

-    * [WINK-248] - Fix warning about methods when more methods used.

-    * [WINK-249] - Fix issue in UriBuilder where not throwing IllegalArgumentException

-    * [WINK-251] - Handling http error 405 correctly 

-    * [WINK-253] - Typo in documentation for Wink 1.0 from Apache incubator website (it has ScopeType.SINGELTON instead of ScopeType.SINGLETON)

-    * [WINK-254] - AtomEntrySyndEntry content unavailable in Wink client

-    * [WINK-255] - Iterator over map of SoftReferences susceptible to ConcurrentModificationException

-    * [WINK-262] - Content-Type of HTTP Response contains no charset.

-    * [WINK-264] - Problem to construct a link using the LinkBuilders for a resource with a path param that contains ":"

-    * [WINK-265] - wink-client-apache-httpclient/pom.xml has duplicate junit def, causing mvn3 to puke

-

-h4. Improvement

-    * [WINK-67] - Use the maven-assembly-plugin to generate release distributions

-    * [WINK-128] - Add Wink quick start guide

-    * [WINK-195] - JAX-RS 1.1 support:  C007

-    * [WINK-196] - JAX-RS 1.1 support:  C008

-    * [WINK-212] - Need to look into handling of Collection types of objects

-    * [WINK-216] - tolerate empty path segments to support empty PathParams

-    * [WINK-223] - reduce log output on 404s

-    * [WINK-224] - Need to set custom ID Resolver for JaxB unmarshaller.

-    * [WINK-225] - Reduce logging the ProvidersRegistry

-    * [WINK-228] - sweep code for java2security compatibility

-    * [WINK-234] - improve debug and return code for unfound writer

-    * [WINK-240] - Change logging to be less noisy

-    * [WINK-245] - Annotations on interfaces - should they work?

-    * [WINK-257] - allow Application subclass to control provider priority

-    * [WINK-259] - add support for injection into Application subclass

-    * [WINK-260] - Add JVM system properties to read from for setting client connection/read timeouts

-    * [WINK-261] - Add way to be able to capture logging warnings in unit tests so we can correctly identify when messages are correctly being emitted

-    * [WINK-263] - Add OSGi metadata to JARs

-    * [WINK-266] - RestServlet constants should be publicily consumable

-    * [WINK-268] - Configure versions for all plugins to avoid Maven 3 complaints

-    * [WINK-270] - Honor Accept-Charset when returning text based content

-    * [WINK-277] - Mention about ext\MultiPart sample in examples\readme.txt

-    * [WINK-278] - Consistent naming convention for Wink distributions

-

-h4. New Feature

-    * [WINK-149] - Map RSS to Syndication Object Model

-    * [WINK-237] - Add a basic auth client handler

-    * [WINK-238] - Select the Content-Type automatically on client

-    * [WINK-250] - Experimental feature for Google Guice injection

-

-h4. Task

-    * [WINK-99] - Use Wink Client instead of Apaceh Http Client in integration tests

-

-h4. Test

-    * [WINK-97] - new integration tests:  context, uriinfo, etc

+h2. Apache Wink 1.1 Release Notes
+
+h3. Overview
+ 
+This is the third official release of Apache Wink project.
+Apache Wink is a framework that helps you to produce and consume RESTful Web Services. 
+Apache Wink is TCK compliant implementation of the JAX-RS v1.0 specification. 
+The project also introduces Java API for writing clients that consume HTTP-based RESTful Web Services. 
+
+h3. Complete list of issues fixed in 1.1
+    
+h4. Sub-task
+    * WINK-241 - Add Documentation regarding client side Basic Authentication handler
+    * WINK-271 - Add code for mapping RSS into Syndication Object Model
+    * WINK-272 - Add an unit-test to verify RSS to Synd mapping
+    * WINK-273 - Add an Apache Wink Client example to demonstrate RSS to Synd mapping
+    * WINK-274 - Create documentation for RSS to Synd mapping
+
+h4. Bug
+    * WINK-226 - need fallback for Class.forName in J2EE environments
+    * WINK-227 - need fallback for Class.forName in J2EE environments
+    * WINK-229 - JAXBXmlProvider should tolerate user jaxb contexts
+    * WINK-230 - NullPointerException occures when Content type in MultiPart isn't sent
+    * WINK-235 - Fix issue with using Locale objects inside ResponseBuilder
+    * WINK-243 - Unable to inject fields once ResourceInstance is initialized
+    * WINK-244 - Wrong log during servlet startup
+    * WINK-247 - Fix issue with wrong informational message given when no Response entity and wrong class used when trying to find media type if not specified
+    * WINK-248 - Fix warning about methods when more methods used.
+    * WINK-249 - Fix issue in UriBuilder where not throwing IllegalArgumentException
+    * WINK-251 - Handling http error 405 correctly 
+    * WINK-253 - Typo in documentation for Wink 1.0 from Apache incubator website (it has ScopeType.SINGELTON instead of ScopeType.SINGLETON)
+    * WINK-254 - AtomEntrySyndEntry content unavailable in Wink client
+    * WINK-255 - Iterator over map of SoftReferences susceptible to ConcurrentModificationException
+    * WINK-262 - Content-Type of HTTP Response contains no charset.
+    * WINK-264 - Problem to construct a link using the LinkBuilders for a resource with a path param that contains ":"
+    * WINK-265 - wink-client-apache-httpclient/pom.xml has duplicate junit def, causing mvn3 to puke
+
+h4. Improvement
+    * WINK-67 - Use the maven-assembly-plugin to generate release distributions
+    * WINK-128 - Add Wink quick start guide
+    * WINK-195 - JAX-RS 1.1 support:  C007
+    * WINK-196 - JAX-RS 1.1 support:  C008
+    * WINK-212 - Need to look into handling of Collection types of objects
+    * WINK-216 - tolerate empty path segments to support empty PathParams
+    * WINK-223 - reduce log output on 404s
+    * WINK-224 - Need to set custom ID Resolver for JaxB unmarshaller.
+    * WINK-225 - Reduce logging the ProvidersRegistry
+    * WINK-228 - sweep code for java2security compatibility
+    * WINK-234 - improve debug and return code for unfound writer
+    * WINK-240 - Change logging to be less noisy
+    * WINK-245 - Annotations on interfaces - should they work?
+    * WINK-257 - allow Application subclass to control provider priority
+    * WINK-259 - add support for injection into Application subclass
+    * WINK-260 - Add JVM system properties to read from for setting client connection/read timeouts
+    * WINK-261 - Add way to be able to capture logging warnings in unit tests so we can correctly identify when messages are correctly being emitted
+    * WINK-263 - Add OSGi metadata to JARs
+    * WINK-266 - RestServlet constants should be publicily consumable
+    * WINK-268 - Configure versions for all plugins to avoid Maven 3 complaints
+    * WINK-270 - Honor Accept-Charset when returning text based content
+    * WINK-277 - Mention about ext\MultiPart sample in examples\readme.txt
+    * WINK-278 - Consistent naming convention for Wink distributions
+
+h4. New Feature
+    * WINK-149 - Map RSS to Syndication Object Model
+    * WINK-237 - Add a basic auth client handler
+    * WINK-238 - Select the Content-Type automatically on client
+    * WINK-250 - Experimental feature for Google Guice injection
+
+h4. Task
+    * WINK-99 - Use Wink Client instead of Apaceh Http Client in integration tests
+
+h4. Test
+    * WINK-97 - new integration tests:  context, uriinfo, etc
diff --git a/src/site/confluence/downloads.confluence.vm b/src/site/confluence/downloads.confluence.vm
index df546ad..0ed9008 100644
--- a/src/site/confluence/downloads.confluence.vm
+++ b/src/site/confluence/downloads.confluence.vm
@@ -1,79 +1,99 @@
-h1. Apache Wink Downloads

-

- Apache Wink is distributed in several formats for your convenience.

-

- You will be prompted for a mirror - if the file is not found on yours, please be patient, as it may take 24 hours to reach all mirrors.

-

- Apache Wink is distributed under the [Apache License, version 2.0|http://maven.apache.org/license.html].

-

-

-h2. Download Wink 1.0

-

-|| Name ||  Archive || MD5 || SHA-1 || Signature ||

-| ${download_1_0Name} (tar.gz) | [tar.gz|${download_1_0MirrorUrl}/${download_1_0File}.tar.gz] |  [MD5|${download_1_0DistUrl}/${download_1_0File}.tar.gz.md5] |  [SHA-1|${download_1_0DistUrl}/${download_1_0File}.tar.gz.sha1]  | [ASC|${download_1_0DistUrl}/${download_1_0File}.tar.gz.asc] |

-| ${download_1_0Name} (zip) | [zip|${download_1_0MirrorUrl}/${download_1_0File}.zip] |  [MD5|${download_1_0DistUrl}/${download_1_0File}.zip.md5] |  [SHA-1|${download_1_0DistUrl}/${download_1_0File}.zip.sha1] | [ASC|${download_1_0DistUrl}/${download_1_0File}.zip.asc] |

-| ${download_1_0Name} (Source tar.gz) | [tar.gz|${download_1_0MirrorUrl}/${download_1_0File}-src.tar.gz] |  [MD5|${download_1_0DistUrl}/${download_1_0File}-src.tar.gz.md5]  | [SHA-1|${download_1_0DistUrl}/${download_1_0File}-src.tar.gz.sha1] | [ASC|${download_1_0DistUrl}/${download_1_0File}-src.tar.gz.asc] |

-| ${download_1_0Name} (Source zip) | [zip|${download_1_0MirrorUrl}/${download_1_0File}-src.zip] |  [MD5|${download_1_0DistUrl}/${download_1_0File}-src.zip.md5] |  [SHA-1|${download_1_0DistUrl}/${download_1_0File}-src.zip.sha1] | [ASC|${download_1_0DistUrl}/${download_1_0File}-src.zip.asc] |

-| Release Notes | [${download_1_0Version}|1.0/release\_notes] | | | |

-| KEYS for {$download_1_0Name} | [KEYS|${download_1_0TagUrl}/KEYS] | | | |

-

-Instructions for checking hashes and signatures is indicated on the [Verifying Apache Software Foundation Releases|http://www.apache.org/info/verification.html] page.

-

-You can also retrieve the source files from our svn repository by typing

-{code}

-svn co ${download_1_0TagUrl}/

-{code}

-

-Instructions for checking hashes and signatures is indicated on the [Verifying Apache Software Foundation Releases|http://www.apache.org/info/verification.html] page.

-

-You can also retrieve the source files from our svn repository by typing

-{code}

-svn co ${download_1_0TagUrl}/

-{code}

-

-h3. Using Maven

-

- We strongly encourage our users to configure a Maven repository mirror closer to their location, please read [How to Use Mirrors for Repositories|http://maven.apache.org/guides/mini/guide-mirror-settings.html].

-

-h4. Dependencies

-

- Add the following dependencies to your Maven pom.xml to include the Apache Wink Client module or the Server module.

-

-h5. Server

-

-{code}

-<dependency>

-    <groupId>org.apache.wink</groupId>

-    <artifactId>wink-server</artifactId>

-    <version>${download_1_1Version}</version>

-</dependency>

-{code}

-

-h5. Client

-

-{code}

-<dependency>

-    <groupId>org.apache.wink</groupId>

-    <artifactId>wink-client</artifactId>

-    <version>${download_1_1Version}</version>

-</dependency>

-{code}

-

-h2. Previous Releases

-

-h3. Wink 0.1

-

-|| Name ||  Archive || MD5 || SHA-1 || Signature ||

-| ${download_0_1Name} (tar.gz) | [tar.gz|${download_0_1MirrorUrl}/${download_0_1File}.tar.gz] |  [MD5|${download_0_1DistUrl}/${download_0_1File}.tar.gz.md5] |  [SHA-1|${download_0_1DistUrl}/${download_0_1File}.tar.gz.sha1]  | [ASC|${download_0_1DistUrl}/${download_0_1File}.tar.gz.asc] |

-| ${download_0_1Name} (zip) | [zip|${download_0_1MirrorUrl}/${download_0_1File}.zip] |  [MD5|${download_0_1DistUrl}/${download_0_1File}.zip.md5] |  [SHA-1|${download_0_1DistUrl}/${download_0_1File}.zip.sha1] | [ASC|${download_0_1DistUrl}/${download_0_1File}.zip.asc] |

-| ${download_0_1Name} (Source tar.gz) | [tar.gz|${download_0_1MirrorUrl}/${download_0_1File}-src.tar.gz] |  [MD5|${download_0_1DistUrl}/${download_0_1File}-src.tar.gz.md5]  | [SHA-1|${download_0_1DistUrl}/${download_0_1File}-src.tar.gz.sha1] | [ASC|${download_0_1DistUrl}/${download_0_1File}-src.tar.gz.asc] |

-| ${download_0_1Name} (Source zip) | [zip|${download_0_1MirrorUrl}/${download_0_1File}-src.zip] |  [MD5|${download_0_1DistUrl}/${download_0_1File}-src.zip.md5] |  [SHA-1|${download_0_1DistUrl}/${download_0_1File}-src.zip.sha1] | [ASC|${download_0_1DistUrl}/${download_0_1File}-src.zip.asc] |

-| Release Notes | [${download_0_1Version}|0.1/release\_notes] | | | |

-| KEYS for ${download_0_1Name} | [KEYS|${download_0_1TagUrl}/KEYS] | | | |

-

-Instructions for checking hashes and signatures is indicated on the [Verifying Apache Software Foundation Releases|http://www.apache.org/info/verification.html] page.

-

-You can also retrieve the source files from our svn repository by typing

-{code}

-svn co ${download_0_1TagUrl}/

-{code}

+h1. Apache Wink Downloads
+
+ Apache Wink is distributed in several formats for your convenience.
+
+ You will be prompted for a mirror - if the file is not found on yours, please be patient, as it may take 24 hours to reach all mirrors.
+
+ Apache Wink is distributed under the [Apache License, version 2.0|http://maven.apache.org/license.html].
+
+
+h2. Download Wink 1.1.1
+
+|| Name ||  Archive || MD5 || SHA-1 || Signature ||
+| ${download_1_1_1Name} (tar.gz) | [tar.gz|${download_1_1_1MirrorUrl}/${download_1_1_1File}.tar.gz] |  [MD5|${download_1_1_1DistUrl}/${download_1_1_1File}.tar.gz.md5] |  [SHA-1|${download_1_1_1DistUrl}/${download_1_1_1File}.tar.gz.sha1]  | [ASC|${download_1_1_1DistUrl}/${download_1_1_1File}.tar.gz.asc] |
+| ${download_1_1_1Name} (zip) | [zip|${download_1_1_1MirrorUrl}/${download_1_1_1File}.zip] |  [MD5|${download_1_1_1DistUrl}/${download_1_1_1File}.zip.md5] |  [SHA-1|${download_1_1_1DistUrl}/${download_1_1_1File}.zip.sha1] | [ASC|${download_1_1_1DistUrl}/${download_1_1_1File}.zip.asc] |
+| ${download_1_1_1Name} (Source tar.gz) | [tar.gz|${download_1_1_1MirrorUrl}/${download_1_1_1File}-src.tar.gz] |  [MD5|${download_1_1_1DistUrl}/${download_1_1_1File}-src.tar.gz.md5]  | [SHA-1|${download_1_1_1DistUrl}/${download_1_1_1File}-src.tar.gz.sha1] | [ASC|${download_1_1_1DistUrl}/${download_1_1_1File}-src.tar.gz.asc] |
+| ${download_1_1_1Name} (Source zip) | [zip|${download_1_1_1MirrorUrl}/${download_1_1_1File}-src.zip] |  [MD5|${download_1_1_1DistUrl}/${download_1_1_1File}-src.zip.md5] |  [SHA-1|${download_1_1_1DistUrl}/${download_1_1_1File}-src.zip.sha1] | [ASC|${download_1_1_1DistUrl}/${download_1_1_1File}-src.zip.asc] |
+| Release Notes | [${download_1_1_1Version}|1.1.1/release\_notes] | | | |
+| KEYS for {$download_1_1_1Name} | [KEYS|${download_1_1_1TagUrl}/KEYS] | | | |
+
+Instructions for checking hashes and signatures is indicated on the [Verifying Apache Software Foundation Releases|http://www.apache.org/info/verification.html] page.
+
+You can also retrieve the source files from our svn repository by typing
+{code}
+svn co ${download_1_1_1TagUrl}/
+{code}
+
+Instructions for checking hashes and signatures is indicated on the [Verifying Apache Software Foundation Releases|http://www.apache.org/info/verification.html] page.
+
+You can also retrieve the source files from our svn repository by typing
+{code}
+svn co ${download_1_1_1TagUrl}/
+{code}
+
+h3. Using Maven
+
+ We strongly encourage our users to configure a Maven repository mirror closer to their location, please read [How to Use Mirrors for Repositories|http://maven.apache.org/guides/mini/guide-mirror-settings.html].
+
+h4. Dependencies
+
+ Add the following dependencies to your Maven pom.xml to include the Apache Wink Client module or the Server module.
+
+h5. Server
+
+{code}
+<dependency>
+    <groupId>org.apache.wink</groupId>
+    <artifactId>wink-server</artifactId>
+    <version>${download_1_1_1Version}</version>
+</dependency>
+{code}
+
+h5. Client
+
+{code}
+<dependency>
+    <groupId>org.apache.wink</groupId>
+    <artifactId>wink-client</artifactId>
+    <version>${download_1_1_1Version}</version>
+</dependency>
+{code}
+
+h2. Previous Releases
+
+h3. Wink 1.1
+
+|| Name ||  Archive || MD5 || SHA-1 || Signature ||
+| ${download_1_1Name} (tar.gz) | [tar.gz|${download_1_1MirrorUrl}/${download_1_1File}.tar.gz] |  [MD5|${download_1_1DistUrl}/${download_1_1File}.tar.gz.md5] |  [SHA-1|${download_1_1DistUrl}/${download_1_1File}.tar.gz.sha1]  | [ASC|${download_1_1DistUrl}/${download_1_1File}.tar.gz.asc] |
+| ${download_1_1Name} (zip) | [zip|${download_1_1MirrorUrl}/${download_1_1File}.zip] |  [MD5|${download_1_1DistUrl}/${download_1_1File}.zip.md5] |  [SHA-1|${download_1_1DistUrl}/${download_1_1File}.zip.sha1] | [ASC|${download_1_1DistUrl}/${download_1_1File}.zip.asc] |
+| ${download_1_1Name} (Source tar.gz) | [tar.gz|${download_1_1MirrorUrl}/${download_1_1File}-src.tar.gz] |  [MD5|${download_1_1DistUrl}/${download_1_1File}-src.tar.gz.md5]  | [SHA-1|${download_1_1DistUrl}/${download_1_1File}-src.tar.gz.sha1] | [ASC|${download_1_1DistUrl}/${download_1_1File}-src.tar.gz.asc] |
+| ${download_1_1Name} (Source zip) | [zip|${download_1_1MirrorUrl}/${download_1_1File}-src.zip] |  [MD5|${download_1_1DistUrl}/${download_1_1File}-src.zip.md5] |  [SHA-1|${download_1_1DistUrl}/${download_1_1File}-src.zip.sha1] | [ASC|${download_1_1DistUrl}/${download_1_1File}-src.zip.asc] |
+| Release Notes | [${download_1_1Version}|1.1/release\_notes] | | | |
+| KEYS for {$download_1_1Name} | [KEYS|${download_1_1TagUrl}/KEYS] | | | |
+
+h3. Wink 1.0
+
+|| Name ||  Archive || MD5 || SHA-1 || Signature ||
+| ${download_1_0Name} (tar.gz) | [tar.gz|${download_1_0MirrorUrl}/${download_1_0File}.tar.gz] |  [MD5|${download_1_0DistUrl}/${download_1_0File}.tar.gz.md5] |  [SHA-1|${download_1_0DistUrl}/${download_1_0File}.tar.gz.sha1]  | [ASC|${download_1_0DistUrl}/${download_1_0File}.tar.gz.asc] |
+| ${download_1_0Name} (zip) | [zip|${download_1_0MirrorUrl}/${download_1_0File}.zip] |  [MD5|${download_1_0DistUrl}/${download_1_0File}.zip.md5] |  [SHA-1|${download_1_0DistUrl}/${download_1_0File}.zip.sha1] | [ASC|${download_1_0DistUrl}/${download_1_0File}.zip.asc] |
+| ${download_1_0Name} (Source tar.gz) | [tar.gz|${download_1_0MirrorUrl}/${download_1_0File}-src.tar.gz] |  [MD5|${download_1_0DistUrl}/${download_1_0File}-src.tar.gz.md5]  | [SHA-1|${download_1_0DistUrl}/${download_1_0File}-src.tar.gz.sha1] | [ASC|${download_1_0DistUrl}/${download_1_0File}-src.tar.gz.asc] |
+| ${download_1_0Name} (Source zip) | [zip|${download_1_0MirrorUrl}/${download_1_0File}-src.zip] |  [MD5|${download_1_0DistUrl}/${download_1_0File}-src.zip.md5] |  [SHA-1|${download_1_0DistUrl}/${download_1_0File}-src.zip.sha1] | [ASC|${download_1_0DistUrl}/${download_1_0File}-src.zip.asc] |
+| Release Notes | [${download_1_0Version}|1.0/release\_notes] | | | |
+| KEYS for {$download_1_0Name} | [KEYS|${download_1_0TagUrl}/KEYS] | | | |
+
+h3. Wink 0.1
+
+|| Name ||  Archive || MD5 || SHA-1 || Signature ||
+| ${download_0_1Name} (tar.gz) | [tar.gz|${download_0_1MirrorUrl}/${download_0_1File}.tar.gz] |  [MD5|${download_0_1DistUrl}/${download_0_1File}.tar.gz.md5] |  [SHA-1|${download_0_1DistUrl}/${download_0_1File}.tar.gz.sha1]  | [ASC|${download_0_1DistUrl}/${download_0_1File}.tar.gz.asc] |
+| ${download_0_1Name} (zip) | [zip|${download_0_1MirrorUrl}/${download_0_1File}.zip] |  [MD5|${download_0_1DistUrl}/${download_0_1File}.zip.md5] |  [SHA-1|${download_0_1DistUrl}/${download_0_1File}.zip.sha1] | [ASC|${download_0_1DistUrl}/${download_0_1File}.zip.asc] |
+| ${download_0_1Name} (Source tar.gz) | [tar.gz|${download_0_1MirrorUrl}/${download_0_1File}-src.tar.gz] |  [MD5|${download_0_1DistUrl}/${download_0_1File}-src.tar.gz.md5]  | [SHA-1|${download_0_1DistUrl}/${download_0_1File}-src.tar.gz.sha1] | [ASC|${download_0_1DistUrl}/${download_0_1File}-src.tar.gz.asc] |
+| ${download_0_1Name} (Source zip) | [zip|${download_0_1MirrorUrl}/${download_0_1File}-src.zip] |  [MD5|${download_0_1DistUrl}/${download_0_1File}-src.zip.md5] |  [SHA-1|${download_0_1DistUrl}/${download_0_1File}-src.zip.sha1] | [ASC|${download_0_1DistUrl}/${download_0_1File}-src.zip.asc] |
+| Release Notes | [${download_0_1Version}|0.1/release\_notes] | | | |
+| KEYS for ${download_0_1Name} | [KEYS|${download_0_1TagUrl}/KEYS] | | | |
+
+Instructions for checking hashes and signatures is indicated on the [Verifying Apache Software Foundation Releases|http://www.apache.org/info/verification.html] page.
+
+You can also retrieve the source files from our svn repository by typing
+{code}
+svn co ${download_0_1TagUrl}/
+{code}
diff --git a/src/site/confluence/news.confluence b/src/site/confluence/news.confluence
index affbedb..f22bcda 100644
--- a/src/site/confluence/news.confluence
+++ b/src/site/confluence/news.confluence
@@ -1,6 +1,8 @@
 h1. News

 

+* 2010-07-07 - Wink 1.1.1 released.

+* 2010-05-14 - Wink 1.1 released.

 * 2009-11-09 - Wink 1.0 released. 

 * 2009-08-26 - Wink 0.1 released.

 * 2009-07-01 - Wink is JAX-RS 1.0 compliant

-* 2009-05-27 - Wink enters incubation.
\ No newline at end of file
+* 2009-05-27 - Wink enters incubation.