You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bm...@apache.org on 2021/10/08 17:33:52 UTC
[shiro-site] branch jbake updated: convert three more pages,
make conferences a redirect to events.
This is an automated email from the ASF dual-hosted git repository.
bmarwell pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/shiro-site.git
The following commit(s) were added to refs/heads/jbake by this push:
new a093a60 convert three more pages, make conferences a redirect to events.
new b5a103d Merge pull request #108 from bmarwell/jbake
a093a60 is described below
commit a093a607e0df36df68d26babd7b0583231104112
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Fri Oct 8 19:30:12 2021 +0200
convert three more pages, make conferences a redirect to events.
---
conferences.md | 2 --
events.md | 28 -----------------
jbake/content/conferences.adoc | 9 ++++++
jbake/content/events.adoc | 35 ++++++++++++++++++++++
.../content/privacy-policy.md | 7 ++++-
5 files changed, 50 insertions(+), 31 deletions(-)
diff --git a/conferences.md b/conferences.md
deleted file mode 100644
index 5fcc229..0000000
--- a/conferences.md
+++ /dev/null
@@ -1,2 +0,0 @@
-If Shiro is presented at any conferences, we'll update this page with details.
-<input type="hidden" id="ghEditPage" value="conferences.md"></input>
diff --git a/events.md b/events.md
deleted file mode 100644
index 3194093..0000000
--- a/events.md
+++ /dev/null
@@ -1,28 +0,0 @@
-<a name="Events-ApacheShiroEvents"></a>
-#Apache Shiro Events
-
-Below is list of upcoming and past Shiro events.
-
-<a name="Events-UpcomingEvents"></a>
-##Upcoming Events
-
-<a name="Events-DevNexus%3AApplicationSecuritywithApacheShiro"></a>
-###DevNexus: Application Security with Apache Shiro
-
-March 22, 2011, Atlanta, GA
-[https://www.devnexus.com/s/presentations#1138](https://www.devnexus.com/s/presentations#1138)
-
-<a name="Events-PastEvents"></a>
-##Past Events
-
-<a name="Events-SanFranciscoJavaUserGroup%3ASuperSimpleApplicationSecuritywithApacheShiro"></a>
-###San Francisco Java User Group: Super Simple Application Security with Apache Shiro
-
-October 12, 2010, San Francisco, CA
-[http://www.meetup.com/sfjava/](http://www.meetup.com/sfjava/)
-
-<a name="Events-SDForum%3ASecuringApplicationswithApacheShiro"></a>
-###SDForum: Securing Applications with Apache Shiro
-
-June 1, 2010, Palo Alto, CA
-<input type="hidden" id="ghEditPage" value="events.md"></input>
diff --git a/jbake/content/conferences.adoc b/jbake/content/conferences.adoc
new file mode 100644
index 0000000..c7e9efc
--- /dev/null
+++ b/jbake/content/conferences.adoc
@@ -0,0 +1,9 @@
+= Conferences
+:jbake-type: redirect
+:jbake-status: published
+:jbake-tags: redirect, conferences
+:jbake-target: /events.html
+:idprefix:
+:icons: font
+
+If Shiro is presented at any conferences, we'll update this page with details.
diff --git a/jbake/content/events.adoc b/jbake/content/events.adoc
new file mode 100644
index 0000000..8045fa2
--- /dev/null
+++ b/jbake/content/events.adoc
@@ -0,0 +1,35 @@
+[#Events-ApacheShiroEvents]
+= Apache Shiro Events
+:jbake-type: page
+:jbake-status: published
+:jbake-tags: events, meetings
+:idprefix:
+:icons: font
+:toc:
+
+Below is list of upcoming and past Shiro events.
+
+If Shiro is presented at any conferences, we'll update this page with details.
+
+[#Events-UpcomingEvents]
+== Upcoming Events
+
+None at the moment.
+
+[#Events-PastEvents]
+== Past Events
+
+=== DevNexus: Application Security with Apache Shiro
+
+March 22, 2011, Atlanta, GA
+https://www.devnexus.com/s/presentations#1138
+
+=== San Francisco Java User Group: Super Simple Application Security with Apache Shiro
+
+October 12, 2010, San Francisco, CA
+http://www.meetup.com/sfjava/
+
+=== SDForum: Securing Applications with Apache Shiro
+
+June 1, 2010, Palo Alto, CA
+<input type="hidden" id="ghEditPage" value="events.md"></input>
diff --git a/privacy-policy.md b/jbake/content/privacy-policy.md
similarity index 92%
rename from privacy-policy.md
rename to jbake/content/privacy-policy.md
index 0da2e66..a04612a 100644
--- a/privacy-policy.md
+++ b/jbake/content/privacy-policy.md
@@ -1,5 +1,10 @@
+title=Apache Shiro Privacy Policy
+type=page
+tags=privacy, policy, agreement
+status=published
+~~~~~~
+
<a name="PrivacyPolicy-ApacheShiroPrivacyPolicy"></a>
-#Apache Shiro Privacy Policy
Information about your use of this website is collected using server access logs and a tracking cookie. The collected information consists of the following: