Update `clang-format -help` output in clang-format docs.

-assume-filename, -fallback-style, and -sort-includes are new.  (They're also
longer than the previous options, so all descriptions shift over by some amount,
making this diff look larger than it is.)

It looks like someone renamed "General options" to "Generic Options" too.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@250672 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/docs/ClangFormat.rst b/docs/ClangFormat.rst
index 45ea32717995877a2f01d411779b2823967717d7..b4968ef1036fc477931d52769f4537e447f04b66 100644 (file)
--- a/docs/ClangFormat.rst
+++ b/docs/ClangFormat.rst
@@ -16,7 +16,7 @@ to format C/C++/Obj-C code.
 .. code-block:: console
 
   $ clang-format -help
-  OVERVIEW: A tool to format C/C++/Obj-C code.
+  OVERVIEW: A tool to format C/C++/Java/JavaScript/Objective-C/Protobuf code.
 
   If no arguments are specified, it formats the code from standard input
   and writes the result to the standard output.
@@ -30,44 +30,53 @@ to format C/C++/Obj-C code.
 
   Clang-format options:
 
-    -cursor=<uint>           - The position of the cursor when invoking
-                               clang-format from an editor integration
-    -dump-config             - Dump configuration options to stdout and exit.
-                               Can be used with -style option.
-    -i                       - Inplace edit <file>s, if specified.
-    -length=<uint>           - Format a range of this length (in bytes).
-                               Multiple ranges can be formatted by specifying
-                               several -offset and -length pairs.
-                               When only a single -offset is specified without
-                               -length, clang-format will format up to the end
-                               of the file.
-                               Can only be used with one input file.
-    -lines=<string>          - <start line>:<end line> - format a range of
-                               lines (both 1-based).
-                               Multiple ranges can be formatted by specifying
-                               several -lines arguments.
-                               Can't be used with -offset and -length.
-                               Can only be used with one input file.
-    -offset=<uint>           - Format a range starting at this byte offset.
-                               Multiple ranges can be formatted by specifying
-                               several -offset and -length pairs.
-                               Can only be used with one input file.
-    -output-replacements-xml - Output replacements as XML.
-    -style=<string>          - Coding style, currently supports:
-                                 LLVM, Google, Chromium, Mozilla, WebKit.
-                               Use -style=file to load style configuration from
-                               .clang-format file located in one of the parent
-                               directories of the source file (or current
-                               directory for stdin).
-                               Use -style="{key: value, ...}" to set specific
-                               parameters, e.g.:
-                                 -style="{BasedOnStyle: llvm, IndentWidth: 8}"
-
-  General options:
-
-    -help                    - Display available options (-help-hidden for more)
-    -help-list               - Display list of available options (-help-list-hidden for more)
-    -version                 - Display the version of this program
+    -assume-filename=<string> - When reading from stdin, clang-format assumes this
+                                filename to look for a style config file (with
+                                -style=file) and to determine the language.
+    -cursor=<uint>            - The position of the cursor when invoking
+                                clang-format from an editor integration
+    -dump-config              - Dump configuration options to stdout and exit.
+                                Can be used with -style option.
+    -fallback-style=<string>  - The name of the predefined style used as a
+                                fallback in case clang-format is invoked with
+                                -style=file, but can not find the .clang-format
+                                file to use.
+                                Use -fallback-style=none to skip formatting.
+    -i                        - Inplace edit <file>s, if specified.
+    -length=<uint>            - Format a range of this length (in bytes).
+                                Multiple ranges can be formatted by specifying
+                                several -offset and -length pairs.
+                                When only a single -offset is specified without
+                                -length, clang-format will format up to the end
+                                of the file.
+                                Can only be used with one input file.
+    -lines=<string>           - <start line>:<end line> - format a range of
+                                lines (both 1-based).
+                                Multiple ranges can be formatted by specifying
+                                several -lines arguments.
+                                Can't be used with -offset and -length.
+                                Can only be used with one input file.
+    -offset=<uint>            - Format a range starting at this byte offset.
+                                Multiple ranges can be formatted by specifying
+                                several -offset and -length pairs.
+                                Can only be used with one input file.
+    -output-replacements-xml  - Output replacements as XML.
+    -sort-includes            - Sort touched include lines
+    -style=<string>           - Coding style, currently supports:
+                                  LLVM, Google, Chromium, Mozilla, WebKit.
+                                Use -style=file to load style configuration from
+                                .clang-format file located in one of the parent
+                                directories of the source file (or current
+                                directory for stdin).
+                                Use -style="{key: value, ...}" to set specific
+                                parameters, e.g.:
+                                  -style="{BasedOnStyle: llvm, IndentWidth: 8}"
+
+  Generic Options:
+
+    -help                     - Display available options (-help-hidden for more)
+    -help-list                - Display list of available options (-help-list-hidden for more)
+    -version                  - Display the version of this program
 
 
 When the desired code formatting style is different from the available options,