You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2015/07/10 10:50:49 UTC
wicket-site git commit: Also include generated pages
Repository: wicket-site
Updated Branches:
refs/heads/asf-site 9fd01a43c -> ffa92d4fb
Also include generated pages
Project: http://git-wip-us.apache.org/repos/asf/wicket-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket-site/commit/ffa92d4f
Tree: http://git-wip-us.apache.org/repos/asf/wicket-site/tree/ffa92d4f
Diff: http://git-wip-us.apache.org/repos/asf/wicket-site/diff/ffa92d4f
Branch: refs/heads/asf-site
Commit: ffa92d4fb5f0763773292b30bdf577861df518a0
Parents: 9fd01a4
Author: Martijn Dashorst <da...@apache.org>
Authored: Fri Jul 10 10:51:22 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Fri Jul 10 10:51:22 2015 +0200
----------------------------------------------------------------------
content/atom.xml | 2 +-
content/help/email.html | 26 +++-----------------------
content/help/index.html | 38 ++++++++++++++++++++++++++++++++++----
content/help/security.html | 2 +-
content/help/support.html | 4 ++--
5 files changed, 41 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket-site/blob/ffa92d4f/content/atom.xml
----------------------------------------------------------------------
diff --git a/content/atom.xml b/content/atom.xml
index 7f2fc60..87ec238 100644
--- a/content/atom.xml
+++ b/content/atom.xml
@@ -3,7 +3,7 @@
<title>Apache Wicket</title>
<link href="http://wicket.apache.org/atom.xml" rel="self"/>
<link href="http://wicket.apache.org/"/>
- <updated>2015-07-06T00:37:42+02:00</updated>
+ <updated>2015-07-10T10:46:29+02:00</updated>
<id>http://wicket.apache.org/</id>
<author>
<name>Apache Wicket</name>
http://git-wip-us.apache.org/repos/asf/wicket-site/blob/ffa92d4f/content/help/email.html
----------------------------------------------------------------------
diff --git a/content/help/email.html b/content/help/email.html
index 83b19ce..6d6733e 100644
--- a/content/help/email.html
+++ b/content/help/email.html
@@ -49,7 +49,7 @@
</p>
</header>
<section class="l-one-third right">
- <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#mailing-lists"><span class="toc-number">1</span> <span class="toc-text">Mailing lists</span></a></li><li class="toc--level-1 toc--section-2"><a href="#user"><span class="toc-number">2</span> <span class="toc-text">The Users list</span></a></li><li class="toc--level-1 toc--section-3"><a href="#announce"><span class="toc-number">3</span> <span class="toc-text">The Announcements list</span></a></li><li class="toc--level-1 toc--section-4"><a href="#commit"><span class="toc-number">4</span> <span class="toc-text">The Commit list</span></a></li><li class="toc--level-1 toc--section-5"><a href="#security"><span class="toc-number">5</span> <span class="toc-text">Report a security issue</span></a><ul><li class="toc--level-2 toc--section-6"><a href="#contact-the-wicket-pmc-privately"><span class="toc-number">5.1</span> <span class="toc-text">Contact th
e Wicket PMC privately</span></a></li><li class="toc--level-2 toc--section-7"><a href="#report-normal-bugs-in-jira"><span class="toc-number">5.2</span> <span class="toc-text">Report normal bugs in JIRA</span></a></li></ul></li></ul></div>
+ <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#mailing-lists"><span class="toc-number">1</span> <span class="toc-text">Mailing lists</span></a></li><li class="toc--level-1 toc--section-2"><a href="#user"><span class="toc-number">2</span> <span class="toc-text">The Users list</span></a></li><li class="toc--level-1 toc--section-3"><a href="#announce"><span class="toc-number">3</span> <span class="toc-text">The Announcements list</span></a></li><li class="toc--level-1 toc--section-4"><a href="#commit"><span class="toc-number">4</span> <span class="toc-text">The Commit list</span></a></li><li class="toc--level-1 toc--section-5"><a href="#security"><span class="toc-number">5</span> <span class="toc-text">Report a security issue</span></a></li></ul></div>
</section>
<section class="l-two-third left">
<h2 id="mailing-lists">Mailing lists</h2>
@@ -113,28 +113,8 @@ and other things.</p>
<p>This list is read only, and only Apache build systems can publish to it.</p>
<hr />
<h2 id="security">Report a security issue</h2>
-<p>The Apache Software Foundation takes a very active stance in
-eliminating security problems against the Apache Wicket web framework.</p>
-<p>For reporting and discussing a security issue you should contact the
-Wicket PMC privately.</p>
-<p><strong>** PLEASE DO NOT CREATE A SECURITY REPORT IN OUR ISSUE TRACKER **</strong></p>
-<p>The issue tracker for Wicket is not the appropriate venue for reporting
-security issues as the issue tracker is publicly accessible. Instead,
-contact the Wicket PMC privately.</p>
-<h3 id="contact-the-wicket-pmc-privately">Contact the Wicket PMC privately</h3>
-<p>Send your security issue to <strong>private at wicket.apache.org</strong>. This list
-is not publicly available so we can discuss and fix the issue in
-private without leaking the info to any bad guys.</p>
-<p><a class="button" href="mailto:private@wicket.apache.org?subject=Security%20issue" onclick="window.location.href='mailto:private@wicket.apache.org?subject=Security%20issue';return false;">
- <i class="fa fa-shield"></i>
- REPORT A SECURITY ISSUE
-</a></p>
-<p>We treat all security issues seriously and will try to fix them as soon
-as possible in all affected versions that we still support.</p>
-<h3 id="report-normal-bugs-in-jira">Report normal bugs in JIRA</h3>
-<p>The Security Team cannot accept regular bug reports or other queries,
-we ask that you use our <a href="{{site.baseurl}}/help/#reportbug">bug reporting page</a>
-for normal, non-security bugs.</p>
+<p>{% capture security %}{% include security.md %}{% endcapture %}
+{{ security | markdownify }}</p>
</section>
</div>
</main>
http://git-wip-us.apache.org/repos/asf/wicket-site/blob/ffa92d4f/content/help/index.html
----------------------------------------------------------------------
diff --git a/content/help/index.html b/content/help/index.html
index 59a8efc..be5b5b1 100644
--- a/content/help/index.html
+++ b/content/help/index.html
@@ -49,7 +49,7 @@
</p>
</header>
<section class="l-one-third right">
- <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#questions"><span class="toc-number">1</span> <span class="toc-text">We are here to Help</span></a></li><li class="toc--level-1 toc--section-2"><a href="#security"><span class="toc-number">2</span> <span class="toc-text">Report A Security Problem</span></a><ul><li class="toc--level-2 toc--section-3"><a href="#contact-the-wicket-pmc-privately"><span class="toc-number">2.1</span> <span class="toc-text">Contact the Wicket PMC privately</span></a></li><li class="toc--level-2 toc--section-4"><a href="#report-normal-bugs-in-jira"><span class="toc-number">2.2</span> <span class="toc-text">Report normal bugs in JIRA</span></a></li></ul></li><li class="toc--level-1 toc--section-5"><a href="#reportbug"><span class="toc-number">3</span> <span class="toc-text">Report a Bug for Apache Wicket</span></a><ul><li class="toc--level-2 toc--section-6"><a href="#
checklist-for-reporting-a-bug"><span class="toc-number">3.1</span> <span class="toc-text">Checklist for Reporting a Bug</span></a></li><li class="toc--level-2 toc--section-7"><a href="#searchbug"><span class="toc-number">3.2</span> <span class="toc-text">Search for a Reported, Existing Bug</span></a></li><li class="toc--level-2 toc--section-8"><a href="#latestrelease"><span class="toc-number">3.3</span> <span class="toc-text">Using the Latest Release of Wicket</span></a></li><li class="toc--level-2 toc--section-9"><a href="#compatible"><span class="toc-number">3.4</span> <span class="toc-text">Using Compatible Versions of Supporting Libraries</span></a></li><li class="toc--level-2 toc--section-10"><a href="#bugquickstart"><span class="toc-number">3.5</span> <span class="toc-text">Provide a Quick Start</span></a></li><li class="toc--level-2 toc--section-11"><a href="#createreport"><span class="toc-number">3.6</span> <span class="toc-text">Create a Report in our Issue Tracker</span></
a></li><li class="toc--level-2 toc--section-12"><a href="#faster"><span class="toc-number">3.7</span> <span class="toc-text">How to Get Help Faster</span></a></li></ul></li><li class="toc--level-1 toc--section-13"><a href="#commercial-wicket-support"><span class="toc-number">4</span> <span class="toc-text">Commercial Wicket Support</span></a></li></ul></div>
+ <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#questions"><span class="toc-number">1</span> <span class="toc-text">We are here to Help</span></a></li><li class="toc--level-1 toc--section-2"><a href="#security"><span class="toc-number">2</span> <span class="toc-text">Report A Security Problem</span></a><ul><li class="toc--level-2 toc--section-3"><a href="#contact-the-wicket-pmc-privately"><span class="toc-number">2.1</span> <span class="toc-text">Contact the Wicket PMC privately</span></a></li><li class="toc--level-2 toc--section-4"><a href="#report-normal-bugs-in-jira"><span class="toc-number">2.2</span> <span class="toc-text">Report normal bugs in JIRA</span></a></li></ul></li><li class="toc--level-1 toc--section-5"><a href="#reportbug"><span class="toc-number">3</span> <span class="toc-text">Report a Bug for Apache Wicket</span></a><ul><li class="toc--level-2 toc--section-6"><a href="#
checklist-for-reporting-a-bug"><span class="toc-number">3.1</span> <span class="toc-text">Checklist for Reporting a Bug</span></a></li><li class="toc--level-2 toc--section-7"><a href="#searchbug"><span class="toc-number">3.2</span> <span class="toc-text">Search for a Reported, Existing Bug</span></a></li><li class="toc--level-2 toc--section-8"><a href="#latestrelease"><span class="toc-number">3.3</span> <span class="toc-text">Using the Latest Release of Wicket</span></a></li><li class="toc--level-2 toc--section-9"><a href="#compatible"><span class="toc-number">3.4</span> <span class="toc-text">Using Compatible Versions of Supporting Libraries</span></a></li><li class="toc--level-2 toc--section-10"><a href="#bugquickstart"><span class="toc-number">3.5</span> <span class="toc-text">Provide a Quick Start</span></a></li><li class="toc--level-2 toc--section-11"><a href="#createreport"><span class="toc-number">3.6</span> <span class="toc-text">Create a Report in our Issue Tracker</span></
a></li><li class="toc--level-2 toc--section-12"><a href="#faster"><span class="toc-number">3.7</span> <span class="toc-text">How to Get Help Faster</span></a></li></ul></li><li class="toc--level-1 toc--section-13"><a href="#commercial"><span class="toc-number">4</span> <span class="toc-text">Commercial Wicket Support</span></a><ul><li class="toc--level-2 toc--section-14"><a href="#finding-a-wicket-service-provider"><span class="toc-number">4.1</span> <span class="toc-text">Finding a Wicket Service Provider</span></a></li><li class="toc--level-2 toc--section-15"><a href="#registering-as-a-wicket-service-provider"><span class="toc-number">4.2</span> <span class="toc-text">Registering as a Wicket Service Provider</span></a></li></ul></li></ul></div>
</section>
<section class="l-two-third left">
<div class="button-bar">
@@ -105,7 +105,7 @@ private without leaking the info to any bad guys.</p>
as possible in all affected versions that we still support.</p>
<h3 id="report-normal-bugs-in-jira">Report normal bugs in JIRA</h3>
<p>The Security Team cannot accept regular bug reports or other queries,
-we ask that you use our <a href="{{site.baseurl}}/help/#reportbug">bug reporting page</a>
+we ask that you use our <a href="/help/#reportbug">bug reporting page</a>
for normal, non-security bugs.</p>
<hr />
<h2 id="reportbug">Report a Bug for Apache Wicket</h2>
@@ -238,8 +238,38 @@ we can normally figure out whats wrong from that.</li>
<p>When you want more direct support, you can consider hiring commercial
support.</p>
<hr />
-<h2 id="commercial-wicket-support">Commercial Wicket Support</h2>
-<p>{% include support.html %}</p>
+<h2 id="commercial">Commercial Wicket Support</h2>
+<p>The Wicket community is not only supported by volunteers but several
+individuals and companies provide professional support for Wicket
+application development in many countries around the world.</p>
+<h3 id="finding-a-wicket-service-provider">Finding a Wicket Service Provider</h3>
+<p>The linked page below lists all companies that provide commercial
+services for Wicket which ranges from training courses, consultancy and
+even project development.</p>
+<div class="button-bar">
+ <a class="button" href="https://cwiki.apache.org/confluence/display/WICKET/Companies+that+provide+services">
+ <i class="fa fa-group"></i><br />
+ Go to the wiki
+ </a>
+ <a class="button invisible" href="https://cwiki.apache.org/confluence/display/WICKET/Companies+that+provide+services">
+ <i class="fa fa-group"></i><br />
+ </a>
+ <a class="button hidden" href="">
+ <i class="fa fa-group"></i><br />
+ </a>
+</div>
+<p>Being mentioned here is not an indication of official “endorsement” by
+the Apache Software Foundation, but is instead provided as a public
+service. This list is in no way a complete listing of the many
+organizations providing either free or for cost support for ASF
+projects. If you would like to be added to this list, or removed, sign
+up for the wiki and add yourself to the list.</p>
+<h3 id="registering-as-a-wicket-service-provider">Registering as a Wicket Service Provider</h3>
+<p>If you are a service provider specializing in Wicket
+application development you are welcome to add yourself to this wiki
+page (a registered account is required).</p>
+<p>We reserve the right to remove your listing if it is deemed
+inappropriate.</p>
</section>
</div>
</main>
http://git-wip-us.apache.org/repos/asf/wicket-site/blob/ffa92d4f/content/help/security.html
----------------------------------------------------------------------
diff --git a/content/help/security.html b/content/help/security.html
index 31c8496..e0d115e 100644
--- a/content/help/security.html
+++ b/content/help/security.html
@@ -50,7 +50,7 @@
<section class="l-one-third right">
</section>
<section class="l-two-third left">
- <p>The Apache Software Foundation takes a very active stance in
+<p>The Apache Software Foundation takes a very active stance in
eliminating security problems against the Apache Wicket web framework.</p>
<p>For reporting and discussing a security issue you should contact the
Wicket PMC privately.</p>
http://git-wip-us.apache.org/repos/asf/wicket-site/blob/ffa92d4f/content/help/support.html
----------------------------------------------------------------------
diff --git a/content/help/support.html b/content/help/support.html
index 83e644b..089cff5 100644
--- a/content/help/support.html
+++ b/content/help/support.html
@@ -47,10 +47,10 @@
<h2>When you can't get help quick enough or you need direct support</h2>
</header>
<section class="l-one-third right">
- <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#commercial-wicket-support"><span class="toc-number">1</span> <span class="toc-text">Commercial Wicket Support</span></a><ul><li class="toc--level-2 toc--section-2"><a href="#finding-a-wicket-service-provider"><span class="toc-number">1.1</span> <span class="toc-text">Finding a Wicket Service Provider</span></a></li><li class="toc--level-2 toc--section-3"><a href="#registering-as-a-wicket-service-provider"><span class="toc-number">1.2</span> <span class="toc-text">Registering as a Wicket Service Provider</span></a></li></ul></li></ul></div>
+ <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#commercial"><span class="toc-number">1</span> <span class="toc-text">Commercial Wicket Support</span></a><ul><li class="toc--level-2 toc--section-2"><a href="#finding-a-wicket-service-provider"><span class="toc-number">1.1</span> <span class="toc-text">Finding a Wicket Service Provider</span></a></li><li class="toc--level-2 toc--section-3"><a href="#registering-as-a-wicket-service-provider"><span class="toc-number">1.2</span> <span class="toc-text">Registering as a Wicket Service Provider</span></a></li></ul></li></ul></div>
</section>
<section class="l-two-third left">
- <h2 id="commercial-wicket-support">Commercial Wicket Support</h2>
+ <h2 id="commercial">Commercial Wicket Support</h2>
<p>The Wicket community is not only supported by volunteers but several
individuals and companies provide professional support for Wicket
application development in many countries around the world.</p>