Merge branch 'releases/2.6' into 'changelog/vc-fieldmatrix'

# Conflicts:
#   CHANGELOG.md

CHANGELOG.md

@@ -8,21 +8,21 @@
   See core/dune-common!325
 
 - `Dune::array` was deprecated use `std::array` from <array> instead.
-   Instead of `Dune::make_arra`, use `Dune::Std::make_array`
+   Instead of `Dune::make_array`, use `Dune::Std::make_array`
    from dune/common/std/make_array.hh
    and `Dune::filledArray` instead of `Dune::fill_array`
    from dune/common/filledarray.hh.`
 
     See core/dune-common!359
   
-- The `DUNE_VERSION...` maccros are deprecated use the new macros
+- The `DUNE_VERSION...` macros are deprecated use the new macros
   `DUNE_VERSION_GT`, `DUNE_VERSION_GTE`, `DUNE_VERSION_LTE`, and
   `DUNE_VERSION_LT` instead.
 
     See core/dune-common!329
   
 - Added some additional fallback implementation to C++17 features:
-  (e.g. `optional`, `conjunction`, `discjunction`)
+  (e.g. `optional`, `conjunction`, `disjunction`)
 
 - `makeVirtualFunction`:
   allows to easily convert any function object (e.g. lambda) to a `VirtualFunction`
@@ -32,4 +32,4 @@
 - `FieldMatrix` now has experimental support for SIMD types from
   [Vc](https://github.com/VcDevel/Vc) as field types.
 
-    See core/dune-common!121
+    See core/dune-common!121
\ No newline at end of file