Commit 57624365 authored by David McMahon's avatar David McMahon

Markdown files in root updated by update-generated-docs.sh.

parent 37787ffe
[Moved to CONTRIBUTING.md](CONTRIBUTING.md) [Moved to CONTRIBUTING.md](CONTRIBUTING.md)
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/CONTRIB.md?pixel)]() [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/CONTRIB.md?pixel)]()
...@@ -17,7 +17,7 @@ Please fill out either the individual or corporate Contributor License Agreement ...@@ -17,7 +17,7 @@ Please fill out either the individual or corporate Contributor License Agreement
Follow either of the two links above to access the appropriate CLA and instructions for how to sign and return it. Once we receive it, we'll be able to accept your pull requests. Follow either of the two links above to access the appropriate CLA and instructions for how to sign and return it. Once we receive it, we'll be able to accept your pull requests.
***NOTE***: Only original source code from you and other people that have signed the CLA can be accepted into the main repository. This policy does not apply to [third_party](https://github.com/kubernetes/kubernetes/tree/master/third_party). ***NOTE***: Only original source code from you and other people that have signed the CLA can be accepted into the main repository. This policy does not apply to [third_party](third_party/).
### Contributing A Patch ### Contributing A Patch
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
See the [user guide overview](docs/user-guide/overview.md) for an introduction to Kubernetes and its core concepts. See the [user guide overview](docs/user-guide/overview.md) for an introduction to Kubernetes and its core concepts.
See the [design overview](docs/design) for an overview of the system design. See the [design overview](docs/design/) for an overview of the system design.
See the [API overview](docs/api.md) and [conventions](docs/devel/api-conventions.md) for an overview of the API design. See the [API overview](docs/api.md) and [conventions](docs/devel/api-conventions.md) for an overview of the API design.
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
[Coverage Status Widget]: https://coveralls.io/repos/kubernetes/kubernetes/badge.svg [Coverage Status Widget]: https://coveralls.io/repos/kubernetes/kubernetes/badge.svg
### Are you ... ### Are you ...
* Interested in learning more about using Kubernetes? Please see our user-facing documentation on [kubernetes.io](http://kubernetes.io) * Interested in learning more about using Kubernetes? Please see our user-facing documentation on [kubernetes.io](http://kubernetes.io)
* Interested in hacking on the core Kubernetes code base? Keep reading! * Interested in hacking on the core Kubernetes code base? Keep reading!
...@@ -32,9 +33,11 @@ Kubernetes builds upon a [decade and a half of experience at Google running prod ...@@ -32,9 +33,11 @@ Kubernetes builds upon a [decade and a half of experience at Google running prod
<hr> <hr>
### Kubernetes can run anywhere! ### Kubernetes can run anywhere!
However, initial development was done on GCE and so our instructions and scripts are built around that. If you make it work on other infrastructure please let us know and contribute instructions/code. However, initial development was done on GCE and so our instructions and scripts are built around that. If you make it work on other infrastructure please let us know and contribute instructions/code.
### Kubernetes is ready for Production! ### Kubernetes is ready for Production!
With the [1.0.1 release](https://github.com/kubernetes/kubernetes/releases/tag/v1.0.1) Kubernetes is ready to serve your production workloads. With the [1.0.1 release](https://github.com/kubernetes/kubernetes/releases/tag/v1.0.1) Kubernetes is ready to serve your production workloads.
...@@ -43,7 +46,7 @@ With the [1.0.1 release](https://github.com/kubernetes/kubernetes/releases/tag/v ...@@ -43,7 +46,7 @@ With the [1.0.1 release](https://github.com/kubernetes/kubernetes/releases/tag/v
Kubernetes works with the following concepts: Kubernetes works with the following concepts:
[**Cluster**](docs/admin/README.md) [**Cluster**](docs/admin/README.md)
: A cluster is a set of physical or virtual machines and other infrastructure resources used by Kubernetes to run your applications. Kubernetes can run anywhere! See the [Getting Started Guides](docs/getting-started-guides) for instructions for a variety of services. : A cluster is a set of physical or virtual machines and other infrastructure resources used by Kubernetes to run your applications. Kubernetes can run anywhere! See the [Getting Started Guides](docs/getting-started-guides/) for instructions for a variety of services.
[**Node**](docs/admin/node.md) [**Node**](docs/admin/node.md)
: A node is a physical or virtual machine running Kubernetes, onto which pods can be scheduled. : A node is a physical or virtual machine running Kubernetes, onto which pods can be scheduled.
...@@ -127,7 +130,7 @@ You can also view recordings of past events and presentations on our [Media page ...@@ -127,7 +130,7 @@ You can also view recordings of past events and presentations on our [Media page
For Q&A, our threads are at: For Q&A, our threads are at:
* [Stack Overflow](http://stackoverflow.com/questions/tagged/kubernetes) * [Stack Overflow](http://stackoverflow.com/questions/tagged/kubernetes)
* [Slack](/docs/troubleshooting.md#slack) * [Slack](https://github.com/docs/troubleshooting.md#slack)
### Want to do more than just 'discuss' Kubernetes? ### Want to do more than just 'discuss' Kubernetes?
......
...@@ -40,6 +40,7 @@ This Code of Conduct is adapted from the Contributor Covenant ...@@ -40,6 +40,7 @@ This Code of Conduct is adapted from the Contributor Covenant
http://contributor-covenant.org/version/1/2/0/ http://contributor-covenant.org/version/1/2/0/
### Kubernetes Events Code of Conduct ### Kubernetes Events Code of Conduct
Kubernetes events are working conferences intended for professional networking and collaboration in the Kubernetes events are working conferences intended for professional networking and collaboration in the
Kubernetes community. Attendees are expected to behave according to professional standards and in accordance Kubernetes community. Attendees are expected to behave according to professional standards and in accordance
with their employer's policies on appropriate workplace behavior. with their employer's policies on appropriate workplace behavior.
...@@ -48,12 +49,11 @@ While at Kubernetes events or related social networking opportunities, attendees ...@@ -48,12 +49,11 @@ While at Kubernetes events or related social networking opportunities, attendees
discriminatory or offensive speech or actions regarding gender, sexuality, race, or religion. Speakers should discriminatory or offensive speech or actions regarding gender, sexuality, race, or religion. Speakers should
be especially aware of these concerns. be especially aware of these concerns.
The Kubernetes team does not condone any statements by speakers contrary to these standards. The Kubernetes The Kubernetes team does not condone any statements by speakers contrary to these standards. The Kubernetes
team reserves the right to deny entrance and/or eject from an event (without refund) any individual found to team reserves the right to deny entrance and/or eject from an event (without refund) any individual found to
be engaging in discriminatory or offensive speech or actions. be engaging in discriminatory or offensive speech or actions.
Please bring any concerns to to the immediate attention of Kubernetes event staff Please bring any concerns to to the immediate attention of Kubernetes event staff
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/code-of-conduct.md?pixel)]() [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/code-of-conduct.md?pixel)]()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment