Fix more inconsistent line endings. NFC.

git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@321016 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 156 insertions, 156 deletions

diff --git a/docs/modularize.rst b/docs/modularize.rst
index 6a62c423..6fe49b42 100644
--- a/docs/modularize.rst
+++ b/docs/modularize.rst
@@ -172,40 +172,40 @@ For example, for the header list::
 
 The following module map will be generated::
 
-  // Output/NoProblemsAssistant.txt

+  // Output/NoProblemsAssistant.txt
   // Generated by: modularize -module-map-path=Output/NoProblemsAssistant.txt \
-       -root-module=Root NoProblemsAssistant.modularize

-  

-  module SomeTypes {

-    header "SomeTypes.h"

-    export *

-  }

-  module SomeDecls {

-    header "SomeDecls.h"

-    export *

-  }

-  module SubModule1 {

-    module Header1 {

-      header "SubModule1/Header1.h"

-      export *

-    }

-    module Header2 {

-      header "SubModule1/Header2.h"

-      export *

-    }

-  }

-  module SubModule2 {

-    module Header3 {

-      header "SubModule2/Header3.h"

-      export *

-    }

-    module Header4 {

-      header "SubModule2/Header4.h"

-      export *

-    }

-    header "SubModule2.h"

-    export *

-  }

+       -root-module=Root NoProblemsAssistant.modularize
+  
+  module SomeTypes {
+    header "SomeTypes.h"
+    export *
+  }
+  module SomeDecls {
+    header "SomeDecls.h"
+    export *
+  }
+  module SubModule1 {
+    module Header1 {
+      header "SubModule1/Header1.h"
+      export *
+    }
+    module Header2 {
+      header "SubModule1/Header2.h"
+      export *
+    }
+  }
+  module SubModule2 {
+    module Header3 {
+      header "SubModule2/Header3.h"
+      export *
+    }
+    module Header4 {
+      header "SubModule2/Header4.h"
+      export *
+    }
+    header "SubModule2.h"
+    export *
+  }
 
 An optional ``-root-module=<root-name>`` option can be used to cause a root module
 to be created which encloses all the modules.
@@ -216,50 +216,50 @@ problem headers can be fixed.
 
 For example, with the same header list from above::
 
-  // Output/NoProblemsAssistant.txt

+  // Output/NoProblemsAssistant.txt
   // Generated by: modularize -module-map-path=Output/NoProblemsAssistant.txt \
-       -root-module=Root NoProblemsAssistant.modularize

-  

-  module Root {

-    module SomeTypes {

-      header "SomeTypes.h"

-      export *

-    }

-    module SomeDecls {

-      header "SomeDecls.h"

-      export *

-    }

-    module SubModule1 {

-      module Header1 {

-        header "SubModule1/Header1.h"

-        export *

-      }

-      module Header2 {

-        header "SubModule1/Header2.h"

-        export *

-      }

-    }

-    module SubModule2 {

-      module Header3 {

-        header "SubModule2/Header3.h"

-        export *

-      }

-      module Header4 {

-        header "SubModule2/Header4.h"

-        export *

-      }

-      header "SubModule2.h"

-      export *

-    }

-  }

-

-Note that headers with dependents will be ignored with a warning, as the

-Clang module mechanism doesn't support headers the rely on other headers

-to be included first.

-

-The module map format defines some keywords which can't be used in module

-names. If a header has one of these names, an underscore ('_') will be

+       -root-module=Root NoProblemsAssistant.modularize
+  
+  module Root {
+    module SomeTypes {
+      header "SomeTypes.h"
+      export *
+    }
+    module SomeDecls {
+      header "SomeDecls.h"
+      export *
+    }
+    module SubModule1 {
+      module Header1 {
+        header "SubModule1/Header1.h"
+        export *
+      }
+      module Header2 {
+        header "SubModule1/Header2.h"
+        export *
+      }
+    }
+    module SubModule2 {
+      module Header3 {
+        header "SubModule2/Header3.h"
+        export *
+      }
+      module Header4 {
+        header "SubModule2/Header4.h"
+        export *
+      }
+      header "SubModule2.h"
+      export *
+    }
+  }
+
+Note that headers with dependents will be ignored with a warning, as the
+Clang module mechanism doesn't support headers the rely on other headers
+to be included first.
+
+The module map format defines some keywords which can't be used in module
+names. If a header has one of these names, an underscore ('_') will be
 prepended to the name. For example, if the header name is ``header.h``,
 because ``header`` is a keyword, the module name will be ``_header``.
 For a list of the module map keywords, please see:
-`Lexical structure <http://clang.llvm.org/docs/Modules.html#lexical-structure>`_

