summaryrefslogtreecommitdiff
path: root/communication.md
diff options
context:
space:
mode:
authorDan Kohn <dan@dankohn.com>2017-03-14 21:54:51 -0400
committerGitHub <noreply@github.com>2017-03-14 21:54:51 -0400
commit08883c8e81aba877f733562ac583b9accdde1587 (patch)
tree859439fd698f43758f2c8db7fa706f6e30ad8f7d /communication.md
parent7a9353c625537915ca0b7053ddb46068322d6315 (diff)
Update KubeCon links
Links were to past conferences. Updated link will stay up-to-date.
Diffstat (limited to 'communication.md')
-rw-r--r--communication.md6
1 files changed, 2 insertions, 4 deletions
diff --git a/communication.md b/communication.md
index 562fb788..34d7a74a 100644
--- a/communication.md
+++ b/communication.md
@@ -68,20 +68,18 @@ please propose a specific date on the [Kubernetes Community Meeting Agenda].
## Conferences
-* [kubecon]
-* [cloudnativecon]
+Kubernetes is the main focus of CloudNativeCon/KubeCon, held every spring in Europe and winter in North America. Information about these and other community events is available on the CNCF [events] pages.
[blog]: http://blog.kubernetes.io
[calendar.google.com]: https://calendar.google.com/calendar/embed?src=cgnt364vd8s86hr2phapfjc6uk%40group.calendar.google.com&ctz=America/Los_Angeles
-[cloudnativecon]: http://events.linuxfoundation.org/events/cloudnativecon
[CNCF code of conduct]: https://github.com/cncf/foundation/blob/master/code-of-conduct.md
[communication]: https://github.com/kubernetes/community/blob/master/communication.md
[community meeting]: https://github.com/kubernetes/community/blob/master/communication.md#weekly-meeting
+[events]: https://www.cncf.io/events/
[file an issue]: https://github.com/kubernetes/kubernetes/issues/new
[Google+]: https://plus.google.com/u/0/b/116512812300813784482/116512812300813784482
[iCal url]: https://calendar.google.com/calendar/ical/cgnt364vd8s86hr2phapfjc6uk%40group.calendar.google.com/public/basic.ics
-[kubecon]: http://events.linuxfoundation.org/events/kubecon
[Kubernetes Community Meeting Agenda]: https://docs.google.com/document/d/1VQDIAB0OqiSjIHI8AWMvSdceWhnz56jNpZrLs6o7NJY/edit#
[kubernetes-community-video-chat]: https://groups.google.com/forum/#!forum/kubernetes-community-video-chat
[kubernetes-dev]: https://groups.google.com/forum/#!forum/kubernetes-dev