Refdocs for 1.2 import

docs/user-guide/kubectl/kubectl_edit.md

@@ -1,7 +1,3 @@
----
-layout: docwithnav
-title: "kubectl edit"
----
 <!-- BEGIN MUNGE: UNVERSIONED_WARNING -->
 
 
@@ -17,15 +13,16 @@ Edit a resource on the server
 Edit a resource from the default editor.
 
 The edit command allows you to directly edit any API resource you can retrieve via the
-command line tools. It will open the editor defined by your KUBE_EDITOR, GIT_EDITOR,
-or EDITOR environment variables, or fall back to 'vi'. You can edit multiple objects,
-although changes are applied one at a time. The command accepts filenames as well as
-command line arguments, although the files you point to must be previously saved
-versions of resources.
+command line tools. It will open the editor defined by your KUBE_EDITOR, or EDITOR
+environment variables, or fall back to 'vi' for Linux or 'notepad' for Windows.
+You can edit multiple objects, although changes are applied one at a time. The command
+accepts filenames as well as command line arguments, although the files you point to must
+be previously saved versions of resources.
 
 The files to edit will be output in the default API version, or a version specified
 by --output-version. The default format is YAML - if you would like to edit in JSON
-pass -o json.
+pass -o json. The flag --windows-line-endings can be used to force Windows line endings,
+otherwise the default for your operating system will be used.
 
 In the event an error occurs while updating, a temporary file will be created on disk
 that contains your unapplied changes. The most common error when updating a resource
@@ -34,44 +31,40 @@ to apply your changes to the newer version of the resource, or update your tempo
 saved copy to include the latest resource version.
 
 ```
-{% raw %}
 kubectl edit (RESOURCE/NAME | -f FILENAME)
-{% endraw %}
 ```
 
 ### Examples
 
 ```
-{% raw %}
   # Edit the service named 'docker-registry':
-  $ kubectl edit svc/docker-registry
+  kubectl edit svc/docker-registry
 
   # Use an alternative editor
-  $ KUBE_EDITOR="nano" kubectl edit svc/docker-registry
+  KUBE_EDITOR="nano" kubectl edit svc/docker-registry
 
   # Edit the service 'docker-registry' in JSON using the v1 API format:
-  $ kubectl edit svc/docker-registry --output-version=v1 -o json
-{% endraw %}
+  kubectl edit svc/docker-registry --output-version=v1 -o json
 ```
 
 ### Options
 
 ```
-{% raw %}
   -f, --filename=[]: Filename, directory, or URL to file to use to edit the resource
   -o, --output="yaml": Output format. One of: yaml|json.
       --output-version="": Output the formatted object with the given version (default api-version).
-{% endraw %}
+      --record[=false]: Record current kubectl command in the resource annotation.
+      --save-config[=false]: If true, the configuration of current object will be saved in its annotation. This is useful when you want to perform kubectl apply on this object in the future.
+      --windows-line-endings[=false]: Use Windows line-endings (default Unix line-endings)
 ```
 
 ### Options inherited from parent commands
 
 ```
-{% raw %}
       --alsologtostderr[=false]: log to standard error as well as files
       --api-version="": The API version to use when talking to the server
       --certificate-authority="": Path to a cert. file for the certificate authority.
-      --client-certificate="": Path to a client key file for TLS.
+      --client-certificate="": Path to a client certificate file for TLS.
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
@@ -91,14 +84,13 @@ kubectl edit (RESOURCE/NAME | -f FILENAME)
       --username="": Username for basic authentication to the API server.
       --v=0: log level for V logs
       --vmodule=: comma-separated list of pattern=N settings for file-filtered logging
-{% endraw %}
 ```
 
 ### SEE ALSO
 
-* [kubectl](kubectl.html)	 - kubectl controls the Kubernetes cluster manager
+* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-09-16 00:43:02.024642139 +0000 UTC
+###### Auto generated by spf13/cobra on 29-Feb-2016
 
 
 
@@ -110,4 +102,3 @@ kubectl edit (RESOURCE/NAME | -f FILENAME)
 <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_edit.md?pixel)]()
 <!-- END MUNGE: GENERATED_ANALYTICS -->
-