+`Lexical structure <http://clang.llvm.org/docs/Modules.html#lexical-structure>`_
diff --git a/docs/pp-trace.rst b/docs/pp-trace.rst
index 902db6fa..b8768ed0 100644
--- a/docs/pp-trace.rst
+++ b/docs/pp-trace.rst
@@ -103,18 +103,18 @@ example:::
 With real data:::
 
   ---
-  - Callback: FileChanged

-    Loc: "c:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-include.cpp:1:1"

-    Reason: EnterFile

-    FileType: C_User

-    PrevFID: (invalid)

-    (etc.)

-  - Callback: FileChanged

-    Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-include.cpp:5:1"

-    Reason: ExitFile

-    FileType: C_User

-    PrevFID: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/Input/Level1B.h"

-  - Callback: EndOfMainFile

+  - Callback: FileChanged
+    Loc: "c:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-include.cpp:1:1"
+    Reason: EnterFile
+    FileType: C_User
+    PrevFID: (invalid)
+    (etc.)
+  - Callback: FileChanged
+    Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-include.cpp:5:1"
+    Reason: ExitFile
+    FileType: C_User
+    PrevFID: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/Input/Level1B.h"
+  - Callback: EndOfMainFile
   ...
 
 In all but one case (MacroDirective) the "Argument" scalars have the same
@@ -171,11 +171,11 @@ PrevFID          ((file)|(invalid))                                   FileID
 
 Example:::
 
-  - Callback: FileChanged

-    Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-include.cpp:1:1"

-    Reason: EnterFile

-    FileType: C_User

-    PrevFID: (invalid)

+  - Callback: FileChanged
+    Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-include.cpp:1:1"
+    Reason: EnterFile
+    FileType: C_User
+    PrevFID: (invalid)
 
 `FileSkipped <http://clang.llvm.org/doxygen/classclang_1_1PPCallbacks.html#ab5b338a0670188eb05fa7685bbfb5128>`_ Callback
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -195,10 +195,10 @@ FileType         (C_User|C_System|C_ExternCSystem)                    SrcMgr::Ch
 
 Example:::
 
-  - Callback: FileSkipped

-    ParentFile: "/path/filename.h"

-    FilenameTok: "filename.h"

-    FileType: C_User

+  - Callback: FileSkipped
+    ParentFile: "/path/filename.h"
+    FilenameTok: "filename.h"
+    FileType: C_User
 
 `FileNotFound <http://clang.llvm.org/doxygen/classclang_1_1PPCallbacks.html#a3045151545f987256bfa8d978916ef00>`_ Callback
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -216,7 +216,7 @@ RecoveryPath     (path)                                               SmallVecto
 
 Example:::
 
-  - Callback: FileNotFound

+  - Callback: FileNotFound
     FileName: "/path/filename.h"
     RecoveryPath:
 
@@ -243,15 +243,15 @@ Imported         ((module name)|(null))                               const Modu
 
 Example:::
 
-  - Callback: InclusionDirective

-    IncludeTok: include

-    FileName: "Input/Level1B.h"

-    IsAngled: false

-    FilenameRange: "Input/Level1B.h"

-    File: "D:/Clang/llvmnewmod/tools/clang/tools/extra/test/pp-trace/Input/Level1B.h"

-    SearchPath: "D:/Clang/llvmnewmod/tools/clang/tools/extra/test/pp-trace"

-    RelativePath: "Input/Level1B.h"

-    Imported: (null)

+  - Callback: InclusionDirective
+    IncludeTok: include
+    FileName: "Input/Level1B.h"
+    IsAngled: false
+    FilenameRange: "Input/Level1B.h"
+    File: "D:/Clang/llvmnewmod/tools/clang/tools/extra/test/pp-trace/Input/Level1B.h"
+    SearchPath: "D:/Clang/llvmnewmod/tools/clang/tools/extra/test/pp-trace"
+    RelativePath: "Input/Level1B.h"
+    Imported: (null)
 
 `moduleImport <http://clang.llvm.org/doxygen/classclang_1_1PPCallbacks.html#af32dcf1b8b7c179c7fcd3e24e89830fe>`_ Callback
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -270,7 +270,7 @@ Imported         ((module name)|(null))                               const Modu
 
 Example:::
 
-  - Callback: moduleImport

+  - Callback: moduleImport
     ImportLoc: "d:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-modules.cpp:4:2"
     Path: [{Name: Level1B, Loc: "d:/Clang/llvmnewmod/tools/clang/tools/extra/test/pp-trace/pp-trace-modules.cpp:4:9"}, {Name: Level2B, Loc: "d:/Clang/llvmnewmod/tools/clang/tools/extra/test/pp-trace/pp-trace-modules.cpp:4:17"}]
     Imported: Level2B
@@ -290,7 +290,7 @@ Argument Name    Argument Value Syntax                                Clang C++
 
 Example:::
 
