r317799 - [clang-format] Keep Sphinx happy after r317794

[Krasimir Georgiev via cfe-commits]

Author: krasimir
Date: Thu Nov  9 07:54:59 2017
New Revision: 317799

URL: http://llvm.org/viewvc/llvm-project?rev=317799&view=rev
Log:
[clang-format] Keep Sphinx happy after r317794

Modified:
    cfe/trunk/docs/ClangFormatStyleOptions.rst
    cfe/trunk/include/clang/Format/Format.h

Modified: cfe/trunk/docs/ClangFormatStyleOptions.rst
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/ClangFormatStyleOptions.rst?rev=317799&r1=317798&r2=317799&view=diff
==============================================================================
--- cfe/trunk/docs/ClangFormatStyleOptions.rst (original)
+++ cfe/trunk/docs/ClangFormatStyleOptions.rst Thu Nov  9 07:54:59 2017
@@ -1584,11 +1584,6 @@ the configuration (without a prefix: ``A
 **SortUsingDeclarations** (``bool``)
   If ``true``, clang-format will sort using declarations.
 
-  .. code-block:: c++
-
-     false:                                 true:
-     using std::cout;               vs.     using std::cin;
-     using std::cin;                        using std::cout;
   The order of using declarations is defined as follows:
   Split the strings by "::" and discard any initial empty strings. The last
   element of each list is a non-namespace name; all others are namespace
@@ -1597,6 +1592,12 @@ the configuration (without a prefix: ``A
   names, and within those groups, names are in case-insensitive
   lexicographic order.
 
+  .. code-block:: c++
+
+     false:                                 true:
+     using std::cout;               vs.     using std::cin;
+     using std::cin;                        using std::cout;
+
 **SpaceAfterCStyleCast** (``bool``)
   If ``true``, a space is inserted after C style casts.
 

Modified: cfe/trunk/include/clang/Format/Format.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Format/Format.h?rev=317799&r1=317798&r2=317799&view=diff
==============================================================================
--- cfe/trunk/include/clang/Format/Format.h (original)
+++ cfe/trunk/include/clang/Format/Format.h Thu Nov  9 07:54:59 2017
@@ -1385,11 +1385,7 @@ struct FormatStyle {
   bool SortIncludes;
 
   /// \brief If ``true``, clang-format will sort using declarations.
-  /// \code
-  ///    false:                                 true:
-  ///    using std::cout;               vs.     using std::cin;
-  ///    using std::cin;                        using std::cout;
-  /// \endcode
+  ///
   /// The order of using declarations is defined as follows:
   /// Split the strings by "::" and discard any initial empty strings. The last
   /// element of each list is a non-namespace name; all others are namespace
@@ -1397,6 +1393,11 @@ struct FormatStyle {
   /// individual names is that all non-namespace names come before all namespace
   /// names, and within those groups, names are in case-insensitive
   /// lexicographic order.
+  /// \code
+  ///    false:                                 true:
+  ///    using std::cout;               vs.     using std::cin;
+  ///    using std::cin;                        using std::cout;
+  /// \endcode
   bool SortUsingDeclarations;
 
   /// \brief If ``true``, a space is inserted after C style casts.