You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@community.apache.org by cu...@apache.org on 2016/09/28 01:09:01 UTC
svn commit: r1762592 - in /comdev/site/trunk/content/calendars:
conferences.mdtext index.mdtext
Author: curcuru
Date: Wed Sep 28 01:09:01 2016
New Revision: 1762592
URL: http://svn.apache.org/viewvc?rev=1762592&view=rev
Log:
Update to point to calendars/index and fixup intros
Modified:
comdev/site/trunk/content/calendars/conferences.mdtext
comdev/site/trunk/content/calendars/index.mdtext
Modified: comdev/site/trunk/content/calendars/conferences.mdtext
URL: http://svn.apache.org/viewvc/comdev/site/trunk/content/calendars/conferences.mdtext?rev=1762592&r1=1762591&r2=1762592&view=diff
==============================================================================
--- comdev/site/trunk/content/calendars/conferences.mdtext (original)
+++ comdev/site/trunk/content/calendars/conferences.mdtext Wed Sep 28 01:09:01 2016
@@ -16,11 +16,14 @@ Notice: Licensed to the Apache Softwa
specific language governing permissions and limitations
under the License.
-This calendar lists events relating to The Apache Software Foundation and its projects.
-This Calendar is maintained by the Apache Community Development Committee (ComDev),
+<h2>Deprecated - See New Calendar instead</h2>
+
+This calendar is no longer maintained; please see <a href="http://community.apache.org/calendars/">http://community.apache.org/calendars/</a> instead.
+
+This Calendar is maintained by the Apache Community Development Committee (ComDev),
to have your event listed considered for addition please mail [dev@community.apache.org][1].
-Note that to be listed in this calendar events must conform to the [Third Party Event Branding Policy][2].
+Note that to be listed in this calendar events must conform to the [Third Party Event Branding Policy][2].
<h2>Upcoming events</h2>
<ul id="events">
@@ -61,7 +64,7 @@ function handleDates(li, when) {
text = from;
} else {
// Really multi day
- text = from + " to " + realToDate.getFullYear() + "-" +
+ text = from + " to " + realToDate.getFullYear() + "-" +
(realToDate.getMonth()+1) + "-" + realToDate.getDate();
}
li.appendChild(document.createTextNode(" - " + text))
@@ -74,8 +77,8 @@ function render(data) {
var ev = document.getElementById("events");
if(ev.hasChildNodes()) {
while(ev.childNodes.length >= 1) {
- ev.removeChild(ev.firstChild);
- }
+ ev.removeChild(ev.firstChild);
+ }
}
var feed = data.feed;
@@ -99,4 +102,4 @@ function render(data) {
[1]: mailto:dev@community.apache.org
[2]: http://www.apache.org/foundation/marks/events.html
- [3]: https://www.google.com/calendar/ical/nerseigospses068jd57bk5ar8%40group.calendar.google.com/public/basic.ics
\ No newline at end of file
+ [3]: https://www.google.com/calendar/ical/nerseigospses068jd57bk5ar8%40group.calendar.google.com/public/basic.ics
Modified: comdev/site/trunk/content/calendars/index.mdtext
URL: http://svn.apache.org/viewvc/comdev/site/trunk/content/calendars/index.mdtext?rev=1762592&r1=1762591&r2=1762592&view=diff
==============================================================================
--- comdev/site/trunk/content/calendars/index.mdtext (original)
+++ comdev/site/trunk/content/calendars/index.mdtext Wed Sep 28 01:09:01 2016
@@ -1,4 +1,4 @@
-Title: Project and Foundation Calendars
+Title: Apache Related Event Calendars
Notice: 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
@@ -16,13 +16,17 @@ Notice: Licensed to the Apache Softwa
specific language governing permissions and limitations
under the License.
-This calendar lists events relating to The Apache Software Foundation and its projects.
+This calendar lists major events relating to The Apache Software Foundation
+and our many Apache projects. We also have an automated
+[listing of upcoming Apache-related Meetups][5] (smaller events) available.
-This Calendar is maintained by the Apache Community Development Committee (ComDev),
+This Calendar is maintained by Apache Community Development volunteers (ComDev);
to have your event listed considered for addition please mail [dev@community.apache.org][1].
-Note that to be listed in this calendar events must conform to the [Third Party Event Branding Policy][2].
+Note that to be listed in this calendar events must <b>already</b> conform
+to the [Third Party Event Branding Policy][2] and have been approved by
+either the relevant Apache PMC or the Branding Committee.
-## Upcoming events
+## Major Upcoming Events
<ul id="events">
<li><i>List loading</i></li>
</ul>
@@ -36,17 +40,18 @@ This Calendar is also available as an [i
<script src="https://events.apache.org/js/events-calendar.js"></script>
<script src="https://apis.google.com/js/client.js"></script>
-## Related Events
+## Other Related Events
-In addition to Official Apache Events, there are a wide range of other
+In addition to major conferences that have applied for approval with us, there are a wide range of other
events which feature Apache projects and technologies. A list of upcoming
[Apache related Meetups is available][5], powered in part by [this script][6]
-(patches welcome!). Secondly, a crowd-source list of related events is maintained
-as a [Lanyrd Guide][4], and we encourage people to help list related events there.
+(patches welcome!). Secondly, a crowd-sourced list of related events is maintained
+as a [Lanyrd Guide][4], and we encourage people to help list
+Apache project related events there.
[1]: mailto:dev@community.apache.org
[2]: http://www.apache.org/foundation/marks/events.html
[3]: https://www.google.com/calendar/ical/nerseigospses068jd57bk5ar8%40group.calendar.google.com/public/basic.ics
[4]: http://lanyrd.com/guides/apache-software-and-technologies/
[5]: http://www.apache.org/events/meetups.html
- [6]: https://svn.apache.org/repos/asf/comdev/tools/get_meetups
\ No newline at end of file
+ [6]: https://svn.apache.org/repos/asf/comdev/tools/get_meetups