From 53f7499fd07b850e7e64a853b62b0a1d19e24c04 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Mon, 22 Dec 2014 13:19:10 -0800 Subject: [PATCH] Update to include links to the user FAQ --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 01e53759e3..daf6492710 100644 --- a/README.md +++ b/README.md @@ -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)