github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3100 from brendandburns/docs 

Update to include links to the user FAQ
pull/6/head
roberthbailey 2014-12-22 13:54:44 -08:00
parent 44ce5bef6a 53f7499fd0
commit bba5147643
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -45,6 +45,7 @@ Kubernetes documentation is organized into several categories.
- for people who want to create a kubernetes cluster
- in [docs/getting-started-guides](docs/getting-started-guides)
- **User Documentation**
- [User FAQ](wiki/User-FAQ)
- in [docs](docs/overview.md)
- for people who want to run programs on kubernetes
- describes current features of the system (with brief mentions of planned features)
@ -64,7 +65,7 @@ Kubernetes documentation is organized into several categories.
- **API documentation**
- in [the API conventions doc](docs/api-conventions.md)
- and automatically generated API documentation served by the master
- **Wiki**
- **Wiki/FAQ**
- in [wiki](https://github.com/GoogleCloudPlatform/kubernetes/wiki)
- includes a number of [Kubernetes community-contributed recipes](/contrib/recipes)