You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2018/04/11 15:40:48 UTC

[myfaces-tobago] branch master updated: TOBAGO-1889: Rearrange the documentation into the demo application

This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/master by this push:
     new f0af1be  TOBAGO-1889: Rearrange the documentation into the demo application
f0af1be is described below

commit f0af1beeb537b5cbbc5603da41961dfd85e4134b
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Apr 11 17:42:25 2018 +0200

    TOBAGO-1889: Rearrange the documentation into the demo application
---
 src/site/apt/api.apt                               | 300 +-----------
 src/site/apt/compatibility.apt                     | 110 +----
 src/site/apt/demo.apt                              |   9 +-
 src/site/apt/download.apt                          | 174 +------
 src/site/apt/{new-2.0.apt => faq.apt}              |   4 +-
 src/site/apt/getting-started.apt                   |  93 +---
 src/site/apt/howto-test.apt                        |  37 +-
 src/site/apt/index.apt                             |  22 +-
 src/site/apt/migration-1.5.apt                     |   2 +-
 src/site/apt/migration-2.0.apt                     |   2 +-
 src/site/apt/release-checklist.apt                 | 274 +----------
 src/site/fml/faq.fml                               | 508 --------------------
 src/site/resources/images/addressbook.png          | Bin 11237 -> 0 bytes
 src/site/site.xml                                  |  18 +-
 .../myfaces/tobago/example/demo/ApiController.java |  70 +++
 .../myfaces/tobago/example/demo/Release.java       | 157 ++++++
 .../myfaces/tobago/example/demo/ServerInfo.java    |   2 +-
 .../apache/myfaces/tobago/example/demo/Demo.xml    |  17 +-
 .../tobago-vm/docker/apache-proxy/000-default.conf |  13 +
 .../10-getting-started/getting-started.xhtml       | 109 +++++
 .../68-new-in-4-2/new-in-4-2.xhtml}                |  27 +-
 .../69-new-in-4-1/new-in-4-1.xhtml}                |  25 +-
 .../70-new-in-4-0/new-in-4-0.xhtml}                |   0
 .../80-new-in-3-0/new-in-3-0.xhtml}                |   0
 .../90-new-in-2-0/new-in-2-0.xhtml}                |   0
 .../content/10-intro/30-whats-new/whats-new.xhtml  |  56 +++
 .../content/10-intro/50-migration/migration.xhtml  |  23 +-
 .../10-intro/60-compatibility/compatibility.xhtml  | 290 +++++++++++
 .../main/webapp/content/10-intro/70-faq/faq.xhtml  | 529 +++++++++++++++++++++
 .../main/webapp/content/10-intro/80-api/api.xhtml  |  56 +++
 .../content/10-intro/85-download/download.xhtml    | 212 +++++++++
 .../90-release-checklist}/drop-artifacts.sh        |   0
 .../90-release-checklist}/release-artifacts.sh     |   0
 .../90-release-checklist/release-checklist.xhtml   | 350 ++++++++++++++
 34 files changed, 1940 insertions(+), 1549 deletions(-)

diff --git a/src/site/apt/api.apt b/src/site/apt/api.apt
index fda26cc..6f1900b 100644
--- a/src/site/apt/api.apt
+++ b/src/site/apt/api.apt
@@ -19,302 +19,4 @@
 
 Tobago API Documentation
 
