Author: dashorst
Date: Mon Jun 24 18:14:45 2013
New Revision: 1496145

URL: http://svn.apache.org/r1496145
Log:
Fixed confluence links for the most part

Modified:
    wicket/common/site/trunk/_posts/2009-07-30-wicket-1.3.7-released.md
    wicket/common/site/trunk/_posts/2010-08-11-wicket-1.5-M1-released.md
    wicket/common/site/trunk/_posts/2010-09-17-wicket.1.5-M2.1-released.md
    wicket/common/site/trunk/_posts/2011-01-22-wicket-1.5-RC1-released.md
    wicket/common/site/trunk/_posts/2011-02-25-wicket-1.5-rc2-released.md
    wicket/common/site/trunk/_posts/2011-04-02-wicket-1.5-RC3-released.md
    wicket/common/site/trunk/_posts/2011-05-11-wicket-1.5-RC4.2-released.md
    wicket/common/site/trunk/_posts/2011-06-25-wicket-1.5-RC5.1-released.md
    wicket/common/site/trunk/_posts/2011-08-28-1.5-RC7-released.md
    wicket/common/site/trunk/_posts/2011-09-07-wicket-1.5-released.md
    wicket/common/site/trunk/_posts/2012-03-26-wicket-6.0.0-beta1-released.md
    wicket/common/site/trunk/_posts/2012-05-29-wicket-6.0.0-beta2-released.md
    wicket/common/site/trunk/_posts/2012-07-16-wicket-6.0.0-beta3-released.md
    wicket/common/site/trunk/_posts/2012-11-16-wicket-6.3.0-released.md
    wicket/common/site/trunk/_site/2009/07/30/wicket-1.3.7-released.html
    wicket/common/site/trunk/_site/2010/08/11/wicket-1.5-M1-released.html
    wicket/common/site/trunk/_site/2010/09/17/wicket.1.5-M2.1-released.html
    wicket/common/site/trunk/_site/2011/01/22/wicket-1.5-RC1-released.html
    wicket/common/site/trunk/_site/2011/02/25/wicket-1.5-rc2-released.html
    wicket/common/site/trunk/_site/2011/04/02/wicket-1.5-RC3-released.html
    wicket/common/site/trunk/_site/2011/05/11/wicket-1.5-RC4.2-released.html
    wicket/common/site/trunk/_site/2011/06/25/wicket-1.5-RC5.1-released.html
    wicket/common/site/trunk/_site/2011/08/28/1.5-RC7-released.html
    wicket/common/site/trunk/_site/2011/09/07/wicket-1.5-released.html
    wicket/common/site/trunk/_site/2012/03/26/wicket-6.0.0-beta1-released.html
    wicket/common/site/trunk/_site/2012/05/29/wicket-6.0.0-beta2-released.html
    wicket/common/site/trunk/_site/2012/07/16/wicket-6.0.0-beta3-released.html
    wicket/common/site/trunk/_site/2012/11/16/wicket-6.3.0-released.html
    wicket/common/site/trunk/_site/atom.xml
    wicket/common/site/trunk/_site/help/index.html
    wicket/common/site/trunk/_site/learn/examples/dropdownchoice.html
    wicket/common/site/trunk/_site/meet/blogs.html
    wicket/common/site/trunk/_site/start/download.html
    wicket/common/site/trunk/help/index.md
    wicket/common/site/trunk/learn/examples/dropdownchoice.md
    wicket/common/site/trunk/meet/blogs.md
    wicket/common/site/trunk/start/download.md

Modified: wicket/common/site/trunk/_posts/2009-07-30-wicket-1.3.7-released.md
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_posts/2009-07-30-wicket-1.3.7-released.md?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_posts/2009-07-30-wicket-1.3.7-released.md 
(original)
+++ wicket/common/site/trunk/_posts/2009-07-30-wicket-1.3.7-released.md Mon Jun 
24 18:14:45 2013
@@ -45,8 +45,7 @@ will be supporting 1.4.x and 1.5.x.
 If you are coming from Wicket 1.2, you really want to read our migration
 guide, found on the wiki:
 
-<http://cwiki.apache.org/WICKET/migrate-13.html>
-
+<https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3>
 
 ### Downloading the release
 

Modified: wicket/common/site/trunk/_posts/2010-08-11-wicket-1.5-M1-released.md
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_posts/2010-08-11-wicket-1.5-M1-released.md?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_posts/2010-08-11-wicket-1.5-M1-released.md 
(original)
+++ wicket/common/site/trunk/_posts/2010-08-11-wicket-1.5-M1-released.md Mon 
Jun 24 18:14:45 2013
@@ -8,7 +8,7 @@ provide our users with a more powerful a
 
 This release is NOT production-ready, it is more of a technology demo that 
should facilitate user-feedback we can fold into the next milestone.
 
