Author: buildbot
Date: Wed Sep 28 01:09:06 2016
New Revision: 998432
Log:
Staging update by buildbot for community
Modified:
websites/staging/community/trunk/content/ (props changed)
websites/staging/community/trunk/content/calendars/conferences.html
websites/staging/community/trunk/content/calendars/index.html
Propchange: websites/staging/community/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Sep 28 01:09:06 2016
@@ -1 +1 @@
-1761642
+1762592
Modified: websites/staging/community/trunk/content/calendars/conferences.html
==============================================================================
--- websites/staging/community/trunk/content/calendars/conferences.html
(original)
+++ websites/staging/community/trunk/content/calendars/conferences.html Wed Sep
28 01:09:06 2016
@@ -167,10 +167,12 @@
visibility: hidden;
}
h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink,
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink,
dt:hover > .elementid-permalink { visibility: visible }</style>
-<p>This calendar lists events relating to The Apache Software Foundation and
its projects. </p>
-<p>This Calendar is maintained by the Apache Community Development Committee
(ComDev),
+<h2>Deprecated - See New Calendar instead</h2>
+
+<p>This calendar is no longer maintained; please see <a
href="http://community.apache.org/calendars/";>http://community.apache.org/calendars/</a>
instead.</p>
+<p>This Calendar is maintained by the Apache Community Development Committee
(ComDev),
to have your event listed considered for addition please mail <a
href="mailto:d...@community.apache.org";>d...@community.apache.org</a>.
-Note that to be listed in this calendar events must conform to the <a
href="http://www.apache.org/foundation/marks/events.html";>Third Party Event
Branding Policy</a>. </p>
+Note that to be listed in this calendar events must conform to the <a
href="http://www.apache.org/foundation/marks/events.html";>Third Party Event
Branding Policy</a>.</p>
<h2>Upcoming events</h2>
<ul id="events">
@@ -210,7 +212,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))
@@ -223,8 +225,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;
Modified: websites/staging/community/trunk/content/calendars/index.html
==============================================================================
--- websites/staging/community/trunk/content/calendars/index.html (original)
+++ websites/staging/community/trunk/content/calendars/index.html Wed Sep 28
01:09:06 2016
@@ -38,7 +38,7 @@
<LINK rel="SHORTCUT ICON" href="images/favicon.ico">
- <TITLE>Apache Community Development - Project and Foundation
Calendars</TITLE>
+ <TITLE>Apache Community Development - Apache Related Event Calendars</TITLE>
</head>
<body>
@@ -166,11 +166,15 @@
visibility: hidden;
}
h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink,
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink,
dt:hover > .elementid-permalink { visibility: visible }</style>
-<p>This calendar lists events relating to The Apache Software Foundation and
its projects. </p>
-<p>This Calendar is maintained by the Apache Community Development Committee
(ComDev),
+<p>This calendar lists major events relating to The Apache Software Foundation
+and our many Apache projects. We also have an automated
+<a href="http://www.apache.org/events/meetups.html";>listing of upcoming
Apache-related Meetups</a> (smaller events) available.</p>
+<p>This Calendar is maintained by Apache Community Development volunteers
(ComDev);
to have your event listed considered for addition please mail <a
href="mailto:d...@community.apache.org";>d...@community.apache.org</a>.
-Note that to be listed in this calendar events must conform to the <a
href="http://www.apache.org/foundation/marks/events.html";>Third Party Event
Branding Policy</a>. </p>
-<h2 id="upcoming-events">Upcoming events<a class="headerlink"
href="#upcoming-events" title="Permanent link">¶</a></h2>
+Note that to be listed in this calendar events must <b>already</b> conform
+to the <a href="http://www.apache.org/foundation/marks/events.html";>Third
Party Event Branding Policy</a> and have been approved by
+either the relevant Apache PMC or the Branding Committee.</p>
+<h2 id="major-upcoming-events">Major Upcoming Events<a class="headerlink"
href="#major-upcoming-events" title="Permanent link">¶</a></h2>
<p><ul id="events">
<li><i>List loading</i></li>
</ul></p>
@@ -184,12 +188,13 @@ style="border: 0" width="800" height="60
<script src="https://apis.google.com/js/client.js";></script>
-<h2 id="related-events">Related Events<a class="headerlink"
href="#related-events" title="Permanent link">¶</a></h2>
-<p>In addition to Official Apache Events, there are a wide range of other
+<h2 id="other-related-events">Other Related Events<a class="headerlink"
href="#other-related-events" title="Permanent link">¶</a></h2>
+<p>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
<a href="http://www.apache.org/events/meetups.html";>Apache related Meetups is
available</a>, powered in part by <a
href="https://svn.apache.org/repos/asf/comdev/tools/get_meetups";>this script</a>
-(patches welcome!). Secondly, a crowd-source list of related events is
maintained
-as a <a
href="http://lanyrd.com/guides/apache-software-and-technologies/";>Lanyrd
Guide</a>, and we encourage people to help list related events there.</p>
+(patches welcome!). Secondly, a crowd-sourced list of related events is
maintained
+as a <a
href="http://lanyrd.com/guides/apache-software-and-technologies/";>Lanyrd
Guide</a>, and we encourage people to help list
+Apache project related events there.</p>
</div>
<footer class="footer" align="center">
