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:51:17 UTC
[52/53] [abbrv] wicket-site git commit: Fixed help index page includes
Fixed help index page includes
apparently the markdown liquid tag plugin doesn't like it when it
is used twice in a page.
Project: http://git-wip-us.apache.org/repos/asf/wicket-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket-site/commit/8e1e3d55
Tree: http://git-wip-us.apache.org/repos/asf/wicket-site/tree/8e1e3d55
Diff: http://git-wip-us.apache.org/repos/asf/wicket-site/diff/8e1e3d55
Branch: refs/heads/asf-site
Commit: 8e1e3d5519cc40fe647b91cc800cb0af85c2cf3c
Parents: 230d686
Author: Martijn Dashorst <da...@apache.org>
Authored: Fri Jul 10 10:48:24 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Fri Jul 10 10:48:24 2015 +0200
----------------------------------------------------------------------
_includes/security.md | 31 +++++++++++++++++++++++++++++++
help/index.md | 3 ++-
help/security.md | 33 ++-------------------------------
help/support.md | 41 +++++++++++++++++++++++++++++++++++++++--
4 files changed, 74 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8e1e3d55/_includes/security.md
----------------------------------------------------------------------
diff --git a/_includes/security.md b/_includes/security.md
new file mode 100644
index 0000000..e0d4a7a
--- /dev/null
+++ b/_includes/security.md
@@ -0,0 +1,31 @@
+The Apache Software Foundation takes a very active stance in
+eliminating security problems against the Apache Wicket web framework.
+
+For reporting and discussing a security issue you should contact the
+Wicket PMC privately.
+
+**\*\* PLEASE DO NOT CREATE A SECURITY REPORT IN OUR ISSUE TRACKER \*\***
+
+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.
+
+### Contact the Wicket PMC privately
+
+Send your security issue to **private at wicket.apache.org**. This list
+is not publicly available so we can discuss and fix the issue in
+private without leaking the info to any bad guys.
+
+<a class="button" href="#" onclick="window.location.href='mailto:private@wicket.apache.org?subject=Security%20issue';return false;" href="mailto:private@wicket.apache.org?subject=Security%20issue">
+ <i class="fa fa-shield"></i>
+ REPORT A SECURITY ISSUE
+</a>
+
+We treat all security issues seriously and will try to fix them as soon
+as possible in all affected versions that we still support.
+
+### Report normal bugs in JIRA
+
+The Security Team cannot accept regular bug reports or other queries,
+we ask that you use our [bug reporting page]({{site.baseurl}}/help/#reportbug)
+for normal, non-security bugs.
http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8e1e3d55/help/index.md
----------------------------------------------------------------------
diff --git a/help/index.md b/help/index.md
index 52c2223..f6c19f3 100644
--- a/help/index.md
+++ b/help/index.md
@@ -48,7 +48,8 @@ way](http://www.catb.org/esr/faqs/smart-questions.html).
## Report A Security Problem {#security}
-{% markdown help/security.md %}
+{% capture security %}{% include security.md %}{% endcapture %}
+{{ security | markdownify }}
---
http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8e1e3d55/help/security.md
----------------------------------------------------------------------
diff --git a/help/security.md b/help/security.md
index 5f3ab0a..9e203e9 100644
--- a/help/security.md
+++ b/help/security.md
@@ -8,34 +8,5 @@ preamble: >
immediately to the Wicket PMC.
---
-The Apache Software Foundation takes a very active stance in
-eliminating security problems against the Apache Wicket web framework.
-
-For reporting and discussing a security issue you should contact the
-Wicket PMC privately.
-
-**\*\* PLEASE DO NOT CREATE A SECURITY REPORT IN OUR ISSUE TRACKER \*\***
-
-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.
-
-### Contact the Wicket PMC privately
-
-Send your security issue to **private at wicket.apache.org**. This list
-is not publicly available so we can discuss and fix the issue in
-private without leaking the info to any bad guys.
-
-<a class="button" href="#" onclick="window.location.href='mailto:private@wicket.apache.org?subject=Security%20issue';return false;" href="mailto:private@wicket.apache.org?subject=Security%20issue">
- <i class="fa fa-shield"></i>
- REPORT A SECURITY ISSUE
-</a>
-
-We treat all security issues seriously and will try to fix them as soon
-as possible in all affected versions that we still support.
-
-### Report normal bugs in JIRA
-
-The Security Team cannot accept regular bug reports or other queries,
-we ask that you use our [bug reporting page]({{site.baseurl}}/help/#reportbug)
-for normal, non-security bugs.
+{% capture security %}{% include security.md %}{% endcapture %}
+{{ security | markdownify }}
http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8e1e3d55/help/support.md
----------------------------------------------------------------------
diff --git a/help/support.md b/help/support.md
index a13c20b..581882c 100644
--- a/help/support.md
+++ b/help/support.md
@@ -4,6 +4,43 @@ title: Get help from companies
subtitle: When you can't get help quick enough or you need direct support
---
-## Commercial Wicket Support
+## Commercial Wicket Support {#commercial}
-{% include support.html %}
+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.
+
+### Finding a Wicket Service Provider
+
+The linked page below lists all companies that provide commercial
+services for Wicket which ranges from training courses, consultancy and
+even project development.
+
+<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>
+
+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.
+
+### Registering as a Wicket Service Provider
+
+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).
+
+We reserve the right to remove your listing if it is deemed
+inappropriate.