Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io

2016-03-09 17:15:52 +00:00
parent cc50fcf538 9a1945635b
commit e04e75c2ff
30 changed files with 627 additions and 365 deletions
@@ -30,6 +30,7 @@ kubectl get [(-o|--output=)json|yaml|wide|go-template=...|go-template-file=...|j
 ### Examples

 ```
+{% raw %}
 # List all pods in ps output format.
 kubectl get pods

@@ -53,6 +54,7 @@ kubectl get rc,services

 # List one or more resources by their type and names.
 kubectl get rc/web service/frontend pods/web-pod-13je7
+{% endraw %}
 ```

 ### Options