diff --git a/docs/src/aria-snapshot.md b/docs/src/aria-snapshot.md
index fe8d111b65..892202c104 100644
--- a/docs/src/aria-snapshot.md
+++ b/docs/src/aria-snapshot.md
@@ -5,45 +5,80 @@ title: "Accessibility Snapshots"
 
 ## Overview
 
-In Playwright, **accessibility snapshots** provide a YAML representation of the accessible elements on a page. These snapshots can be stored and compared later to verify if the page structure remains consistent or meets defined expectations.
+In Playwright, accessibility snapshots provide a YAML representation of the accessible elements on a page.
+These snapshots can be stored and compared later to verify if the page structure remains consistent or meets defined
+expectations.
+
+The YAML format describes the hierarchical structure of accessible elements on the page, detailing **roles**,
+**attributes**, **values**, and **text content**. The structure follows a tree-like syntax, where each node represents
+an accessible element, and indentation indicates nested elements.
+
+Following is a simple example of an accessibility snapshot for the playwright.dev homepage:
+
+```yaml
+- banner:
+  - heading /Playwright enables reliable/ [level=1]
+  - link "Get started"
+  - link "Star microsoft/playwright on GitHub"
+- main:
+  - img "Browsers (Chromium, Firefox, WebKit)"
+  - heading "Any browser • Any platform • One API"
+```
+
+Each accessible element in the tree is represented as a YAML node:
+
+```yaml
+- role "name" [attribute=value]
+```
+
+- **role**: Specifies the ARIA or HTML role of the element (e.g., `heading`, `list`, `listitem`, `button`).
+- **"name"**: Accessible name of the element. Quoted strings indicate exact values, or regular expression.
+- **[attribute=value]**: Attributes and values, in square brackets, represent specific ARIA attributes, such
+  as `checked`, `disabled`, `expanded`, `level`, `pressed`, or `selected`.
+
+These values are derived from ARIA attributes or calculated based on HTML semantics. To inspect the accessibility tree
+structure of a page, use the [Chrome DevTools Accessibility Pane](https://developer.chrome.com/docs/devtools/accessibility/reference#pane).
 
-The YAML format describes the hierarchical structure of accessible elements on the page, detailing roles, attributes, values, and text content. The structure follows a tree-like syntax, where each node represents an accessible element, and indentation indicates nested elements.
 
 ## Snapshot Matching
 
-The [`method: LocatorAssertions.toMatchAriaSnapshot`] assertion method in Playwright compares the accessible structure of a page with a predefined accessibility snapshot template, helping validate the page's accessibility state against testing requirements.
+The [`method: LocatorAssertions.toMatchAriaSnapshot`] assertion method in Playwright compares the accessible
+structure of a page with a predefined accessibility snapshot template, helping validate the page's accessibility
+state against testing requirements.
 
+For the following DOM:
+
+```html
+<h1>title</h1>
+```
+
+You can match it using the following snapshot template:
 
 ```js
-await page.setContent(`<h1>title</h1>`);
 await expect(page.locator('body')).toMatchAriaSnapshot(`
   - heading "title"
 `);
 ```
 
 ```python sync
-page.set_content("<h1>title</h1>")
 page.locator("body").to_match_aria_snapshot("""
   - heading "title"
 """)
 ```
 
 ```python async
-await page.set_content("<h1>title</h1>")
 await page.locator("body").to_match_aria_snapshot("""
   - heading "title"
 """)
 ```
 
 ```java
-page.setContent("<h1>title</h1>");
 page.locator("body").expect().toMatchAriaSnapshot("""
   - heading "title"
 """);
 ```
 
 ```csharp
-await page.SetContentAsync("<h1>title</h1>");
 await Expect(page.Locator("body")).ToMatchAriaSnapshotAsync(@"
   - heading ""title""
 ");
@@ -51,97 +86,36 @@ await Expect(page.Locator("body")).ToMatchAriaSnapshotAsync(@"
 
 When matching, the snapshot template is compared to the current accessibility tree of the page:
 
-* If the tree structure matches the template, the test passes; otherwise, it fails, indicating a mismatch between expected and actual accessibility states.
+* If the tree structure matches the template, the test passes; otherwise, it fails, indicating a mismatch between
+  expected and actual accessibility states.
 * The comparison is case-sensitive and collapses whitespace, so indentation and line breaks are ignored.
-* The comparison is order-sensitive, meaning the order of elements in the snapshot template must match the order in the page's accessibility tree.
+* The comparison is order-sensitive, meaning the order of elements in the snapshot template must match the order in the
+  page's accessibility tree.
 
-## Generating Snapshots
-
-Creating accessibility snapshots in Playwright helps ensure and maintain your application’s structure.
-You can generate snapshots in various ways depending on your testing setup and workflow.
-
-### 1. Using the `Locator.ariaSnapshot` Method
-
-The [`method: Locator.ariaSnapshot`] method allows you to programmatically create a YAML representation of accessible elements within a locator’s scope, especially helpful for generating snapshots dynamically during test execution.
-
-**Example**:
-
-```js
-const snapshot = await page.locator('body').ariaSnapshot();
-console.log(snapshot);
-```
-
-```python sync
-snapshot = page.locator("body").aria_snapshot()
-print(snapshot)
-```
-
-```python async
-snapshot = await page.locator("body").aria_snapshot()
-print(snapshot)
-```
-
-```java
-String snapshot = page.locator("body").ariaSnapshot();
-System.out.println(snapshot);
-```
-
-```csharp
-var snapshot = await page.Locator("body").AriaSnapshotAsync();
-Console.WriteLine(snapshot);
-```
-
-This command outputs the accessibility tree within the specified locator’s scope in YAML format, which you can validate or store as needed.
-
-### 2. Generating Snapshots with the Playwright Code Generator
-
-If you’re using Playwright’s [Code Generator](./codegen.md), generating accessibility snapshots is streamlined with its interactive interface:
-
-- **"Assert Snapshot" Action**: In the code generator, you can select elements and use the "Assert snapshot" action to automatically create a snapshot assertion for those elements. This is a quick way to capture the accessibility structure as part of your recorded test flow.
-  
-- **"Accessibility" Tab**: The "Accessibility" tab within the code generator interface visually represents the accessibility tree for a selected locator, letting you explore, inspect, and verify element roles, attributes, and accessible names to aid snapshot creation and review.
-
-### 3. Updating Snapshots with `@playwright/test` and the `--update-snapshots` Flag
-
-When using the Playwright test runner (`@playwright/test`), you can automatically update snapshots by running tests with the `--update-snapshots` flag:
-
-```bash
-npx playwright test --update-snapshots
-```
-
-This command regenerates snapshots for assertions, including accessibility snapshots, replacing outdated ones. It’s useful when application structure changes require new snapshots as a baseline.
-
-#### Empty Template for Snapshot Generation
-
-Passing an empty string as the template in an assertion generates a snapshot on-the-fly:
-
-```js
-await expect(locator).toMatchAriaSnapshot('');
-```
-
-#### Snapshot Patch Files
-
-When updating snapshots, Playwright creates patch files that capture differences. These patch files can be reviewed, approved, and committed to source control, allowing teams to track structural changes over time and ensure updates are consistent with application requirements.
 
 ### Partial Matching
 
-You can perform partial matches on nodes by omitting attributes or accessible names, enabling verification of specific parts of the accessibility tree without requiring exact matches. This flexibility is helpful for dynamic or irrelevant attributes.
+You can perform partial matches on nodes by omitting attributes or accessible names, enabling verification of specific
+parts of the accessibility tree without requiring exact matches. This flexibility is helpful for dynamic or irrelevant
+attributes.
 
 ```html
 <button>Submit</button>
 ```
 
-*accessibility tree for partial match*
 
 ```yaml
+# accessibility snapshot
 - button
 ```
 
-In this example, the button role is matched, but the accessible name ("Submit") is not specified, allowing the test to pass regardless of the button’s label.
+In this example, the button role is matched, but the accessible name ("Submit") is not specified, allowing the test to
+pass regardless of the button’s label.
 
 ---
 
-For elements with ARIA attributes like `checked` or `disabled`, omitting these attributes allows partial matching, focusing solely on role and hierarchy.
+For elements with ARIA attributes like `checked` or `disabled`, omitting these attributes allows partial matching,
+focusing solely on role and hierarchy.
 
 ```html
 <input type="checkbox" checked>
@@ -175,11 +149,13 @@ Similarly, you can partially match children in lists or groups by omitting speci
   - listitem: Feature B
 ```
 
-Partial matches let you create flexible accessibility tests that verify essential page structure without enforcing specific content or attributes.
+Partial matches let you create flexible accessibility tests that verify essential page structure without enforcing
+specific content or attributes.
 
-### Dynamic Matching with Regular Expressions
+### Matching with Regular Expressions
 
-Regular expressions allow flexible matching for elements with dynamic or variable text. Accessible names and text can support regex patterns.
+Regular expressions allow flexible matching for elements with dynamic or variable text. Accessible names and text can
+support regex patterns.
 
 ```html
 <h1>Issues 12</h1>
@@ -191,27 +167,96 @@ Regular expressions allow flexible matching for elements with dynamic or variabl
 - heading /Issues \d+/
 ```
 
-## Accessibility Tree
 
-### Syntax Overview
+## Generating Snapshots
 
-Each accessible element in the tree is represented as a YAML node:
+Creating accessibility snapshots in Playwright helps ensure and maintain your application’s structure.
+You can generate snapshots in various ways depending on your testing setup and workflow.
 
-```yaml
-- role "name" [attribute=value]
+### 1. Using the `Locator.ariaSnapshot` Method
+
+The [`method: Locator.ariaSnapshot`] method allows you to programmatically create a YAML representation of accessible
+elements within a locator’s scope, especially helpful for generating snapshots dynamically during test execution.
+
+**Example**:
+
+```js
+const snapshot = await page.locator('body').ariaSnapshot();
+console.log(snapshot);
 ```
 
-- **role**: Specifies the ARIA or HTML role of the element (e.g., `heading`, `list`, `listitem`, `button`).
-- **"name"** (optional): Accessible name of the element. Quoted strings indicate exact values, while regular expressions (e.g., `/pattern/`) allow dynamic matching.
-- **[attribute=value]** (optional): Attributes and values, in square brackets, represent specific ARIA attributes, such as `checked`, `disabled`, `expanded`, `level`, `pressed`, or `selected`.
+```python sync
+snapshot = page.locator("body").aria_snapshot()
+print(snapshot)
+```
 
-These values are derived from ARIA attributes or calculated based on HTML semantics.
+```python async
+snapshot = await page.locator("body").aria_snapshot()
+print(snapshot)
+```
 
-To inspect the accessibility tree structure of a page, use the [Chrome DevTools Accessibility Pane](https://developer.chrome.com/docs/devtools/accessibility/reference#pane).
+```java
+String snapshot = page.locator("body").ariaSnapshot();
+System.out.println(snapshot);
+```
 
-### Examples
+```csharp
+var snapshot = await page.Locator("body").AriaSnapshotAsync();
+Console.WriteLine(snapshot);
+```
 
-#### Headings with Level Attributes
+This command outputs the accessibility tree within the specified locator’s scope in YAML format, which you can validate
+or store as needed.
+
+### 2. Generating Snapshots with the Playwright Code Generator
+
+If you’re using Playwright’s [Code Generator](./codegen.md), generating accessibility snapshots is streamlined with its
+interactive interface:
+
+- **"Assert Snapshot" Action**: In the code generator, you can select elements and use the "Assert snapshot" action to
+automatically create a snapshot assertion for those elements. This is a quick way to capture the accessibility structure
+as part of your recorded test flow.
+  
+- **"Accessibility" Tab**: The "Accessibility" tab within the code generator interface visually represents the
+accessibility tree for a selected locator, letting you explore, inspect, and verify element roles, attributes, and
+accessible names to aid snapshot creation and review.
+
+### 3. Updating Snapshots with `@playwright/test` and the `--update-snapshots` Flag
+
+When using the Playwright test runner (`@playwright/test`), you can automatically update snapshots by running tests with
+the `--update-snapshots` flag:
+
+```bash
+npx playwright test --update-snapshots
+```
+
+This command regenerates snapshots for assertions, including accessibility snapshots, replacing outdated ones. It’s
+useful when application structure changes require new snapshots as a baseline. Note that Playwright will wait for the
+maximum timeout specified in the test runner configuration to ensure the page is fully loaded before taking the
+snapshot. It might be necessary to adjust the `--timeout` if the test hits the timeout
+while generating snapshots.
+
+#### Empty Template for Snapshot Generation
+
+Passing an empty string as the template in an assertion generates a snapshot on-the-fly:
+
+```js
+await expect(locator).toMatchAriaSnapshot('');
+```
+
+Note that Playwright will wait for the maximum timeout specified in the test runner configuration to ensure the page is
+fully loaded before taking the snapshot. It might be necessary to adjust the `--timeout` if the test hits the timeout
+while generating snapshots.
+
+#### Snapshot Patch Files
+
+When updating snapshots, Playwright creates patch files that capture differences. These patch files can be reviewed,
+approved, and committed to source control, allowing teams to track structural changes over time and ensure updates are
+consistent with application requirements.
+
+## Accessibility Tree Examples
+
+### Headings with Level Attributes
 
 Headings can include a `level` attribute indicating their heading level.
 
@@ -227,7 +272,7 @@ Headings can include a `level` attribute indicating their heading level.
 - heading "Subtitle" [level=2]
 ```
 
-#### Text Nodes
+### Text Nodes
 
 Standalone or descriptive text elements appear as text nodes.
 
@@ -241,9 +286,9 @@ Standalone or descriptive text elements appear as text nodes.
 - text: Sample accessible name
 ```
 
-#### Inline Multiline Text
+### Inline Multiline Text
 
-Multiline text, such as paragraphs, is flattened in the accessibility tree.
+Multiline text, such as paragraphs, is normalized in the accessibility tree.
 
 ```html
 <p>Line 1<br>Line 2</p>
@@ -255,7 +300,7 @@ Multiline text, such as paragraphs, is flattened in the accessibility tree.
 - paragraph: Line 1 Line 2
 ```
 
-#### Links
+### Links
 
 Links display their text or composed content from pseudo-elements.
 
@@ -269,7 +314,7 @@ Links display their text or composed content from pseudo-elements.
 - link "Read more about Accessibility"
 ```
 
-#### Textboxes
+### Text boxes
 
 Input elements of type `text` show their `value` attribute content.
 
@@ -283,11 +328,7 @@ Input elements of type `text` show their `value` attribute content.
 - textbox: Enter your name
 ```
 
-### Composite Structures
-
-The accessibility tree mirrors the DOM hierarchy, excluding elements with `presentation` or `none` roles, while inlining text content for generic nodes.
-
-#### Example: Lists with Items
+### Lists with Items
 
 Ordered and unordered lists include their list items.
 
@@ -306,7 +347,7 @@ Ordered and unordered lists include their list items.
   - listitem: Feature 2
 ```
 
-#### Example: Grouped Elements
+### Grouped Elements
 
 Groups capture nested elements, such as `<details>` elements with summary content.
 
@@ -325,7 +366,8 @@ Groups capture nested elements, such as `<details>` elements with summary conten
 
 ### Attributes and States
 
-Commonly used ARIA attributes, like `checked`, `disabled`, `expanded`, `level`, `pressed`, and `selected`, represent control states.
+Commonly used ARIA attributes, like `checked`, `disabled`, `expanded`, `level`, `pressed`, and `selected`, represent
+control states.
 
 #### Checkbox with `checked` Attribute