Merge branch 'release/v2.2.0'

.clang-format

@@ -29,10 +29,21 @@ ConstructorInitializerAllOnOneLineOrOnePerLine : true
 ConstructorInitializerIndentWidth              : 4
 ContinuationIndentWidth                        : 4
 Cpp11BracedListStyle                           : true
-DerivePointerAlignment                         : true
+DerivePointerAlignment                         : false
 DisableFormat                                  : false
 # ExperimentalAutoDetectBinPacking               :
 # ForEachMacros                                  :
+IncludeCategories                              :
+  - Regex:           '^<vsmc/.*/internal'
+    Priority:        1
+  - Regex:           '^<vsmc/internal'
+    Priority:        2
+  - Regex:           '^<vsmc/'
+    Priority:        3
+  - Regex:           '^<'
+    Priority:        4
+  - Regex:           '.\*'
+    Priority:        5
 IndentCaseLabels                               : true
 IndentWidth                                    : 4
 IndentWrappedFunctionNames                     : true

.gitignore

@@ -1,3 +1,26 @@
-/build
-/doc/main.md
-/user_options.cmake
+build
+doc/main.md
+doc/news.md
+user_guide/_minted-user_guide
+user_guide/cpp/pf
+user_guide/cpp/pf.out
+user_guide/cpp/pf.pdf
+user_guide/cpp/pf.rout
+user_guide/cpp/pf_seq
+user_guide/cpp/pf_tbb
+user_guide/cpp/program_option
+user_guide/cpp/progress
+user_guide/user_guide.aux
+user_guide/user_guide.bbl
+user_guide/user_guide.bcf
+user_guide/user_guide.blg
+user_guide/user_guide.fdb_latexmk
+user_guide/user_guide.fls
+user_guide/user_guide.log
+user_guide/user_guide.out
+user_guide/user_guide.pdf
+user_guide/user_guide.pyg
+user_guide/user_guide.run.xml
+user_guide/user_guide.synctex.gz
+user_guide/user_guide.toc
+user_options.cmake