summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mendoza <jeffmendoza@google.com>2016-08-15 13:04:34 -0700
committerJeff Mendoza <jeffmendoza@google.com>2016-08-25 15:09:27 -0700
commit33dbe1a2592659bb650feda4cab4eda2826852df (patch)
tree13f161a42ff362e73185ffc56df46ad484f8a97a
parent5d02f4bf1bd40ae447650abaa0af4cb1addac45f (diff)
Removed non-md files from docs. Moved doc yamls to test/fixtures.
Most of the contents of docs/ has moved to kubernetes.github.io. Development of the docs and accompanying files has continued there, making the copies in this repo stale. I've removed everything but the .md files which remain to redirect old links. The .yaml config files in the docs were used by some tests, these have been moved to test/fixtures/doc-yaml, and can remain there to be used by tests or other purposes.
-rw-r--r--how-to-doc.md16
-rw-r--r--local-cluster/docker.md2
-rw-r--r--local-cluster/k8s-singlenode-docker.pngbin0 -> 31801 bytes
-rw-r--r--local-cluster/local.md2
-rw-r--r--running-locally.md2
5 files changed, 11 insertions, 11 deletions
diff --git a/how-to-doc.md b/how-to-doc.md
index e0659339..99569426 100644
--- a/how-to-doc.md
+++ b/how-to-doc.md
@@ -108,7 +108,7 @@ The above example generates the following links:
## How to Include an Example
While writing examples, you may want to show the content of certain example
-files (e.g. [pod.yaml](../user-guide/pod.yaml)). In this case, insert the
+files (e.g. [pod.yaml](../../test/fixtures/doc-yaml/user-guide/pod.yaml)). In this case, insert the
following code in the md file:
```
@@ -125,13 +125,13 @@ out-of-date every time you update the example file.
For example, the following:
```
-<!-- BEGIN MUNGE: EXAMPLE ../user-guide/pod.yaml -->
-<!-- END MUNGE: EXAMPLE ../user-guide/pod.yaml -->
+<!-- BEGIN MUNGE: EXAMPLE ../../test/fixtures/doc-yaml/user-guide/pod.yaml -->
+<!-- END MUNGE: EXAMPLE ../../test/fixtures/doc-yaml/user-guide/pod.yaml -->
```
generates the following after `hack/update-munge-docs.sh`:
-<!-- BEGIN MUNGE: EXAMPLE ../user-guide/pod.yaml -->
+<!-- BEGIN MUNGE: EXAMPLE ../../test/fixtures/doc-yaml/user-guide/pod.yaml -->
```yaml
apiVersion: v1
@@ -148,8 +148,8 @@ spec:
- containerPort: 80
```
-[Download example](../user-guide/pod.yaml?raw=true)
-<!-- END MUNGE: EXAMPLE ../user-guide/pod.yaml -->
+[Download example](../../test/fixtures/doc-yaml/user-guide/pod.yaml?raw=true)
+<!-- END MUNGE: EXAMPLE ../../test/fixtures/doc-yaml/user-guide/pod.yaml -->
## Misc.
@@ -170,7 +170,7 @@ console code block:
```
```console
-$ kubectl create -f docs/user-guide/pod.yaml
+$ kubectl create -f test/fixtures/doc-yaml/user-guide/pod.yaml
pod "foo" created
``` 
@@ -179,7 +179,7 @@ pod "foo" created
which renders as:
```console
-$ kubectl create -f docs/user-guide/pod.yaml
+$ kubectl create -f test/fixtures/doc-yaml/user-guide/pod.yaml
pod "foo" created
```
diff --git a/local-cluster/docker.md b/local-cluster/docker.md
index b69121e8..38550e9f 100644
--- a/local-cluster/docker.md
+++ b/local-cluster/docker.md
@@ -34,7 +34,7 @@ The following instructions show you how to set up a simple, single node Kubernet
Here's a diagram of what the final result will look like:
-![Kubernetes Single Node on Docker](../../getting-started-guides/k8s-singlenode-docker.png)
+![Kubernetes Single Node on Docker](k8s-singlenode-docker.png)
## Prerequisites
diff --git a/local-cluster/k8s-singlenode-docker.png b/local-cluster/k8s-singlenode-docker.png
new file mode 100644
index 00000000..5ebf8126
--- /dev/null
+++ b/local-cluster/k8s-singlenode-docker.png
Binary files differ
diff --git a/local-cluster/local.md b/local-cluster/local.md
index 23e2156f..8c22a7d1 100644
--- a/local-cluster/local.md
+++ b/local-cluster/local.md
@@ -109,7 +109,7 @@ However you cannot view the nginx start page on localhost. To verify that nginx
You can control the specifications of a pod via a user defined manifest, and reach nginx through your browser on the port specified therein:
```shell
-cluster/kubectl.sh create -f docs/user-guide/pod.yaml
+cluster/kubectl.sh create -f test/fixtures/doc-yaml/user-guide/pod.yaml
```
Congratulations!
diff --git a/running-locally.md b/running-locally.md
index 2b92bb32..4bf86c1b 100644
--- a/running-locally.md
+++ b/running-locally.md
@@ -143,7 +143,7 @@ However you cannot view the nginx start page on localhost. To verify that nginx
You can control the specifications of a pod via a user defined manifest, and reach nginx through your browser on the port specified therein:
```sh
-cluster/kubectl.sh create -f docs/user-guide/pod.yaml
+cluster/kubectl.sh create -f test/fixtures/doc-yaml/user-guide/pod.yaml
```
Congratulations!