-  Documentation of the Java classes and the tags.
-
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-|| Version      || JavaDoc API Documentation                                                    || Tag Library Documentation (TLD)                                                                                                        |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 4.1.0         | {{{./doc/4.1.0/api/index.html}4.1.0 API Documentation}}                       | {{{./doc/4.1.0/tld/index.html}4.1.0 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 3.0.6         | {{{./doc/3.0.6/api/index.html}3.0.6 API Documentation}}                       | {{{./doc/3.0.6/tld/index.html}3.0.6 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.1.1         | {{{./doc/2.1.1/api/index.html}2.1.1 API Documentation}}                       | {{{./doc/2.1.1/tld/index.html}2.1.1 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.5.13        | {{{./doc/1.5.13/api/index.html}1.5.13 API Documentation}}                     | {{{./doc/1.5.13/tld/index.html}1.5.13 TLD Documentation of \<tc:\>}} \                                                                  |
-|               |                                                                               | {{{./doc/1.5.13/tld-tx/index.html}1.5.13 TLD Documentation of \<tx:\>}}                                                                 |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.42        | {{{./doc/1.0.42/api/index.html}1.0.42 API Documentation}}                     | {{{./doc/1.0.42/tld/index.html}1.0.42 TLD Documentation}} \                                                                             |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-
-Tobago API Documentation of the old Releases
-
-  Documentation of the Java classes and the tags.
-
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-|| Version      || JavaDoc API Documentation                                                    || Tag Library Documentation (TLD)                                                                                                        |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 4.0.0         | {{{./doc/4.0.0/api/index.html}4.0.0 API Documentation}}                       | {{{./doc/4.0.0/tld/index.html}4.0.0 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 3.0.5         | {{{./doc/3.0.5/api/index.html}3.0.5 API Documentation}}                       | {{{./doc/3.0.5/tld/index.html}3.0.5 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 3.0.4         | {{{./doc/3.0.4/api/index.html}3.0.4 API Documentation}}                       | {{{./doc/3.0.4/tld/index.html}3.0.4 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 3.0.3         | {{{./doc/3.0.3/api/index.html}3.0.3 API Documentation}}                       | {{{./doc/3.0.3/tld/index.html}3.0.3 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 3.0.2         | {{{./doc/3.0.2/api/index.html}3.0.2 API Documentation}}                       | {{{./doc/3.0.2/tld/index.html}3.0.2 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 3.0.1         | {{{./doc/3.0.1/api/index.html}3.0.1 API Documentation}}                       | {{{./doc/3.0.1/tld/index.html}3.0.1 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 3.0.0         | {{{./doc/3.0.0/api/index.html}3.0.0 API Documentation}}                       | {{{./doc/3.0.0/tld/index.html}3.0.0 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 3.0.0-beta-1  | {{{./doc/3.0.0-beta-1/api/index.html}3.0.0-beta-1 API Documentation}}         | {{{./doc/3.0.0-beta-1/tld/index.html}3.0.0-beta-1 TLD Documentation}} \                                                                 |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 3.0.0-alpha-7 | {{{./doc/3.0.0-alpha-7/api/index.html}3.0.0-alpha-7 API Documentation}}       | {{{./doc/3.0.0-alpha-7/tld/index.html}3.0.0-alpha-7 TLD Documentation}} \                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 3.0.0-alpha-6 | {{{./doc/3.0.0-alpha-6/api/index.html}3.0.0-alpha-6 API Documentation}}       | {{{./doc/3.0.0-alpha-6/tld/index.html}3.0.0-alpha-6 TLD Documentation}} \                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 3.0.0-alpha-5 | {{{./doc/3.0.0-alpha-5/api/index.html}3.0.0-alpha-5 API Documentation}}       | {{{./doc/3.0.0-alpha-5/tld/index.html}3.0.0-alpha-5 TLD Documentation}} \                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 3.0.0-alpha-4 | {{{./doc/3.0.0-alpha-4/api/index.html}3.0.0-alpha-4 API Documentation}}       | {{{./doc/3.0.0-alpha-4/tld/index.html}3.0.0-alpha-4 TLD Documentation}} \                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 3.0.0-alpha-3 | {{{./doc/3.0.0-alpha-3/api/index.html}3.0.0-alpha-3 API Documentation}}       | {{{./doc/3.0.0-alpha-3/tld/index.html}3.0.0-alpha-3 TLD Documentation}} \                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 3.0.0-alpha-2 | {{{./doc/3.0.0-alpha-2/api/index.html}3.0.0-alpha-2 API Documentation}}       | {{{./doc/3.0.0-alpha-2/tld/index.html}3.0.0-alpha-2 TLD Documentation}} \                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 3.0.0-alpha-1 | {{{./doc/3.0.0-alpha-1/api/index.html}3.0.0-alpha-1 API Documentation}}       | {{{./doc/3.0.0-alpha-1/tld/index.html}3.0.0-alpha-1 TLD Documentation}} \                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.1.0         | {{{./doc/2.1.0/api/index.html}2.1.0 API Documentation}}                       | {{{./doc/2.1.0/tld/index.html}2.1.0 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.0.10        | {{{./doc/2.0.10/api/index.html}2.0.10 API Documentation}}                     | {{{./doc/2.0.10/tld/index.html}2.0.10 TLD Documentation}} \                                                                             |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.0.9         | {{{./doc/2.0.9/api/index.html}2.0.9 API Documentation}}                       | {{{./doc/2.0.9/tld/index.html}2.0.9 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.0.8         | {{{./doc/2.0.8/api/index.html}2.0.8 API Documentation}}                       | {{{./doc/2.0.8/tld/index.html}2.0.8 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.0.7         | {{{./doc/2.0.7/api/index.html}2.0.7 API Documentation}}                       | {{{./doc/2.0.7/tld/index.html}2.0.7 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.0.6         | {{{./doc/2.0.6/api/index.html}2.0.6 API Documentation}}                       | {{{./doc/2.0.6/tld/index.html}2.0.6 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.0.5         | {{{./doc/2.0.5/api/index.html}2.0.5 API Documentation}}                       | {{{./doc/2.0.5/tld/index.html}2.0.5 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.0.4         | {{{./doc/2.0.4/api/index.html}2.0.4 API Documentation}}                       | {{{./doc/2.0.4/tld/index.html}2.0.4 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.0.3         | {{{./doc/2.0.3/api/index.html}2.0.3 API Documentation}}                       | {{{./doc/2.0.3/tld/index.html}2.0.3 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.0.2         | {{{./doc/2.0.2/api/index.html}2.0.2 API Documentation}}                       | {{{./doc/2.0.2/tld/index.html}2.0.2 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.0.1         | {{{./doc/2.0.1/api/index.html}2.0.1 API Documentation}}                       | {{{./doc/2.0.1/tld/index.html}2.0.1 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.0.0         | {{{./doc/2.0.0/api/index.html}2.0.0 API Documentation}}                       | {{{./doc/2.0.0/tld/index.html}2.0.0 TLD Documentation}} \                                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.0.0-beta-4  | {{{./doc/2.0.0-beta-4/api/index.html}2.0.0-beta-4 API Documentation}}         | {{{./doc/2.0.0-beta-4/tld/index.html}2.0.0-beta-4 TLD Documentation}} \                                                                 |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.0.0-beta-3  | {{{./doc/2.0.0-beta-3/api/index.html}2.0.0-beta-3 API Documentation}}         | {{{./doc/2.0.0-beta-3/tld/index.html}2.0.0-beta-3 TLD Documentation}} \                                                                 |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.0.0-beta-2  | {{{./doc/2.0.0-beta-2/api/index.html}2.0.0-beta-2 API Documentation}}         | {{{./doc/2.0.0-beta-2/tld/index.html}2.0.0-beta-2 TLD Documentation}} \                                                                 |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.0.0-beta-1  | {{{./doc/2.0.0-beta-1/api/index.html}2.0.0-beta-1 API Documentation}}         | {{{./doc/2.0.0-beta-1/tld/index.html}2.0.0-beta-1 TLD Documentation}} \                                                                 |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.0.0-alpha-3 | {{{./doc/2.0.0-alpha-3/api/index.html}2.0.0-alpha-3 API Documentation}}       | {{{./doc/2.0.0-alpha-3/tld/index.html}2.0.0-alpha-3 TLD Documentation}} \                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.0.0-alpha-2 | {{{./doc/2.0.0-alpha-2/api/index.html}2.0.0-alpha-2 API Documentation}}       | {{{./doc/2.0.0-alpha-2/tld/index.html}2.0.0-alpha-2 TLD Documentation}} \                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 2.0.0-alpha-1 | {{{./doc/2.0.0-alpha-1/api/index.html}2.0.0-alpha-1 API Documentation}}       | {{{./doc/2.0.0-alpha-1/tld/index.html}2.0.0-alpha-1 TLD Documentation}} \                                                               |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.6.0-beta-2  | {{{./doc/1.6.0-beta-2/api/index.html}1.6.0-beta-2 API Documentation}}         | {{{./doc/1.6.0-beta-2/tld/index.html}1.6.0-beta-2 TLD Documentation of \<tc:\>}} \                                           |
-|               |                                                                               | {{{./doc/1.6.0-beta-2/tld-tx/index.html}1.6.0-beta-2 TLD Documentation of \<tx:\>}}                |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.6.0-beta-1  | {{{./doc/1.6.0-beta-1/api/index.html}1.6.0-beta-1 API Documentation}}         | {{{./doc/1.6.0-beta-1/tld/index.html}1.6.0-beta-1 TLD Documentation of \<tc:\>}} \                                           |
-|               |                                                                               | {{{./doc/1.6.0-beta-1/tld-tx/index.html}1.6.0-beta-1 TLD Documentation of \<tx:\>}}                |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.5.12        | {{{./doc/1.5.12/api/index.html}1.5.12 API Documentation}}                     | {{{./doc/1.5.12/tld/index.html}1.5.12 TLD Documentation of \<tc:\>}} \                                                       |
-|               |                                                                               | {{{./doc/1.5.12/tld-tx/index.html}1.5.12 TLD Documentation of \<tx:\>}}                            |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.5.11        | {{{./doc/1.5.11/api/index.html}1.5.11 API Documentation}}                     | {{{./doc/1.5.11/tld/index.html}1.5.11 TLD Documentation of \<tc:\>}} \                                                       |
-|               |                                                                               | {{{./doc/1.5.11/tld-tx/index.html}1.5.11 TLD Documentation of \<tx:\>}}                            |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.5.10        | {{{./doc/1.5.10/api/index.html}1.5.10 API Documentation}}                     | {{{./doc/1.5.10/tld/index.html}1.5.10 TLD Documentation of \<tc:\>}} \                                                       |
-|               |                                                                               | {{{./doc/1.5.10/tld-tx/index.html}1.5.10 TLD Documentation of \<tx:\>}}                            |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.5.9         | {{{./doc/1.5.9/api/index.html}1.5.9 API Documentation}}                       | {{{./doc/1.5.9/tld/index.html}1.5.9 TLD Documentation of \<tc:\>}} \                                                         |
-|               |                                                                               | {{{./doc/1.5.9/tld-tx/index.html}1.5.9 TLD Documentation of \<tx:\>}}                              |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.5.8         | {{{./doc/1.5.8/api/index.html}1.5.8 API Documentation}}                       | {{{./doc/1.5.8/tld/index.html}1.5.8 TLD Documentation of \<tc:\>}} \                                                         |
-|               |                                                                               | {{{./doc/1.5.8/tld-tx/index.html}1.5.8 TLD Documentation of \<tx:\>}}                              |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.5.7         | {{{./doc/1.5.7/api/index.html}1.5.7 API Documentation}}                       | {{{./doc/1.5.7/tld/index.html}1.5.7 TLD Documentation of \<tc:\>}} \                                                         |
-|               |                                                                               | {{{./doc/1.5.7/tld-tx/index.html}1.5.7 TLD Documentation of \<tx:\>}}                              |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.5.6         | {{{./doc/1.5.6/api/index.html}1.5.6 API Documentation}}                       | {{{./doc/1.5.6/tld/index.html}1.5.6 TLD Documentation of \<tc:\>}} \                                                         |
-|               |                                                                               | {{{./doc/1.5.6/tld-tx/index.html}1.5.6 TLD Documentation of \<tx:\>}}                              |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.5.5         | {{{./doc/1.5.5/api/index.html}1.5.5 API Documentation}}                       | {{{./doc/1.5.5/tld/index.html}1.5.5 TLD Documentation of \<tc:\>}} \                                                         |
-|               |                                                                               | {{{./doc/1.5.5/tld-tx/index.html}1.5.5 TLD Documentation of \<tx:\>}}                              |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.5.4         | {{{./doc/1.5.4/api/index.html}1.5.4 API Documentation}}                       | {{{./doc/1.5.4/tld/index.html}1.5.4 TLD Documentation of \<tc:\>}} \                                                         |
-|               |                                                                               | {{{./doc/1.5.4/tld-tx/index.html}1.5.4 TLD Documentation of \<tx:\>}}                              |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.5.3         | {{{./doc/1.5.3/api/index.html}1.5.3 API Documentation}}                       | {{{./doc/1.5.3/tld/index.html}1.5.3 TLD Documentation of \<tc:\>}} \                                                         |
-|               |                                                                               | {{{./doc/1.5.3/tld-tx/index.html}1.5.3 TLD Documentation of \<tx:\>}}                              |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.5.2         | {{{./doc/1.5.2/api/index.html}1.5.2 API Documentation}}                       | {{{./doc/1.5.2/tld/index.html}1.5.2 TLD Documentation of \<tc:\>}} \                                                         |
-|               |                                                                               | {{{./doc/1.5.2/tld-tx/index.html}1.5.2 TLD Documentation of \<tx:\>}}                              |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.5.1         | {{{./doc/1.5.1/api/index.html}1.5.1 API Documentation}}                       | {{{./doc/1.5.1/tld/index.html}1.5.1 TLD Documentation of \<tc:\>}} \                                                         |
-|               |                                                                               | {{{./doc/1.5.1/tld-tx/index.html}1.5.1 TLD Documentation of \<tx:\>}}                              |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.5.0         | {{{./doc/1.5.0/api/index.html}1.5.0 API Documentation}}                       | {{{./doc/1.5.0/tld/index.html}1.5.0 TLD Documentation of \<tc:\>}} \                                                         |
-|               |                                                                               | {{{./doc/1.5.0/tld-tx/index.html}1.5.0 TLD Documentation of \<tx:\>}}                              |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.41        | {{{./doc/1.0.41/api/index.html}1.0.41 API Documentation}}                     | {{{./doc/1.0.41/tld/index.html}1.0.41 TLD Documentation}} \                                                                             |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.40        | {{{./doc/1.0.40/api/index.html}1.0.40 API Documentation}}                     | {{{./doc/1.0.40/tld/index.html}1.0.40 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.39        | {{{./doc/1.0.39/api/index.html}1.0.39 API Documentation}}                     | {{{./doc/1.0.39/tld/index.html}1.0.39 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.38        | {{{./doc/1.0.38/api/index.html}1.0.38 API Documentation}}                     | {{{./doc/1.0.38/tld/index.html}1.0.38 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.37        | {{{./doc/1.0.37/api/index.html}1.0.37 API Documentation}}                     | {{{./doc/1.0.37/tld/index.html}1.0.37 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.36        | {{{./doc/1.0.36/api/index.html}1.0.36 API Documentation}}                     | {{{./doc/1.0.36/tld/index.html}1.0.36 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.35        | {{{./doc/1.0.35/api/index.html}1.0.35 API Documentation}}                     | {{{./doc/1.0.35/tld/index.html}1.0.35 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.34        | {{{./doc/1.0.34/api/index.html}1.0.34 API Documentation}}                     | {{{./doc/1.0.34/tld/index.html}1.0.34 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.33        | {{{./doc/1.0.33/api/index.html}1.0.33 API Documentation}}                     | {{{./doc/1.0.33/tld/index.html}1.0.33 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.32        | {{{./doc/1.0.32/api/index.html}1.0.32 API Documentation}}                     | {{{./doc/1.0.32/tld/index.html}1.0.32 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.31        | {{{./doc/1.0.31/api/index.html}1.0.31 API Documentation}}                     | {{{./doc/1.0.31/tld/index.html}1.0.31 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.30        | {{{./doc/1.0.30/api/index.html}1.0.30 API Documentation}}                     | {{{./doc/1.0.30/tld/index.html}1.0.30 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.29        | {{{./doc/1.0.29/api/index.html}1.0.29 API Documentation}}                     | {{{./doc/1.0.29/tld/index.html}1.0.29 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.28        | {{{./doc/1.0.28/api/index.html}1.0.28 API Documentation}}                     | {{{./doc/1.0.28/tld/index.html}1.0.28 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.27        | {{{./doc/1.0.27/api/index.html}1.0.27 API Documentation}}                     | {{{./doc/1.0.27/tld/index.html}1.0.27 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.26        | {{{./doc/1.0.26/api/index.html}1.0.26 API Documentation}}                     | {{{./doc/1.0.26/tld/index.html}1.0.26 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.25        | {{{./doc/1.0.25/api/index.html}1.0.25 API Documentation}}                     | {{{./doc/1.0.25/tld/index.html}1.0.25 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.24        | {{{./doc/1.0.24/api/index.html}1.0.24 API Documentation}}                     | {{{./doc/1.0.24/tld/index.html}1.0.24 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.23        | {{{./doc/1.0.23/api/index.html}1.0.23 API Documentation}}                     | {{{./doc/1.0.23/tld/index.html}1.0.23 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.22        | {{{./doc/1.0.22/api/index.html}1.0.22 API Documentation}}                     | {{{./doc/1.0.22/tld/index.html}1.0.22 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.21        | {{{./doc/1.0.21/api/index.html}1.0.21 API Documentation}}                     | {{{./doc/1.0.21/tld/index.html}1.0.21 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.20        | {{{./doc/1.0.20/api/index.html}1.0.20 API Documentation}}                     | {{{./doc/1.0.20/tld/index.html}1.0.20 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.19        | {{{./doc/1.0.19/api/index.html}1.0.19 API Documentation}}                     | {{{./doc/1.0.19/tld/index.html}1.0.19 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.18        | {{{./doc/1.0.18/api/index.html}1.0.18 API Documentation}}                     | {{{./doc/1.0.18/tld/index.html}1.0.18 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.17        | {{{./doc/1.0.17/api/index.html}1.0.17 API Documentation}}                     | {{{./doc/1.0.17/tld/index.html}1.0.17 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.16        | {{{./doc/1.0.16/api/index.html}1.0.16 API Documentation}}                     | {{{./doc/1.0.16/tld/index.html}1.0.16 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.15        | {{{./doc/1.0.15/api/index.html}1.0.15 API Documentation}}                     | {{{./doc/1.0.15/tld/index.html}1.0.15 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.14        | {{{./doc/1.0.14/api/index.html}1.0.14 API Documentation}}                     | {{{./doc/1.0.14/tld/index.html}1.0.14 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.13        | {{{./doc/1.0.13/api/index.html}1.0.13 API Documentation}}                     | {{{./doc/1.0.13/tld/index.html}1.0.13 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.12        | {{{./doc/1.0.12/api/index.html}1.0.12 API Documentation}}                     | {{{./doc/1.0.12/tld/index.html}1.0.12 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.11        | {{{./doc/1.0.11/api/index.html}1.0.11 API Documentation}}                     | {{{./doc/1.0.11/tld/index.html}1.0.11 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.10        | {{{./doc/1.0.10/api/index.html}1.0.10 API Documentation}}                     | {{{./doc/1.0.10/tld/index.html}1.0.10 TLD Documentation}} \                                                                  |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.9         | {{{./doc/1.0.9/api/index.html}1.0.9 API Documentation}}                       | {{{./doc/1.0.9/tld/index.html}1.0.9 TLD Documentation}} \                                                                    |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.8         | {{{./doc/1.0.8/api/index.html}1.0.8 API Documentation}}                       | {{{./doc/1.0.8/tld/index.html}1.0.8 TLD Documentation}} \                                                                    |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| 1.0.7         | {{{./doc/1.0.7/api/index.html}1.0.7 API Documentation}}                       | {{{./doc/1.0.7/tld/index.html}1.0.7 TLD Documentation}} \                                                                    |
-|               |                                                                               |                                                                                                                                         |
-*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-
-Further JSF Documentation
-
-  {{{http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html}JSF 1.1 API Documentation}}\
-  {{{http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/tlddocs/index.html}JSF 1.1 Tag Library Documentation}}
-
-  {{{http://java.sun.com/javaee/javaserverfaces/1.2_MR1/docs/api/index.html}JSF 1.2 API Documentation}}\
-  {{{http://java.sun.com/javaee/javaserverfaces/1.2_MR1/docs/tlddocs/index.html}JSF 1.2 Tag Library Documentation}}
-
-  {{{http://javaserverfaces.java.net/nonav/docs/2.0/javadocs/index.html}JSF 2.0 API Documentation}}\
-  {{{http://javaserverfaces.java.net/nonav/docs/2.0/renderkitdocs/index.html}JSF 2.0 RenderKit Documentation}}\
-  {{{http://javaserverfaces.java.net/nonav/docs/2.0/managed-bean-api/index.html}JSF 2.0 Managed Bean API Documentation}}\
-  {{{http://javaserverfaces.java.net/nonav/docs/2.0/vdldocs/facelets/index.html}JSF 2.0 Facelets Tag Library Documentation}}\
-  {{{http://javaserverfaces.java.net/nonav/docs/2.0/vdldocs/jsp/index.html}JSF 2.0 JSP Tag Library Documentation}}\
-  {{{http://javaserverfaces.java.net/nonav/docs/2.0/jsdocs/index.html}JSF 2.0 JavaScript API}}
-
-  {{{http://javaserverfaces.java.net/nonav/docs/2.1/}JSF 2.1 Documentation}}
-
-  {{{http://javaserverfaces.java.net/nonav/docs/2.2/}JSF 2.2 Documentation}}
+  The content of this page was moved to {{{http://tobago-vm.apache.org/api.html}}}
diff --git a/src/site/apt/compatibility.apt b/src/site/apt/compatibility.apt
index 5b5297a..ad36a27 100644
--- a/src/site/apt/compatibility.apt
+++ b/src/site/apt/compatibility.apt
@@ -17,112 +17,6 @@
  Compatibility
  ------
 
-Compatibility
+Content was moved
 
-  Tobago was compatible with the following specifications, libraries and containers.
-  This list is not exhaustive, additions are welcome.
-
-  \ 
-
-*--+--+--+--+--+
-|| <<Tobago Version>>  || <<1.0.x>>                 || <<1.5.x>>                                   || <<2.0.x>>                             || <<3.x>>
-*--+--+--+--+--+
-|| <<Specifications>>  ||                           ||                                             ||                                       ||
-*--+--+--+--+--+
-| Java                 | 1.4\[retro\], <<1.5>>, 1.6, 1.7 | 1.5, 1.6, 1.7, 1.8                      | 1.5, 1.6, 1.7, 1.8                     | 1.6, 1.7, 1.8
-*--+--+--+--+--+
-| JSF                  | <<1.1>>, 1.2               | 1.2, 2.0\[disable vh\], 2.1\[disable vh\]    | 2.0, 2.1, 2.2                          | 2.0, 2.1, 2.2
-*--+--+--+--+--+
-| Facelets             | <<1.1>>\[ext\]             | <<1.1>>\[ext\]                               | \[int\]                                | \[int\]
-*--+--+--+--+--+
-| Servlet              | 2.3, <<2.4>>, 2.5          | 2.4\[facelets only\], <<2.5>>, 3.0           | 2.4\[facelets only\], <<2.5>>, <<3.0>>, <<3.1>> | 3.0, 3.1
-*--+--+--+--+--+
-| JSP                  | 1.2, <<2.0>>, 2.1          | <<2.1>>, 2.2                                 | 2.1, 2.2                               | -
-*--+--+--+--+--+
-|| <<Implementations>> ||                           ||                                             ||                                       ||
-*--+--+--+--+--+
-| MyFaces              | <<1.1>>, 1.2               | 1.2, 2.0, 2.1                                | 2.0, 2.1, 2.2                          | 2.0, 2.1, 2.2
-*--+--+--+--+--+
-| Sun RI               | <<1.1>>, 1.2               | 1.2, 2.0, 2.1                                | 2.0, 2.1, 2.2                          | 2.0, 2.1, 2.2
-*--+--+--+--+--+
-|                      |                            |                                              |                                        |
-*--+--+--+--+--+
-|| <<Servers>>         ||                           ||                                             ||                                       ||
-*--+--+--+--+--+
-| Tomcat               | 4.1, 5.0, 5.5, 6, 7        | 5.5\[facelets only\], 6, 7                   | 5.5\[facelets only\], 6, 7             | 7, 8
-*--+--+--+--+--+
-| Jetty                | 6, 7                       | 6, 7, 8                                      | 6, 7, 8                                | 8, 9
-*--+--+--+--+--+
-| WebLogic             | 8.1, 9.0, 9.1, 9.2, 10, 11g | 9.2\[facelets only\], 10, 11g, 12c           | 9.2\[facelets only\], 10, 11g, 12c     | 12c
-*--+--+--+--+--+
-| WebSphere            | 6.0, 6.1                   | 6.1\[facelets only\], 7, 8, 8.5              | 6.1\[facelets only\], 7, 8, 8.5        | 8, 8.5
-*--+--+--+--+--+
-| others               |                            | \[other servers\]                            | \[other servers\]                      | \[other servers\]
-*--+--+--+--+--+
-|                      |                            |                                              |                                        |
-*--+--+--+--+--+
-|| <<Browser>>         ||                           ||                                             ||                                       ||
-*--+--+--+--+--+
-| Internet Explorer / Edge | 6, 7, 8, 9, 10, 11     | 6, 7, 8, 9, 10, 11, ...                      | 6\[lim\], 7\[lim\], 8\[lim\], 9, 10, 11, ... | 10\[lim\], 11, ...
-*--+--+--+--+--+
-| Firefox              | 2, 3, 4, ...               | 2, 3, 4, ...                                 | 2\[lim\], 3, 4, ...                    | \[latest\]
-*--+--+--+--+--+
-| Safari               |                            | 4, 5, 6, ...                                 | 4, 5, 6, ...                           | \[latest\]
-*--+--+--+--+--+
-| Chrome               |                            | 5, ...                                       | 5, ...                                 | \[latest\]
-*--+--+--+--+--+
-| Opera                |                            | 10, 11                                       | 10, 11, ...                            | \[latest\]
-*--+--+--+--+--+
-| others               |                            | \[other browsers\]                           | \[other browsers\]                     | \[latest\]
-*--+--+--+--+--+
-|                      |                            |                                              |                                        |
-*--+--+--+--+--+
-|| <<Frameworks>>      ||                           ||                                             ||                                       ||
-*--+--+--+--+--+
-| CDI                  |                            | yes                                          | yes                                    | yes
-*--+--+--+--+--+
-| Codi                 |                            | yes                                          | yes                                    | yes
-*--+--+--+--+--+
-| DeltaSpike           |                            | yes                                          | yes                                    | yes
-*--+--+--+--+--+
-| JSR-303 / BV         |                            | yes                                          | yes                                    | yes
-*--+--+--+--+--+
-
- ~~ JSF Addon-Frameworks: Apache Shale Dialog, Apache Shale Clay, Spring Web Flow, Seam, WebBeans, "Validator", ...
- ~~ IoC Frameworks: Spring, Guice, ...
- ~~ Component Libs: Richfaces, Icefaces, Trinidad, Tomahawk ...
-
-  <<bold:>> preferred
-
-  normal: compatible
-
-  \[retro\]: use the JDK 1.4 retro version (available for Tobago 1.0.41 and before)
-
-  \[ext\]: add the tobago-facelets extension
-
-  \[int\]: since Tobago 2.0 and JSF 2.0 Facelets are integrated in JSF
-
-  \[tbd\]: to be defined (this information is unsettled and may change)
-  
-  \[lim\]: these old browsers are generally supported, but may have weak appearance
-
-  \[facelets only\]: it works with facelets, but not with JSP, because JSF 1.2 requires JSP 2.1
-
-  \[other servers\]: other servers should work, when they are compliant to the named specifications
-
-  \[latest\]: all browser supported by Bootstrap 4 are supported, these are usually the latest, stable releases
-
-  \[other browsers\]: other browsers should work, in their actual version, when they are standard compliant to HTML 4 and CSS 2.1
-
-  \[no release\]: Using Tobago 1.5 with JSF 1.1 is currently not part of the release, but can be build from the sources with mvn -Pjsf-1.1
-
-  \[disable vh\]: Tobago 1.5 works with JSF 2.0 when you are disable the Facelets ViewHandler from JSF 2.0 and using the
-  original Facelets:
-
-+----------------------------------------
-  <context-param>
-    <description>For backward compatibility (using "old" Facelets with JSF 2.0)</description>
-    <param-name>javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER</param-name>
-    <param-value>true</param-value>
-  </context-param>
-+----------------------------------------
+  The content of this page was moved to {{{http://tobago-vm.apache.org/compatibility.html}}}
diff --git a/src/site/apt/demo.apt b/src/site/apt/demo.apt
index 879d9c5..1de0dc8 100644
--- a/src/site/apt/demo.apt
+++ b/src/site/apt/demo.apt
@@ -14,10 +14,10 @@
  ~~ limitations under the License.
  
  ------
- Demo
+ Demo and Documentation
  ------
 
-Live Demo
+Live Demo and Documentation
 
   The Tobago demo is for demonstration and documentation purpose.
   It presents the features of Tobago including layout and themes and contains
@@ -25,10 +25,7 @@ Live Demo
 
   A {{{http://tobago-vm.apache.org/}live demo}} can be found for different versions.
 
-  This demo and more examples you can find in the VCS (see {{{./getting-started.html}Getting Started}} section).
-
-  The current snapshot of the demo war can be downloaded at:
-  {{https://repository.apache.org/content/repositories/snapshots/org/apache/myfaces/tobago/tobago-example-demo/}}
+  This demo and more examples you can find in the VCS (see {{{http://tobago-vm.apache.org/getting-started.html}Getting Started}} section).
 
 Blank WAR
 
diff --git a/src/site/apt/download.apt b/src/site/apt/download.apt
index e721919..c1c0424 100644
--- a/src/site/apt/download.apt
+++ b/src/site/apt/download.apt
@@ -19,176 +19,4 @@ Download MyFaces Tobago
 
 Download MyFaces Tobago
 
-
-  Use the links below to download a distribution of MyFaces Tobago from
-  one of our mirrors. It is good practice to verify the integrity of the
-  distribution files.
-
-  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 MyFaces Tobago is distributed as a <<<zip>>> archive (for Windows) and
-  as a <<<tar.gz>>> archive (for UNIX). The content is the same. Please note
-  that the <<<tar.gz>>> archives contain file names longer than 100 characters and have been
-  created using GNU tar extensions. Thus they must be untarred with a GNU compatible
-  version of tar.
-
-MyFaces Tobago 4.1.0 Distribution
-
-    Release notes can be found in
-    {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&version=12339443}Jira}}.
-
-*-------------------------+--------+---------+----------+-----------+
-|                         | Typ    | Mirrors | Checksum | Signature |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago          | tar.gz | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-4.1.0-dist.tar.gz} myfaces-tobago-4.1.0-dist.tar.gz}}             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.1.0-dist.tar.gz.sha256} myfaces-tobago-4.1.0-dist.tar.gz.sha256}}\             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.1.0-dist.tar.gz.asc} myfaces-tobago-4.1.0-dist.tar.gz.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago          | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-4.1.0-dist.zip} myfaces-tobago-4.1.0-dist.zip}}                   | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.1.0-dist.zip.sha256} myfaces-tobago-4.1.0-dist.zip.sha256}}\                   | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.1.0-dist.zip.asc} myfaces-tobago-4.1.0-dist.zip.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago Source   | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/source/myfaces-tobago-4.1.0-source-release.zip} myfaces-tobago-4.1.0-source-release.zip}} | {{{https://www.apache.org/dist/myfaces/source/myfaces-tobago-4.1.0-source-release.zip.sha256} myfaces-tobago-4.1.0-source-release.zip.sha256}}\ | {{{https://www.apache.org/dist/myfaces/source/myfaces-tobago-4.1.0-source-release.zip.asc} myfaces-tobago-4.1.0-source-release.zip.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago Example  | tar.gz | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-4.1.0-example.tar.gz} myfaces-tobago-4.1.0-example.tar.gz}}       | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.1.0-example.tar.gz.sha256} myfaces-tobago-4.1.0-example.tar.gz.sha256}}\       | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.1.0-example.tar.gz.asc} myfaces-tobago-4.1.0-example.tar.gz.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago Example  | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-4.1.0-example.zip} myfaces-tobago-4.1.0-example.zip}}             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.1.0-example.zip.sha256} myfaces-tobago-4.1.0-example.zip.sha256}}\             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.1.0-example.zip.asc} myfaces-tobago-4.1.0-example.zip.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-
-MyFaces Tobago 4.0.0 Distribution
-
-    Release notes can be found in
-    {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&version=12338728}Jira}}.
-
-*-------------------------+--------+---------+----------+-----------+
-|                         | Typ    | Mirrors | Checksum | Signature |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago          | tar.gz | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-4.0.0-dist.tar.gz} myfaces-tobago-4.0.0-dist.tar.gz}}             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-dist.tar.gz.sha256} myfaces-tobago-4.0.0-dist.tar.gz.sha256}}\             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-dist.tar.gz.asc} myfaces-tobago-4.0.0-dist.tar.gz.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago          | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-4.0.0-dist.zip} myfaces-tobago-4.0.0-dist.zip}}                   | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-dist.zip.sha256} myfaces-tobago-4.0.0-dist.zip.sha256}}\                   | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-dist.zip.asc} myfaces-tobago-4.0.0-dist.zip.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago Source   | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/source/myfaces-tobago-4.0.0-source-release.zip} myfaces-tobago-4.0.0-source-release.zip}} | {{{https://www.apache.org/dist/myfaces/source/myfaces-tobago-4.0.0-source-release.zip.sha256} myfaces-tobago-4.0.0-source-release.zip.sha256}}\ | {{{https://www.apache.org/dist/myfaces/source/myfaces-tobago-4.0.0-source-release.zip.asc} myfaces-tobago-4.0.0-source-release.zip.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago Example  | tar.gz | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-4.0.0-example.tar.gz} myfaces-tobago-4.0.0-example.tar.gz}}       | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-example.tar.gz.sha256} myfaces-tobago-4.0.0-example.tar.gz.sha256}}\       | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-example.tar.gz.asc} myfaces-tobago-4.0.0-example.tar.gz.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago Example  | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-4.0.0-example.zip} myfaces-tobago-4.0.0-example.zip}}             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-example.zip.sha256} myfaces-tobago-4.0.0-example.zip.sha256}}\             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-example.zip.asc} myfaces-tobago-4.0.0-example.zip.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-
-MyFaces Tobago 3.0.6 Distribution
-
-    Release notes can be found in
-    {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&version=12340258}Jira}}.
-
-*-------------------------+--------+---------+----------+-----------+
-|                         | Typ    | Mirrors | Checksum | Signature |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago          | tar.gz | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-3.0.6-dist.tar.gz} myfaces-tobago-3.0.6-dist.tar.gz}}             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-3.0.6-dist.tar.gz.sha256} myfaces-tobago-3.0.6-dist.tar.gz.sha256}}\             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-3.0.6-dist.tar.gz.asc} myfaces-tobago-3.0.6-dist.tar.gz.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago          | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-3.0.6-dist.zip} myfaces-tobago-3.0.6-dist.zip}}                   | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-3.0.6-dist.zip.sha256} myfaces-tobago-3.0.6-dist.zip.sha256}}\                   | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-3.0.6-dist.zip.asc} myfaces-tobago-3.0.6-dist.zip.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago Source   | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/source/myfaces-tobago-3.0.6-source-release.zip} myfaces-tobago-3.0.6-source-release.zip}} | {{{https://www.apache.org/dist/myfaces/source/myfaces-tobago-3.0.6-source-release.zip.sha256} myfaces-tobago-3.0.6-source-release.zip.sha256}}\ | {{{https://www.apache.org/dist/myfaces/source/myfaces-tobago-3.0.6-source-release.zip.asc} myfaces-tobago-3.0.6-source-release.zip.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago Example  | tar.gz | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-3.0.6-example.tar.gz} myfaces-tobago-3.0.6-example.tar.gz}}       | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-3.0.6-example.tar.gz.sha256} myfaces-tobago-3.0.6-example.tar.gz.sha256}}\       | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-3.0.6-example.tar.gz.asc} myfaces-tobago-3.0.6-example.tar.gz.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago Example  | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-3.0.6-example.zip} myfaces-tobago-3.0.6-example.zip}}             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-3.0.6-example.zip.sha256} myfaces-tobago-3.0.6-example.zip.sha256}}\             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-3.0.6-example.zip.asc} myfaces-tobago-3.0.6-example.zip.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-
-MyFaces Tobago 2.1.1 Distribution
-
-    Release notes can be found in
-    {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&version=12338208}Jira}}.
-
-*-------------------------+--------+---------+----------+-----------+
-|                         | Typ    | Mirrors | Checksum | Signature |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago          | tar.gz | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-2.1.1-dist.tar.gz} myfaces-tobago-2.1.1-dist.tar.gz}}             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-2.1.1-dist.tar.gz.sha256} myfaces-tobago-2.1.1-dist.tar.gz.sha256}}\             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-2.1.1-dist.tar.gz.asc} myfaces-tobago-2.1.1-dist.tar.gz.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago          | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-2.1.1-dist.zip} myfaces-tobago-2.1.1-dist.zip}}                   | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-2.1.1-dist.zip.sha256} myfaces-tobago-2.1.1-dist.zip.sha256}}\                   | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-2.1.1-dist.zip.asc} myfaces-tobago-2.1.1-dist.zip.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago Source   | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/source/myfaces-tobago-2.1.1-source-release.zip} myfaces-tobago-2.1.1-source-release.zip}} | {{{https://www.apache.org/dist/myfaces/source/myfaces-tobago-2.1.1-source-release.zip.sha256} myfaces-tobago-2.1.1-source-release.zip.sha256}}\ | {{{https://www.apache.org/dist/myfaces/source/myfaces-tobago-2.1.1-source-release.zip.asc} myfaces-tobago-2.1.1-source-release.zip.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago Example  | tar.gz | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-2.1.1-example.tar.gz} myfaces-tobago-2.1.1-example.tar.gz}}       | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-2.1.1-example.tar.gz.sha256} myfaces-tobago-2.1.1-example.tar.gz.sha256}}\       | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-2.1.1-example.tar.gz.asc} myfaces-tobago-2.1.1-example.tar.gz.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago Example  | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-2.1.1-example.zip} myfaces-tobago-2.1.1-example.zip}}             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-2.1.1-example.zip.sha256} myfaces-tobago-2.1.1-example.zip.sha256}}\             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-2.1.1-example.zip.asc} myfaces-tobago-2.1.1-example.zip.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-
-MyFaces Tobago 1.5.13 Distribution
-
-    Release notes can be found in
-    {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&version=12325597}Jira}}.
-
-*-------------------------+--------+---------+----------+-----------+
-|                         | Typ    | Mirrors | Checksum | Signature |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago          | tar.gz | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-1.5.13-dist.tar.gz} myfaces-tobago-1.5.13-dist.tar.gz}}             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.13-dist.tar.gz.sha256} myfaces-tobago-1.5.13-dist.tar.gz.sha256}}             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.13-dist.tar.gz.asc} myfaces-tobago-1.5.13-dist.tar.gz.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago          | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-1.5.13-dist.zip} myfaces-tobago-1.5.13-dist.zip}}                   | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.13-dist.zip.sha256} myfaces-tobago-1.5.13-dist.zip.sha256}}                   | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.13-dist.zip.asc} myfaces-tobago-1.5.13-dist.zip.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago Source   | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/source/myfaces-tobago-1.5.13-source-release.zip} myfaces-tobago-1.5.13-source-release.zip}} | {{{https://www.apache.org/dist/myfaces/source/myfaces-tobago-1.5.13-source-release.zip.sha256} myfaces-tobago-1.5.13-source-release.zip.sha256}} | {{{https://www.apache.org/dist/myfaces/source/myfaces-tobago-1.5.13-source-release.zip.asc} myfaces-tobago-1.5.13-source-release.zip.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago Example  | tar.gz | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-1.5.13-example.tar.gz} myfaces-tobago-1.5.13-example.tar.gz}}       | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.13-example.tar.gz.sha256} myfaces-tobago-1.5.13-example.tar.gz.sha256}}       | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.13-example.tar.gz.asc} myfaces-tobago-1.5.13-example.tar.gz.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago Example  | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-1.5.13-example.zip} myfaces-tobago-1.5.13-example.zip}}             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.13-example.zip.sha256} myfaces-tobago-1.5.13-example.zip.sha256}}             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.13-example.zip.asc} myfaces-tobago-1.5.13-example.zip.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-
-MyFaces Tobago 1.0.42 Distribution
-
-    Release notes can be found in
-    {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&version=12326705}Jira}}.
-
-*-------------------------+--------+---------+----------+-----------+
-|                         | Typ    | Mirrors | Checksum | Signature |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago          | tar.gz | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-1.0.42-dist.tar.gz} myfaces-tobago-1.0.42-dist.tar.gz}}             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.42-dist.tar.gz.sha256} myfaces-tobago-1.0.42-dist.tar.gz.sha256}}\             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.42-dist.tar.gz.asc} myfaces-tobago-1.0.42-dist.tar.gz.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago          | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-1.0.42-dist.zip} myfaces-tobago-1.0.42-dist.zip}}                   | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.42-dist.zip.sha256} myfaces-tobago-1.0.42-dist.zip.sha256}}\                   | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.42-dist.zip.asc} myfaces-tobago-1.0.42-dist.zip.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago Source   | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/source/myfaces-tobago-1.0.42-source-release.zip} myfaces-tobago-1.0.42-source-release.zip}} | {{{https://www.apache.org/dist/myfaces/source/myfaces-tobago-1.0.42-source-release.zip.sha256} myfaces-tobago-1.0.42-source-release.zip.sha256}}\ | {{{https://www.apache.org/dist/myfaces/source/myfaces-tobago-1.0.42-source-release.zip.asc} myfaces-tobago-1.0.42-source-release.zip.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago Example  | tar.gz | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-1.0.42-example.tar.gz} myfaces-tobago-1.0.42-example.tar.gz}}       | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.42-example.tar.gz.sha256} myfaces-tobago-1.0.42-example.tar.gz.sha256}}\       | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.42-example.tar.gz.asc} myfaces-tobago-1.0.42-example.tar.gz.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-| MyFaces Tobago Example  | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-1.0.42-example.zip} myfaces-tobago-1.0.42-example.zip}}             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.42-example.zip.sha256} myfaces-tobago-1.0.42-example.zip.sha256}}\             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.42-example.zip.asc} myfaces-tobago-1.0.42-example.zip.asc}} |
-*-------------------------+--------+---------+----------+-----------+
-
-
-Latest source code from SVN repository
-
-    If you want to use the latest Apache MyFaces Tobago features, the source code is under
-    version control with SVN. In the {{{./getting-started.html} Getting Started }}
-    section you will find information how to use the ASF MyFaces Tobago SVN Repository.
-
-Archive of old releases
-
-    Older releases are available in the {{{https://archive.apache.org/dist/myfaces/} archive}}. Those
-    releases are only provided as historical artifacts. We strongly
-    recommend not to use those releases, but upgrade to the most recent release.
-
-Verifying checksums
-
-    It is essential that you verify the integrity of the downloaded
-    files using the SHA 256.
-    This verification ensures the
-    file was not corrupted during the download or mirroring process.
-
-    To verify the hash signature on the files, you need to use a program
-    called e. g. <<<sha>>>, <<<shasum>>>, which is
-    included in many UNIX distributions and MacOS.
-    It is also available for Windows.
-
-Verifying signatures
-
-  	PGP verification ensures that the file came from a certain person.
-  	We recommend you verify your downloads with PGP.
-
-	  First download the Apache MyFaces
-	  {{{https://www.apache.org/dist/myfaces/KEYS}KEYS}}	as well as the <<<asc>>> signature file
-	  for the particular distribution. It is important that you get these files from the ultimate
-	  trusted source - the main ASF distribution site, rather than from a mirror.
-
-    You need an installation of e. g. OpenPGP or GPG to check the files. More information you'll find on the Apache
-    {{{https://www.apache.org/info/verification.html#CheckingSignatures}verification}} site.
-
-	  Then verify the signatures for all downloaded files. With gpg for the dist.tar.gz it looks like
-
-+----------------------------------------
-$ TOBAGO_VERSION=4.0.0
-$ gpg --import KEYS
-$ gpg --verify myfaces-tobago-$TOBAGO_VERSION-dist.tar.gz.asc myfaces-tobago-$TOBAGO_VERSION-dist.tar.gz
-+----------------------------------------
+  The content of this page was moved to {{{http://tobago-vm.apache.org/download.html}}}
diff --git a/src/site/apt/new-2.0.apt b/src/site/apt/faq.apt
similarity index 88%
rename from src/site/apt/new-2.0.apt
rename to src/site/apt/faq.apt
index f1f2451..d0714ec 100644
--- a/src/site/apt/new-2.0.apt
+++ b/src/site/apt/faq.apt
@@ -14,9 +14,9 @@
  ~~ limitations under the License.
 
  ------
- What's new in Tobago 2.0?
+ FAQ - Frequently Asked Questions
  ------
 
 Content was moved
 
-  The content of this page was moved to {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/40-new+in+2+0/new+in+2+0.xhtml}New in Tobago 2.0}}
+  The content of this page was moved to {{{http://tobago-vm.apache.org/faq.html}}}
diff --git a/src/site/apt/getting-started.apt b/src/site/apt/getting-started.apt
index 25353fc..f542b2a 100644
--- a/src/site/apt/getting-started.apt
+++ b/src/site/apt/getting-started.apt
@@ -17,95 +17,6 @@
  Getting Started
  ------
 
-  This section describes how to build Tobago and run the
-  example applications from the sources.
+Content was moved
 
-Checking Out
-
-  Check out the 3.x.x sources by running the following:
-
-+----------------------------------------
-  git clone https://github.com/apache/myfaces-tobago tobago
-+----------------------------------------
-
-  Check out the 2.0.x sources by running the following:
-
-+----------------------------------------
-  git clone -b tobago-2.0.x https://github.com/apache/myfaces-tobago tobago-2.0.x
-+----------------------------------------
-
-  Check out the 1.5.x sources by running the following:
-
-+----------------------------------------
-  git clone -b tobago-1.5.x https://github.com/apache/myfaces-tobago tobago-1.5.x
-+----------------------------------------
-
-  Check out the 1.0.x sources by running the following:
-
-+----------------------------------------
-  git clone -b tobago-1.0.x https://github.com/apache/myfaces-tobago tobago-1.0.x
-+----------------------------------------
-
-
-Building
-
-  You need {{{http://maven.apache.org/download.html}Maven}} (at least 2.2.1) Java 5 to build Tobago 1.0.x.\
-  You need {{{http://maven.apache.org/download.html}Maven}} (at least 3.0.4) Java 6 or 7 to build Tobago 1.5.x.
-  You need {{{http://maven.apache.org/download.html}Maven}} (at least 3.0.4) Java 8 to build Tobago 2.0.x and
-  Tobago 3.0.x.
-
-  In the
-  {{{https://github.com/apache/myfaces-tobago}main directory}}
-  you can use
-
-+----------------------------------------
-  mvn install
-+----------------------------------------
-
-  to run the install target on all sub projects. This will
-  put all necessary artifacts into your local repository.
-
-The Demo
-
-  You can run the examples inside tobago-example with jetty
-
-+----------------------------------------
-  mvn jetty:run
-+----------------------------------------
-
-  or
-
-+----------------------------------------
-  mvn package
-+----------------------------------------
-
-  and deploy the WAR from the target directory manually.
-
-Using different JSF implementations (Tobago 1.x)
-
-  By default the example will be started with MyFaces 1.2.
-  You can run the examples with other version like you see here:
-
-+----------------------------------------
-  mvn jetty:run
-  mvn jetty:run -Djsf=myfaces-2.0
-  mvn jetty:run -Djsf=myfaces-2.1
-  mvn jetty:run -Djsf=mojarra-1.2
-  mvn jetty:run -Djsf=mojarra-2.0
-  mvn jetty:run -Djsf=mojarra-2.1
-  mvn jetty:run -Djsf=mojarra-2.2
-+----------------------------------------
-
-Using different JSF implementations (Tobago 2.x)
-
-  By default the example will be started with MyFaces 2.0
-  You can run the examples with other version like you see here:
-
-+----------------------------------------
-  mvn jetty:run
-  mvn jetty:run -Djsf=myfaces-2.1
-  mvn jetty:run -Djsf=myfaces-2.2
-  mvn jetty:run -Djsf=mojarra-2.0
-  mvn jetty:run -Djsf=mojarra-2.1
-  mvn jetty:run -Djsf=mojarra-2.2
-+----------------------------------------
+  The content of this page was moved to {{{http://tobago-vm.apache.org/getting-started.html}}}
diff --git a/src/site/apt/howto-test.apt b/src/site/apt/howto-test.apt
index 06a1a88..ce56b5e 100644
--- a/src/site/apt/howto-test.apt
+++ b/src/site/apt/howto-test.apt
@@ -19,39 +19,4 @@
 
 Howto create QUnit tests for Tobago Demo 3.0 or higher
 
-  [[1]] Choose a \<sample\>.xhtml file for testing.
-
-  [[2]] Create a \<sample\>.test.js file (with same name).
-
-  [[3]] Add a {{{http://api.qunitjs.com/QUnit.test/}QUnit test}} to the \<sample\>.test.js.
-
-+----------------------------------------
-  QUnit.test("Testtitle", function(assert) {
-    ...
-  });
-+----------------------------------------
-
-    [[a]] The test will run in a different frame.
-    To get an element in the test frame use <<<jQueryFrame()>>> instead of <<<jQuery()>>>.
-
-    [[b]] To wait for a submit use <<<jQuery("#page\\:testframe").load()>>>.
-
-    [[c]] To wait for an AJAX event use <<<waitForAjax(waitingDone, executeWhenDone)>>>.
-    The function <<<waitingDone>>> must return false if still waiting and true if the waiting is done.
-    The function <<<executeWhenDone>>> is executed afterwards.
-
-  [[4]] Add the test to QUnitTests.
-
-+----------------------------------------
-  @Test
-  public void testname() throws UnsupportedEncodingException, InterruptedException {
-    String page = "content/.../testname.xhtml";
-    runStandardTest(page);
-  }
-+----------------------------------------
-
-  [[5]] Run the tests from QUnitTests or type
-
-+----------------------------------------
-  mvn verify -Pqunit-integration-tests
-+----------------------------------------
+  The content of this page was moved to {{{http://tobago-vm.apache.org/faq.html}}}
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index da1cbaa..15d2425 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -72,7 +72,7 @@ News
       The MyFaces Tobago component library in version 4.0.0 has been released.
 
       A short overview you can find in the
-      {{{http://tobago-vm.apache.org/demo-4-release/content/10-intro/28-new+in+4+0/new+in+4+0.xhtml}Tobago Demo 4}}.
+      {{{http://tobago-vm.apache.org/whats-new.xhtml}Tobago Demo 4}}.
 
       Release notes can be found in
       {{{http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=12338728}Jira}}.
@@ -219,7 +219,7 @@ News
 
       []
 
-      Also see section: {{{http://tobago-vm.apache.org/demo-4-release/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
+      Also see section: {{{http://tobago-vm.apache.org/whats-new.html} What's new in Tobago 3.0?}}
 
       \ {}
       ~~ hack for a bit space
@@ -259,8 +259,6 @@ News
 
       []
 
-      Also see section: {{{http://tobago-vm.apache.org/demo-4-release/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
-
       \ {}
       ~~ hack for a bit space
 
@@ -285,8 +283,6 @@ News
 
       []
 
-      Also see section: {{{http://tobago-vm.apache.org/demo-4-release/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
-
       \ {}
       ~~ hack for a bit space
 
@@ -309,8 +305,6 @@ News
 
       []
 
-      Also see section: {{{http://tobago-vm.apache.org/demo-4-release/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
-
       \ {}
       ~~ hack for a bit space
 
@@ -356,8 +350,6 @@ News
 
       []
 
-      Also see section: {{{http://tobago-vm.apache.org/demo-4-release/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
-
       \ {}
       ~~ hack for a bit space
 
@@ -380,8 +372,6 @@ News
 
       []
 
-      Also see section: {{{http://tobago-vm.apache.org/demo-4-release/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
-
       \ {}
       ~~ hack for a bit space
 
@@ -442,8 +432,6 @@ svn switch https://svn.apache.org/repos/asf/myfaces/tobago/trunk/
 
       []
 
-      Also see section: {{{http://tobago-vm.apache.org/demo-4-release/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
-
       \ {}
       ~~ hack for a bit space
 
@@ -469,8 +457,6 @@ svn switch https://svn.apache.org/repos/asf/myfaces/tobago/trunk/
       This may be the last version using Bootstrap 3.
       The next alpha of Tobago will properly using Bootstrap 4, where the second alpha was released a few days ago.
 
-      Also see section: {{{http://tobago-vm.apache.org/demo-4-release/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
-
       \ {}
       ~~ hack for a bit space
 
@@ -481,8 +467,6 @@ svn switch https://svn.apache.org/repos/asf/myfaces/tobago/trunk/
       Release notes can be found in
       {{{http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=12325880}Jira}}.
 
-      See section: {{{http://tobago-vm.apache.org/demo-4-release/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
-
       \ {}
       ~~ hack for a bit space
 
@@ -588,7 +572,7 @@ svn switch https://svn.apache.org/repos/asf/myfaces/tobago/trunk/
       Release notes can be found in
       {{{http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=12321253}Jira}}.
 
-      See section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/40-new+in+2+0/new+in+2+0.xhtml} What's new in Tobago 2.0?}}
+      See section: {{{http://tobago-vm.apache.org/whats-new.html} What's new in Tobago 2.0?}}
 
       \ {}
       ~~ hack for a bit space
diff --git a/src/site/apt/migration-1.5.apt b/src/site/apt/migration-1.5.apt
index 4fb5af6..a9e2582 100644
--- a/src/site/apt/migration-1.5.apt
+++ b/src/site/apt/migration-1.5.apt
@@ -19,4 +19,4 @@
 
 Content was moved
 
-  The content of this page was moved to {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/50-migration/99-migration/migration15.xhtml}Migration from Tobago 1.0 to 1.5}}
+  The content of this page was moved to {{{http://tobago-vm.apache.org/migration.html}}}
diff --git a/src/site/apt/migration-2.0.apt b/src/site/apt/migration-2.0.apt
index d0c3e9b..76ca02c 100644
--- a/src/site/apt/migration-2.0.apt
+++ b/src/site/apt/migration-2.0.apt
@@ -19,4 +19,4 @@
 
 Content was moved
 
-  The content of this page was moved to {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/50-migration/98-migration/migration20.xhtml}Migration from Tobago 1.5 to 2.0}}
+  The content of this page was moved to {{{http://tobago-vm.apache.org/migration.html}}}
diff --git a/src/site/apt/release-checklist.apt b/src/site/apt/release-checklist.apt
index ab4b077..f94c382 100644
--- a/src/site/apt/release-checklist.apt
+++ b/src/site/apt/release-checklist.apt
@@ -19,276 +19,4 @@
 
 Release Checklist (Developer Info)
 
-  Checklist of tasks to perform for each release. For general information about Apache releases you may also consult {{{http://www.apache.org/dev/publishing-maven-artifacts.html}Publishing Maven Artifacts}}.
-
-* Preparation
-
-  * You need to add your GPG keys in {{{https://svn.apache.org/repos/asf/myfaces/keys/KEYS}Subversion}} and the {{{https://www.apache.org/dist/myfaces/KEYS}Apache site}} before a release.
-
-  * Ensure that all open bugs and issues in {{{https://issues.apache.org/jira/}Jira}} have been either fixed
-    or moved to an other release version.
-
-  * Ensure that all examples are working with the release candidate.
-
-  * Check the scheduled version number against "semantic versioning".
-
-  * Post a note and ask for problems with the release candidate (see {{Preparation template}} below).
-
-  * Install (or unpack) a jdk 1.4 on your computer (only for Tobago 1.0.x).
-
-  * Please switch to a jdk depending of the version to build:
-
-    * for Tobago 1.0.x use jdk 1.5 or 1.6 for build and 1.7 for deployment.
-
-    * for Tobago 1.5.x use jdk 1.7.
-
-    * for Tobago 2.x and higher use jdk 1.8.
-
-  * Perform basic checks on an unmodified checkout for all modules:
-
-+------------------------+
-# for Tobago 1.0.x
-mvn checkstyle:check rat:check -Pall-modules
-
-# for Tobago 1.5.x and higher
-mvn clean install -Pall-modules && mvn checkstyle:check apache-rat:check animal-sniffer:check -Pall-modules
-
-# for Tobago 2.0.9 and higher
-mvn clean install && mvn checkstyle:check apache-rat:check animal-sniffer:check dependency-check:check
-
-# for Tobago 3.0.0 and higher
-mvn clean install -Pall-modules && mvn checkstyle:check apache-rat:check animal-sniffer:check dependency-check:check -Pall-modules
-
-# for Tobago 4.2.0 and higher
-mvn clean install && mvn checkstyle:check apache-rat:check animal-sniffer:check dependency-check:check
-+------------------------+
-
-  * Check version info in this file manually:
-
-+------------------------+
-tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java
-+------------------------+
-
-* Building the Release (Tobago 1.0.x to 2.0.8) [TODO: migrate this docs to git]
-
-  * Prepare the release with:
-
-+------------------------+
-mvn release:prepare -Pall-modules
-+------------------------+
-
-  * Check out a fresh copy of the svn tag:
-
-+------------------------+
-cd ..
-svn co https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-<version>
-cd tobago-<version>
-+------------------------+
-
-  * Deploy the fresh copy to the Nexus repository with the apache-release profile (we are not using release:perform here, because of some different options):
-
-+------------------------+
-# for Tobago 1.0.x
-# "install" with Java 1.6 and Maven 2
-mvn install -Papache-release,jdk14retro,generate-assembly --no-plugin-updates -Dnon-default-modules -Djava14.home=${java14.jre}
-# "deploy" with Java 1.7 and Maven 3 (hotfix: also comment out the maven-apt-plugin stuff)
-mvn deploy -Papache-release,generate-assembly --no-plugin-updates -Dnon-default-modules
-
-# for Tobago 1.5.x to 2.0.8
-mvn deploy -Papache-release,generate-assembly --no-plugin-updates -Dnon-default-modules
-+------------------------+
-
-* Building the Release (Tobago 2.0.9 and higher)
-
-  * Prepare and perform the release with:
-
-+------------------------+
-mvn release:prepare
-mvn release:perform
-+------------------------+
-
-* Staging repository
-
-  * <Close> the repository on the {{{https://repository.apache.org/}Nexus}} instance for staging (you will receive a mail with the staging location).
-
-  * Update the staging and snapshot version on tobago-vm.apache.org
-
-* Voting
-
-  * Propose a vote on the dev list with the staging location (see {{Vote template}} below).
-
-  * For a positive result wait at least 72 hours.
-
-  * Once a vote is successful, post the result to the dev list.
-
-* Publishing
-
-  * <Release> the version in {{{https://issues.apache.org/jira/}Jira}} and close all resolved issues for the release.
-
-  * <Release> the staging repository on the {{{https://repository.apache.org/}Nexus}} instance.
-
-  * Copy the download artifacts from the repository to the site (see script {{{./scripts/release-artifacts.sh}release-artifacts.sh}}).
-
-  * Add the release version and date to the {{{https://reporter.apache.org/addrelease.html?myfaces}Apache Committee Report Helper}}.
-
-  * Update the release and staging version on tobago-vm.apache.org
-
-  * Building the site
-
-    * Updating the release and version information in the APT files of trunk, e. g.:
-
-+------------------------+
-src/site/apt/api.apt
-src/site/apt/download.apt
-src/site/apt/index.apt
-src/site/resources/doap_tobago.rdf
-+------------------------+
-
-    * Note: The site can only be build correctly on file systems that supports to differ upper-/lower-case.
-      This is not the default on Windows and Mac OS X machines.
-      On Mac OS X you can mount a virtual filesystem (sparse bundle) that supports upper-/lower-case with the
-      Disk Utility.
-
-+------------------------+
-TOBAGO_SITE=/Volumes/tobago-site
-cd $TOBAGO_SITE
-git clone https://github.com/apache/myfaces-tobago tobago-master
-svn co https://svn.apache.org/repos/asf/myfaces/site/publish/tobago tobago-publish
-cd tobago-master
-export MAVEN_OPTS="-Xmx1500m ${MAVEN_OPTS}"
-mvn clean package -Pattach-source
-mvn site:site
-mvn site:stage -DstagingDirectory=$TOBAGO_SITE/tobago-publish
-+------------------------+
-
-  * Call "reformat code" on all *.html file in $TOBAGO_SITE/tobago-publish in the IDE
-    (the generated code has the main content in only one single line).
-
-  * Update the site after the distribution is on the Apache mirrors available.
-
-  * Unpack and commit the API Docs of the release with the update.sh (or update-1.5.sh) script in
-    /Volumes/tobago-site/tobago-publish.
-
-  * Remove old download artifacts from the site (see script {{{./scripts/drop-artifacts.sh}drop-artifacts.sh}}).
-    Older releases are automatic available in the {{{http://archive.apache.org/dist/myfaces/} archive}}.
-
-  * Remove old snapshots in the maven snapshot repository. This is done automatically, it is only needed, when
-    there are dead development ends, e. g. last alpha or beta version like 3.0.0-beta-2-SNAPSHOT which
-    will no longer developed.
-
-  * Create and send announcement (see {{Announcement template}} below).
-
-
-{Preparation template}
-
-  Send to: {{mailto:MyFaces Development \<dev@myfaces.apache.org\>}}
-
-  <Replace the variable parts like \<version\>>.
-
-+------------------------+
-
-Subject: [Tobago] Preparation for the <version> release
-
-
-Hi, folks,
-
-I plan to build the <version> of Tobago soon.
-
-If you know any blocking problems with the current SNAPSHOT, give me a hint.
-
-Regards,
-<sender>
-
-+------------------------+
-
-
-
-{Vote template}
-
-  Send to: {{mailto:MyFaces Development \<dev@myfaces.apache.org\>}}
-
-  <Replace the variable parts like \<version\>>.
-
-+------------------------+
-
-Subject: [VOTE] Release Tobago <version>
-
-
-Hello,
-
-I would like to release Tobago <version>.
-
-Major changes since last release are:
-
-<insert list>
-
-<use one of>
-<a> This is a MAJOR release and may contain incompatible API changes.
-<b> This is a MINOR release with new functionality in a backwards-compatible manner.
-<c> This is a PATCH release with backwards-compatible bug fixes.
-
-For a detail list please consult the release notes at:
-
-https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&version=<version_id_from_jira>
-
-The version is available at the staging repository (Nexus) at:
-
-https://repository.apache.org/content/repositories/orgapachemyfaces-<id_from_nexus>/
-
-Please vote now! (The vote is open for 72h.)
-
-[ ] +1
-[ ] +0
-[ ] -1
-
-Regards,
-<sender>
-
-+------------------------+
-
-
-
-{Announcement template}
-
-  For all versions send to: {{mailto:MyFaces Discussion \<users@myfaces.apache.org\>}}\
-  Only for major versions send to: {{mailto:announce@apache.org}}
-
-  <Replace the variable parts like \<version\>>.
-
-+------------------------+
-
-Subject: [ANNOUNCE] Apache Tobago <version> released
-
-
-The Apache MyFaces team is pleased to announce the release of Apache
-Tobago <version>.
-
-Apache Tobago is a component library for JavaServer Faces (JSF) that
-allows to write web-applications without the need of coding HTML, CSS
-and JavaScript
-
-Main new features
------------------
-
-<list of main new features here or remove this section>
-
-Changes
--------
-
-Please check the release notes at
-http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=<versionidfromjira>
-for a full list of the changes in this version.
-
-Known limitations and bugs
---------------------------
-
-<add main limitations and known bugs here or remove this section>
-
-For more information about Apache Tobago, please visit
-http://myfaces.apache.org/tobago/.
-
-Have fun,
--The MyFaces team
-
-+------------------------+
-
+  The content of this page was moved to {{{http://tobago-vm.apache.org/release-checklist.html}}}
diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
deleted file mode 100644
index edad68a..0000000
--- a/src/site/fml/faq.fml
+++ /dev/null
@@ -1,508 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!--
-  Note: Please use &lt; instead of < in the source tag, when the example is XML.
-  Otherwise you will lost the attributes.
--->
-
-<faqs xmlns="http://maven.apache.org/FML/1.0.1"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
-      title="Frequently Asked Questions">
-
-  <part id="faq">
-    <faq id="howto">
-      <question>Where can I find documentation or HowTos for using Tobago?</question>
-      <answer>
-        <p>
-          Beside this site, the use of Tobago is explained in the
-          <a href="http://tobago-vm.apache.org/">Demo</a>.
-        </p>
-      </answer>
-    </faq>
-    <faq id="hello-world">
-      <question>Where can I find a "Hello World" example and a list of required
-        jars?
-      </question>
-      <answer>
-        <p>
-          Please look at
-          <a href="https://github.com/apache/myfaces-tobago/tobago-example/tobago-example-blank/">
-            tobago-example-blank</a> or download the myfaces-tobago-example from the
-          <a href="https://repository.apache.org/content/repositories/snapshots/org/apache/myfaces/tobago/">nightly builds directory</a>.
-        </p>
-      </answer>
-    </faq>
-    <faq id="tobago/RI">
-      <question>Does Tobago run with the Sun reference implementation (RI)?</question>
-      <answer>
-        <p>Tobago runs with Sun RI and with MyFaces.
-        Please take a look at the <a href="compatibility.html">Compatibility</a> List.</p>
-      </answer>
-    </faq>
-    <faq id="tobago/facelets">
-      <question>Does Tobago supports Facelets?</question>
-      <answer>
-        <p>Tobago 2.0.x:</p>
-        <p>Tobago supports the JSF 2.0 Facelets.
-          Note: Please add following context param in your web.xml</p>
-        <source>
-&lt;context-param>
-  &lt;param-name>javax.faces.FACELETS_SKIP_COMMENTS&lt;/param-name>
-  &lt;param-value>true&lt;/param-value>
-&lt;/context-param></source>
-        <p>Tobago 1.0.x and 1.5.x:</p>
-        <p>Tobago supports Facelets with the tobago-facelets.jar.
-        Note: Please add following context param in your web.xml</p>
-        <source>
-&lt;context-param>
-  &lt;param-name>facelets.SKIP_COMMENTS&lt;/param-name>
-  &lt;param-value>true&lt;/param-value>
-&lt;/context-param></source>
-      </answer>
-    </faq>
-    <faq id="tobago/myfaces extension">
-      <question>Can I mix Tobago and MyFaces extensions in the same web application?
-      </question>
-      <answer>
-        <p>JSF only supports one renderkit (renderkitId) per page (f:view).
-          Because Tobago has it's own renderkitId you cannot use any non-Tobago
-          components that need a renderer.
-        </p>
-      </answer>
-    </faq>
-    <faq id="tobago/layout">
-      <question>How do I use GridLayout in Tobago?</question>
-      <answer>
-        <source>
-&lt;tc:gridLayout rows="auto 100px 1fr 2fr" /></source>
-        <p>
-          The attribute 'fixed' means a theme dependent height of one row (i.e. in Speyside
-          a row is typically 20px high.) In a 'fixed' row all one height unit high elements find their place
-          (like buttons, input fields, one row of text...).<br/>
-          Using px heights is at your own risk, but it is sometimes needed for elements like box or sheet.
-        </p>
-        <p>
-          Alternatively you can give elements a proportion with the * notation.<br/>
-          For example rows="1fr 2fr" gives the first row 1/3 of the available vertical space and the
-          second row 2/3. This works fine for columns, too.
-        </p>
-        <p>
-          You can group elements with a tc:panel element. Such a panel is interpreted as one
-          element regarding layout. The panel itself can have its own layout for multiple elements inside
-          the panel.
-        </p>
-      </answer>
-    </faq>
-
-    <faq id="tobago/fileupload">
-      <question>How do I configure file upload in Tobago?</question>
-      <answer>
-        <p>Till Tobago 2.0 and lower, you have two options.</p>
-        <p>Add a TobagoMultipartFormdataFilter to your web.xml.
-          <a href="http://myfaces.apache.org/tobago/apidocs/org/apache/myfaces/tobago/webapp/TobagoMultipartFormdataFilter.html">JavaDoc Description</a>
-        </p>
-        <p>Add the tobago-fileupload.jar to your project.
-           The tobago-fileupload.jar contains a FacesContextFactory that wraps the
-            multipart-formdata request inside the FacesContext.
-          <a href="http://myfaces.apache.org/tobago/apidocs/org/apache/myfaces/tobago/fileupload/FileUploadFacesContextFactoryImpl.html">JavaDoc Description</a>
-        </p>
-        <p>Starting with Tobago 3.0 the Servlet API 3.0 will be used. Some more information about the
-          usage you will find in <a href="https://issues.apache.org/jira/browse/TOBAGO-1539">Jira</a>
-          and in the <a href="http://tobago-vm.apache.org/demo-3-release/faces/content/20-component/100-upload/upload.xhtml">Tobago Demo 3.0</a>.
-          There is also a <a href="http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml">migration guide</a> available.
-        </p>
-      </answer>
-    </faq>
-
-    <faq id="tobago/form">
-      <question>Do I need a form tag in a normal Tobago page?</question>
-      <answer>
-        <p>The page tag already acts like a form tag. You only need a explicit form tag for partial validation of your data.
-        Please look at the forms example in the
-        <a href="http://tobago-vm.apache.org/demo-3-release/faces/content/30-concept/08-form/form.xhtml">Tobago demo</a>
-        </p>
-      </answer>
-    </faq>
-
-    <faq id="tobago/browser">
-      <question>Which web browsers are currently supported by Tobago?</question>
-      <answer>
-        <p>Please take a look at the <a href="compatibility.html">Compatibility</a> List.</p>
-      </answer>
-    </faq>
-
-    <faq id="tobago/owntheme">
-      <question>How do I create my own theme?</question>
-      <answer>
-        <p>
-          You have to define a new name for the theme in the META-INF/tobago-config.xml.
-          Choose a fallback theme in the tobago-config.xml.
-          Put the modified resources under the resource-path + theme-name.
-          An example for this is the charlotteville theme. (TODO more details resource handling)
-          </p>
-        <p>
-        Example layout of a theme jar:
-        </p>
-         <source>
-/META-INF/tobago-config.xml
-(resource-path/html/theme-name)
-/org/apache/myfaces/tobago/renderkit/html/xxxxx/standard/style/tobago.css (standard styles)
-/org/apache/myfaces/tobago/renderkit/html/xxxxx/standard/style/tobago-menu.css (menu styles)
-/org/apache/myfaces/tobago/renderkit/html/xxxxx/standard/style/tobago-sheet.css (sheet styles)
-/org/apache/myfaces/tobago/renderkit/html/xxxxx/msie/style/tobago.css (different styles for msie)</source>
-
-           Property and resource loading and renderer loading is done in the following order
-           <source>
-resource-path/content-type/theme/client/[tag(for renderer)|property|style|script|image]_locale
-    .(class|property|property.xml|css|js|gif|png...]</source>
-
-           for example OutRenderer<br/>
-
-           org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag.OutRenderer<br/>
-
-           OutRenderer is getRendererType() + "Renderer"<br/>
-
-        The locale handling is handled like the Properties Class.<br/>
-
-        You have not define everything because the ResourceManager is asking the fallback theme for missing resources<br/>
-
-        The fallback theme of charlotteville is speyside.<br/>
-        The fallback theme of speyside is scarborough.<br/>
-        The fallback theme of scarborough is standard<br/>
-
-        The resource manager looks in the case of the charlotteville theme in<br/>
-        charlotteville -> speyside -> scarborough -> standard
-        <p>
-          Please look at
-          <a href="https://github.com/apache/myfaces-tobago/tobago-theme/tobago-theme-example/src/main/resources">
-            tobago-example-theme
-          </a>
-         </p>
-      </answer>
-    </faq>
-
-    <faq id="tobago/custommarkup">
-      <question>How do I use and extend the markup attribute?</question>
-      <answer>
-        <p>UIBox, UIInput and UIOutput support custom markup with the markup attribute.
-          The supported markup is defined in the tobago-config.xml.
-          The standard markup is defined in tobago-config.xml of the tobago-theme-standard.
-          This can be extended in your own theme.
-          The markup attribute is rendered as a CSS class tobago-[renderer-name.toLowerCase]-markup-[markup].
-          For an example please look at the markup number and the CSS class tobago-in-markup-number for UIIn
-          in theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css
-          </p>
-      </answer>
-    </faq>
-
-    <faq id="tobago/container">
-      <question>In which containers was Tobago tested?</question>
-      <answer>
-        <p>Please take a look at the <a href="compatibility.html">Compatibility</a> List.
-        Feel free to post your own experiences.</p>
-      </answer>
-    </faq>
-
-    <faq id="tiles/sitemesh">
-      <question>Can Tobago replace Tiles? Can I ignore Tiles and Sitemesh in
-        favor of Tobago?
-      </question>
-      <answer>
-        <p>Tobago cannot replace it. But sometimes you may not need it, when
-          you are using Tobago.
-          If you want to position and size your components automatically, you
-          can do this with a Tobago LayoutManager.
-          If you want your header and sidebar rendered without writing duplicate
-          code, you may use JSP 2.0 tag files, Facelets or Tiles/Sitemesh.
-        </p>
-      </answer>
-    </faq>
-    <faq id="maven-mirror">
-      <question>How to configure a maven mirror?</question>
-      <answer>
-        <p>
-          If you want to set up a different mirror for some reason, you can use
-          your ~/.m2/settings.xml and add the following lines:
-        </p>
-        <source>
-&lt;mirrors>
-  &lt;mirror>
-    &lt;id>mirror ID&lt;/id>
-    &lt;name>Give it a name&lt;/name>
-    &lt;url>The URL of the mirror&lt;/url>
-    &lt;mirrorOf>The server ID of the repository being mirrored.
-        This must not match the mirror ID&lt;/mirrorOf>
-  &lt;/mirror>
-&lt;/mirrors></source>
-        <p>See:
-          <a href="http://maven.apache.org/guides/mini/guide-mirror-settings.html">
-            Guide to mirror settings
-          </a>
-        </p>
-        <p>Mirrors:
-          <a href="http://docs.codehaus.org/display/MAVENUSER/Mirrors+Repositories">
-            List of mirrors
-          </a>
-        </p>
-      </answer>
-    </faq>
-    <faq id="offline-build">
-      <question>How do I configure an offline build?</question>
-      <answer>
-        <p>
-          If you run into problems with fetching jars from the online
-          repository, you can configure Maven not to fetch them but use
-          the ones already in your local repository by adding the following to your ~/.m2/settings.xml:
-        </p>
-        <source>
-&lt;settings>
-  &lt;offline/>
-&lt;/settings></source>
-        <p>or use the mvn -o switch.</p>
-      </answer>
-    </faq>
-    <faq id="checkstyle">
-      <question>How do I perform a local checkstyle check?</question>
-      <answer>
-        <source>
-mvn compile checkstyle:check</source>
-      </answer>
-    </faq>
-    <faq id="checkstyle-vdl">
-      <question>How do I check the syntax of Facelet-Files (*.xhtml) with respect to the Taglib?</question>
-      <answer>
-        <p>
-        The problem is, that there is no concept for <em>deprecation</em> in Taglibs.
-        The tobago-core.jar contains a generated checkstyle configuration to perform
-        a syntax check via the maven checkstyle plugin.
-        </p>
-
-        <p>
-        Configure in the applications pom.xml an entry like this example
-        <source>    &lt;profile>
-      &lt;id>checkstyle-for-view-definition-language&lt;/id>
-      &lt;build>
-        &lt;plugins>
-          &lt;plugin>
-            &lt;groupId>org.apache.maven.plugins&lt;/groupId>
-            &lt;artifactId>maven-checkstyle-plugin&lt;/artifactId>
-            &lt;configuration>
-              &lt;configLocation>META-INF/checkstyle-tobago.xml&lt;/configLocation>
-              &lt;includes>**/*.xhtml&lt;/includes>
-              &lt;excludes>**/*.java&lt;/excludes>
-              &lt;sourceDirectory>src/main/webapp&lt;/sourceDirectory>
-            &lt;/configuration>
-            &lt;dependencies>
-              &lt;dependency>
-                &lt;groupId>org.apache.myfaces.tobago&lt;/groupId>
-                &lt;artifactId>tobago-core&lt;/artifactId>
-                &lt;version>${tobago.version}&lt;/version>
-              &lt;/dependency>
-            &lt;/dependencies>
-          &lt;/plugin>
-        &lt;/plugins>
-      &lt;/build>
-    &lt;/profile>
-        </source>
-        </p>
-        <p>
-        To perform a check call
-        <source>
-mvn checkstyle:check -Pcheckstyle-for-view-definition-language</source>
-          You will find the result in target/checkstyle-result.xml
-        </p>      </answer>
-    </faq>
-    <faq id="max-path">
-      <question>Why my Subversion checkout fails on Windows?</question>
-      <answer>
-        One reason is, that the checked out files will have a too long path name.
-        Under Windows the MAX_PATH is set to 260 characters. When you try to checkout in
-        a directory like C:\Dokumente und Einstellungen\MyUser\Apache Projects\
-        the path will be too long. A workaround will be checking out in an other directory
-        or register a new drive letter and check it out in X:
-        <source>
-SUBST X: "C:\Dokumente und Einstellungen\MyUser\Apache Projects\"</source>
-      </answer>
-    </faq>
-    <faq id="seleniumTobago12">
-      <question>How can I run the Selenium tests? (Tobago 1 and 2)</question>
-      <answer>
-      <p>
-        In the tobago-example-test application, the pages can be checked with selenium since Tobago 1.5.
-        To run the full test automatically call
-        <source>
-mvn -P integration-test</source>
-        This will start a jetty server and a selenium server and calls every listed page in the test application.
-      </p>
-
-        <p>
-        If you want to run the tests from your IDE, please start the jetty with
-        <source>
-mvn jetty:run</source> or <source>mvn jetty:run-exploded</source>
-        and start the selenium server with
-        <source>
-mvn selenium:start-server</source>
-        Now you can start the selenium tests in the IDE.
-        </p>
-        <p>
-          Sometimes there is a problem with Firefox. You may try to use a different version, or an installation without
-          plugins.
-        </p>
-      </answer>
-    </faq>
-    <faq id="integrationTestTobago3">
-      <question>How can I run the integration tests? (Tobago 3)</question>
-      <answer>
-        <p>In the tobago-example-demo application, the pages can be checked with QUnit/Arquillian.
-          To run the full test automatically call
-          <source>cd tobago-example/tobago-example-demo
-mvn verify -Pqunit-integration-tests</source>
-          The default arquillian browser is 'phantomjs'.
-          You can change it in tobago-example-demo/pom.xml &lt;arquillian.browser>.</p>
-        <p>If you want to run the tests from your IDE, please use the maven profile 'tomee'.
-          After that, you can start the test from the QUnitTests class.</p>
-      </answer>
-    </faq>
-    <faq id="testInBrowser">
-      <question>How can I run tests in the browser? (Tobago 3)</question>
-      <answer>
-        <ol>
-          <li>start demo
-            <source>cd tobago-example/tobago-example-demo
-mvn clean jetty:run</source>
-          </li>
-          <li>open 'Test' menu in the header of the Tobago-Demo-Page
-            <ol>
-              <li>'Run Test' is enabled if a test is available for the current page.</li>
-              <li>'Run all tests' is enabled if in development mode. (opens every test in a separate iframe)</li>
-              <li>'Access all pages' is enabled if in development mode. (opens every page in a separate iframe)</li>
-            </ol>
-          </li>
-        </ol>
-      </answer>
-    </faq>
-    <faq id="liberty">
-      <question>How can I run the Tobago demo with WebSphere Liberty Profile (WLP) from Maven?</question>
-      <answer>
-        <p>
-          <b>Please use at least Tobago 2.0 for this guidance (in this version the pom.xml files are prepared).</b>
-        </p>
-        <p>
-          You will need to do the following steps for preparation:
-        </p>
-        <ul>
-          <li>Download the server like:
-            <source>wlp-developers-runtime-8.5.5.0.jar</source>
-            from
-            <a href="https://www.ibm.com/developerworks/mydeveloperworks/blogs/wasdev/entry/download?lang=en">IBM</a>
-          </li>
-          <li>
-            Unpack the server anywhere in you file system, e.g. like this
-            <source>mkdir /opt/wlp-developers-runtime-8.5.5.0
-cd /opt/wlp-developers-runtime-8.5.5.0
-java -jar ~/Downloads/wlp-developers-runtime-8.5.5.0.jar</source>
-          </li>
-          <li>
-            Adding your server home to a property in the settings.xml of Maven
-            <source>&lt;wlp.directory&gt;/opt/wlp-developers-runtime-8.5.5.0/wlp&lt;/wlp.directory&gt;</source>
-          </li>
-        </ul>
-        <p>
-          After these steps you can start/stop the server and deploy an built artifact.
-          For these steps, you need to be in the Tobago example demo directory.
-          <source>cd tobago-examples/tobago-example-demo</source>
-          This is <b>important</b> for the first start of the server,
-          because at the first start the server will be initialized.
-          For the setup the file
-          <source>test/resources/server.xml</source>
-          will be read. It contains the features, the WLP server will be support, and other configurations.
-          In our case we have the following features:
-          <source>&lt;feature>cdi-1.0&lt;/feature>
-&lt;feature>jsp-2.2&lt;/feature>
-&lt;feature>servlet-3.0&lt;/feature>
-&lt;feature>jsf-2.0&lt;/feature></source>
-        </p>
-        <ul>
-          <li>
-            Start the server
-            <source>mvn -Pliberty liberty:start-server</source>
-          </li>
-          <li>
-            Build an artifact (you need the "provided" property, because JSF and OWB comes from the server)
-            <source>mvn clean package -Djsf=provided</source>
-          </li>
-          <li>
-            Deploy an artifact
-            <source>mvn -Pliberty liberty:deploy</source>
-          </li>
-          <li>
-            You will find the web application under this URL
-            <source>http://localhost:9080/tobago-example-demo/</source>
-          </li>
-          <li>
-            Redeploy an artifact: The same as deploy.
-          </li>
-          <li>
-            Stop the server
-            <source>mvn -Pliberty liberty:stop-server</source>
-          </li>
-        </ul>
-        <p>
-          The server starts very fast and is simple to use (very different from the full WebSphere installation).
-          The log files you will find here:
-          <source>cd /opt/wlp-developers-8.5.next.beta/wlp/usr/servers/tobago/logs/</source>
-          Sometime you may need to the clean the server, in particular when you are changing JAR dependencies.
-          For doing that
-        </p>
-        <ul>
-          <li>
-            Stop the server
-          </li>
-          <li>
-            Remove the whole concrete server installation
-            <source>rm -r /opt/wlp-developers-8.5.next.beta/wlp/usr/servers/tobago</source>
-          </li>
-          <li>
-            Start the server (don't forget the server.xml)
-          </li>
-          <li>
-            Deploy again
-          </li>
-        </ul>
-        Please also consider the plugin configuration in the tobago-example/pom.xml
-        <source>
-          &lt;groupId>com.ibm.websphere.wlp.maven.plugins&lt;/groupId>
-          &lt;artifactId>liberty-maven-plugin&lt;/artifactId></source>
-      </answer>
-    </faq>
-    <faq id="portlet">
-      <question>How to setup my project to work with Portlets?</question>
-      <answer>
-        <p>
-          There is a basic example for portlets in the GIT repository in the sub-folder
-          tobago-example/tobago-example-portlet
-          There is no specific configuration to use Tobago in Portlets.
-          The portlet stuff is currently not active, so the example is removed in Tobago 4.
-        </p>
-      </answer>
-    </faq>
-  </part>
-</faqs>
diff --git a/src/site/resources/images/addressbook.png b/src/site/resources/images/addressbook.png
deleted file mode 100644
index 5b55e43..0000000
Binary files a/src/site/resources/images/addressbook.png and /dev/null differ
diff --git a/src/site/site.xml b/src/site/site.xml
index beb4c4b..751c2f8 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -38,28 +38,14 @@
       <item name="Apache"   href="http://www.apache.org/"/>
       <item name="MyFaces"  href="http://myfaces.apache.org/"/>
       <item name="Tobago"   href="http://myfaces.apache.org/tobago"/>
-      <item name="Download" href="http://myfaces.apache.org/download.html" />
       <item name="Mailing Lists"    href="http://myfaces.apache.org/tobago/mail-lists.html" />
     </links>
 
     <menu name="Tobago">
       <item name="Introduction"  href="http://myfaces.apache.org/tobago/index.html"/>
-      <item name="Download"      href="http://myfaces.apache.org/tobago/download.html"/>
-      <item name="Demo"          href="http://myfaces.apache.org/tobago/demo.html"/>
-      <item name="Mailing Lists" href="mail-lists.html" />
-    </menu>
-
-    <menu name="Documentation">
-      <item name="Getting Started" href="http://myfaces.apache.org/tobago/getting-started.html"/>
-      <item name="Compatibility" href="http://myfaces.apache.org/tobago/compatibility.html"/>
-      <item name="New in Tobago 4.0" href="http://tobago-vm.apache.org/demo-4-release/content/10-intro/28-new+in+4+0/new+in+4+0.xhtml"/>
+      <item name="Download"      href="http://tobago-vm.apache.org/download.html"/>
+      <item name="Demo &amp; Docs"          href="http://tobago-vm.apache.org/"/>
       <item name="Guide to Tobago" href="http://myfaces.apache.org/tobago/guide.html"/>
-      <item name="Test Tobago" href="http://myfaces.apache.org/tobago/howto-test.html"/>
-      <item name="Migration" href="http://tobago-vm.apache.org/demo-4-release/content/10-intro/50-migration/migration.xhtml"/>
-      <item name="Roadmap" href="https://issues.apache.org/jira/browse/TOBAGO?selectedTab=com.atlassian.jira.plugin.system.project%3Aroadmap-panel" />
-      <item name="FAQ" href="http://myfaces.apache.org/tobago/faq.html" />
-      <item name="API Documentation" href="http://myfaces.apache.org/tobago/api.html" />
-      <item name="Release Checklist" href="http://myfaces.apache.org/tobago/release-checklist.html" />
     </menu>
 
 <!--
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java
new file mode 100644
index 0000000..0657ed3
--- /dev/null
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.tobago.example.demo;
+
+import javax.enterprise.context.RequestScoped;
+import javax.faces.event.AjaxBehaviorEvent;
+import javax.inject.Named;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@RequestScoped
+@Named
+public class ApiController implements Serializable {
+
+  private List<Release> releases;
+  private boolean onlyCurrent = true;
+
+  public ApiController() {
+    init();
+  }
+
+  public void init(final AjaxBehaviorEvent event) {
+    init();
+  }
+
+  private void init() {
+    releases = new ArrayList<>();
+    for (Release release : Release.values()) {
+      if (! release.isUnreleased() && (!onlyCurrent || release.isCurrent())) {
+        releases.add(release);
+      }
+    }
+    Collections.reverse(releases);
+  }
+
+  public List<Release> getReleases() {
+    return releases;
+  }
+
+  public String getBase() {
+    return "http://myfaces.apache.org/tobago";
+  }
+
+  public boolean isOnlyCurrent() {
+    return onlyCurrent;
+  }
+
+  public void setOnlyCurrent(boolean onlyCurrent) {
+    this.onlyCurrent = onlyCurrent;
+  }
+}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Release.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Release.java
new file mode 100644
index 0000000..6dfb6bb
--- /dev/null
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Release.java
@@ -0,0 +1,157 @@
+package org.apache.myfaces.tobago.example.demo;
+
+public enum Release {
+
+  v1_0_7("12310824"),
+  v1_0_8("12310900"),
+  v1_0_9("12312042"),
+  v1_0_10("12312204"),
+  v1_0_11("12312376"),
+  v1_0_12("12312498"),
+  v1_0_13("12312766"),
+  v1_0_14("12312878"),
+  v1_0_15("12312929"),
+  v1_0_16("12312966"),
+  v1_0_17("12313084"),
+  v1_0_18("12313150"),
+  v1_0_19("12313372"),
+  v1_0_20("12313447"),
+  v1_0_21("12313470"),
+  v1_0_22("12314027"),
+  v1_0_23("12314159"),
+  v1_0_24("12314193"),
+  v1_0_25("12314527"),
+  v1_0_26("12314961"),
+  v1_0_27("12315099"),
+  v1_0_28("12315109"),
+  v1_0_29("12315262"),
+  v1_0_30("12315336"),
+  v1_0_31("12315383"),
+  v1_0_32("12315489"),
+  v1_0_33("12315586"),
+  v1_0_34("12316162"),
+  v1_0_35("12316183"),
+  v1_0_36("12316297"),
+  v1_0_37("12316458"),
+  v1_0_38("12317350"),
+  v1_0_39("12319455"),
+  v1_0_40("12319866"),
+  v1_0_41("12324116"),
+  v1_0_42("12326705"),
+  v1_0_43("12333048", false, true),
+
+  v1_5_0_alpha_2("12314340"),
+  v1_5_0_beta_1("12316222"),
+  v1_5_0_beta_2("12317052"),
+  v1_5_0("12312205"),
+  v1_5_1("12319154"),
+  v1_5_2("12319248"),
+  v1_5_3("12319499"),
+  v1_5_4("12319864"),
+  v1_5_5("12319865"),
+  v1_5_6("12321251"),
+  v1_5_7("12321444"),
+  v1_5_8("12322450"),
+  v1_5_9("12323506"),
+  v1_5_10("12324008"),
+  v1_5_11("12324453"),
+  v1_5_12("12325597"),
+  v1_5_13("12325858"),
+  v1_5_14("12326706", false, true),
+
+  v1_6_0_beta_1("12321691"),
+  v1_6_0_beta_2("12321701"),
+
+  v2_0_0_alpha_1("12321874"),
+  v2_0_0_alpha_2("12324818"),
+  v2_0_0_alpha_3("12325247"),
+  v2_0_0_beta_1("12325856"),
+  v2_0_0_beta_2("12326662"),
+  v2_0_0_beta_3("12326693"),
+  v2_0_0_beta_4("12326809"),
+  v2_0_0("12321253"),
+  v2_0_1("12327455"),
+  v2_0_2("12327500"),
+  v2_0_3("12328040"),
+  v2_0_4("12328041"),
+  v2_0_5("12329025"),
+  v2_0_6("12329161"),
+  v2_0_7("12329376"),
+  v2_0_8("12329723"),
+  v2_0_9("12332146"),
+  v2_0_10("12334742"),
+  v2_1_0("12338208"),
+  v2_1_1("12341246", true),
+  v2_1_2("12342740", false, true),
+
+  v3_0_0_alpha_1("12325880"),
+  v3_0_0_alpha_2("12333887"),
+  v3_0_0_alpha_3("12334363"),
+  v3_0_0_alpha_4("12337842"),
+  v3_0_0_alpha_5("12338164"),
+  v3_0_0_alpha_6("12338231"),
+  v3_0_0_alpha_7("12338278"),
+  v3_0_0_beta_1("12333888"),
+  v3_0_0("12325880"),
+  v3_0_1("12338730"),
+  v3_0_2("12339171"),
+  v3_0_3("12339442"),
+  v3_0_4("12340258"),
+  v3_0_5("12340325"),
+  v3_0_6("12341574", true),
+  v3_0_7("12342388", false, true),
+
+  v4_0_0("12338728"),
+  v4_1_0("12339443"),
+  v4_2_0("12342739", true),
+  v4_2_1("12342849", false, true),
+  v4_3_0("12342850", false, true),
+
+  v5_0_0("12338729", false, true);
+
+  private String jira;
+  private String version;
+  private boolean tx;
+  private boolean current;
+  private boolean unreleased;
+
+  Release(final String jira) {
+    this(jira, false, false);
+  }
+
+  Release(final String jira, final boolean current) {
+    this(jira, current, false);
+  }
+
+  Release(final String jira, final boolean current, final boolean unreleased) {
+    this.current = current;
+    this.jira = jira;
+    this.unreleased = unreleased;
+    version = name()
+        .substring(1)
+        .replaceAll("_alpha_", "-alpha-")
+        .replaceAll("_beta_", "-beta-")
+        .replace('_', '.');
+    tx = version.startsWith("1.5") || version.startsWith("1.6");
+  }
+
+  public String getVersion() {
+    return version;
+  }
+
+  public boolean isTx() {
+    return tx;
+  }
+
+  public boolean isCurrent() {
+    return current;
+  }
+
+  public boolean isUnreleased() {
+    return unreleased;
+  }
+
+  public String getJira() {
+    return jira;
+  }
+}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java
index baf0e1c..73ee268 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java
@@ -50,7 +50,7 @@ public class ServerInfo {
   private static final String CONFIG_FILE_DEFAULT = "/etc/tobago-example-demo.properties";
   private static final String ENABLED_KEY = "server.info.enabled";
 
-  private static final String LAST_RELEASED_VERSION = "4.0.0";
+  private static final String LAST_RELEASED_VERSION = "4.1.0";
 
   private String version;
 
diff --git a/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml b/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml
index 1317ab5..c9be892 100644
--- a/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml
+++ b/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml
@@ -38,14 +38,23 @@
 
   <!-- navigate -->
   <entry key="intro">Intro</entry>
+  <entry key="getting_started">Getting started</entry>
+  <entry key="whats_new">What's new?</entry>
+  <entry key="new_in_4_2">Tobago 4.2</entry>
+  <entry key="new_in_4_1">Tobago 4.1</entry>
   <entry key="new_in_4_0">Tobago 4</entry>
   <entry key="new_in_3_0">Tobago 3</entry>
   <entry key="new_in_2_0">Tobago 2</entry>
   <entry key="migration">Migration</entry>
-  <entry key="migration15">to 1.5</entry>
-  <entry key="migration20">to 2</entry>
-  <entry key="migration30">to 3</entry>
-  <entry key="migration40">to 4</entry>
+  <entry key="migration15">1.0 to 1.5</entry>
+  <entry key="migration20">1.5 to 2</entry>
+  <entry key="migration30">2 to 3</entry>
+  <entry key="migration40">3 to 4</entry>
+  <entry key="compatibility">Compatibility</entry>
+  <entry key="faq">FAQ</entry>
+  <entry key="api">API</entry>
+  <entry key="download">Download</entry>
+  <entry key="release_checklist">Release Checklist</entry>
 
   <!-- navigate : components -->
   <entry key="component">Components</entry>
diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/000-default.conf b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/000-default.conf
index 38abb58..1fa2e4b 100644
--- a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/000-default.conf
+++ b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/000-default.conf
@@ -16,6 +16,8 @@
 ServerTokens ProductOnly
 ServerSignature Off
 
+ServerName tobago-vm.apache.org
+
 <VirtualHost *:80>
 
 	ServerName tobago-vm.apache.org
@@ -24,6 +26,17 @@ ServerSignature Off
 	ErrorLog ${APACHE_LOG_DIR}/error.log
 	CustomLog ${APACHE_LOG_DIR}/access.log combined
 
+# Permanent external links:
+  Redirect temp /intro.html             /demo-4-release/content/10-intro/intro.xhtml
+  Redirect temp /getting-started.html   /demo-4-release/content/10-intro/10-getting-started/getting-started.xhtml
+  Redirect temp /whats-new.html         /demo-4-release/content/10-intro/30-whats-new/whats-new.xhtml
+  Redirect temp /migration.html         /demo-4-release/content/10-intro/50-migration/migration.xhtml
+  Redirect temp /compatibility.html     /demo-4-release/content/10-intro/60-compatibility/compatibility.xhtml
+  Redirect temp /faq.html               /demo-4-release/content/10-intro/70-faq/faq.xhtml
+  Redirect temp /api.html               /demo-4-release/content/10-intro/80-api/api.xhtml
+  Redirect temp /download.html          /demo-4-release/content/10-intro/85-download/download.xhtml
+  Redirect temp /release-checklist.html /demo-4-release/content/10-intro/90-release-checklist/release-checklist.xhtml
+
 # 4
 
   <Location /demo-4-release/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/10-getting-started/getting-started.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/10-getting-started/getting-started.xhtml
new file mode 100644
index 0000000..05c9869
--- /dev/null
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/10-getting-started/getting-started.xhtml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition template="/main.xhtml"
+                xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:tc="http://myfaces.apache.org/tobago/component"
+                xmlns:ui="http://java.sun.com/jsf/facelets">
+  <ui:param name="title" value="#{demoBundle.getting_started}"/>
+
+  This section describes how to build Tobago and run the
+  example applications from the sources.
+
+  <tc:section label="Checking Out">
+
+    Check out the 4.x.x sources by running the following:
+
+    <pre><code class="language-bash">$ git clone https://github.com/apache/myfaces-tobago tobago</code></pre>
+
+    Check out the 3.0.x sources by running the following:
+
+    <pre><code
+        class="language-bash">$ git clone -b tobago-3.0.x https://github.com/apache/myfaces-tobago tobago-3.0.x</code></pre>
+
+    Check out the 2.0.x sources by running the following:
+
+    <pre><code
+        class="language-bash">$ git clone -b tobago-2.0.x https://github.com/apache/myfaces-tobago tobago-2.0.x</code></pre>
+
+  </tc:section>
+
+  <tc:section label="Building">
+
+    <p>
+      You need <tc:link label="Maven" link="http://maven.apache.org/download.html" image="fa-external-link"/> (at
+      least version 3.0.4)
+      and Java (version 8 or higher) to build Tobago.
+    </p>
+
+    <p>
+      Change to the local loaded source directory and call
+    </p>
+
+    <pre><code class="language-bash">$ mvn</code></pre>
+
+    <p>
+      or
+    </p>
+
+    <pre><code class="language-bash">$ mvn clean install</code></pre>
+
+    <p>
+      to run the install target on all sub projects. This will
+      download all necessary artifacts into your local Maven repository.
+    </p>
+
+  </tc:section>
+
+  <tc:section label="Examples">
+
+    You can run the examples inside tobago-example with jetty
+
+    <pre><code class="language-bash">$ mvn jetty:run</code></pre>
+
+    or
+
+    <pre><code class="language-bash">$ mvn package</code></pre>
+
+    and deploy the WAR from the target directory manually.
+
+    <tc:section label="Using different JSF implementations">
+
+      By default the example will be started with MyFaces 2.0
+      You can run the examples with other version like you see here:
+
+      <pre><code class="language-bash">$ mvn jetty:run</code></pre>
+
+      You can select a specific MyFaces version with the <i>jsf</i> variable.
+
+      <pre><code class="language-bash">$ mvn jetty:run -Djsf=myfaces-2.1
+$ mvn jetty:run -Djsf=myfaces-2.2
+$ mvn jetty:run -Djsf=myfaces-2.3</code></pre>
+
+      Or you can select Mojarra with a specific version.
+
+      <pre><code class="language-bash">$ mvn jetty:run -Djsf=mojarra-2.0
+$ mvn jetty:run -Djsf=mojarra-2.1
+$ mvn jetty:run -Djsf=mojarra-2.2
+$ mvn jetty:run -Djsf=mojarra-2.3</code></pre>
+    </tc:section>
+
+  </tc:section>
+
+</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/migration.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/68-new-in-4-2/new-in-4-2.xhtml
similarity index 52%
copy from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/migration.xhtml
copy to tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/68-new-in-4-2/new-in-4-2.xhtml
index 4d45d86..d9fdb83 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/migration.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/68-new-in-4-2/new-in-4-2.xhtml
@@ -20,13 +20,30 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
-  <ui:param name="title" value="#{demoBundle.migration}"/>
+                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:f="http://java.sun.com/jsf/core">
+  <ui:param name="title" value="#{demoBundle.new_in_4_2}"/>
 
-  <tc:section label="Migration of Tobago applications">
+  <tc:section label="Overview">
+    <p>
+      In April 2018, Tobago 4.2 was released with some bugfixes and new features.
+    </p>
+  </tc:section>
 
-    Here you can find migration guides to the major versions of Tobago.
+  <tc:section label="New Features and Enhancements">
 
-  </tc:section>
+    <ul>
+      <li>Desktop-like vertial layout is possible (like in Tobago 2), use <code>markup="spread"</code></li>
+      <li>New component &lt;tc:badge/> <tc:badge value="badge"/></li>
+      <li>&lt;tc:selectReference> is fixed</li>
+      <li>Better compatibility with Mojarra</li>
+      <li>Theme Charlotteville</li>
+      <li>Many other enhancements and bugfixes</li>
+    </ul>
 
+    The full list is available in
+    <tc:link label="Jira" image="fa-external-link"
+             link="https://issues.apache.org/jira/projects/TOBAGO/versions/12342739"/>.
+
+  </tc:section>
 </ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/migration.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/69-new-in-4-1/new-in-4-1.xhtml
similarity index 56%
copy from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/migration.xhtml
copy to tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/69-new-in-4-1/new-in-4-1.xhtml
index 4d45d86..5a22708 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/migration.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/69-new-in-4-1/new-in-4-1.xhtml
@@ -20,13 +20,28 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
-  <ui:param name="title" value="#{demoBundle.migration}"/>
+                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:f="http://java.sun.com/jsf/core">
+  <ui:param name="title" value="#{demoBundle.new_in_4_1}"/>
 
-  <tc:section label="Migration of Tobago applications">
+  <tc:section label="Overview">
+    <p>
+      In February 2018, Tobago 4.1 was released with some bugfixes and new features.
+    </p>
+  </tc:section>
 
-    Here you can find migration guides to the major versions of Tobago.
+  <tc:section label="New Features and Enhancements">
 
-  </tc:section>
+    <ul>
+      <li>Update to Bootstrap 4.0.0 (final)</li>
+      <li>New component for rating: &lt;tc:stars> <tc:stars value="4"/></li>
+      <li>Converter for tab label and box label</li>
+      <li>Change style of &lt;tc:tabGroup> to Bootstrap 4</li>
+    </ul>
 
+    The full list is available in
+    <tc:link label="Jira" image="fa-external-link"
+             link="https://issues.apache.org/jira/projects/TOBAGO/versions/12339443"/>.
+
+  </tc:section>
 </ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/28-new+in+4+0/new+in+4+0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/70-new-in-4-0/new-in-4-0.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/28-new+in+4+0/new+in+4+0.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/70-new-in-4-0/new-in-4-0.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/80-new-in-3-0/new-in-3-0.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/80-new-in-3-0/new-in-3-0.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/40-new+in+2+0/new+in+2+0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/90-new-in-2-0/new-in-2-0.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/40-new+in+2+0/new+in+2+0.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/90-new-in-2-0/new-in-2-0.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/whats-new.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/whats-new.xhtml
new file mode 100644
index 0000000..8e23691
--- /dev/null
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/whats-new.xhtml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition template="/main.xhtml"
+                xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:tc="http://myfaces.apache.org/tobago/component"
+                xmlns:ui="http://java.sun.com/jsf/facelets">
+  <ui:param name="title" value="#{demoBundle.whats_new}"/>
+
+  <p>
+    Here you find a condensed overview by versions:
+  </p>
+  <ul>
+    <li>
+      <tc:link label="#{demoBundle.new_in_4_2}"
+               outcome="/content/10-intro/30-whats-new/68-new-in-4-2/new-in-4-2.xhtml"/>
+    </li>
+    <li>
+      <tc:link label="#{demoBundle.new_in_4_1}"
+               outcome="/content/10-intro/30-whats-new/69-new-in-4-1/new-in-4-1.xhtml"/>
+    </li>
+    <li>
+      <tc:link label="#{demoBundle.new_in_4_0}"
+               outcome="/content/10-intro/30-whats-new/70-new-in-4-0/new-in-4-0.xhtml"/>
+    </li>
+    <li>
+      <tc:link label="#{demoBundle.new_in_3_0}"
+               outcome="/content/10-intro/30-whats-new/80-new-in-3-0/new-in-3-0.xhtml"/>
+    </li>
+    <li>
+      <tc:link label="#{demoBundle.new_in_2_0}"
+               outcome="/content/10-intro/30-whats-new/90-new-in-2-0/new-in-2-0.xhtml"/>
+    </li>
+  </ul>
+  <p>
+    You'll find all changes in the issue tracking system
+    <tc:link label="Jira" link="https://issues.apache.org/jira/projects/TOBAGO" image="fa-external-link"/>.
+  </p>
+
+</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/migration.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/migration.xhtml
index 4d45d86..f3b5845 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/migration.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/migration.xhtml
@@ -25,7 +25,28 @@
 
   <tc:section label="Migration of Tobago applications">
 
-    Here you can find migration guides to the major versions of Tobago.
+    <p>
+      Here you can find migration guides to the major versions of Tobago.
+    </p>
+
+    <ul>
+      <li>
+        <tc:link label="#{demoBundle.migration40}"
+                 outcome="/content/10-intro/50-migration/96-migration/migration40.xhtml"/>
+      </li>
+      <li>
+        <tc:link label="#{demoBundle.migration30}"
+                 outcome="/content/10-intro/50-migration/97-migration/migration30.xhtml"/>
+      </li>
+      <li>
+        <tc:link label="#{demoBundle.migration20}"
+                 outcome="/content/10-intro/50-migration/98-migration/migration20.xhtml"/>
+      </li>
+      <li>
+        <tc:link label="#{demoBundle.migration15}"
+                 outcome="/content/10-intro/50-migration/99-migration/migration15.xhtml"/>
+      </li>
+    </ul>
 
   </tc:section>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/60-compatibility/compatibility.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/60-compatibility/compatibility.xhtml
new file mode 100644
index 0000000..81f8368
--- /dev/null
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/60-compatibility/compatibility.xhtml
@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition template="/main.xhtml"
+                xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:tc="http://myfaces.apache.org/tobago/component"
+                xmlns:ui="http://java.sun.com/jsf/facelets">
+  <ui:param name="title" value="#{demoBundle.compatibility}"/>
+
+  <p>
+    Tobago was compatible with the following specifications, libraries and containers.
+    This list is not exhaustive, additions are welcome.
+  </p>
+  <table class="table table-bordered">
+    <tbody>
+    <tr>
+      <th>Tobago Version</th>
+      <th>1.0.x<tc:badge value="archived"/></th>
+      <th>1.5.x<tc:badge value="archived"/></th>
+      <th>2.x</th>
+      <th>3.x</th>
+      <th>4.x</th>
+    </tr>
+    <tr>
+      <th colspan="6">Specifications</th>
+    </tr>
+    <tr>
+      <td>Java</td>
+      <td>1.4<tc:badge value="retro"/>, <b>1.5</b>, 1.6, 1.7</td>
+      <td>1.5, 1.6, 1.7, 1.8</td>
+      <td> 1.5, 1.6, 1.7, 1.8, 9</td>
+      <td>1.8, 9, 10</td>
+      <td>1.8, 9, 10, ...</td>
+    </tr>
+    <tr>
+      <td>JSF</td>
+      <td><b>1.1</b>, 1.2</td>
+      <td>1.2, 2.0<tc:badge value="disable vh"/>, 2.1<tc:badge value="disable vh"/></td>
+      <td>2.0, 2.1, 2.2</td>
+      <td>2.0, 2.1, 2.2</td>
+      <td>2.0, 2.1, 2.2, 2.3</td>
+    </tr>
+    <tr>
+      <td>Facelets</td>
+      <td><b>1.1</b><tc:badge value="ext"/></td>
+      <td><b>1.1</b><tc:badge value="ext"/></td>
+      <td><tc:badge value="int"/></td>
+      <td><tc:badge value="int"/></td>
+      <td><tc:badge value="int"/></td>
+    </tr>
+    <tr>
+      <td>Servlet</td>
+      <td> 2.3, <b>2.4</b>, 2.5</td>
+      <td>2.4<tc:badge value="facelets only"/>, <b>2.5</b>, 3.0</td>
+      <td>2.4<tc:badge value="facelets only"/>, <b>2.5</b>, <b>3.0</b>, <b>3.1</b></td>
+      <td>3.0, 3.1</td>
+      <td>?</td>
+    </tr>
+    <tr>
+      <td>JSP</td>
+      <td>1.2, <b>2.0</b>, 2.1</td>
+      <td><b>2.1</b>, 2.2</td>
+      <td>2.1, 2.2</td>
+      <td>-</td>
+      <td>-</td>
+    </tr>
+    <tr>
+      <th colspan="6">Implementations</th>
+    </tr>
+    <tr>
+      <td>MyFaces</td>
+      <td>yes</td>
+      <td>yes</td>
+      <td>yes</td>
+      <td>yes</td>
+      <td>yes</td>
+    </tr>
+    <tr>
+      <td>Mojarra</td>
+      <td>yes</td>
+      <td>yes</td>
+      <td>yes</td>
+      <td>yes</td>
+      <td>yes</td>
+    </tr>
+    <tr>
+      <th colspan="6">Servers</th>
+    </tr>
+    <tr>
+      <td>Tomcat</td>
+      <td>4.1, 5.0, 5.5, 6, 7</td>
+      <td> 5.5<tc:badge value="facelets only"/>, 6, 7</td>
+      <td>5.5<tc:badge value="facelets only"/>, 6, 7</td>
+      <td>7, 8</td>
+      <td>7, 8</td>
+    </tr>
+    <tr>
+      <td>Jetty</td>
+      <td> 6, 7</td>
+      <td>6, 7, 8</td>
+      <td> 6, 7, 8</td>
+      <td> 8, 9</td>
+      <td> 8, 9</td>
+    </tr>
+    <tr>
+      <td>WebLogic</td>
+      <td> 8.1, 9.0, 9.1, 9.2, 10, 11g</td>
+      <td>9.2<tc:badge value="facelets only"/>, 10, 11g, 12c</td>
+      <td>9.2<tc:badge value="facelets only"/>, 10, 11g, 12c</td>
+      <td>12c</td>
+      <td>12c</td>
+    </tr>
+    <tr>
+      <td>WebSphere</td>
+      <td>6.0, 6.1</td>
+      <td> 6.1<tc:badge value="facelets only"/>, 7, 8, 8.5</td>
+      <td>6.1<tc:badge value="facelets only"/>, 7, 8, 8.5</td>
+      <td>8, 8.5</td>
+      <td>8, 8.5</td>
+    </tr>
+    <tr>
+      <td>Other</td>
+      <td><tc:badge value="other servers"/></td>
+      <td><tc:badge value="other servers"/></td>
+      <td><tc:badge value="other servers"/></td>
+      <td><tc:badge value="other servers"/></td>
+      <td><tc:badge value="other servers"/></td>
+    </tr>
+    <tr>
+      <th colspan="6">Browser</th>
+    </tr>
+    <tr>
+      <td>Internet Explorer / Edge</td>
+      <td>6, 7, 8, 9, 10, 11</td>
+      <td>6, 7, 8, 9, 10, 11, ...</td>
+      <td>6<tc:badge value="lim"/>, 7<tc:badge value="lim"/>, 8<tc:badge value="lim"/>, 9, 10, 11, ...</td>
+      <td>10<tc:badge value="lim"/>, 11, ...</td>
+      <td>10<tc:badge value="lim"/>, 11, ...</td>
+    </tr>
+    <tr>
+      <td>Firefox</td>
+      <td>2, 3, 4, ...</td>
+      <td>2, 3, 4, ...</td>
+      <td>2<tc:badge value="lim"/>, 3, 4, ...</td>
+      <td><tc:badge value="latest"/></td>
+      <td><tc:badge value="latest"/></td>
+    </tr>
+    <tr>
+      <td>Safari</td>
+      <td>-</td>
+      <td>4, 5, 6, ...</td>
+      <td>4, 5, 6, ...</td>
+      <td><tc:badge value="latest"/></td>
+      <td><tc:badge value="latest"/></td>
+    </tr>
+    <tr>
+      <td>Chrome</td>
+      <td>-</td>
+      <td>5, ...</td>
+      <td>5, ...</td>
+      <td><tc:badge value="latest"/></td>
+      <td><tc:badge value="latest"/></td>
+    </tr>
+    <tr>
+      <td>Opera</td>
+      <td>-</td>
+      <td>10, 11</td>
+      <td>10, 11, ...</td>
+      <td><tc:badge value="latest"/></td>
+      <td><tc:badge value="latest"/></td>
+    </tr>
+    <tr>
+      <td><tc:badge value="other browsers"/></td>
+      <td><tc:badge value="other browsers"/></td>
+      <td><tc:badge value="other browsers"/></td>
+      <td><tc:badge value="other browsers"/></td>
+      <td><tc:badge value="other browsers"/></td>
+      <td><tc:badge value="other browsers"/></td>
+    </tr>
+    <tr>
+      <th colspan="6">Frameworks</th>
+    </tr>
+    <tr>
+      <td>CDI</td>
+      <td></td>
+      <td>yes</td>
+      <td>yes</td>
+      <td>yes</td>
+      <td>yes</td>
+    </tr>
+    <tr>
+      <td>Codi</td>
+      <td></td>
+      <td>yes</td>
+      <td>yes</td>
+      <td>yes</td>
+      <td>yes</td>
+    </tr>
+    <tr>
+      <td>DeltaSpike</td>
+      <td></td>
+      <td>yes</td>
+      <td>yes</td>
+      <td>yes</td>
+      <td>yes</td>
+    </tr>
+    <tr>
+      <td>JSR-303 / BV</td>
+      <td></td>
+      <td>yes</td>
+      <td>yes</td>
+      <td>yes</td>
+      <td>yes</td>
+    </tr>
+    </tbody>
+  </table>
+
+  <!-- JSF Addon-Frameworks: Apache Shale Dialog, Apache Shale Clay, Spring Web Flow, Seam, WebBeans, "Validator", ...-->
+  <!-- IoC Frameworks: Spring, Guice, ...-->
+  <!-- Component Libs: Richfaces, Icefaces, Trinidad, Tomahawk ...-->
+
+  <dl>
+    <dt><b>bold:</b></dt>
+    <dd>preferred</dd>
+
+    <dt>normal</dt>
+    <dd>compatible</dd>
+
+    <dt><tc:badge value="archived"/></dt>
+    <dd>this version of Tobago is archived and not under active development</dd>
+
+    <dt><tc:badge value="retro"/></dt>
+    <dd>use the JDK 1.4 retro version (available for Tobago 1.0.41 and before)</dd>
+
+    <dt><tc:badge value="ext"/></dt>
+    <dd>add the tobago-facelets extension</dd>
+
+    <dt><tc:badge value="int"/></dt>
+    <dd>since Tobago 2.0 and JSF 2.0 Facelets are integrated in JSF</dd>
+
+    <dt><tc:badge value="tbd"/></dt>
+    <dd>to be defined (this information is unsettled and may change)</dd>
+
+    <dt><tc:badge value="lim"/></dt>
+    <dd>these old browsers are generally supported, but may have weak appearance</dd>
+
+    <dt><tc:badge value="facelets only"/></dt>
+    <dd>it works with facelets, but not with JSP, because JSF 1.2 requires JSP 2.1</dd>
+
+    <dt><tc:badge value="other servers"/></dt>
+    <dd>other servers should work, when they are compliant to the named specifications</dd>
+
+    <dt><tc:badge value="latest"/></dt>
+    <dd>all browser supported by Bootstrap 4 are supported, these are usually the latest, stable releases</dd>
+
+    <dt><tc:badge value="other browsers"/></dt>
+    <dd>other browsers should work, in their actual version, when they are standard compliant to HTML 4 and CSS 2.1</dd>
+
+    <dt><tc:badge value="no release"/></dt>
+    <dd>Using Tobago 1.5 with JSF 1.1 is currently not part of the release, but can be build from the sources with mvn -Pjsf-1.1</dd>
+
+    <dt><tc:badge
+        value="disable vh"/></dt>
+    <dd>Tobago 1.5 works with JSF 2.0 when you are disable the Facelets ViewHandler from JSF 2.0 and using the
+      original Facelets:
+      <pre><code class="language-markup">&lt;context-param>
+  &lt;description>For backward compatibility (using "old" Facelets with JSF 2.0)&lt;/description>
+  &lt;param-name>javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER&lt;/param-name>
+  &lt;param-value>true&lt;/param-value>
+&lt;/context-param></code></pre>
+    </dd>
+  </dl>
+
+</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/faq.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/faq.xhtml
new file mode 100644
index 0000000..c4eaf70
--- /dev/null
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/faq.xhtml
@@ -0,0 +1,529 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition template="/main.xhtml"
+                xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:tc="http://myfaces.apache.org/tobago/component"
+                xmlns:ui="http://java.sun.com/jsf/facelets">
+  <ui:param name="title" value="#{demoBundle.faq}"/>
+
+  <tc:section id="howto" label="Where can I find documentation or HowTos for using Tobago?">
+    <p>
+      The use of Tobago is explained in the
+      <a href="http://tobago-vm.apache.org/">Demo</a>.
+    </p>
+  </tc:section>
+
+  <tc:section id="support" label="Where can I find support?">
+    <p>
+      You may subscribe to the user <a href="http://myfaces.apache.org/tobago/mail-lists.html">mailing list</a>,
+      and post questions there.
+    </p>
+  </tc:section>
+
+  <tc:section id="hello-world" label="Where can I find a 'Hello World' example and a list of required jars?">
+    <p>
+      Please look at
+      <a href="https://github.com/apache/myfaces-tobago/tobago-example/tobago-example-blank/">
+        tobago-example-blank</a> or download the myfaces-tobago-example from the
+      <a href="https://repository.apache.org/content/repositories/snapshots/org/apache/myfaces/tobago/">nightly builds directory</a>.
+    </p>
+  </tc:section>
+
+  <tc:section id="tobago-RI" label="Does Tobago run with the Sun reference implementation (RI)?">
+    <p>Tobago runs with Sun RI and with MyFaces.
+      Please take a look at the
+      <tc:link image="fa-external-link" link="http://tobago-vm.apache.org/compatibility.html" label="Compatibility"/>
+    List.</p>
+  </tc:section>
+
+  <tc:section id="tobago-facelets" label="Does Tobago supports Facelets?">
+    <p>Tobago 2.0.x:</p>
+    <p>Tobago supports the JSF 2.0 Facelets.
+      Note: Please add following context param in your web.xml</p>
+    <pre><code class="language-markup">&lt;context-param>
+  &lt;param-name>javax.faces.FACELETS_SKIP_COMMENTS&lt;/param-name>
+  &lt;param-value>true&lt;/param-value>
+&lt;/context-param></code></pre>
+    <p>Tobago 1.0.x and 1.5.x:</p>
+    <p>Tobago supports Facelets with the tobago-facelets.jar.
+      Note: Please add following context param in your web.xml</p>
+    <pre><code class="language-markup">&lt;context-param>
+  &lt;param-name>facelets.SKIP_COMMENTS&lt;/param-name>
+  &lt;param-value>true&lt;/param-value>
+&lt;/context-param></code></pre>
+  </tc:section>
+
+  <tc:section id="tobago-myfaces-extension">Can I mix Tobago and MyFaces extensions in the same web application?
+    >
+    <p>JSF only supports one renderkit (renderkitId) per page (f:view).
+      Because Tobago has it's own renderkitId you cannot use any non-Tobago
+      components that need a renderer.
+    </p>
+  </tc:section>
+
+  <tc:section id="tobago-layout" label="How do I use GridLayout in Tobago?">
+          <pre><code class="language-markup">
+        &lt;tc:gridLayout rows="auto 100px 1fr 2fr" /></code></pre>
+    <p>
+      The attribute 'fixed' means a theme dependent height of one row (i.e. in Speyside
+      a row is typically 20px high.) In a 'fixed' row all one height unit high elements find their place
+      (like buttons, input fields, one row of text...).<br/>
+      Using px heights is at your own risk, but it is sometimes needed for elements like box or sheet.
+    </p>
+    <p>
+      Alternatively you can give elements a proportion with the * notation.<br/>
+      For example rows="1fr 2fr" gives the first row 1/3 of the available vertical space and the
+      second row 2/3. This works fine for columns, too.
+    </p>
+    <p>
+      You can group elements with a tc:panel element. Such a panel is interpreted as one
+      element regarding layout. The panel itself can have its own layout for multiple elements inside
+      the panel.
+    </p>
+  </tc:section>
+
+  <tc:section id="tobago-fileupload" label="How do I configure file upload in Tobago?">
+    <p>Till Tobago 2.0 and lower, you have two options.</p>
+    <p>Add a TobagoMultipartFormdataFilter to your web.xml.
+      <a href="http://myfaces.apache.org/tobago/apidocs/org/apache/myfaces/tobago/webapp/TobagoMultipartFormdataFilter.html">JavaDoc Description</a>
+    </p>
+    <p>Add the tobago-fileupload.jar to your project.
+      The tobago-fileupload.jar contains a FacesContextFactory that wraps the
+      multipart-formdata request inside the FacesContext.
+      <a href="http://myfaces.apache.org/tobago/apidocs/org/apache/myfaces/tobago/fileupload/FileUploadFacesContextFactoryImpl.html">JavaDoc Description</a>
+    </p>
+    <p>Starting with Tobago 3.0 the Servlet API 3.0 will be used. Some more information about the
+      usage you will find in <a href="https://issues.apache.org/jira/browse/TOBAGO-1539">Jira</a>
+      and in the
+      <a href="http://tobago-vm.apache.org/demo-3-release/faces/content/20-component/100-upload/upload.xhtml">Tobago Demo 3.0</a>.
+      There is also a
+      <a href="http://tobago-vm.apache.org/migration-guide.html">migration guide</a> available.
+    </p>
+  </tc:section>
+
+  <tc:section id="tobago-form" label="Do I need a form tag in a normal Tobago page?">
+    <p>The page tag already acts like a form tag. You only need a explicit form tag for partial validation of your data.
+      Please look at the forms example in the
+      <a href="http://tobago-vm.apache.org/demo-3-release/faces/content/30-concept/08-form/form.xhtml">Tobago demo</a>
+    </p>
+  </tc:section>
+
+  <tc:section id="tobago-browser" label="Which web browsers are currently supported by Tobago?">
+    <p>Please take a look at the
+      <tc:link image="fa-external-link" link="http://tobago-vm.apache.org/compatibility.html" label="Compatibility"/>
+      List.</p>
+  </tc:section>
+
+  <tc:section id="tobago-owntheme" label="How do I create my own theme?">
+    <p>
+      You have to define a new name for the theme in the META-INF/tobago-config.xml.
+      Choose a fallback theme in the tobago-config.xml.
+      Put the modified resources under the resource-path + theme-name.
+      An example for this is the charlotteville theme. (TODO more details resource handling)
+    </p>
+    <p>
+      Example layout of a theme jar:
+    </p>
+    <pre><code class="language-markup">
+        /META-INF/tobago-config.xml
+        (resource-path/html/theme-name)
+        /org/apache/myfaces/tobago/renderkit/html/xxxxx/standard/style/tobago.css (standard styles)
+        /org/apache/myfaces/tobago/renderkit/html/xxxxx/standard/style/tobago-menu.css (menu styles)
+        /org/apache/myfaces/tobago/renderkit/html/xxxxx/standard/style/tobago-sheet.css (sheet styles)
+        /org/apache/myfaces/tobago/renderkit/html/xxxxx/msie/style/tobago.css (different styles for msie)</code></pre>
+
+    Property and resource loading and renderer loading is done in the following order
+    <pre><code class="language-markup">
+        resource-path/content-type/theme/client/[tag(for renderer)|property|style|script|image]_locale
+        .(class|property|property.xml|css|js|gif|png...]</code></pre>
+
+    for example OutRenderer<br/>
+
+    org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag.OutRenderer<br/>
+
+    OutRenderer is getRendererType() + "Renderer"<br/>
+
+    The locale handling is handled like the Properties Class.<br/>
+
+    You have not define everything because the ResourceManager is asking the fallback theme for missing resources<br/>
+
+    The fallback theme of charlotteville is speyside.<br/>
+    The fallback theme of speyside is scarborough.<br/>
+    The fallback theme of scarborough is standard<br/>
+
+    The resource manager looks in the case of the charlotteville theme in<br/>
+    charlotteville -> speyside -> scarborough -> standard
+    <p>
+      Please look at
+      <a href="https://github.com/apache/myfaces-tobago/tobago-theme/tobago-theme-example/src/main/resources">
+        tobago-example-theme
+      </a>
+    </p>
+  </tc:section>
+
+  <tc:section id="tobago-custommarkup" label="How do I use and extend the markup attribute?">
+    <p>UIBox, UIInput and UIOutput support custom markup with the markup attribute.
+      The supported markup is defined in the tobago-config.xml.
+      The standard markup is defined in tobago-config.xml of the tobago-theme-standard.
+      This can be extended in your own theme.
+      The markup attribute is rendered as a CSS class tobago-[renderer-name.toLowerCase]-markup-[markup].
+      For an example please look at the markup number and the CSS class tobago-in-markup-number for UIIn
+      in theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css
+    </p>
+  </tc:section>
+
+
+  <tc:section id="tobago-container" label="In which containers was Tobago tested?">
+    <p>Please take a look at the
+      <tc:link image="fa-external-link" link="http://tobago-vm.apache.org/compatibility.html" label="Compatibility"/>
+      List.
+      Feel free to post your own experiences.</p>
+  </tc:section>
+
+
+  <tc:section id="tiles-sitemesh">Can Tobago replace Tiles? Can I ignore Tiles and Sitemesh in
+    favor of Tobago?
+    >
+    <p>Tobago cannot replace it. But sometimes you may not need it, when
+      you are using Tobago.
+      If you want to position and size your components automatically, you
+      can do this with a Tobago LayoutManager.
+      If you want your header and sidebar rendered without writing duplicate
+      code, you may use JSP 2.0 tag files, Facelets or Tiles/Sitemesh.
+    </p>
+  </tc:section>
+
+  <tc:section id="maven-mirror" label="How to configure a maven mirror?">
+    <p>
+      If you want to set up a different mirror for some reason, you can use
+      your ~/.m2/settings.xml and add the following lines:
+    </p>
+    <pre><code class="language-markup">
+        &lt;mirrors>
+        &lt;mirror>
+        &lt;id>mirror ID&lt;/id>
+        &lt;name>Give it a name&lt;/name>
+        &lt;url>The URL of the mirror&lt;/url>
+        &lt;mirrorOf>The server ID of the repository being mirrored.
+        This must not match the mirror ID&lt;/mirrorOf>
+        &lt;/mirror>
+        &lt;/mirrors></code></pre>
+    <p>See:
+      <a href="http://maven.apache.org/guides/mini/guide-mirror-settings.html">
+        Guide to mirror settings
+      </a>
+    </p>
+    <p>Mirrors:
+      <a href="http://docs.codehaus.org/display/MAVENUSER/Mirrors+Repositories">
+        List of mirrors
+      </a>
+    </p>
+  </tc:section>
+
+  <tc:section id="offline-build" label="How do I configure an offline build?">
+    <p>
+      If you run into problems with fetching jars from the online
+      repository, you can configure Maven not to fetch them but use
+      the ones already in your local repository by adding the following to your ~/.m2/settings.xml:
+    </p>
+    <pre><code class="language-markup">
+        &lt;settings>
+        &lt;offline/>
+        &lt;/settings></code></pre>
+    <p>or use the mvn -o switch.</p>
+  </tc:section>
+
+  <tc:section id="checkstyle" label="How do I perform a local checkstyle check?">
+          <pre><code class="language-markup">
+        mvn compile checkstyle:check</code></pre>
+  </tc:section>
+
+  <tc:section id="checkstyle-vdl"
+              label="How do I check the syntax of Facelet-Files (*.xhtml) with respect to the Taglib?">
+    <p>
+      The problem is, that there is no concept for <em>deprecation</em> in Taglibs.
+      The tobago-core.jar contains a generated checkstyle configuration to perform
+      a syntax check via the maven checkstyle plugin.
+    </p>
+
+    <p>
+      Configure in the applications pom.xml an entry like this example
+    </p>
+    <pre><code class="language-markup">    &lt;profile>
+          &lt;id>checkstyle-for-view-definition-language&lt;/id>
+          &lt;build>
+          &lt;plugins>
+          &lt;plugin>
+          &lt;groupId>org.apache.maven.plugins&lt;/groupId>
+          &lt;artifactId>maven-checkstyle-plugin&lt;/artifactId>
+          &lt;configuration>
+          &lt;configLocation>META-INF/checkstyle-tobago.xml&lt;/configLocation>
+          &lt;includes>**/*.xhtml&lt;/includes>
+          &lt;excludes>**/*.java&lt;/excludes>
+          &lt;sourceDirectory>src/main/webapp&lt;/sourceDirectory>
+          &lt;/configuration>
+          &lt;dependencies>
+          &lt;dependency>
+          &lt;groupId>org.apache.myfaces.tobago&lt;/groupId>
+          &lt;artifactId>tobago-core&lt;/artifactId>
+          &lt;version>\${tobago.version}&lt;/version>
+          &lt;/dependency>
+          &lt;/dependencies>
+          &lt;/plugin>
+          &lt;/plugins>
+          &lt;/build>
+          &lt;/profile>
+        </code></pre>
+    <p>
+      To perform a check call
+    </p>
+    <pre><code class="language-markup">
+          mvn checkstyle:check -Pcheckstyle-for-view-definition-language</code></pre>
+    <p>
+      You will find the result in target/checkstyle-result.xml
+    </p>
+  </tc:section>
+
+  <tc:section id="max-path" label="Why my Subversion checkout fails on Windows?">
+    One reason is, that the checked out files will have a too long path name.
+    Under Windows the MAX_PATH is set to 260 characters. When you try to checkout in
+    a directory like C:\Dokumente und Einstellungen\MyUser\Apache Projects\
+    the path will be too long. A workaround will be checking out in an other directory
+    or register a new drive letter and check it out in X:
+    <pre><code class="language-markup">
+        SUBST X: "C:\Dokumente und Einstellungen\MyUser\Apache Projects\"</code></pre>
+  </tc:section>
+
+  <tc:section id="seleniumTobago12" label="How can I run the Selenium tests? (Tobago 1 and 2)">
+    <p>
+      In the tobago-example-test application, the pages can be checked with selenium since Tobago 1.5.
+      To run the full test automatically call
+    </p>
+    <pre><code class="language-markup">
+          mvn -P integration-test</code></pre>
+    <p>
+      This will start a jetty server and a selenium server and calls every listed page in the test application.
+    </p>
+
+    <p>
+      If you want to run the tests from your IDE, please start the jetty with
+      <code class="language-markup">
+        mvn jetty:run</code> or <code class="language-markup">mvn jetty:run-exploded</code>
+      and start the selenium server with
+    </p>
+    <pre><code class="language-markup">
+          mvn selenium:start-server</code></pre>
+    <p>
+      Now you can start the selenium tests in the IDE.
+    </p>
+    <p>
+      Sometimes there is a problem with Firefox. You may try to use a different version, or an installation without
+      plugins.
+    </p>
+  </tc:section>
+
+  <tc:section id="integrationTestTobago3" label="How can I run the integration tests? (Tobago 3)">
+    <p>In the tobago-example-demo application, the pages can be checked with QUnit/Arquillian.
+      To run the full test automatically call
+    </p>
+    <pre><code class="language-markup">cd tobago-example/tobago-example-demo
+          mvn verify -Pqunit-integration-tests</code></pre>
+    <p>
+      The default arquillian browser is 'phantomjs'.
+      You can change it in tobago-example-demo/pom.xml &lt;arquillian.browser>.</p>
+    <p>If you want to run the tests from your IDE, please use the maven profile 'tomee'.
+      After that, you can start the test from the QUnitTests class.</p>
+  </tc:section>
+
+  <tc:section id="testInBrowser" label="How can I run tests in the browser? (Tobago 3)">
+    <ol>
+      <li>start demo
+        <pre><code class="language-markup">cd tobago-example/tobago-example-demo
+            mvn clean jetty:run</code></pre>
+      </li>
+      <li>open 'Test' menu in the header of the Tobago-Demo-Page
+        <ol>
+          <li>'Run Test' is enabled if a test is available for the current page.</li>
+          <li>'Run all tests' is enabled if in development mode. (opens every test in a separate iframe)</li>
+          <li>'Access all pages' is enabled if in development mode. (opens every page in a separate iframe)</li>
+        </ol>
+      </li>
+    </ol>
+  </tc:section>
+
+  <tc:section id="testQUnit" label="Howto create QUnit tests? (Tobago 3 or higher)">
+
+    Howto create QUnit tests for Tobago Demo 3.0 or higher
+
+    <ol>
+      <li>
+        Choose a <code>sample.xhtml</code> file for testing.
+      </li>
+      <li>
+        Create a <code>sample.test.js</code> file (with same name).
+      </li>
+      <li>
+        Add a
+        <tc:link label="QUnit Test" link="http://api.qunitjs.com/QUnit.test/" image="fa-external-link"/>
+        to the <code>sample.test.js</code>.
+
+    <pre><code class="language-java">QUnit.test("Testtitle", function(assert) { 
+...
+});</code></pre>
+
+        <ol>
+          <li>The test will run in a different frame.
+            To get an element in the test frame use <code>jQueryFrame()</code> instead of <code>jQuery()</code>.
+          </li>
+          <li>To wait for a submit use <code>jQuery("#page\\:testframe").load()</code>.
+          </li>
+          <li>To wait for an AJAX event use <code>waitForAjax(waitingDone, executeWhenDone)</code>.
+            The function <code>waitingDone</code> must return false if still waiting and true if the waiting is done.
+            The function <code>executeWhenDone</code> is executed afterwards.
+          </li>
+          <li>Add the test to QUnitTests.
+          </li>
+        </ol>
+
+        <pre><code class="language-java">@Test
+public void testname() throws UnsupportedEncodingException, InterruptedException {
+  String page = "content/.../testname.xhtml";
+  runStandardTest(page);
+}</code></pre>
+
+      </li>
+      <li>
+        Run the tests from QUnitTests or type
+
+        <pre><code class="language-bash">mvn verify -Pqunit-integration-tests</code></pre>
+      </li>
+    </ol>
+  </tc:section>
+
+  <tc:section id="liberty" label="How can I run the Tobago demo with WebSphere Liberty Profile (WLP) from Maven?">
+    <p>
+      <b>Please use at least Tobago 2.0 for this guidance (in this version the pom.xml files are prepared).</b>
+    </p>
+    <p>
+      You will need to do the following steps for preparation:
+    </p>
+    <ul>
+      <li>Download the server like:
+        <pre><code class="language-markup">wlp-developers-runtime-8.5.5.0.jar</code></pre>
+        from
+        <a href="https://www.ibm.com/developerworks/mydeveloperworks/blogs/wasdev/entry/download?lang=en">IBM</a>
+      </li>
+      <li>
+        Unpack the server anywhere in you file system, e.g. like this
+        <pre><code class="language-markup">mkdir /opt/wlp-developers-runtime-8.5.5.0
+            cd /opt/wlp-developers-runtime-8.5.5.0
+            java -jar ~/Downloads/wlp-developers-runtime-8.5.5.0.jar</code></pre>
+      </li>
+      <li>
+        Adding your server home to a property in the settings.xml of Maven
+        <pre><code
+            class="language-markup">&lt;wlp.directory&gt;/opt/wlp-developers-runtime-8.5.5.0/wlp&lt;/wlp.directory&gt;</code></pre>
+      </li>
+    </ul>
+    <p>
+      After these steps you can start/stop the server and deploy an built artifact.
+      For these steps, you need to be in the Tobago example demo directory.
+    </p>
+    <pre><code class="language-markup">cd tobago-examples/tobago-example-demo</code></pre>
+    <p>
+      This is <b>important</b> for the first start of the server,
+      because at the first start the server will be initialized.
+      For the setup the file
+    </p>
+    <pre><code class="language-markup">test/resources/server.xml</code></pre>
+    <p>
+      will be read. It contains the features, the WLP server will be support, and other configurations.
+      In our case we have the following features:
+    </p>
+    <pre><code class="language-markup">&lt;feature>cdi-1.0&lt;/feature>
+          &lt;feature>jsp-2.2&lt;/feature>
+          &lt;feature>servlet-3.0&lt;/feature>
+          &lt;feature>jsf-2.0&lt;/feature></code></pre>
+    <ul>
+      <li>
+        Start the server
+        <pre><code class="language-markup">mvn -Pliberty liberty:start-server</code></pre>
+      </li>
+      <li>
+        Build an artifact (you need the "provided" property, because JSF and OWB comes from the server)
+        <pre><code class="language-markup">mvn clean package -Djsf=provided</code></pre>
+      </li>
+      <li>
+        Deploy an artifact
+        <pre><code class="language-markup">mvn -Pliberty liberty:deploy</code></pre>
+      </li>
+      <li>
+        You will find the web application under this URL
+        <pre><code class="language-markup">http://localhost:9080/tobago-example-demo/</code></pre>
+      </li>
+      <li>
+        Redeploy an artifact: The same as deploy.
+      </li>
+      <li>
+        Stop the server
+        <pre><code class="language-markup">mvn -Pliberty liberty:stop-server</code></pre>
+      </li>
+    </ul>
+    <p>
+      The server starts very fast and is simple to use (very different from the full WebSphere installation).
+      The log files you will find here:
+    </p>
+    <pre><code class="language-markup">cd /opt/wlp-developers-8.5.next.beta/wlp/usr/servers/tobago/logs/</code></pre>
+    <p>
+      Sometime you may need to the clean the server, in particular when you are changing JAR dependencies.
+      For doing that
+    </p>
+    <ul>
+      <li>
+        Stop the server
+      </li>
+      <li>
+        Remove the whole concrete server installation
+        <pre><code class="language-markup">rm -r /opt/wlp-developers-8.5.next.beta/wlp/usr/servers/tobago</code></pre>
+      </li>
+      <li>
+        Start the server (don't forget the server.xml)
+      </li>
+      <li>
+        Deploy again
+      </li>
+    </ul>
+    Please also consider the plugin configuration in the tobago-example/pom.xml
+    <pre><code class="language-markup">
+        &lt;groupId>com.ibm.websphere.wlp.maven.plugins&lt;/groupId>
+        &lt;artifactId>liberty-maven-plugin&lt;/artifactId></code></pre>
+  </tc:section>
+
+  <tc:section id="portlet" label="How to setup my project to work with Portlets?">
+    <p>
+      There is a basic example for portlets in the GIT repository in the sub-folder
+      tobago-example/tobago-example-portlet
+      There is no specific configuration to use Tobago in Portlets.
+      The portlet stuff is currently not active, so the example is removed in Tobago 4.
+    </p>
+  </tc:section>
+
+
+</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/80-api/api.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/80-api/api.xhtml
new file mode 100644
index 0000000..61e7c25
--- /dev/null
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/80-api/api.xhtml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition template="/main.xhtml"
+                xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:tc="http://myfaces.apache.org/tobago/component"
+                xmlns:ui="http://java.sun.com/jsf/facelets">
+  <ui:param name="title" value="#{demoBundle.api}"/>
+
+  <tc:section id="api" label="API Documentation">
+
+    <p>
+      Documentation of the Java classes and the tags.
+    </p>
+
+    <tc:selectBooleanCheckbox value="#{apiController.onlyCurrent}" label="Show current only">
+      <f:ajax render="api" listener="#{apiController.init}"/>
+    </tc:selectBooleanCheckbox>
+
+    <tc:sheet value="#{apiController.releases}" var="release">
+      <tc:column label="Version">
+        <tc:out value="#{release.version}" labelLayout="skip" compact="true"/>
+      </tc:column>
+      <tc:column label="JavaDoc API Documentation">
+        <tc:link label="#{release.version} API Documentation"
+                 link="#{apiController.base}/doc/#{release.version}/api/index.html"/>
+      </tc:column>
+      <tc:column label="Tag Library Documentation (TLD)">
+        <tc:link label="#{release.version} TLD &lt;tc:> Documentation"
+                 link="#{apiController.base}/doc/#{release.version}/tld/index.html"/>
+        <f:verbatim rendered="#{release.tx}"><br/></f:verbatim>
+        <tc:link label="#{release.version} TLD &lt;tx:> Documentation" rendered="#{release.tx}"
+                 link="#{apiController.base}/doc/#{release.version}/tld-tx/index.html"/>
+      </tc:column>
+    </tc:sheet>
+
+  </tc:section>
+
+</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/85-download/download.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/85-download/download.xhtml
new file mode 100644
index 0000000..2511278
--- /dev/null
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/85-download/download.xhtml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition template="/main.xhtml"
+                xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:tc="http://myfaces.apache.org/tobago/component"
+                xmlns:ui="http://java.sun.com/jsf/facelets">
+  <ui:param name="title" value="#{demoBundle.download}"/>
+
+  <tc:section id="download" label="Download Tobago source- and binary packages">
+
+    <p>
+      Most commen Tobago will be used in a Maven project, so an explicit download is not needed.
+      Nevertheless here are the artifacts to download.
+    </p>
+
+    <p>
+      Use the links below to download a distribution of MyFaces Tobago from
+      one of our mirrors. It is good practice to verify the integrity of the
+      distribution files.
+    </p>
+
+    <p>
+      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.
+    </p>
+
+    <p>
+      Apache MyFaces Tobago is distributed as a <i>zip</i> archive and
+      as a <i>tar.gz</i> archive. The content is the same. Please note
+      that the <i>tar.gz</i> archives contain file names longer than 100 characters and have been
+      created using GNU tar extensions. Thus they must be untarred with a GNU compatible
+      version of tar.
+    </p>
+
+    <tc:selectBooleanCheckbox value="#{apiController.onlyCurrent}" label="Show current only">
+      <f:ajax render="download" listener="#{apiController.init}"/>
+    </tc:selectBooleanCheckbox>
+
+    <ui:repeat value="#{apiController.releases}" var="release">
+
+      <tc:section label="MyFaces Tobago #{release.version} Distribution">
+
+        <tc:panel rendered="#{release.jira ne null}">
+          Release notes can be found in
+          <tc:link label="Jira" image="fa-external-link"
+                   link="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&amp;version=#{release.jira}"/>.
+        </tc:panel>
+
+        <table class="table">
+          <tbody>
+          <tr>
+            <th>#{release.version}</th>
+            <th>Type</th>
+            <th>Mirrors</th>
+            <th>Checksum</th>
+            <th>Signature</th>
+          </tr>
+          <tr>
+            <td>MyFaces Tobago</td>
+            <td>tar.gz</td>
+            <td><tc:link
+                link="http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-#{release.version}-dist.tar.gz"
+                label="myfaces-tobago-#{release.version}-dist.tar.gz" image="fa-external-link"/></td>
+            <td><tc:link
+                link="https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-#{release.version}-dist.tar.gz.sha256"
+                label="myfaces-tobago-#{release.version}-dist.tar.gz.sha256" image="fa-external-link"/></td>
+            <td><tc:link
+                link="https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-#{release.version}-dist.tar.gz.asc"
+                label="myfaces-tobago-#{release.version}-dist.tar.gz.asc" image="fa-external-link"/></td>
+          </tr>
+          <tr>
+            <td>MyFaces Tobago</td>
+            <td>zip</td>
+            <td><tc:link
+                link="http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-#{release.version}-dist.zip"
+                label="myfaces-tobago-#{release.version}-dist.zip" image="fa-external-link"/></td>
+            <td><tc:link
+                link="https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-#{release.version}-dist.zip.sha256"
+                label="myfaces-tobago-#{release.version}-dist.zip.sha256" image="fa-external-link"/></td>
+            <td><tc:link
+                link="https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-#{release.version}-dist.zip.asc"
+                label="myfaces-tobago-#{release.version}-dist.zip.asc" image="fa-external-link"/></td>
+          </tr>
+          <tr>
+            <td>MyFaces Tobago Source</td>
+            <td>zip</td>
+            <td><tc:link
+                link="http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-#{release.version}-source-release.zip"
+                label="myfaces-tobago-#{release.version}-source-release.zip" image="fa-external-link"/></td>
+            <td><tc:link
+                link="https://www.apache.org/source-release/myfaces/binaries/myfaces-tobago-#{release.version}-source-release.zip.sha256"
+                label="myfaces-tobago-#{release.version}-source-release.zip.sha256" image="fa-external-link"/></td>
+            <td><tc:link
+                link="https://www.apache.org/source-release/myfaces/binaries/myfaces-tobago-#{release.version}-source-release.zip.asc"
+                label="myfaces-tobago-#{release.version}-source-release.zip.asc" image="fa-external-link"/></td>
+          </tr>
+          <tr>
+            <td>MyFaces Tobago Example</td>
+            <td>tar.gz</td>
+            <td><tc:link
+                link="http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-#{release.version}-example.tar.gz"
+                label="myfaces-tobago-#{release.version}-example.tar.gz" image="fa-external-link"/></td>
+            <td><tc:link
+                link="https://www.apache.org/example/myfaces/binaries/myfaces-tobago-#{release.version}-example.tar.gz.sha256"
+                label="myfaces-tobago-#{release.version}-example.tar.gz.sha256" image="fa-external-link"/></td>
+            <td><tc:link
+                link="https://www.apache.org/example/myfaces/binaries/myfaces-tobago-#{release.version}-example.tar.gz.asc"
+                label="myfaces-tobago-#{release.version}-example.tar.gz.asc" image="fa-external-link"/></td>
+          </tr>
+          <tr>
+            <td>MyFaces Tobago Example</td>
+            <td>zip</td>
+            <td><tc:link
+                link="http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-#{release.version}-example.zip"
+                label="myfaces-tobago-#{release.version}-example.zip" image="fa-external-link"/></td>
+            <td><tc:link
+                link="https://www.apache.org/example/myfaces/binaries/myfaces-tobago-#{release.version}-example.zip.sha256"
+                label="myfaces-tobago-#{release.version}-example.zip.sha256" image="fa-external-link"/></td>
+            <td><tc:link
+                link="https://www.apache.org/example/myfaces/binaries/myfaces-tobago-#{release.version}-example.zip.asc"
+                label="myfaces-tobago-#{release.version}-example.zip.asc" image="fa-external-link"/></td>
+          </tr>
+          </tbody>
+        </table>
+
+      </tc:section>
+
+    </ui:repeat>
+
+    <tc:section label="Latest source code from GIT repository">
+      <p>
+        If you want to use the latest Apache MyFaces Tobago features, the source code is under
+        version control with GIT. In the
+        <tc:link label="Getting Started" link="http://tobago-vm.apache.org/getting-started.html"
+                 image="fa-external-link"/>
+        <!--XXX internal vs. external link -->
+        section you will find information how to use the ASF MyFaces Tobago GIT Repository.
+      </p>
+    </tc:section>
+
+    <tc:section label="Archive of old releases">
+      <p>
+        Older releases are available in the
+        <tc:link label="archive" link="https://archive.apache.org/dist/myfaces/" image="fa-external-link"/>.
+        Those releases are only provided as historical artifacts. We strongly
+        recommend not to use those releases, but upgrade to the most recent release.
+      </p>
+    </tc:section>
+
+    <tc:section label="Verifying checksums">
+      <p>
+        It is essential that you verify the integrity of the downloaded
+        files using the SHA 256.
+        This verification ensures the
+        file was not corrupted during the download or mirroring process.
+      </p>
+      <p>
+        To verify the hash signature on the files, you need to use a program
+        called e. g. <i>sha</i>, <i>shasum</i>, which is
+        included in many UNIX distributions and MacOS.
+        It is also available for Windows.
+      </p>
+    </tc:section>
+
+    <tc:section label="Verifying signatures">
+      <p>
+        PGP verification ensures that the file came from a certain person.
+        We recommend you verify your downloads with PGP.
+      </p>
+      <p>
+        First download the Apache MyFaces
+        <tc:link label="KEYS" link="https://www.apache.org/dist/myfaces/KEYS" image="fa-external-link"/>
+        as well as the <i>asc</i> signature file
+        for the particular distribution. It is important that you get these files from the ultimate
+        trusted source - the main ASF distribution site, rather than from a mirror.
+      </p>
+      <p>
+        You need an installation of e. g. OpenPGP or GPG to check the files. More information you'll find on the
+        <tc:link label="Apache verification" link="https://www.apache.org/info/verification.html#CheckingSignatures"
+                 image="fa-external-link"/>
+        site.
+      </p>
+      <p>
+        Then verify the signatures for all downloaded files. With gpg for the dist.tar.gz it looks like
+      </p>
+      <pre><code class="language-bash">$ TOBAGO_VERSION=#{apiController.releases[0].version} 
+$ gpg --import KEYS
+$ gpg --verify myfaces-tobago-$TOBAGO_VERSION-dist.tar.gz.asc myfaces-tobago-$TOBAGO_VERSION-dist.tar.gz
+  </code></pre>
+    </tc:section>
+
+  </tc:section>
+
+</ui:composition>
diff --git a/src/site/resources/scripts/drop-artifacts.sh b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/90-release-checklist/drop-artifacts.sh
similarity index 100%
rename from src/site/resources/scripts/drop-artifacts.sh
rename to tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/90-release-checklist/drop-artifacts.sh
diff --git a/src/site/resources/scripts/release-artifacts.sh b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/90-release-checklist/release-artifacts.sh
similarity index 100%
rename from src/site/resources/scripts/release-artifacts.sh
rename to tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/90-release-checklist/release-artifacts.sh
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/90-release-checklist/release-checklist.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/90-release-checklist/release-checklist.xhtml
new file mode 100644
index 0000000..dd40e38
--- /dev/null
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/90-release-checklist/release-checklist.xhtml
@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition template="/main.xhtml"
+                xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:tc="http://myfaces.apache.org/tobago/component"
+                xmlns:ui="http://java.sun.com/jsf/facelets">
+  <ui:param name="title" value="#{demoBundle.release_checklist}"/>
+
+  <tc:section label="Release Checklist (Developer Info)">
+
+    <tc:section label="Step by Step">
+
+      Checklist of tasks to perform for each release. For general information about Apache releases you may also consult
+      <tc:link label="Publishing Maven Artifacts" link="http://www.apache.org/dev/publishing-maven-artifacts.html"
+               image="fa-external-link"/>.
+
+      <ul>
+        <li>Preparation</li>
+
+        <li>You need to add your GPG keys in <tc:link label="Subversion"
+                                                      link="https://svn.apache.org/repos/asf/myfaces/keys/KEYS"
+                                                      image="fa-external-link"/>
+          and the <tc:link label="Apache site" link="https://www.apache.org/dist/myfaces/KEYS"
+                           image="fa-external-link"/> before a release.
+        </li>
+
+        <li>Ensure that all open bugs and issues in <tc:link label="Jira" link="https://issues.apache.org/jira/"
+                                                             image="fa-external-link"/> have been either fixed
+          or moved to an other release version.
+        </li>
+
+        <li>Ensure that all examples are working with the release candidate.
+        </li>
+
+        <li>Check the scheduled version number against "semantic versioning".
+        </li>
+
+        <li>Post a note and ask for problems with the release candidate (see {{Preparation template}} below).
+        </li>
+
+        <li>Install (or unpack) a jdk 1.4 on your computer (only for Tobago 1.0.x).
+        </li>
+
+        <li>Please switch to a jdk depending of the version to build:
+        </li>
+
+        <li>for Tobago 1.0.x use jdk 1.5 or 1.6 for build and 1.7 for deployment.
+        </li>
+
+        <li>for Tobago 1.5.x use jdk 1.7.
+        </li>
+
+        <li>for Tobago 2.x and higher use jdk 1.8.
+        </li>
+
+        <li>Perform basic checks on an unmodified checkout for all modules:
+
+          <pre><code class="language-bash"># for Tobago 1.0.x
+$ mvn checkstyle:check rat:check -Pall-modules
+
+# for Tobago 1.5.x and higher
+$ mvn clean install -Pall-modules &amp;&amp; mvn checkstyle:check apache-rat:check animal-sniffer:check -Pall-modules
+
+# for Tobago 2.0.9 and higher
+$ mvn clean install &amp;&amp; mvn checkstyle:check apache-rat:check animal-sniffer:check dependency-check:check
+
+# for Tobago 3.0.0 and higher
+$ mvn clean install -Pall-modules &amp;&amp; mvn checkstyle:check apache-rat:check animal-sniffer:check dependency-check:check -Pall-modules
+
+# for Tobago 4.2.0 and higher
+$ mvn clean install &amp;&amp; mvn checkstyle:check apache-rat:check animal-sniffer:check dependency-check:check
+</code></pre>
+        </li>
+
+        <li>Check version info in this file manually:
+          <pre><code
+              class="language-bash">$ tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java</code></pre>
+        </li>
+
+        <li>Building the Release (Tobago 1.0.x to 2.0.8) [<tc:badge value="TODO"
+                                                                    markup="warning"/>: migrate this docs to git]
+        </li>
+
+        <li>Prepare the release with:
+
+          <pre><code class="language-bash">$ mvn release:prepare -Pall-modules</code></pre>
+        </li>
+
+        <li>Check out a fresh copy of the svn tag:
+
+          <pre><code class="language-bash">cd ..
+svn co https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-&lt;version>
+cd tobago-&lt;version>
+</code></pre>
+        </li>
+
+        <li>Deploy the fresh copy to the Nexus repository with the apache-release profile (we are not using release:perform here, because of some different options):
+
+          <pre><code class="language-bash"># for Tobago 1.0.x
+# "install" with Java 1.6 and Maven 2
+$ mvn install -Papache-release,jdk14retro,generate-assembly --no-plugin-updates -Dnon-default-modules -Djava14.home=\${java14.jre}
+# "deploy" with Java 1.7 and Maven 3 (hotfix: also comment out the maven-apt-plugin stuff)
+$ mvn deploy -Papache-release,generate-assembly --no-plugin-updates -Dnon-default-modules
+
+# for Tobago 1.5.x to 2.0.8
+$ mvn deploy -Papache-release,generate-assembly --no-plugin-updates -Dnon-default-modules
+</code></pre>
+        </li>
+
+        <li>Building the Release (Tobago 2.0.9 and higher)
+        </li>
+
+        <li>Prepare and perform the release with:
+
+          <pre><code class="language-bash">$ mvn release:prepare
+$ mvn release:perform
+</code></pre>
+        </li>
+
+        <li>Staging repository
+        </li>
+
+        <li><i>Close</i> the repository on the <tc:link label="Nexus" link="https://repository.apache.org/"
+                                                        image="fa-external-link"/> instance for staging (you will receive a mail with the staging location).
+        </li>
+
+        <li>Update the staging and snapshot version on tobago-vm.apache.org
+        </li>
+
+        <li>Voting
+        </li>
+
+        <li>Propose a vote on the dev list with the staging location (see {{Vote template}} below).
+        </li>
+
+        <li>For a positive result wait at least 72 hours.
+        </li>
+
+        <li>Once a vote is successful, post the result to the dev list.
+        </li>
+
+        <li>Publishing
+        </li>
+
+        <li><i>Release</i> the version in <tc:link label="Jira" link="https://issues.apache.org/jira/"
+                                                   image="fa-external-link"/> and close all resolved issues for the release.
+        </li>
+
+        <li><i>Release</i> the staging repository on the <tc:link label="Nexus" link="https://repository.apache.org/"
+                                                                  image="fa-external-link"/> instance.
+        </li>
+
+        <li>Copy the download artifacts from the repository to the site (see script <tc:link
+            label="release-artifacts.sh" link="./release-artifacts.sh"/>).
+        </li>
+
+        <li>Add the release version and date to the <tc:link label="Apache Committee Report Helper"
+                                                             link="https://reporter.apache.org/addrelease.html?myfaces"
+                                                             image="fa-external-link"/>.
+        </li>
+
+        <li>Update the release and staging version on tobago-vm.apache.org
+        </li>
+
+        <li>Building the site
+        </li>
+
+        <li>Updating the release and version information in the APT files of trunk, e. g.:
+
+          <!--todo this has changed!-->
+          <pre><code class="language-bash">src/site/apt/api.apt
+src/site/apt/download.apt
+src/site/apt/index.apt
+src/site/resources/doap_tobago.rdf</code></pre>
+        </li>
+
+        <li>Note: The site can only be build correctly on file systems that supports to differ upper-/lower-case.
+          This is not the default on Windows and Mac OS X machines.
+          On Mac OS X you can mount a virtual filesystem (sparse bundle) that supports upper-/lower-case with the
+          Disk Utility.
+
+          <pre><code class="language-bash">$ TOBAGO_SITE=/Volumes/tobago-site
+$ cd $TOBAGO_SITE
+$ git clone https://github.com/apache/myfaces-tobago tobago-master
+$ svn co https://svn.apache.org/repos/asf/myfaces/site/publish/tobago tobago-publish
+$ cd tobago-master
+$ export MAVEN_OPTS="-Xmx1500m \${MAVEN_OPTS}"
+$ mvn clean package -Pattach-source
+$ mvn site:site
+$ mvn site:stage -DstagingDirectory=$TOBAGO_SITE/tobago-publish</code></pre>
+        </li>
+
+        <li>Call "reformat code" on all *.html file in $TOBAGO_SITE/tobago-publish in the IDE
+          (the generated code has the main content in only one single line).
+        </li>
+
+        <li>Update the site after the distribution is on the Apache mirrors available.
+        </li>
+
+        <li>Unpack and commit the API Docs of the release with the update.sh (or update-1.5.sh) script in
+          /Volumes/tobago-site/tobago-publish.
+        </li>
+
+        <li>Remove old download artifacts from the site (see script <tc:link label="drop-artifacts.sh"
+                                                                             link="./drop-artifacts.sh"/>).
+          Older releases are automatic available in the <tc:link label=" archive"
+                                                                 link="http://archive.apache.org/dist/myfaces/"
+                                                                 image="fa-external-link"/>.
+        </li>
+
+        <li>Remove old snapshots in the maven snapshot repository. This is done automatically, it is only needed, when
+          there are dead development ends, e. g. last alpha or beta version like 3.0.0-beta-2-SNAPSHOT which
+          will no longer developed.
+        </li>
+
+        <li>Create and send announcement (see {{Announcement template}} below).
+        </li>
+      </ul>
+
+    </tc:section>
+
+    <tc:section label="Preparation template">
+
+      Send to: <tc:link label="MyFaces Development"
+                        link="mailto:MyFaces Development &lt;dev@myfaces.apache.org>"
+                        image="fa-external-link"/>
+
+      <i>Replace the variable parts like &lt;version></i>.
+
+      <pre><code>Subject: [Tobago] Preparation for the &lt;version> release
+
+Hi, folks,
+
+I plan to build the &lt;version> of Tobago soon.
+
+If you know any blocking problems with the current SNAPSHOT, give me a hint.
+
+Regards,
+  &lt;sender></code></pre>
+
+    </tc:section>
+
+    <tc:section label="Vote template">
+
+      Send to: <tc:link link="mailto:MyFaces Development &lt;dev@myfaces.apache.org>" label="MyFaces Development"
+                        image="fa-pencil"/>
+
+      <i>Replace the variable parts like &lt;version></i>.
+
+      <pre><code>Subject: [VOTE] Release Tobago &lt;version>
+
+Hello,
+
+I would like to release Tobago &lt;version>.
+
+Major changes since last release are:
+
+&lt;insert list>
+
+&lt;use one of>
+&lt;a> This is a MAJOR release and may contain incompatible API changes.
+&lt;b> This is a MINOR release with new functionality in a backwards-compatible manner.
+&lt;c> This is a PATCH release with backwards-compatible bug fixes.
+
+For a detail list please consult the release notes at:
+
+https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&amp;version=&lt;version_id_from_jira>
+
+The version is available at the staging repository (Nexus) at:
+
+https://repository.apache.org/content/repositories/orgapachemyfaces-&lt;id_from_nexus>/
+
+Please vote now! (The vote is open for 72h.)
+
+[ ] +1
+[ ] +0
+[ ] -1
+
+Regards,
+&lt;sender>
+
+</code></pre>
+
+    </tc:section>
+
+    <tc:section label="Announcement template">
+      For all versions send to:
+      <tc:link link="mailto:MyFaces Discussion &lt;users@myfaces.apache.org\>" label="MyFaces Discussion"
+               image="fa-pencil"/>
+      Only for major versions send to:
+      <tc:link link="mailto:Apache Announces &lt;announce@apache.org\>" label="Apache Announces"
+               image="fa-pencil"/>
+
+      <i>Replace the variable parts like &lt;version\></i>.
+
+      <pre><code>Subject: [ANNOUNCE] Apache Tobago &lt;version> released
+
+The Apache MyFaces team is pleased to announce the release of Apache
+Tobago &lt;version>.
+
+Apache Tobago is a component library for JavaServer Faces (JSF) that
+allows to write web-applications without the need of coding HTML, CSS
+and JavaScript
+
+Main new features
+-----------------
+
+&lt;list of main new features here or remove this section>
+
+Changes
+-------
+
+Please check the release notes at
+http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&amp;styleName=Html&amp;version=&lt;versionidfromjira>
+for a full list of the changes in this version.
+
+Known limitations and bugs
+--------------------------
+
+&lt;add main limitations and known bugs here or remove this section>
+
+For more information about Apache Tobago, please visit
+http://myfaces.apache.org/tobago/.
+
+Have fun,
+-The MyFaces team
+</code></pre>
+
+    </tc:section>
+
+  </tc:section>
+
+</ui:composition>

-- 
To stop receiving notification emails like this one, please contact
lofwyr@apache.org.