Merge pull request #13530 from goltermann/docs

README.md

@@ -114,7 +114,7 @@ You can also view recordings of past events and presentations on our [Media page
 For Q&A, our threads are at:
 
  * [Stack Overflow](http://stackoverflow.com/questions/tagged/kubernetes)
- * [BotBot.me (IRC)](https://botbot.me/freenode/google-containers/)
+ * [Slack](/docs/troubleshooting.md#slack)
 
 #### Want to do more than just 'discuss' Kubernetes?
 

docs/devel/writing-a-getting-started-guide.md

@@ -76,7 +76,7 @@ These guidelines say *what* to do.  See the Rationale section for *why*.
 
 If you have a cluster partially working, but doing all the above steps seems like too much work,
 we still want to hear from you.  We suggest you write a blog post or a Gist, and we will link to it on our wiki page.
-Just file an issue or chat us on IRC and one of the committers will link to it from the wiki.
+Just file an issue or chat us on [Slack](../troubleshooting.md#slack) and one of the committers will link to it from the wiki.
 
 ## Development Distro Guidelines
 

docs/getting-started-guides/docker-multinode/master.md

@@ -193,7 +193,7 @@ NAME        LABELS                             STATUS
 ```
 
 If the status of the node is `NotReady` or `Unknown` please check that all of the containers you created are successfully running.
-If all else fails, ask questions on IRC at [#google-containers](http://webchat.freenode.net/?channels=google-containers).
+If all else fails, ask questions on [Slack](../../troubleshooting.md#slack).
 
 
 ### Next steps

docs/getting-started-guides/docker-multinode/testing.md

@@ -47,8 +47,7 @@ NAME           LABELS                                 STATUS
 127.0.0.1      kubernetes.io/hostname=127.0.0.1       Ready
 ```
 
-If the status of any node is `Unknown` or `NotReady` your cluster is broken, double check that all containers are running properly, and if all else fails, contact us on IRC at
-[`#google-containers`](http://webchat.freenode.net/?channels=google-containers) for advice.
+If the status of any node is `Unknown` or `NotReady` your cluster is broken, double check that all containers are running properly, and if all else fails, contact us on [Slack](../../troubleshooting.md#slack).
 
 ### Run an application
 

docs/getting-started-guides/gce.md

@@ -100,7 +100,7 @@ cluster/kube-up.sh
 If you want more than one cluster running in your project, want to use a different name, or want a different number of worker nodes, see the `<kubernetes>/cluster/gce/config-default.sh` file for more fine-grained configuration before you start up your cluster.
 
 If you run into trouble, please see the section on [troubleshooting](gce.md#troubleshooting), post to the
-[google-containers group](https://groups.google.com/forum/#!forum/google-containers), or come ask questions on IRC at [#google-containers](http://webchat.freenode.net/?channels=google-containers) on freenode.
+[google-containers group](https://groups.google.com/forum/#!forum/google-containers), or come ask questions on [Slack](../troubleshooting.md#slack).
 
 The next few steps will show you:
 

docs/getting-started-guides/scratch.md

@@ -875,7 +875,7 @@ pinging or SSH-ing from one node to another.
 ### Getting Help
 
 If you run into trouble, please see the section on [troubleshooting](gce.md#troubleshooting), post to the
-[google-containers group](https://groups.google.com/forum/#!forum/google-containers), or come ask questions on IRC at [#google-containers](http://webchat.freenode.net/?channels=google-containers) on freenode.
+[google-containers group](https://groups.google.com/forum/#!forum/google-containers), or come ask questions on [Slack](../troubleshooting.md#slack).
 
 
 <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->

docs/troubleshooting.md

@@ -62,9 +62,9 @@ You may also find the Stack Overflow topics relevant:
 
 Someone else from the community may have already asked a similar question or may be able to help with your problem. The Kubernetes team will also monitor [posts tagged kubernetes](http://stackoverflow.com/questions/tagged/kubernetes). If there aren't any existing questions that help, please [ask a new one](http://stackoverflow.com/questions/ask?tags=kubernetes)!
 
-## IRC
+## <a name="slack"></a>Slack
 
-The Kubernetes team hangs out on IRC at [`#google-containers`](https://botbot.me/freenode/google-containers/) on freenode.  Feel free to come and ask any and all questions there.
+The Kubernetes team hangs out on Slack in the `#kubernetes-users` channel.  You can participate in the Kubernetes team [here](https://kubernetes.slack.com).  Slack requires registration, but the Kubernetes team is open invitation to anyone to register [here](http://slack.kubernetes.io).  Feel free to come and ask any and all questions.
 
 ## Mailing List
 

docs/user-guide/debugging-services.md

@@ -546,7 +546,7 @@ misbehaving.  And yet your `Service` is not working.  You should probably let
 us know, so we can help investigate!
 
 Contact us on
-[IRC](http://webchat.freenode.net/?channels=google-containers) or
+[Slack](../troubleshooting.md#slack) or
 [email](https://groups.google.com/forum/#!forum/google-containers) or
 [GitHub](https://github.com/kubernetes/kubernetes).
 

docs/user-guide/monitoring.md

@@ -85,7 +85,7 @@ Here is a snapshot of the a Google Cloud Monitoring dashboard showing cluster-wi
 
 ## Try it out!
 
-Now that you’ve learned a bit about Heapster, feel free to try it out on your own clusters! The [Heapster repository](https://github.com/GoogleCloudPlatform/heapster) is available on GitHub. It contains detailed instructions to setup Heapster and its storage backends. Heapster runs by default on most Kubernetes clusters, so you may already have it! Feedback is always welcome. Please let us know if you run into any issues. Heapster and Kubernetes developers hang out in the [#google-containers](http://webchat.freenode.net/?channels=google-containers) IRC channel on freenode.net. You can also reach us on the [google-containers Google Groups mailing list](https://groups.google.com/forum/#!forum/google-containers).
+Now that you’ve learned a bit about Heapster, feel free to try it out on your own clusters! The [Heapster repository](https://github.com/kubernetes/heapster) is available on GitHub. It contains detailed instructions to setup Heapster and its storage backends. Heapster runs by default on most Kubernetes clusters, so you may already have it! Feedback is always welcome. Please let us know if you run into any issues via the troubleshooting [channels](../troubleshooting.md).
 
 ***
 *Authors: Vishnu Kannan and Victor Marmol, Google Software Engineers.*

docs/user-guide/persistent-volumes/README.md

@@ -122,8 +122,7 @@ $ curl 10.0.0.241:3000
 I love Kubernetes storage!
 ```
 
-Hopefully this simple guide is enough to get you started with PersistentVolumes.  If you have any questions, join
-[`#google-containers`](https://botbot.me/freenode/google-containers/) on IRC and ask!
+Hopefully this simple guide is enough to get you started with PersistentVolumes.  If you have any questions, join the team on [Slack](../../troubleshooting.md#slack) and ask!
 
 Enjoy!
 

examples/k8petstore/README.md

@@ -137,7 +137,7 @@ Thus we plan to add another tier of queueing, which empties the REDIS transactio
 
 ## Questions
 
-For questions on running this app, you can ask on the google containers group (freenode ~ google-containers@googlegroups.com or #google-containers on IRC)
+For questions on running this app, you can ask on [Slack](../../docs/troubleshooting.md#slack).
 
 For questions about bigpetstore, and how the data is generated, ask on the apache bigtop mailing list.