-  - Callback: EndOfMainFile

+  - Callback: EndOfMainFile
 
 `Ident <http://clang.llvm.org/doxygen/classclang_1_1PPCallbacks.html#a3683f1d1fa513e9b6193d446a5cc2b66>`_ Callback
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -308,7 +308,7 @@ str              (name)                                               const std:
 
 Example:::
 
-  - Callback: Ident

+  - Callback: Ident
     Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-ident.cpp:3:1"
     str: "$Id$"
 
@@ -328,7 +328,7 @@ Introducer       (PIK_HashPragma|PIK__Pragma|PIK___pragma)            PragmaIntr
 
 Example:::
 
-  - Callback: PragmaDirective

+  - Callback: PragmaDirective
     Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:1"
     Introducer: PIK_HashPragma
 
@@ -349,7 +349,7 @@ Str              (message directive)                                  const std:
 
 Example:::
 
-  - Callback: PragmaComment

+  - Callback: PragmaComment
     Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:1"
     Kind: library
     Str: kernel32.lib
@@ -371,7 +371,7 @@ Value            (string)                                             const std:
 
 Example:::
 
-  - Callback: PragmaDetectMismatch

+  - Callback: PragmaDetectMismatch
     Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:1"
     Name: name
     Value: value
@@ -392,7 +392,7 @@ DebugType        (string)                                             StringRef
 
 Example:::
 
-  - Callback: PragmaDebug

+  - Callback: PragmaDebug
     Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:1"
     DebugType: warning
 
@@ -414,7 +414,7 @@ Str              (string)                                             StringRef
 
 Example:::
 
-  - Callback: PragmaMessage

+  - Callback: PragmaMessage
     Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:1"
     Namespace: "GCC"
     Kind: PMK_Message
@@ -436,7 +436,7 @@ Namespace        (name)                                               StringRef
 
 Example:::
 
-  - Callback: PragmaDiagnosticPush

+  - Callback: PragmaDiagnosticPush
     Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:1"
     Namespace: "GCC"
 
@@ -456,7 +456,7 @@ Namespace        (name)                                               StringRef
 
 Example:::
 
-  - Callback: PragmaDiagnosticPop

+  - Callback: PragmaDiagnosticPop
     Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:1"
     Namespace: "GCC"
 
@@ -478,7 +478,7 @@ Str              (string)                                             StringRef
 
 Example:::
 
-  - Callback: PragmaDiagnostic

+  - Callback: PragmaDiagnostic
     Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:1"
     Namespace: "GCC"
     mapping: MAP_WARNING
@@ -502,7 +502,7 @@ State            (1|0)                                                unsigned
 
 Example:::
 
-  - Callback: PragmaOpenCLExtension

+  - Callback: PragmaOpenCLExtension
     NameLoc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:10"
     Name: Name
     StateLoc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:18"
@@ -525,7 +525,7 @@ Ids              [(number)[, ...]]                                    ArrayRef<i
 
 Example:::
 
-  - Callback: PragmaWarning

+  - Callback: PragmaWarning
     Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:1"
     WarningSpec: disable
     Ids: 1,2,3
@@ -546,7 +546,7 @@ Level            (number)                                             int
 
 Example:::
 
-  - Callback: PragmaWarningPush

+  - Callback: PragmaWarningPush
     Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:1"
     Level: 1
 
@@ -565,7 +565,7 @@ Loc              "(file):(line):(col)"                                SourceLoca
 
 Example:::
 
-  - Callback: PragmaWarningPop

+  - Callback: PragmaWarningPop
     Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:1"
 
 `MacroExpands <http://clang.llvm.org/doxygen/classclang_1_1PPCallbacks.html#a9bc725209d3a071ea649144ab996d515>`_ Callback
@@ -586,11 +586,11 @@ Args             [(name)|(number)|<(token name)>[, ...]]              const Macr
 
 Example:::
 
-  - Callback: MacroExpands

-    MacroNameTok: X_IMPL

-    MacroDirective: MD_Define

-    Range: [(nonfile), (nonfile)]

-    Args: [a <plus> y, b]

+  - Callback: MacroExpands
+    MacroNameTok: X_IMPL
+    MacroDirective: MD_Define
+    Range: [(nonfile), (nonfile)]
+    Args: [a <plus> y, b]
 
 `MacroDefined <http://clang.llvm.org/doxygen/classclang_1_1PPCallbacks.html#a8448fc9f96f22ad1b93ff393cffc5a76>`_ Callback
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -608,9 +608,9 @@ MacroDirective   (MD_Define|MD_Undefine|MD_Visibility)                const Macr
 
 Example:::
 
-  - Callback: MacroDefined

-    MacroNameTok: X_IMPL

-    MacroDirective: MD_Define

