[GitHub] vieiro closed pull request #74: ApacheCon 2018 Event

[GitBox <gi...@apache.org>]

vieiro closed pull request #74: ApacheCon 2018 Event
URL: https://github.com/apache/incubator-netbeans-website/pull/74
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/netbeans.apache.org/src/content/community/events.asciidoc b/netbeans.apache.org/src/content/community/events.asciidoc
index 28399ac..8376ae2 100644
--- a/netbeans.apache.org/src/content/community/events.asciidoc
+++ b/netbeans.apache.org/src/content/community/events.asciidoc
@@ -20,12 +20,12 @@
 :jbake-type: page
 :jbake-tags: community
 :jbake-status: published
-:keywords: Apache NetBeans Events Days
+:keywords: Apache NetBeans Events Days Conferences ApacheCon
 :description: Apache NetBeans Events
 :toc: left
 :toc-title:
 
-== Apache NetBeans Events
+== Apache NetBeans Days
 
 An "Apache NetBeans Day" is a class of event that happens regularly, with a clear definition of what makes an event be part of that class:
 
@@ -37,12 +37,26 @@ An "Apache NetBeans Day" is a class of event that happens regularly, with a clea
 
 For publicizing NetBeans events, the Apache News posts at https://blogs.apache.org/foundation/ can mention those events, best is to contact press@apache.org for that. Apache has an Event Listing (https://events.apache.org/), that we'd also like to make use of.
 
-=== Upcoming Apache NetBeans Days
+=== Apache NetBeans Day UK 2018
 
-Apache NetBeans Day UK 2018::
-To be held at the University of Greenwich campus (London) on April the 27th, 2018. See the link:https://www.eventbrite.co.uk/e/apache-netbeans-day-uk-2018-tickets-43401128945[agenda and details] and the dedicated link:https://twitter.com/NetBeansDayUK[Twitter account].
+Was held at the University of Greenwich campus (London) on April the 27th, 2018. See the link:https://www.eventbrite.co.uk/e/apache-netbeans-day-uk-2018-tickets-43401128945[agenda and details] and the dedicated link:https://twitter.com/NetBeansDayUK[Twitter account].
 
-=== Apache Software Foundation Resources
+== NetBeans in Other Events
+
+This is a list of different events where Apache NetBeans was or will be the subject of one or more sessions or talks:
+
+=== Apache Conference Montreal 2018
+Ken Fogel, "What Makes NetBeans Special", Sept. the 25th, 2018. link:https://apachecon.dukecon.org/acna/2018/#/schedule[click here for more information].
+
+
+== Other Apache Community Events
+
+This is a link to the next Apache Community major event:
+
+[caption="Apache Current Event", link=https://www.apache.org/events/current-event.html]
+image::https://www.apache.org/events/current-event-234x60.png[CurrentEvent,234,60]
+
+== Apache Software Foundation Resources For Events And Conferences
 
 The Apache Software Foundation provides different resources for events and conferences:
 
@@ -59,3 +73,5 @@ Be sure to also check the Apache Software Foundation link:http://community.apach
 
 
 
+
+


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists