Author: jroelofs
Date: Mon Mar 20 12:07:49 2017
New Revision: 298275
URL: http://llvm.org/viewvc/llvm-project?rev=298275&view=rev
Log:
Fix some sphinx -Werror's
... mostly having to do with code blocks which the syntax highlighter chokes on
Modified:
cfe/trunk/docs/ClangFormatStyleOptions.rst
cfe/trunk/docs/ReleaseNotes.rst
Modified: cfe/trunk/docs/ClangFormatStyleOptions.rst
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/ClangFormatStyleOptions.rst?rev=298275&r1=298274&r2=298275&view=diff
==============================================================================
--- cfe/trunk/docs/ClangFormatStyleOptions.rst (original)
+++ cfe/trunk/docs/ClangFormatStyleOptions.rst Mon Mar 20 12:07:49 2017
@@ -302,7 +302,7 @@ the configuration (without a prefix: ``A
.. code-block:: c++
- class {
+ class Foo {
void f() { foo(); }
};
@@ -311,7 +311,7 @@ the configuration (without a prefix: ``A
.. code-block:: c++
- class {
+ class Foo {
void f() { foo(); }
};
void f() { bar(); }
@@ -898,7 +898,7 @@ the configuration (without a prefix: ``A
.. code-block:: c++
- CommentPragmas: '^ FOOBAR pragma:'
+ // CommentPragmas: '^ FOOBAR pragma:'
// Will leave the following line unaffected
#include <vector> // FOOBAR pragma: keep
Modified: cfe/trunk/docs/ReleaseNotes.rst
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/ReleaseNotes.rst?rev=298275&r1=298274&r2=298275&view=diff
==============================================================================
--- cfe/trunk/docs/ReleaseNotes.rst (original)
+++ cfe/trunk/docs/ReleaseNotes.rst Mon Mar 20 12:07:49 2017
@@ -135,32 +135,43 @@ clang-format
* Option **BreakBeforeInheritanceComma** added to break before ``:`` and ``,``
in case of
multiple inheritance in a class declaration. Enabled by default in the
Mozilla coding style.
- .. code-block:: c++
-
- true: false:
- class MyClass vs. class MyClass : public X, public Y
{
- : public X };
- , public Y {
- };
+ +---------------------+----------------------------------------+
+ | true | false |
+ +=====================+========================================+
+ | .. code-block:: c++ | .. code-block:: c++ |
+ | | |
+ | class MyClass | class MyClass : public X, public Y { |
+ | : public X | }; |
+ | , public Y { | |
+ | }; | |
+ +---------------------+----------------------------------------+
* Align block comment decorations.
- .. code-block:: c++
-
- /* line 1 /* line 1
- * line 2 becomes: * line 2
- */ */
+ +----------------------+---------------------+
+ | Before | After |
+ +======================+=====================+
+ | .. code-block:: c++ | .. code-block:: c++ |
+ | | |
+ | /* line 1 | /* line 1 |
+ | * line 2 | * line 2 |
+ | */ | */ |
+ +----------------------+---------------------+
* The :doc:`ClangFormatStyleOptions` documentation provides detailed examples
for most options.
* Namespace end comments are now added or updated automatically.
- .. code-block:: c++
-
- namespace A { namespace A {
- int i; int i;
- int j; becomes: int j;
- } } // namespace A
+ +---------------------+---------------------+
+ | Before | After |
+ +=====================+=====================+
+ | .. code-block:: c++ | .. code-block:: c++ |
+ | | |
+ | namespace A { | namespace A { |
+ | int i; | int i; |
+ | int j; | int j; |
+ | } | } |
+ +---------------------+---------------------+
* Comment reflow support added. Overly long comment lines will now be reflown
with the rest of
the paragraph instead of just broken. Option **ReflowComments** added and
enabled by default.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
