Skip to content

Commit

Permalink
Merge pull request kubernetes#11596 from brendandburns/docs
Browse files Browse the repository at this point in the history
Add some additional text about getting help.
  • Loading branch information
krousey committed Jul 20, 2015
2 parents 6553ec4 + 21f5401 commit 220cc6a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
8 changes: 1 addition & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,7 @@ Kubernetes documentation is organized into several categories.

If you have questions or want to start contributing please reach out. We don't bite!

You are always welcome to file a [Github issue](https://github.com/GoogleCloudPlatform/kubernetes/issues)
if you have a problem or feature request, or would like
feedback on an idea for something you want to implement in Kubernetes.

The Kubernetes team hangs out on IRC on the [#google-containers channel on freenode.net](http://webchat.freenode.net/?channels=google-containers). This client may be overloaded from time to time. If this happens you can use any [IRC client out there](http://en.wikipedia.org/wiki/Comparison_of_Internet_Relay_Chat_clients) to talk to us.

We also have the [google-containers Google Groups mailing list](https://groups.google.com/forum/#!forum/google-containers) for questions and discussion as well as the [kubernetes-announce mailing list](https://groups.google.com/forum/#!forum/kubernetes-announce) for important announcements (low-traffic, no chatter).
Please see the [troubleshooting guide](docs/troubleshooting.md), or how to [get more help.](docs/troubleshooting.md#getting-help)

If you are a company and are looking for a more formal engagement with Google around Kubernetes and containers at Google as a whole, please fill out [this form](https://docs.google.com/a/google.com/forms/d/1_RfwC8LZU4CKe4vKq32x5xpEJI5QZ-j0ShGmZVv9cm4/viewform) and we'll be in touch.

Expand Down
4 changes: 2 additions & 2 deletions docs/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Sometimes things go wrong. This guide is aimed at making them right. It has tw

# Getting help

If your problem isn't answered by any of guides above, there are variety of ways for you to get help from the Kubernetes team.
If your problem isn't answered by any of the guides above, there are variety of ways for you to get help from the Kubernetes team.

## Questions

Expand All @@ -66,7 +66,7 @@ The Kubernetes team hangs out on IRC at [`#google-containers`](https://botbot.me

## Mailing List

The Kubernetes mailing list is [email protected]
The Kubernetes mailing list is [[email protected]](https://groups.google.com/forum/#!forum/google-containers)


<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
Expand Down

0 comments on commit 220cc6a

Please sign in to comment.