diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst --- a/clang/docs/ClangFormatStyleOptions.rst +++ b/clang/docs/ClangFormatStyleOptions.rst @@ -2453,7 +2453,7 @@ * ``BBCDS_Allowed`` (in configuration: ``Allowed``) Breaking between template declaration and ``concept`` is allowed. The actual behavior depends on the content and line breaking rules and - penalties. + penalities. * ``BBCDS_Always`` (in configuration: ``Always``) Always break before ``concept``, putting it in the line after the @@ -4561,11 +4561,6 @@ **SortIncludes** (``SortIncludesOptions``) :versionbadge:`clang-format 3.8` :ref:`ΒΆ ` Controls if and how clang-format will sort ``#includes``. - If ``Never``, includes are never sorted. - If ``CaseInsensitive``, includes are sorted in an ASCIIbetical or case - insensitive fashion. - If ``CaseSensitive``, includes are sorted in an alphabetical or case - sensitive fashion. Possible values: diff --git a/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h --- a/clang/include/clang/Format/Format.h +++ b/clang/include/clang/Format/Format.h @@ -3601,11 +3601,6 @@ }; /// Controls if and how clang-format will sort ``#includes``. - /// If ``Never``, includes are never sorted. - /// If ``CaseInsensitive``, includes are sorted in an ASCIIbetical or case - /// insensitive fashion. - /// If ``CaseSensitive``, includes are sorted in an alphabetical or case - /// sensitive fashion. /// \version 3.8 SortIncludesOptions SortIncludes;