From: Krasimir Georgiev <krasimir@google.com>
Date: Thu, 9 Nov 2017 15:54:59 +0000 (+0000)
Subject: [clang-format] Keep Sphinx happy after r317794
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78960a92a5a858bcab2c0ef18de6901930363822;p=clang

[clang-format] Keep Sphinx happy after r317794

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

diff --git a/docs/ClangFormatStyleOptions.rst b/docs/ClangFormatStyleOptions.rst
index 1b9387cd6e..8e3c5dad3c 100644
--- a/docs/ClangFormatStyleOptions.rst
+++ b/docs/ClangFormatStyleOptions.rst
@@ -1584,11 +1584,6 @@ the configuration (without a prefix: ``Auto``).
 **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: ``Auto``).
   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.
 
diff --git a/include/clang/Format/Format.h b/include/clang/Format/Format.h
index 7be794e959..fcca42d620 100644
--- a/include/clang/Format/Format.h
+++ b/include/clang/Format/Format.h
@@ -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.