diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7499fa1d10f83..d8e6af73aad21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -104,7 +104,7 @@ Following are all team members who have contributed to this release:
 
 #### Breaking changes
 
-- Passing additional props (like `data-*`, `aria-*`) directly on the Data Grid component is no longer supported. To pass the props, use `slotProps`.
+- Passing additional props (like `data-*`, `aria-*`) directly on the Data Grid component is no longer supported. To pass the props, use `slotProps`:
 
   - For `.root` element, use `slotProps.root`.
   - For `.main` element (the one with `role="grid"`), use `slotProps.main`.
diff --git a/docs/data/migration/migration-charts-v7/migration-charts-v7.md b/docs/data/migration/migration-charts-v7/migration-charts-v7.md
index 72a8ce9490119..e192355a5d389 100644
--- a/docs/data/migration/migration-charts-v7/migration-charts-v7.md
+++ b/docs/data/migration/migration-charts-v7/migration-charts-v7.md
@@ -122,7 +122,7 @@ The `<PieChart />` by error had the code to render axes.
 This code has been removed in v8, which implies removing the following props: `axisHighlight`, `topAxis`, `rightAxis`, `bottomAxis`, and `leftAxis`.
 
 This should not impact your code.
-If you used axes in a pie chart please open an issue, we would be curious to get more information about the use-case.
+If you used axes in a pie chart please open an issue, we would be curious to get more information about the use case.
 
 ## Remove `resolveSizeBeforeRender` prop
 
diff --git a/docs/data/migration/migration-data-grid-v7/migration-data-grid-v7.md b/docs/data/migration/migration-data-grid-v7/migration-data-grid-v7.md
index a16848e577412..85b8dfa37d6c5 100644
--- a/docs/data/migration/migration-data-grid-v7/migration-data-grid-v7.md
+++ b/docs/data/migration/migration-data-grid-v7/migration-data-grid-v7.md
@@ -36,7 +36,7 @@ Below are described the steps you need to make to migrate from v7 to v8.
 
 ### Props
 
-- Passing additional props (like `data-*`, `aria-*`) directly on the Data Grid component is no longer supported. To pass the props, use `slotProps`.
+- Passing additional props (like `data-*`, `aria-*`) directly on the Data Grid component is no longer supported. To pass the props, use `slotProps`:
   - For the `.root` element, use `slotProps.root`
   - For the `.main` element (the one with `role="grid"`), use `slotProps.main`
 
@@ -57,7 +57,7 @@ Below are described the steps you need to make to migrate from v7 to v8.
 
   ```diff
   -const idToIdLookup = gridRowsDataRowIdToIdLookupSelector(apiRef);
-  -const rowId = idToIdLookup[id]
+  -const rowId = idToIdLookup[id];
   +const rowsLookup = gridRowsLookupSelector(apiRef);
   +const rowId = apiRef.current.getRowId(rowsLookup[id]);
   ```
@@ -91,13 +91,13 @@ Below are described the steps you need to make to migrate from v7 to v8.
 - The `useGridSelector` signature has been updated due to the introduction of arguments parameter in the selectors. Pass `undefined` as `arguments` if the selector doesn't use any arguments.
 
   ```diff
-  -const output = useGridSelector(apiRef, selector, equals)
-  +const output = useGridSelector(apiRef, selector, arguments, equals)
+  -const output = useGridSelector(apiRef, selector, equals);
+  +const output = useGridSelector(apiRef, selector, arguments, equals);
   ```
 
 ### Other exports
 
-- `ariaV8` experimental flag is removed.
+- `ariaV8` experimental flag is removed. It's now the default behavior.
 
 <!-- ### Editing
 
