Merge pull request #18184 from amygdala/docs

docs/devel/coding-conventions.md

@@ -72,7 +72,8 @@ Directory and file conventions
     - Package directories should generally avoid using separators as much as possible (when packages are multiple words, they usually should be in nested subdirectories).
   - Document directories and filenames should use dashes rather than underscores
   - Contrived examples that illustrate system features belong in /docs/user-guide or /docs/admin, depending on whether it is a feature primarily intended for users that deploy applications or cluster administrators, respectively. Actual application examples belong in /examples.
-    - Examples should also illustrate [best practices for using the system](../user-guide/config-best-practices.md)
+    - Examples should also illustrate
+      [best practices for configuration and using the system](../user-guide/config-best-practices.md)
   - Third-party code
     - Third-party Go code is managed using Godeps
     - Other third-party code belongs in /third_party

docs/user-guide/README.md

@@ -125,7 +125,7 @@ If you don't have much familiarity with Kubernetes, we recommend you read the fo
   * [Downward API: accessing system configuration from a pod](downward-api.md)
   * [Images and registries](images.md)
   * [Migrating from docker-cli to kubectl](docker-cli-to-kubectl.md)
-  * [Tips and tricks when working with config](config-best-practices.md)
+  * [Configuration Best Practices and Tips](config-best-practices.md)
   * [Assign pods to selected nodes](node-selection/)
   * [Perform a rolling update on a running group of pods](update-demo/)
 

docs/user-guide/kubectl-overview.md

@@ -86,7 +86,7 @@ where `command`, `TYPE`, `NAME`, and `flags` are:
         * To specify multiple resource types individually: `TYPE1/name1 TYPE1/name2 TYPE2/name3 TYPE<#>/name<#>`<br/>
         Example: `$ kubectl get pod/example-pod1 replicationcontroller/example-rc1`
    * To specify resources with one or more files: `-f file1 -f file2 -f file<#>`
-	 [Use YAML rather than JSON](config-best-practices.md) since YAML tends to be more user-friendly, especially for configuration files.<br/>
+	 [Use YAML rather than JSON](config-best-practices.md#general-config-tips) since YAML tends to be more user-friendly, especially for configuration files.<br/>
      Example: `$ kubectl get pod -f ./pod.yaml`
 * `flags`: Specifies optional flags. For example, you can use the `-s` or `--server` flags to specify the address and port of the Kubernetes API server.<br/>
 **Important**: Flags that you specify from the command line override default values and any corresponding environment variables.

docs/user-guide/managing-deployments.md

@@ -526,7 +526,7 @@ replicationcontrollers "my-nginx-v4" replaced
 ## What's next?
 
 - [Learn about how to use `kubectl` for application introspection and debugging.](introspection-and-debugging.md)
-- [Tips and tricks when working with config](config-best-practices.md)
+- [Configuration Best Practices and Tips](config-best-practices.md)
 
 
 <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->

examples/guestbook/frontend-controller.yaml

@@ -4,9 +4,9 @@ metadata:
   name: frontend
   # these labels can be applied automatically
   # from the labels in the pod template if not set
-  labels:
-    app: guestbook
-    tier: frontend
+  # labels:
+    # app: guestbook
+    # tier: frontend
 spec:
   # this replicas value is default
   # modify it according to your case