Merge pull request #16160 from kargakis/windows-fixes-for-edit

edit: Windows fixes

docs/user-guide/kubectl/kubectl_edit.md

@@ -42,14 +42,15 @@ 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.
+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
@@ -80,6 +81,7 @@ kubectl edit (RESOURCE/NAME | -f FILENAME)
   -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).
+      --windows-line-endings[=false]: Use Windows line-endings (default Unix line-endings)
 ```
 
 ### Options inherited from parent commands
@@ -114,7 +116,7 @@ kubectl edit (RESOURCE/NAME | -f FILENAME)
 
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-09-22 12:53:42.290401559 +0000 UTC
+###### Auto generated by spf13/cobra on 23-Oct-2015
 
 <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_edit.md?pixel)]()