diff --git a/docs/data/migration/migration-pickers-v7/migration-pickers-v7.md b/docs/data/migration/migration-pickers-v7/migration-pickers-v7.md
index d7315974d17d4..4f2e1d378e23e 100644
--- a/docs/data/migration/migration-pickers-v7/migration-pickers-v7.md
+++ b/docs/data/migration/migration-pickers-v7/migration-pickers-v7.md
@@ -356,8 +356,8 @@ This change causes a few breaking changes:
 
    return (
   -  <PickersLayoutRoot ownerState={props}>
-  +  <PickersLayoutRoot ownerState={ownerState}>
   -    <PickersLayoutContentWrapper>
+  +  <PickersLayoutRoot ownerState={ownerState}>
   +    <PickersLayoutContentWrapper ownerState={ownerState}>
        </PickersLayoutContentWrapper>
      </PickersLayoutRoot>
@@ -455,8 +455,10 @@ This change causes a few breaking changes:
 
    // This contains a small behavior change.
    // If the picker is not controlled and has a default value,
-   // opening it and calling `acceptValueChanges` without any change will call `onAccept` with the default value.
-   // Whereas before, opening it and calling `onDimiss` without any change would not have called `onAccept`.
+   // opening it and calling `acceptValueChanges` without any change will call `onAccept`
+   // with the default value.
+   // Whereas before, opening it and calling `onDimiss` without any change would
+   // not have called `onAccept`.
   -const { onDismiss } = props;
   +const { acceptValueChanges } = usePickerActionsContext();
   +const onDismiss = acceptValueChanges
diff --git a/docs/data/migration/migration-tree-view-v7/migration-tree-view-v7.md b/docs/data/migration/migration-tree-view-v7/migration-tree-view-v7.md
index 23a21fa1b2e18..b93029b90d9ec 100644
--- a/docs/data/migration/migration-tree-view-v7/migration-tree-view-v7.md
+++ b/docs/data/migration/migration-tree-view-v7/migration-tree-view-v7.md
@@ -129,8 +129,8 @@ This inconsistency has been solved, all the event manager now target the root of
 
 ```diff
 -<SimpleTreeView>
-+<SimpleTreeView onItemClick={handleItemClick}>
 -  <TreeItem onClick={handleItemClick}>
++<SimpleTreeView onItemClick={handleItemClick}>
 +  <TreeItem>
  </SimpleTreeView>
 ```
diff --git a/docs/data/pages.ts b/docs/data/pages.ts
index 1e7a23dee23c7..e0d0eabaaf69a 100644
--- a/docs/data/pages.ts
+++ b/docs/data/pages.ts
@@ -585,14 +585,14 @@ const pages: MuiPage[] = [
             pathname: '/x/migration/migration-pickers-v7',
             title: 'Breaking changes: Date and Time Pickers',
           },
-          {
-            pathname: '/x/migration/migration-tree-view-v7',
-            title: 'Breaking changes: Tree View',
-          },
           {
             pathname: '/x/migration/migration-charts-v7',
             title: 'Breaking changes: Charts',
           },
+          {
+            pathname: '/x/migration/migration-tree-view-v7',
+            title: 'Breaking changes: Tree View',
+          },
         ],
       },
       {
@@ -604,14 +604,14 @@ const pages: MuiPage[] = [
             pathname: '/x/migration/migration-pickers-v6',
             title: 'Breaking changes: Date and Time Pickers',
           },
-          {
-            pathname: '/x/migration/migration-tree-view-v6',
-            title: 'Breaking changes: Tree View',
-          },
           {
             pathname: '/x/migration/migration-charts-v6',
             title: 'Breaking changes: Charts',
           },
+          {
+            pathname: '/x/migration/migration-tree-view-v6',
+            title: 'Breaking changes: Tree View',
+          },
         ],
       },
       {
diff --git a/packages/x-data-grid/src/models/gridSlotsComponentsProps.ts b/packages/x-data-grid/src/models/gridSlotsComponentsProps.ts
index 5ee2ca93f49b5..b52a75c08e75e 100644
--- a/packages/x-data-grid/src/models/gridSlotsComponentsProps.ts
+++ b/packages/x-data-grid/src/models/gridSlotsComponentsProps.ts
@@ -146,16 +146,16 @@ interface ElementSlotProps {
   skeletonCell: GridSkeletonCellProps & SkeletonCellPropsOverrides;
   toolbar: GridToolbarProps & ToolbarPropsOverrides;
   /**
-   * Props passed to the `.main` (role="grid") element
+   * Props passed to the `.main` (role="grid") element.
    */
   main: MainProps;
   /**
-   * Props passed to the `.root` element
+   * Props passed to the `.root` element.
    */
   root: RootProps;
 }
 
-/* Merge MUI types into base types to keep slotProps working. */
+// Merge MUI types into base types to keep slotProps working.
 type Merge<A, B> = {
   [K in keyof A | keyof B]: K extends keyof A & keyof B
     ? A[K] & B[K]