+  - Callback: MacroDefined
+    MacroNameTok: X_IMPL
+    MacroDirective: MD_Define
 
 `MacroUndefined <http://clang.llvm.org/doxygen/classclang_1_1PPCallbacks.html#acb80fc6171a839db8e290945bf2c9d7a>`_ Callback
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -628,9 +628,9 @@ MacroDirective   (MD_Define|MD_Undefine|MD_Visibility)                const Macr
 
 Example:::
 
-  - Callback: MacroUndefined

-    MacroNameTok: X_IMPL

-    MacroDirective: MD_Define

+  - Callback: MacroUndefined
+    MacroNameTok: X_IMPL
+    MacroDirective: MD_Define
 
 `Defined <http://clang.llvm.org/doxygen/classclang_1_1PPCallbacks.html#a3cc2a644533d0e4088a13d2baf90db94>`_ Callback
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -649,7 +649,7 @@ Range            ["(file):(line):(col)", "(file):(line):(col)"]       SourceRang
 
 Example:::
 
-  - Callback: Defined

+  - Callback: Defined
     MacroNameTok: MACRO
     MacroDirective: (null)
     Range: ["D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:5", "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:19"]
@@ -669,7 +669,7 @@ Range            ["(file):(line):(col)", "(file):(line):(col)"]       SourceRang
 
 Example:::
 
-  - Callback: SourceRangeSkipped

+  - Callback: SourceRangeSkipped
     Range: [":/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:2", ":/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:9:2"]
 
 `If <http://clang.llvm.org/doxygen/classclang_1_1PPCallbacks.html#a645edcb0d6becbc6f256f02fd1287778>`_ Callback
@@ -689,10 +689,10 @@ ConditionValue   (true|false)                                         bool
 
 Example:::
 
-  - Callback: If

-    Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:2"

-    ConditionRange: ["D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:4", "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:9:1"]

-    ConditionValue: false

+  - Callback: If
+    Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:2"
+    ConditionRange: ["D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:4", "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:9:1"]
+    ConditionValue: false
 
 `Elif <http://clang.llvm.org/doxygen/classclang_1_1PPCallbacks.html#a180c9e106a28d60a6112e16b1bb8302a>`_ Callback
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -712,11 +712,11 @@ IfLoc            "(file):(line):(col)"                                SourceLoca
 
 Example:::
 
-  - Callback: Elif

-    Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:10:2"

-    ConditionRange: ["D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:10:4", "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:11:1"]

-    ConditionValue: false

-    IfLoc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:2"

+  - Callback: Elif
+    Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:10:2"
+    ConditionRange: ["D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:10:4", "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:11:1"]
+    ConditionValue: false
+    IfLoc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:2"
 
 `Ifdef <http://clang.llvm.org/doxygen/classclang_1_1PPCallbacks.html#a0ce79575dda307784fd51a6dd4eec33d>`_ Callback
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -735,10 +735,10 @@ MacroDirective   (MD_Define|MD_Undefine|MD_Visibility)                const Macr
 
 Example:::
 
-  - Callback: Ifdef

+  - Callback: Ifdef
     Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-conditional.cpp:3:1"
-    MacroNameTok: MACRO

-    MacroDirective: MD_Define

+    MacroNameTok: MACRO
+    MacroDirective: MD_Define
 
 `Ifndef <http://clang.llvm.org/doxygen/classclang_1_1PPCallbacks.html#a767af69f1cdcc4cd880fa2ebf77ad3ad>`_ Callback
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -757,10 +757,10 @@ MacroDirective   (MD_Define|MD_Undefine|MD_Visibility)                const Macr
 
 Example:::
 
-  - Callback: Ifndef

+  - Callback: Ifndef
     Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-conditional.cpp:3:1"
-    MacroNameTok: MACRO

-    MacroDirective: MD_Define

+    MacroNameTok: MACRO
+    MacroDirective: MD_Define
 
 `Else <http://clang.llvm.org/doxygen/classclang_1_1PPCallbacks.html#ad57f91b6d9c3cbcca326a2bfb49e0314>`_ Callback
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -778,9 +778,9 @@ IfLoc            "(file):(line):(col)"                                SourceLoca
 
 Example:::
 
-  - Callback: Else

-    Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:10:2"

-    IfLoc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:2"

+  - Callback: Else
+    Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:10:2"
+    IfLoc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:2"
 
 `Endif <http://clang.llvm.org/doxygen/classclang_1_1PPCallbacks.html#afc62ca1401125f516d58b1629a2093ce>`_ Callback
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -798,9 +798,9 @@ IfLoc            "(file):(line):(col)"                                SourceLoca
 
 Example:::
 
-  - Callback: Endif

-    Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:10:2"

-    IfLoc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:2"

+  - Callback: Endif
+    Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:10:2"
+    IfLoc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:2"
 
 Building pp-trace
 =================