-* [Migration 
notes](https://cwiki.apache.org/WICKET/migration-to-wicket-15.html)
+* [Migration 
notes](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5)
 * [Subversion 
tag](http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-M1/) 
 * To use in Maven: 
 {% highlight xml %}

Modified: wicket/common/site/trunk/_posts/2010-09-17-wicket.1.5-M2.1-released.md
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_posts/2010-09-17-wicket.1.5-M2.1-released.md?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_posts/2010-09-17-wicket.1.5-M2.1-released.md 
(original)
+++ wicket/common/site/trunk/_posts/2010-09-17-wicket.1.5-M2.1-released.md Mon 
Jun 24 18:14:45 2013
@@ -8,9 +8,9 @@ provide our users with a more powerful a
 
 This release is NOT production-ready, it is more of a technology demo that 
should facilitate user-feedback we can fold into the next milestone.
 
-New and noteworthy items in this milestone include [Inter-component event 
mechanism](https://cwiki.apache.org/WICKET/migration-to-wicket-15.html#MigrationtoWicket1.5-Intercomponentevents)
 which allows components to communicate in a decoupled fashion, and improved 
[resource 
caching](https://cwiki.apache.org/WICKET/migration-to-wicket-15.html#MigrationtoWicket1.5-getResourceSettings%2528%2529.setAddLastModifiedTimeToResourceReferenceUrl%2528%2529hasbeenreplaced).
 
+New and noteworthy items in this milestone include [Inter-component event 
mechanism](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5#MigrationtoWicket1.5-Intercomponentevents)
 which allows components to communicate in a decoupled fashion, and improved 
[resource 
caching](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5#MigrationtoWicket1.5-getResourceSettings%2528%2529.setAddLastModifiedTimeToResourceReferenceUrl%2528%2529hasbeenreplaced).
 
 
-* [Migration 
notes](https://cwiki.apache.org/WICKET/migration-to-wicket-15.html)
+* [Migration 
notes](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5)
 * [Subversion 
tag](http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-M2.1) 
 * To use in Maven: 
 {% highlight xml %}

Modified: wicket/common/site/trunk/_posts/2011-01-22-wicket-1.5-RC1-released.md
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_posts/2011-01-22-wicket-1.5-RC1-released.md?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_posts/2011-01-22-wicket-1.5-RC1-released.md 
(original)
+++ wicket/common/site/trunk/_posts/2011-01-22-wicket-1.5-RC1-released.md Mon 
Jun 24 18:14:45 2013
@@ -10,7 +10,7 @@ The Wicket Team is proud to introduce th
 * More flexible markup loading
 * Better proxy support (x-forwarded-for header)
 
-More detailed migration notes are available on our [Migrate to 1.5 Wiki 
Page](https://cwiki.apache.org/WICKET/migration-to-wicket-15.html)
+More detailed migration notes are available on our [Migrate to 1.5 Wiki 
Page](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5)
 
 Release Artifacts:
 * [Subversion 
tag](http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-RC1) 

Modified: wicket/common/site/trunk/_posts/2011-02-25-wicket-1.5-rc2-released.md
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_posts/2011-02-25-wicket-1.5-rc2-released.md?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_posts/2011-02-25-wicket-1.5-rc2-released.md 
(original)
+++ wicket/common/site/trunk/_posts/2011-02-25-wicket-1.5-rc2-released.md Mon 
Jun 24 18:14:45 2013
@@ -5,7 +5,7 @@ title: Wicket 1.5-rc2 released
 
 The Wicket Team is proud to introduce the second Release Candidate in Wicket 
1.5 series. See the changelog for the list of bug fixes and improvements done 
between 1.5-RC1 and 1.5-rc2
 
-More detailed migration notes are available on our [Migrate to 1.5 Wiki 
Page](https://cwiki.apache.org/WICKET/migration-to-wicket-15.html)
+More detailed migration notes are available on our [Migrate to 1.5 Wiki 
Page](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5)
 
 Release Artifacts:
 * [Subversion 
tag](http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-rc2) 

Modified: wicket/common/site/trunk/_posts/2011-04-02-wicket-1.5-RC3-released.md
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_posts/2011-04-02-wicket-1.5-RC3-released.md?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_posts/2011-04-02-wicket-1.5-RC3-released.md 
(original)
+++ wicket/common/site/trunk/_posts/2011-04-02-wicket-1.5-RC3-released.md Mon 
Jun 24 18:14:45 2013
@@ -5,7 +5,7 @@ title: Wicket 1.5-RC3 released
 
 The Wicket Team is proud to introduce the third Release Candidate in Wicket 
1.5 series. See the changelog for the list of bug fixes and improvements done 
between 1.5-rc2 and 1.5-RC3
 
-More detailed migration notes are available on our [Migrate to 1.5 Wiki 
Page](https://cwiki.apache.org/WICKET/migration-to-wicket-15.html)
+More detailed migration notes are available on our [Migrate to 1.5 Wiki 
Page](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5)
 
 Release Artifacts:
 * [Subversion 
tag](http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-RC3) 

Modified: 
wicket/common/site/trunk/_posts/2011-05-11-wicket-1.5-RC4.2-released.md
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_posts/2011-05-11-wicket-1.5-RC4.2-released.md?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_posts/2011-05-11-wicket-1.5-RC4.2-released.md 
(original)
+++ wicket/common/site/trunk/_posts/2011-05-11-wicket-1.5-RC4.2-released.md Mon 
Jun 24 18:14:45 2013
@@ -5,7 +5,7 @@ title: Wicket 1.5-RC4.2 released
 
 The Wicket Team is proud to introduce the fourth Release Candidate in Wicket 
1.5 series. See the changelog for the list of bug fixes and improvements done 
between 1.5-RC3 and 1.5-RC4.2
 
-More detailed migration notes are available on our [Migrate to 1.5 Wiki 
Page](https://cwiki.apache.org/WICKET/migration-to-wicket-15.html)
+More detailed migration notes are available on our [Migrate to 1.5 Wiki 
Page](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5)
 
 Release Artifacts:
 * [Subversion 
tag](http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-RC4.2) 

Modified: 
wicket/common/site/trunk/_posts/2011-06-25-wicket-1.5-RC5.1-released.md
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_posts/2011-06-25-wicket-1.5-RC5.1-released.md?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_posts/2011-06-25-wicket-1.5-RC5.1-released.md 
(original)
+++ wicket/common/site/trunk/_posts/2011-06-25-wicket-1.5-RC5.1-released.md Mon 
Jun 24 18:14:45 2013
@@ -5,7 +5,7 @@ title: Wicket 1.5-RC5.1 released
 
 The Wicket Team is proud to introduce the fourth Release Candidate in Wicket 
1.5 series. See the changelog for the list of bug fixes and improvements done 
between 1.5-RC4.2 and 1.5-RC5.1
 
-More detailed migration notes are available on our [Migrate to 1.5 Wiki 
Page](https://cwiki.apache.org/WICKET/migration-to-wicket-15.html)
+More detailed migration notes are available on our [Migrate to 1.5 Wiki 
Page](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5)
 
 Release Artifacts:
 * [Subversion 
tag](http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-RC5.1) 

Modified: wicket/common/site/trunk/_posts/2011-08-28-1.5-RC7-released.md
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_posts/2011-08-28-1.5-RC7-released.md?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_posts/2011-08-28-1.5-RC7-released.md (original)
+++ wicket/common/site/trunk/_posts/2011-08-28-1.5-RC7-released.md Mon Jun 24 
18:14:45 2013
@@ -5,7 +5,7 @@ title: Wicket 1.5-RC7 released
 
 The Wicket Team is proud to introduce the seventh Release Candidate in Wicket 
1.5 series. See the changelog for the list of bug fixes and improvements done 
between 1.5-RC5.1 and 1.5-RC7
 
-More detailed migration notes are available on our [Migrate to 1.5 Wiki 
Page](https://cwiki.apache.org/WICKET/migration-to-wicket-15.html)
+More detailed migration notes are available on our [Migrate to 1.5 Wiki 
Page](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5)
 
 Release Artifacts:
 * [Subversion 
tag](http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-RC7) 

Modified: wicket/common/site/trunk/_posts/2011-09-07-wicket-1.5-released.md
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_posts/2011-09-07-wicket-1.5-released.md?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_posts/2011-09-07-wicket-1.5-released.md (original)
+++ wicket/common/site/trunk/_posts/2011-09-07-wicket-1.5-released.md Mon Jun 
24 18:14:45 2013
@@ -120,5 +120,5 @@ public class MyComponent extends Compone
 
 [1]: http://www.apache.org/dyn/closer.cgi/wicket/1.5.0
 [2]: http://s.apache.org/wicket-1.5-migration
-[3]: https://cwiki.apache.org/WICKET/requestcycle-in-wicket-15.html
-[4]: https://cwiki.apache.org/WICKET/caching-in-wicket-15.html
+[3]: 
https://cwiki.apache.org/confluence/display/WICKET/RequestCycle+in+Wicket+1.5
+[4]: https://cwiki.apache.org/confluence/display/WICKET/Caching+in+Wicket+1.5

Modified: 
wicket/common/site/trunk/_posts/2012-03-26-wicket-6.0.0-beta1-released.md
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_posts/2012-03-26-wicket-6.0.0-beta1-released.md?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_posts/2012-03-26-wicket-6.0.0-beta1-released.md 
(original)
+++ wicket/common/site/trunk/_posts/2012-03-26-wicket-6.0.0-beta1-released.md 
Mon Jun 24 18:14:45 2013
@@ -6,8 +6,8 @@ title: Wicket 6.0.0-beta1 released
 The Wicket team is proud to announce the first beta release of the Wicket 6.x 
series.
 This release brings over many improvements over the 1.5.x series.
 
-Check the [roadmap](https://cwiki.apache.org/WICKET/wicket-60-roadmap.html) 
with a list of the major goals.
-And the [migration 
guide](https://cwiki.apache.org/WICKET/migration-to-wicket-60.html) with all 
major and some minor changes between 1.5.x and 6.x series.
+Check the 
[roadmap](https://cwiki.apache.org/confluence/display/WICKET/Wicket+6.0+Roadmap)
 with a list of the major goals.
+And the [migration 
guide](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0)
 with all major and some minor changes between 1.5.x and 6.x series.
 
 The Jira changelog of all closed ticket at 
[Jira](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&version=12319052)
 

Modified: 
wicket/common/site/trunk/_posts/2012-05-29-wicket-6.0.0-beta2-released.md
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_posts/2012-05-29-wicket-6.0.0-beta2-released.md?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_posts/2012-05-29-wicket-6.0.0-beta2-released.md 
(original)
+++ wicket/common/site/trunk/_posts/2012-05-29-wicket-6.0.0-beta2-released.md 
Mon Jun 24 18:14:45 2013
@@ -48,8 +48,8 @@ Please note that this is still experimen
 
 ### This release ###
 
-Check the [roadmap](https://cwiki.apache.org/WICKET/wicket-60-roadmap.html) 
with a list of the major goals.
-And the [migration 
guide](https://cwiki.apache.org/WICKET/migration-to-wicket-60.html) with all 
major and some minor changes between 1.5.x and 6.x series.
+Check the 
[roadmap](https://cwiki.apache.org/confluence/display/WICKET/Wicket+6.0+Roadmap)
 with a list of the major goals.
+And the [migration 
guide](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0)
 with all major and some minor changes between 1.5.x and 6.x series.
 
 The Jira changelog of all closed ticket at 
[Jira](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&version=12320343)
 

Modified: 
wicket/common/site/trunk/_posts/2012-07-16-wicket-6.0.0-beta3-released.md
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_posts/2012-07-16-wicket-6.0.0-beta3-released.md?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_posts/2012-07-16-wicket-6.0.0-beta3-released.md 
(original)
+++ wicket/common/site/trunk/_posts/2012-07-16-wicket-6.0.0-beta3-released.md 
Mon Jun 24 18:14:45 2013
@@ -109,7 +109,7 @@ This release
 ============
 
  - Check the roadmap  with a list of the major
-   goals: [6.0 roadmap](https://cwiki.apache.org/WICKET/wicket-60-roadmap.html)
+   goals: [6.0 
roadmap](https://cwiki.apache.org/confluence/display/WICKET/Wicket+6.0+Roadmap)
  - And the migration guide with all major and some minor changes
    between 1.5.x and 6.x series: [migration 
guide](http://s.apache.org/wicket-6.0-migration)
  - The Jira changelog of all closed ticket at

Modified: wicket/common/site/trunk/_posts/2012-11-16-wicket-6.3.0-released.md
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_posts/2012-11-16-wicket-6.3.0-released.md?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_posts/2012-11-16-wicket-6.3.0-released.md 
(original)
+++ wicket/common/site/trunk/_posts/2012-11-16-wicket-6.3.0-released.md Mon Jun 
24 18:14:45 2013
@@ -18,7 +18,7 @@ This release fixes some javascript error
 We have upgraded the embedded JQuery library to 1.8.2 (the most recent
 stable release of JQuery). If you depend on an earlier version of
 JQuery, you can instruct Wicket to use your older version. See the
-[Wicket Ajax 
Guide](https://cwiki.apache.org/WICKET/wicket-ajax.html#WicketAjax-Configuration)
+[Wicket Ajax 
Guide](https://cwiki.apache.org/confluence/display/WICKET/Wicket+Ajax#WicketAjax-Configuration)
 for more information.
 
 For the full changelog see the release notes attached to the end of

Modified: wicket/common/site/trunk/_site/2009/07/30/wicket-1.3.7-released.html
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/2009/07/30/wicket-1.3.7-released.html?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/2009/07/30/wicket-1.3.7-released.html 
(original)
+++ wicket/common/site/trunk/_site/2009/07/30/wicket-1.3.7-released.html Mon 
Jun 24 18:14:45 2013
@@ -199,7 +199,7 @@
 
 <p>If you are coming from Wicket 1.2, you really want to read our migration 
guide, found on the wiki:</p>
 
-<p><a 
href='http://cwiki.apache.org/WICKET/migrate-13.html'>http://cwiki.apache.org/WICKET/migrate-13.html</a></p>
+<p><a 
href='https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3'>https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3</a></p>
 
 <h3 id='downloading_the_release'>Downloading the release</h3>
 

Modified: wicket/common/site/trunk/_site/2010/08/11/wicket-1.5-M1-released.html
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/2010/08/11/wicket-1.5-M1-released.html?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/2010/08/11/wicket-1.5-M1-released.html 
(original)
+++ wicket/common/site/trunk/_site/2010/08/11/wicket-1.5-M1-released.html Mon 
Jun 24 18:14:45 2013
@@ -176,7 +176,7 @@
 <p>This release is NOT production-ready, it is more of a technology demo that 
should facilitate user-feedback we can fold into the next milestone.</p>
 
 <ul>
-<li><a 
href='https://cwiki.apache.org/WICKET/migration-to-wicket-15.html'>Migration 
notes</a></li>
+<li><a 
href='https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5'>Migration
 notes</a></li>
 
 <li><a 
href='http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-M1/'>Subversion
 tag</a></li>
 

Modified: 
wicket/common/site/trunk/_site/2010/09/17/wicket.1.5-M2.1-released.html
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/2010/09/17/wicket.1.5-M2.1-released.html?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/2010/09/17/wicket.1.5-M2.1-released.html 
(original)
+++ wicket/common/site/trunk/_site/2010/09/17/wicket.1.5-M2.1-released.html Mon 
Jun 24 18:14:45 2013
@@ -175,10 +175,10 @@
 
 <p>This release is NOT production-ready, it is more of a technology demo that 
should facilitate user-feedback we can fold into the next milestone.</p>
 
-<p>New and noteworthy items in this milestone include <a 
href='https://cwiki.apache.org/WICKET/migration-to-wicket-15.html#MigrationtoWicket1.5-Intercomponentevents'>Inter-component
 event mechanism</a> which allows components to communicate in a decoupled 
fashion, and improved <a 
href='https://cwiki.apache.org/WICKET/migration-to-wicket-15.html#MigrationtoWicket1.5-getResourceSettings%2528%2529.setAddLastModifiedTimeToResourceReferenceUrl%2528%2529hasbeenreplaced'>resource
 caching</a>.</p>
+<p>New and noteworthy items in this milestone include <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5#MigrationtoWicket1.5-Intercomponentevents'>Inter-component
 event mechanism</a> which allows components to communicate in a decoupled 
fashion, and improved <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5#MigrationtoWicket1.5-getResourceSettings%2528%2529.setAddLastModifiedTimeToResourceReferenceUrl%2528%2529hasbeenreplaced'>resource
 caching</a>.</p>
 
 <ul>
-<li><a 
href='https://cwiki.apache.org/WICKET/migration-to-wicket-15.html'>Migration 
notes</a></li>
+<li><a 
href='https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5'>Migration
 notes</a></li>
 
 <li><a 
href='http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-M2.1'>Subversion
 tag</a></li>
 

Modified: wicket/common/site/trunk/_site/2011/01/22/wicket-1.5-RC1-released.html
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/2011/01/22/wicket-1.5-RC1-released.html?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/2011/01/22/wicket-1.5-RC1-released.html 
(original)
+++ wicket/common/site/trunk/_site/2011/01/22/wicket-1.5-RC1-released.html Mon 
Jun 24 18:14:45 2013
@@ -185,7 +185,7 @@
 <li>Better proxy support (x-forwarded-for header)</li>
 </ul>
 
-<p>More detailed migration notes are available on our <a 
href='https://cwiki.apache.org/WICKET/migration-to-wicket-15.html'>Migrate to 
1.5 Wiki Page</a></p>
+<p>More detailed migration notes are available on our <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5'>Migrate
 to 1.5 Wiki Page</a></p>
 
 <p>Release Artifacts:</p>
 

Modified: wicket/common/site/trunk/_site/2011/02/25/wicket-1.5-rc2-released.html
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/2011/02/25/wicket-1.5-rc2-released.html?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/2011/02/25/wicket-1.5-rc2-released.html 
(original)
+++ wicket/common/site/trunk/_site/2011/02/25/wicket-1.5-rc2-released.html Mon 
Jun 24 18:14:45 2013
@@ -173,7 +173,7 @@
                        <h1>Wicket 1.5-rc2 released</h1>
                        <p>The Wicket Team is proud to introduce the second 
Release Candidate in Wicket 1.5 series. See the changelog for the list of bug 
fixes and improvements done between 1.5-RC1 and 1.5-rc2</p>
 
-<p>More detailed migration notes are available on our <a 
href='https://cwiki.apache.org/WICKET/migration-to-wicket-15.html'>Migrate to 
1.5 Wiki Page</a></p>
+<p>More detailed migration notes are available on our <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5'>Migrate
 to 1.5 Wiki Page</a></p>
 
 <p>Release Artifacts:</p>
 

Modified: wicket/common/site/trunk/_site/2011/04/02/wicket-1.5-RC3-released.html
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/2011/04/02/wicket-1.5-RC3-released.html?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/2011/04/02/wicket-1.5-RC3-released.html 
(original)
+++ wicket/common/site/trunk/_site/2011/04/02/wicket-1.5-RC3-released.html Mon 
Jun 24 18:14:45 2013
@@ -173,7 +173,7 @@
                        <h1>Wicket 1.5-RC3 released</h1>
                        <p>The Wicket Team is proud to introduce the third 
Release Candidate in Wicket 1.5 series. See the changelog for the list of bug 
fixes and improvements done between 1.5-rc2 and 1.5-RC3</p>
 
-<p>More detailed migration notes are available on our <a 
href='https://cwiki.apache.org/WICKET/migration-to-wicket-15.html'>Migrate to 
1.5 Wiki Page</a></p>
+<p>More detailed migration notes are available on our <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5'>Migrate
 to 1.5 Wiki Page</a></p>
 
 <p>Release Artifacts:</p>
 

Modified: 
wicket/common/site/trunk/_site/2011/05/11/wicket-1.5-RC4.2-released.html
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/2011/05/11/wicket-1.5-RC4.2-released.html?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/2011/05/11/wicket-1.5-RC4.2-released.html 
(original)
+++ wicket/common/site/trunk/_site/2011/05/11/wicket-1.5-RC4.2-released.html 
Mon Jun 24 18:14:45 2013
@@ -173,7 +173,7 @@
                        <h1>Wicket 1.5-RC4.2 released</h1>
                        <p>The Wicket Team is proud to introduce the fourth 
Release Candidate in Wicket 1.5 series. See the changelog for the list of bug 
fixes and improvements done between 1.5-RC3 and 1.5-RC4.2</p>
 
-<p>More detailed migration notes are available on our <a 
href='https://cwiki.apache.org/WICKET/migration-to-wicket-15.html'>Migrate to 
1.5 Wiki Page</a></p>
+<p>More detailed migration notes are available on our <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5'>Migrate
 to 1.5 Wiki Page</a></p>
 
 <p>Release Artifacts:</p>
 

Modified: 
wicket/common/site/trunk/_site/2011/06/25/wicket-1.5-RC5.1-released.html
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/2011/06/25/wicket-1.5-RC5.1-released.html?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/2011/06/25/wicket-1.5-RC5.1-released.html 
(original)
+++ wicket/common/site/trunk/_site/2011/06/25/wicket-1.5-RC5.1-released.html 
Mon Jun 24 18:14:45 2013
@@ -173,7 +173,7 @@
                        <h1>Wicket 1.5-RC5.1 released</h1>
                        <p>The Wicket Team is proud to introduce the fourth 
Release Candidate in Wicket 1.5 series. See the changelog for the list of bug 
fixes and improvements done between 1.5-RC4.2 and 1.5-RC5.1</p>
 
-<p>More detailed migration notes are available on our <a 
href='https://cwiki.apache.org/WICKET/migration-to-wicket-15.html'>Migrate to 
1.5 Wiki Page</a></p>
+<p>More detailed migration notes are available on our <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5'>Migrate
 to 1.5 Wiki Page</a></p>
 
 <p>Release Artifacts:</p>
 

Modified: wicket/common/site/trunk/_site/2011/08/28/1.5-RC7-released.html
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/2011/08/28/1.5-RC7-released.html?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/2011/08/28/1.5-RC7-released.html (original)
+++ wicket/common/site/trunk/_site/2011/08/28/1.5-RC7-released.html Mon Jun 24 
18:14:45 2013
@@ -173,7 +173,7 @@
                        <h1>Wicket 1.5-RC7 released</h1>
                        <p>The Wicket Team is proud to introduce the seventh 
Release Candidate in Wicket 1.5 series. See the changelog for the list of bug 
fixes and improvements done between 1.5-RC5.1 and 1.5-RC7</p>
 
-<p>More detailed migration notes are available on our <a 
href='https://cwiki.apache.org/WICKET/migration-to-wicket-15.html'>Migrate to 
1.5 Wiki Page</a></p>
+<p>More detailed migration notes are available on our <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5'>Migrate
 to 1.5 Wiki Page</a></p>
 
 <p>Release Artifacts:</p>
 

Modified: wicket/common/site/trunk/_site/2011/09/07/wicket-1.5-released.html
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/2011/09/07/wicket-1.5-released.html?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/2011/09/07/wicket-1.5-released.html 
(original)
+++ wicket/common/site/trunk/_site/2011/09/07/wicket-1.5-released.html Mon Jun 
24 18:14:45 2013
@@ -203,19 +203,19 @@
 
 <li><code>IBehavior</code> has been removed and <code>AbstractBehavior</code> 
has been deprecated, you should now extend <code>Behavior</code> instead</li>
 
-<li>Simplified the <a 
href='https://cwiki.apache.org/WICKET/requestcycle-in-wicket-15.html'>request 
cycle processing</a> and made it more extensible</li>
+<li>Simplified the <a 
href='https://cwiki.apache.org/confluence/display/WICKET/RequestCycle+in+Wicket+1.5'>request
 cycle processing</a> and made it more extensible</li>
 
 <li>URL handling is now in one place</li>
 
 <li>Wicket&#8217;s rendering code has been greatly simplified</li>
 
-<li>Improved browser <a 
href='https://cwiki.apache.org/WICKET/caching-in-wicket-15.html'>caching 
support</a></li>
+<li>Improved browser <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Caching+in+Wicket+1.5'>caching
 support</a></li>
 
 <li>ClientSideImageMap replaces old ImageMap</li>
 
 <li>Better support for running behind proxies with 
<code>x-forwarded-for</code> header</li>
 
-<li><a 
href='https://cwiki.apache.org/WICKET/requestcycle-in-wicket-15.html'>Request 
cycle listeners</a> make it easier to integrate frameworks in your Wicket 
application</li>
+<li><a 
href='https://cwiki.apache.org/confluence/display/WICKET/RequestCycle+in+Wicket+1.5'>Request
 cycle listeners</a> make it easier to integrate frameworks in your Wicket 
application</li>
 
 <li>Consistent naming: methods with <code>Javascript</code> in the name have 
been renamed to use proper capitalization: <code>JavaScript</code></li>
 

Modified: 
wicket/common/site/trunk/_site/2012/03/26/wicket-6.0.0-beta1-released.html
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/2012/03/26/wicket-6.0.0-beta1-released.html?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/2012/03/26/wicket-6.0.0-beta1-released.html 
(original)
+++ wicket/common/site/trunk/_site/2012/03/26/wicket-6.0.0-beta1-released.html 
Mon Jun 24 18:14:45 2013
@@ -173,7 +173,7 @@
                        <h1>Wicket 6.0.0-beta1 released</h1>
                        <p>The Wicket team is proud to announce the first beta 
release of the Wicket 6.x series. This release brings over many improvements 
over the 1.5.x series.</p>
 
-<p>Check the <a 
href='https://cwiki.apache.org/WICKET/wicket-60-roadmap.html'>roadmap</a> with 
a list of the major goals. And the <a 
href='https://cwiki.apache.org/WICKET/migration-to-wicket-60.html'>migration 
guide</a> with all major and some minor changes between 1.5.x and 6.x 
series.</p>
+<p>Check the <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Wicket+6.0+Roadmap'>roadmap</a>
 with a list of the major goals. And the <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0'>migration
 guide</a> with all major and some minor changes between 1.5.x and 6.x 
series.</p>
 
 <p>The Jira changelog of all closed ticket at <a 
href='https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;version=12319052'>Jira</a></p>
 

Modified: 
wicket/common/site/trunk/_site/2012/05/29/wicket-6.0.0-beta2-released.html
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/2012/05/29/wicket-6.0.0-beta2-released.html?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/2012/05/29/wicket-6.0.0-beta2-released.html 
(original)
+++ wicket/common/site/trunk/_site/2012/05/29/wicket-6.0.0-beta2-released.html 
Mon Jun 24 18:14:45 2013
@@ -205,7 +205,7 @@
 
 <h3 id='this_release'>This release</h3>
 
-<p>Check the <a 
href='https://cwiki.apache.org/WICKET/wicket-60-roadmap.html'>roadmap</a> with 
a list of the major goals. And the <a 
href='https://cwiki.apache.org/WICKET/migration-to-wicket-60.html'>migration 
guide</a> with all major and some minor changes between 1.5.x and 6.x 
series.</p>
+<p>Check the <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Wicket+6.0+Roadmap'>roadmap</a>
 with a list of the major goals. And the <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0'>migration
 guide</a> with all major and some minor changes between 1.5.x and 6.x 
series.</p>
 
 <p>The Jira changelog of all closed ticket at <a 
href='https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;version=12320343'>Jira</a></p>
 

Modified: 
wicket/common/site/trunk/_site/2012/07/16/wicket-6.0.0-beta3-released.html
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/2012/07/16/wicket-6.0.0-beta3-released.html?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/2012/07/16/wicket-6.0.0-beta3-released.html 
(original)
+++ wicket/common/site/trunk/_site/2012/07/16/wicket-6.0.0-beta3-released.html 
Mon Jun 24 18:14:45 2013
@@ -243,7 +243,7 @@ public void renderHead(IHeaderResponse r
 <h1 id='this_release'>This release</h1>
 
 <ul>
-<li>Check the roadmap with a list of the major goals: <a 
href='https://cwiki.apache.org/WICKET/wicket-60-roadmap.html'>6.0 
roadmap</a></li>
+<li>Check the roadmap with a list of the major goals: <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Wicket+6.0+Roadmap'>6.0
 roadmap</a></li>
 
 <li>And the migration guide with all major and some minor changes between 
1.5.x and 6.x series: <a 
href='http://s.apache.org/wicket-6.0-migration'>migration guide</a></li>
 

Modified: wicket/common/site/trunk/_site/2012/11/16/wicket-6.3.0-released.html
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/2012/11/16/wicket-6.3.0-released.html?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/2012/11/16/wicket-6.3.0-released.html 
(original)
+++ wicket/common/site/trunk/_site/2012/11/16/wicket-6.3.0-released.html Mon 
Jun 24 18:14:45 2013
@@ -179,7 +179,7 @@
 
 <p>This release fixes some javascript errors in IE7 and IE8 with Wicket 6.</p>
 
-<p>We have upgraded the embedded JQuery library to 1.8.2 (the most recent 
stable release of JQuery). If you depend on an earlier version of JQuery, you 
can instruct Wicket to use your older version. See the <a 
href='https://cwiki.apache.org/WICKET/wicket-ajax.html#WicketAjax-Configuration'>Wicket
 Ajax Guide</a> for more information.</p>
+<p>We have upgraded the embedded JQuery library to 1.8.2 (the most recent 
stable release of JQuery). If you depend on an earlier version of JQuery, you 
can instruct Wicket to use your older version. See the <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Wicket+Ajax#WicketAjax-Configuration'>Wicket
 Ajax Guide</a> for more information.</p>
 
 <p>For the full changelog see the release notes attached to the end of this 
announcement.</p>
 

Modified: wicket/common/site/trunk/_site/atom.xml
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/atom.xml?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/atom.xml (original)
+++ wicket/common/site/trunk/_site/atom.xml Mon Jun 24 18:14:45 2013
@@ -820,7 +820,7 @@
 
 &lt;p&gt;This release fixes some javascript errors in IE7 and IE8 with Wicket 
6.&lt;/p&gt;
 
-&lt;p&gt;We have upgraded the embedded JQuery library to 1.8.2 (the most 
recent stable release of JQuery). If you depend on an earlier version of 
JQuery, you can instruct Wicket to use your older version. See the &lt;a 
href='https://cwiki.apache.org/WICKET/wicket-ajax.html#WicketAjax-Configuration'&gt;Wicket
 Ajax Guide&lt;/a&gt; for more information.&lt;/p&gt;
+&lt;p&gt;We have upgraded the embedded JQuery library to 1.8.2 (the most 
recent stable release of JQuery). If you depend on an earlier version of 
JQuery, you can instruct Wicket to use your older version. See the &lt;a 
href='https://cwiki.apache.org/confluence/display/WICKET/Wicket+Ajax#WicketAjax-Configuration'&gt;Wicket
 Ajax Guide&lt;/a&gt; for more information.&lt;/p&gt;
 
 &lt;p&gt;For the full changelog see the release notes attached to the end of 
this announcement.&lt;/p&gt;
 

Modified: wicket/common/site/trunk/_site/help/index.html
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/help/index.html?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/help/index.html (original)
+++ wicket/common/site/trunk/_site/help/index.html Mon Jun 24 18:14:45 2013
@@ -221,7 +221,7 @@
 
 <h2 id='commercial_support'>Commercial Support</h2>
 
-<p>The list of companies found at <a 
href='https://cwiki.apache.org/WICKET/companies-that-provide-services.html'>this
 wiki page</a> provide commercial services for Wicket which ranges from 
training courses, consultancy and even project development.</p>
+<p>The list of companies found at <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Companies+that+provide+services'>this
 wiki page</a> provide commercial services for Wicket which ranges from 
training courses, consultancy and even project development.</p>
 
 <p>Being mentioned here is not an indication of official 
&#8220;endorsement&#8221; by the Apache Software Foundation, but is instead 
provided as a public service. This list is in no way a complete listing of the 
many organizations providing either free or for cost support for ASF projects. 
If you would like to be added to this list, or removed, sign up for the wiki 
and add yourself to the list.</p>
                </div>

Modified: wicket/common/site/trunk/_site/learn/examples/dropdownchoice.html
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/examples/dropdownchoice.html?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/examples/dropdownchoice.html (original)
+++ wicket/common/site/trunk/_site/learn/examples/dropdownchoice.html Mon Jun 
24 18:14:45 2013
@@ -171,7 +171,7 @@
 
                <div id="contentbody">
                        <h1>Using the DropDownChoice component</h1>
-                       <p>One of the most problematic components for beginners 
of Wicket is the <code>DropDownChoice</code> component. In this example we will 
work the component to give a little more insight into its workings. This 
example requires that you have some understanding of the Wicket component model 
(nothing fancy though, but you might want to read the other examples first), 
and the Model concept used in Wicket (you can read more on models <a 
href='http://cwiki.apache.org/WICKET/working-with-wicket-models.html'>here</a>).</p>
+                       <p>One of the most problematic components for beginners 
of Wicket is the <code>DropDownChoice</code> component. In this example we will 
work the component to give a little more insight into its workings. This 
example requires that you have some understanding of the Wicket component model 
(nothing fancy though, but you might want to read the other examples first), 
and the Model concept used in Wicket (you can read more on models <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Working+with+Wicket+models'>here</a>).</p>
 
 <h2 id='the_example_domain'>The example domain</h2>
 

Modified: wicket/common/site/trunk/_site/meet/blogs.html
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/meet/blogs.html?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/meet/blogs.html (original)
+++ wicket/common/site/trunk/_site/meet/blogs.html Mon Jun 24 18:14:45 2013
@@ -207,7 +207,7 @@
 
 <h2 id='get_your_blog_listed'>Get your blog listed!</h2>
 
-<p>If you think your blog is missing, then please send a message to one of the 
core contributors or the mailinglist. In the mean time you can add your blog to 
our wiki&#8217;s <a 
href='https://cwiki.apache.org/WICKET/wicket-blogs.html'>special blog 
page</a>.</p>
+<p>If you think your blog is missing, then please send a message to one of the 
core contributors or the mailinglist. In the mean time you can add your blog to 
our wiki&#8217;s <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Wicket+Blogs'>special 
blog page</a>.</p>
                </div>
         <div id="clearer"></div>
                <div id="footer"><span>

Modified: wicket/common/site/trunk/_site/start/download.html
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/start/download.html?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/start/download.html (original)
+++ wicket/common/site/trunk/_site/start/download.html Mon Jun 24 18:14:45 2013
@@ -220,13 +220,13 @@
 <p>If you are migrating an existing application from earlier versions of 
Wicket you may find our migration guides invaluable:</p>
 
 <ul>
-<li>Migrating from <a 
href='https://cwiki.apache.org/WICKET/migrate-13.html'>Wicket 1.2 to Wicket 
1.3</a></li>
+<li>Migrating from <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3'>Wicket
 1.2 to Wicket 1.3</a></li>
 
-<li>Migrating from <a 
href='https://cwiki.apache.org/WICKET/migrating-to-wicket-14.html'>Wicket 1.3 
to Wicket 1.4</a></li>
+<li>Migrating from <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.4'>Wicket
 1.3 to Wicket 1.4</a></li>
 
-<li>Migrating from <a 
href='https://cwiki.apache.org/WICKET/migration-to-wicket-15.html'>Wicket 1.4 
to Wicket 1.5</a></li>
+<li>Migrating from <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5'>Wicket
 1.4 to Wicket 1.5</a></li>
 
-<li>Migrating from <a 
href='https://cwiki.apache.org/WICKET/migration-to-wicket-60.html'>Wicket 1.5 
to Wicket 6</a></li>
+<li>Migrating from <a 
href='https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0'>Wicket
 1.5 to Wicket 6</a></li>
 </ul>
 
 <h2 id='maven'>Maven</h2>

Modified: wicket/common/site/trunk/help/index.md
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/help/index.md?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/help/index.md (original)
+++ wicket/common/site/trunk/help/index.md Mon Jun 24 18:14:45 2013
@@ -59,7 +59,7 @@ We can help you much quicker if you try 
 ## Commercial Support ##
 
 The list of companies found at [this wiki
-page](https://cwiki.apache.org/WICKET/companies-that-provide-services.html)
+page](https://cwiki.apache.org/confluence/display/WICKET/Companies+that+provide+services)
 provide commercial services for Wicket which ranges from training courses,
 consultancy and even project development.
 

Modified: wicket/common/site/trunk/learn/examples/dropdownchoice.md
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/learn/examples/dropdownchoice.md?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/learn/examples/dropdownchoice.md (original)
+++ wicket/common/site/trunk/learn/examples/dropdownchoice.md Mon Jun 24 
18:14:45 2013
@@ -9,7 +9,7 @@ give a little more insight into its work
 have some understanding of the Wicket component model (nothing fancy though,
 but you might want to read the other examples first), and the Model concept
 used in Wicket (you can read more on models
-[here](http://cwiki.apache.org/WICKET/working-with-wicket-models.html)).
+[here](https://cwiki.apache.org/confluence/display/WICKET/Working+with+Wicket+models)).
 
 ## The example domain
 

Modified: wicket/common/site/trunk/meet/blogs.md
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/meet/blogs.md?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/meet/blogs.md (original)
+++ wicket/common/site/trunk/meet/blogs.md Mon Jun 24 18:14:45 2013
@@ -31,4 +31,4 @@ Here is a list of regular Wicket blogger
 If you think your blog is missing, then please send a message to one of the
 core contributors or the mailinglist. In the mean time you can add your blog
 to our wiki's [special blog
-page](https://cwiki.apache.org/WICKET/wicket-blogs.html).
+page](https://cwiki.apache.org/confluence/display/WICKET/Wicket+Blogs).

Modified: wicket/common/site/trunk/start/download.md
URL: 
http://svn.apache.org/viewvc/wicket/common/site/trunk/start/download.md?rev=1496145&r1=1496144&r2=1496145&view=diff
==============================================================================
--- wicket/common/site/trunk/start/download.md (original)
+++ wicket/common/site/trunk/start/download.md Mon Jun 24 18:14:45 2013
@@ -45,10 +45,10 @@ for more information.
 ## Migrating from earlier versions
 If you are migrating an existing application from earlier versions of Wicket 
you may find our migration guides invaluable:
 
- * Migrating from [Wicket 1.2 to Wicket 
1.3](https://cwiki.apache.org/WICKET/migrate-13.html)
- * Migrating from [Wicket 1.3 to Wicket 
1.4](https://cwiki.apache.org/WICKET/migrating-to-wicket-14.html)
- * Migrating from [Wicket 1.4 to Wicket 
1.5](https://cwiki.apache.org/WICKET/migration-to-wicket-15.html)
- * Migrating from [Wicket 1.5 to Wicket 
6](https://cwiki.apache.org/WICKET/migration-to-wicket-60.html)
+ * Migrating from [Wicket 1.2 to Wicket 
1.3](https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3)
+ * Migrating from [Wicket 1.3 to Wicket 
1.4](https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.4)
+ * Migrating from [Wicket 1.4 to Wicket 
1.5](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5)
+ * Migrating from [Wicket 1.5 to Wicket 
6](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0)
 
 ## Maven
 


Reply via email to