You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@community.apache.org by ni...@apache.org on 2011/06/10 18:21:29 UTC
svn commit: r1134373 - in /comdev/site/trunk/content: calendars/
calendars/conferences.mdtext calendars/index.mdtext index.mdtext
Author: nick
Date: Fri Jun 10 16:21:29 2011
New Revision: 1134373
URL: http://svn.apache.org/viewvc?rev=1134373&view=rev
Log:
Add a stub calendars section, as discussed with Ross, and include the ConCom calendar in it.
Added:
comdev/site/trunk/content/calendars/
comdev/site/trunk/content/calendars/conferences.mdtext (with props)
comdev/site/trunk/content/calendars/index.mdtext (with props)
Modified:
comdev/site/trunk/content/index.mdtext
Added: comdev/site/trunk/content/calendars/conferences.mdtext
URL: http://svn.apache.org/viewvc/comdev/site/trunk/content/calendars/conferences.mdtext?rev=1134373&view=auto
==============================================================================
--- comdev/site/trunk/content/calendars/conferences.mdtext (added)
+++ comdev/site/trunk/content/calendars/conferences.mdtext Fri Jun 10 16:21:29 2011
@@ -0,0 +1,30 @@
+Title: Apache Conferences Calendar
+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
+ 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.
+
+This Calendar is maintained by the [Apache Conferences Committee][1] (ConCom). It's used to list official Apache events, and
+those events which have been approved to use Apache Marks under the [Third Party Event Branding Policy][2].
+
+<iframe src="https://www.google.com/calendar/embed?src=nerseigospses068jd57bk5ar8%40group.calendar.google.com&ctz=America/New_York"
+style="border: 0" width="800" height="600" frameborder="0" scrolling="no"></iframe>
+
+
+This Calendar is also available as an [iCal feed][3]
+
+ [1]: http://www.apache.org/foundation/conferences.html
+ [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
Propchange: comdev/site/trunk/content/calendars/conferences.mdtext
------------------------------------------------------------------------------
svn:eol-style = native
Added: comdev/site/trunk/content/calendars/index.mdtext
URL: http://svn.apache.org/viewvc/comdev/site/trunk/content/calendars/index.mdtext?rev=1134373&view=auto
==============================================================================
--- comdev/site/trunk/content/calendars/index.mdtext (added)
+++ comdev/site/trunk/content/calendars/index.mdtext Fri Jun 10 16:21:29 2011
@@ -0,0 +1,34 @@
+Title: Project and Foundation 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
+ 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.
+
+Within the Apache Software Foundation, a number of projects maintain their own calendars for events, talks and milestones.
+To make it easier to track these things across the whole foundation, the Community Development project will soon provide
+this central to aggregate these into one calendar.
+
+The Apache Conferences Committee (ConCom) also maintains their list of Apache and Apache related conferences
+[here][1]
+
+# Calendar
+*This is coming soon*
+
+## Getting your project events into the Calendar
+If events from your project are not being listed in the calendar, please get in touch via our [mailing list][2], and let
+us know the details of your event feed (ideally in iCal format). Note that only Apache Projects will be listed here
+
+ [1]: conferences.html
+ [2]: http://mail-archives.apache.org/mod_mbox/community-dev/
\ No newline at end of file
Propchange: comdev/site/trunk/content/calendars/index.mdtext
------------------------------------------------------------------------------
svn:eol-style = native
Modified: comdev/site/trunk/content/index.mdtext
URL: http://svn.apache.org/viewvc/comdev/site/trunk/content/index.mdtext?rev=1134373&r1=1134372&r2=1134373&view=diff
==============================================================================
--- comdev/site/trunk/content/index.mdtext (original)
+++ comdev/site/trunk/content/index.mdtext Fri Jun 10 16:21:29 2011
@@ -31,6 +31,9 @@ Apache Committers will find our [committ
External event organisers looking for speakers or speakers looking for materials will find our [speakers section][4] useful.
+For a list of current events, our [calendar section][5] contains an aggregation of foundation wide calendars, along with
+the [official conferences calendar][6]
+
<a name="Index-ManagingtheCommunityDevelopmentproject"></a>
#### Managing the Community Development project
@@ -42,4 +45,6 @@ External event organisers looking for sp
[1]: /newcomers/index.html
[2]: /contributors/index.html
[3]: /committers/index.html
- [4]: /speakers/index.html
\ No newline at end of file
+ [4]: /speakers/index.html
+ [5]: /calendar/index.html
+ [6]: /calendar/conferences.html
\ No newline at end of file