From 7d53c7a4995e3205cffdea2a4e87a1d2ae92516b Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 14 Mar 2017 09:43:55 +0000
Subject: [PATCH] describe the recent changes in clang-format in the 5.0
 release notes

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@297721 91177308-0d34-0410-b5e6-96231b3b80d8
---
 docs/ReleaseNotes.rst | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/docs/ReleaseNotes.rst b/docs/ReleaseNotes.rst
index d22857ed43..af7aa5e91e 100644
--- a/docs/ReleaseNotes.rst
+++ b/docs/ReleaseNotes.rst
@@ -128,6 +128,31 @@ AST Matchers
 
 ...
 
+
+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 {
+     };
+
+* Align block comment decorations
+
+  .. code-block:: c++
+
+     /* line 1
+      * line 2
+      */
+
+* The :doc:`ClangFormatStyleOptions` documentation provides detailled examples for most options.
+
 libclang
 --------
 
-- 
2.40.0