Merge pull request #603 from ExpressionEngine/7.dev

7 dev to .x

Author: TomJaeger

docs/add-ons/query.md

@@ -107,7 +107,7 @@ NOTE: **Note:** The default values of `parse_files=` and `parse_bases=` can be o
 
 In case you select a table which stores site settings, the returned value may have `{base_` variables. To parse them, enable the `parse_bases` parameter:
 
-```html
+```
 <table>
   <thead>
     <tr>
@@ -129,7 +129,8 @@ In case you select a table which stores site settings, the returned value may ha
     {/exp:query}
   </tbody>
 </table>
-=======
+```
+
 
 
 NOTE: **Note:** The default values of `parse_files=` and `parse_bases=` can be override using [`parse_variables_query_results_by_default`](/general/system-configuration-overrides.md#parse_variables_query_results_by_default)

docs/installation/changelog.md

@@ -31,7 +31,7 @@
 - Resolved [#2842](https://github.com/ExpressionEngine/ExpressionEngine/issues/2842) where channel form with HTML buttons could show notices when using PHP 8.1
 - Resolved [#2207](https://github.com/ExpressionEngine/ExpressionEngine/issues/2207) where the bug report link was incorrect
 - Resolved [#2822](https://github.com/ExpressionEngine/ExpressionEngine/issues/2822), [#2678](https://github.com/ExpressionEngine/ExpressionEngine/issues/2678) where some custom fields were not properly parsed in Live Preview mode
-- Resolved [#3093](https://github.com/ExpressionEngine/ExpressionEngine/issues/3093) where deprecation message could be shown when editing member using PHP 8.1
+- Resolved [#3093](https://github.com/ExpressionEngine/ExpressionEngine/issues/3093) where deprecation message could be shown when editing members using PHP 8.1
 - Resolved [#3116](https://github.com/ExpressionEngine/ExpressionEngine/issues/3116) where navigating File Picker from Category edit page caused  PHP error
 - [Error](https://github.com/ExpressionEngine/ExpressionEngine/pull/3142/commits/66a49d823363edb22dbdb5d9c1317e486ecb9521) with empty custom member fields
 - [Improved preformance](https://github.com/ExpressionEngine/ExpressionEngine/pull/3142/commits/5754ec61854633ae30fcafb5cbd4b8778af174d1) on member list tag