openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robw...@apache.org
Subject svn commit: r1407898 - /incubator/ooo/site/trunk/content/openofficeorg/events.mdtext
Date Sat, 10 Nov 2012 22:41:09 GMT
Author: robweir
Date: Sat Nov 10 22:41:08 2012
New Revision: 1407898

URL: http://svn.apache.org/viewvc?rev=1407898&view=rev
Log:
CMS commit to openofficeorg by robweir

Modified:
    incubator/ooo/site/trunk/content/openofficeorg/events.mdtext

Modified: incubator/ooo/site/trunk/content/openofficeorg/events.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/events.mdtext?rev=1407898&r1=1407897&r2=1407898&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/events.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/events.mdtext Sat Nov 10 22:41:08 2012
@@ -1,37 +1,40 @@
-Title:     Events
-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.
-
-## Apache OpenOffice Events
-
-
-## Future Event Planning
-
-A list of future events where Apache OpenOffice may be represented is [here](https://cwiki.apache.org/confluence/display/OOOUSERS/Events+Calendar).
-
-If you know of an event where Apache OpenOffice should be represented, send a note to [our
marketing mailing list](mailto:ooo-marketing@incubator.apache.org).
-
-## Past Events
-
-The following sections link to material related to past events where Apache OpenOffice was
presented.
-
-### ApacheCon Europe 2012, Sinsheim, Germany
-
-    - Blog Post: [Apache OpenOffice track at ApacheCon: Day 1(https://blogs.apache.org/OOo/entry/openoffice_track_at_apachecon_day)
-    - Blog Post: [Apache OpenOffice track at ApacheCon: Day 2](https://blogs.apache.org/OOo/entry/apache_openoffice_track_at_apachecon)
-    
-
+Title:     Events
+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.
+
+## Apache OpenOffice Events
+
+Some useful links for conference planning:
+
+  - [ASF policy on 3rd party Event Branding](http://www.apache.org/foundation/marks/events.html)
+
+## Future Event Planning
+
+A list of future events where Apache OpenOffice may be represented is [here](https://cwiki.apache.org/confluence/display/OOOUSERS/Events+Calendar).
+
+If you know of an event where Apache OpenOffice should be represented, send a note to [our
marketing mailing list](mailto:ooo-marketing@incubator.apache.org).
+
+## Past Events
+
+The following sections link to material related to past events where Apache OpenOffice was
presented.
+
+### ApacheCon Europe 2012, Sinsheim, Germany
+
+   - Blog Post: [Apache OpenOffice track at ApacheCon: Day 1](https://blogs.apache.org/OOo/entry/openoffice_track_at_apachecon_day)
+   - Blog Post: [Apache OpenOffice track at ApacheCon: Day 2](https://blogs.apache.org/OOo/entry/apache_openoffice_track_at_apachecon)
+    
+



Mime
View raw message