diff --git a/.github/workflows/pr-example-validation.yaml b/.github/workflows/pr-example-validation.yaml
new file mode 100644
index 000000000..76ed67ab7
--- /dev/null
+++ b/.github/workflows/pr-example-validation.yaml
@@ -0,0 +1,31 @@
+name: Validate example configurations in PRs
+
+on:
+  pull_request:
+    paths:
+      - '**/*.md'
+
+permissions: {}
+
+# Avoid multiple commits on the same PR racing to update the comment.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  validate-configs:
+    name: Validate example configurations in changed Markdown files
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v7
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+
+      - name: Validate example configurations in changed files
+        run: |
+          ./scripts/validate-changed-files.sh "${{ github.event.pull_request.base.sha }}" HEAD
+        shell: bash
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ba69b99c7..665f58bb1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -141,6 +141,10 @@ Every plugin page should include both a YAML and a classic configuration example
 {% endtabs %}
 ```
 
+We have some checks in CI to validate these examples so ensure the `scripts/validate-changed-files.sh` script passes for your branch vs the origin.
+This uses the Fluent Bit linux container so may not always pass, e.g. for Windows plugins.
+Suppressions can be defined in the `scripts/test-config.sh` script with a comment explaining why.
+
 ### Key casing in examples
 
 Key casing differs between the two configuration formats:
diff --git a/administration/configuring-fluent-bit/yaml/parsers-section.md b/administration/configuring-fluent-bit/yaml/parsers-section.md
index 4aec29143..71e0bd6c1 100644
--- a/administration/configuring-fluent-bit/yaml/parsers-section.md
+++ b/administration/configuring-fluent-bit/yaml/parsers-section.md
@@ -75,7 +75,7 @@ parsers:
 1. Update the `parsers_file` parameter in the `service` section of your YAML configuration file:
 
 {% tabs %}
-{% tab title="fluent-bit.yaml" %}
+{% tab title="custom-parsers-fluent-bit.yaml" %}
 
 ```yaml
 service:
diff --git a/installation/downloads/docker.md b/installation/downloads/docker.md
index 9a837d7f2..99caaa96e 100644
--- a/installation/downloads/docker.md
+++ b/installation/downloads/docker.md
@@ -15,7 +15,7 @@ docker run -ti cr.fluentbit.io/fluent/fluent-bit
 Use the following command to start Fluent Bit while using a configuration file:
 
 {% tabs %}
-{% tab title="fluent-bit.conf" %}
+{% tab title="Legacy Configuration: fluent-bit.conf" %}
 
 ```shell
 docker run -ti -v ./fluent-bit.conf:/fluent-bit/etc/fluent-bit.conf \
@@ -24,7 +24,7 @@ docker run -ti -v ./fluent-bit.conf:/fluent-bit/etc/fluent-bit.conf \
 
 {% endtab %}
 
-{% tab title="fluent-bit.yaml" %}
+{% tab title="YAML configuration: fluent-bit.yaml" %}
 
 ```shell
 docker run -ti -v ./fluent-bit.yaml:/fluent-bit/etc/fluent-bit.yaml \
@@ -317,7 +317,7 @@ The reasons for using distroless are well covered in
 - Reduces false positives on scans (and reduces resources required for scanning).
 - Reduces supply chain security requirements to only what you need.
 - Helps prevent unauthorised processes or users interacting with the container.
-- Less need to harden the container (and container runtime, K8s, and so on).
+- Less need to harden the container (and container runtime, Kubernetes, and so on).
 - Faster CI/CD processes.
 
 With any choice, there are downsides:
diff --git a/local-testing/validating-your-data-and-structure.md b/local-testing/validating-your-data-and-structure.md
index 81c1132cc..e61b2f0ff 100644
--- a/local-testing/validating-your-data-and-structure.md
+++ b/local-testing/validating-your-data-and-structure.md
@@ -83,7 +83,6 @@ The following is the Fluent Bit YAML configuration file:
 service:
   flush: 1
   log_level: info
-  parsers_file: parsers.yaml
 
 pipeline:
   inputs:
@@ -128,7 +127,6 @@ The following is the Fluent Bit classic configuration file:
 [SERVICE]
     flush        1
     log_level    info
-    parsers_file parsers.conf
 
 [INPUT]
     name        tail
@@ -177,7 +175,6 @@ The following is the Fluent Bit YAML configuration file:
 service:
   flush: 1
   log_level: info
-  parsers_file: parsers.yaml
 
 pipeline:
   inputs:
@@ -230,7 +227,6 @@ pipeline:
 [SERVICE]
     flush        1
     log_level    info
-    parsers_file parsers.conf
 
 [INPUT]
     name         tail
diff --git a/pipeline/buffering.md b/pipeline/buffering.md
index 1796bbb7c..87637a9ed 100644
--- a/pipeline/buffering.md
+++ b/pipeline/buffering.md
@@ -102,7 +102,8 @@ pipeline:
       # Inherits storage.type: filesystem from service
 
     - name: mem
-      storage.type: memory  # Overrides the inherited default
+      # Overrides the inherited default
+      storage.type: memory
 ```
 
 {% endtab %}
@@ -124,7 +125,8 @@ pipeline:
 
 [INPUT]
   Name          mem
-  Storage.Type  memory  # Overrides the inherited default
+  # Overrides the inherited default
+  Storage.Type  memory
 ```
 
 {% endtab %}
diff --git a/pipeline/filters/geoip2-filter.md b/pipeline/filters/geoip2-filter.md
index bbd981580..5e4f969c0 100644
--- a/pipeline/filters/geoip2-filter.md
+++ b/pipeline/filters/geoip2-filter.md
@@ -33,7 +33,7 @@ The following configuration processes the incoming `remote_addr` and appends cou
 pipeline:
   inputs:
     - name: dummy
-      dummy: {"remote_addr": "8.8.8.8"}
+      dummy: '{"remote_addr": "8.8.8.8"}'
 
   filters:
     - name: geoip2
diff --git a/pipeline/filters/grep.md b/pipeline/filters/grep.md
index 1232efc63..2d8ff2376 100644
--- a/pipeline/filters/grep.md
+++ b/pipeline/filters/grep.md
@@ -55,9 +55,6 @@ fluent-bit -i tail -p 'path=lines.txt' -F grep -p 'regex=log aa' -m '*' -o stdou
 {% tab title="fluent-bit.yaml" %}
 
 ```yaml
-service:
-  parsers_file: /path/to/parsers.conf
-
 pipeline:
   inputs:
     - name: tail
@@ -78,9 +75,6 @@ pipeline:
 {% tab title="fluent-bit.conf" %}
 
 ```text
-[SERVICE]
-  Parsers_File /path/to/parsers.conf
-
 [INPUT]
   Name   tail
   Path   lines.txt
diff --git a/pipeline/filters/kubernetes.md b/pipeline/filters/kubernetes.md
index 028952caf..5501e90fc 100644
--- a/pipeline/filters/kubernetes.md
+++ b/pipeline/filters/kubernetes.md
@@ -360,10 +360,11 @@ pipeline:
 {% tab title="fluent-bit.conf" %}
 
 ```text
-[PARSER]
-  Name    custom-tag
-  Format  regex
-  Regex   ^(?<namespace_name>[^_]+)\.(?<pod_name>[a-z0-9](?:[-a-z0-9]*[a-z0-9])?(?:\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)\.(?<container_name>.+)\.(?<container_id>[a-z0-9]{64})
+# Ensure this is added to parsers_file loaded in the SERVICE section
+# [PARSER]
+#   Name    custom-tag
+#   Format  regex
+#   Regex   ^(?<namespace_name>[^_]+)\.(?<pod_name>[a-z0-9](?:[-a-z0-9]*[a-z0-9])?(?:\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)\.(?<container_name>.+)\.(?<container_id>[a-z0-9]{64})
 
 [INPUT]
   Name              tail
@@ -488,7 +489,7 @@ pipeline:
       parser: docker
       docker_mode: on
       mem_buf_limit: 50MB
-      skip_login_lines: on
+      skip_long_lines: on
       refresh_interval: 10
 
   filters:
diff --git a/pipeline/filters/multiline-stacktrace.md b/pipeline/filters/multiline-stacktrace.md
index d45324a20..a4c4cd9d9 100644
--- a/pipeline/filters/multiline-stacktrace.md
+++ b/pipeline/filters/multiline-stacktrace.md
@@ -72,7 +72,8 @@ This is the primary Fluent Bit YAML configuration file. It includes the `parsers
 service:
   flush: 1
   log_level: info
-  parsers_file: parsers_multiline.yaml
+  # Configure this to load your custom parser if required
+  # parsers_file: parsers_multiline.yaml
 
 pipeline:
   inputs:
@@ -100,7 +101,8 @@ This is the primary Fluent Bit classic configuration file. It includes the `pars
 [SERVICE]
   Flush                 1
   Log_Level             info
-  Parsers_File          parsers_multiline.conf
+  # Configure this to load your custom parser if required
+  # Parsers_File          parsers_multiline.conf
 
 [INPUT]
   Name                  tail
diff --git a/pipeline/filters/parser.md b/pipeline/filters/parser.md
index 1db516612..d47bd196a 100644
--- a/pipeline/filters/parser.md
+++ b/pipeline/filters/parser.md
@@ -16,7 +16,7 @@ The plugin supports the following configuration parameters:
 | `parser` | Specify the parser name to interpret the field. Multiple parser entries are allowed (one per line). | _none_ |
 | `preserve_key` | Keep the original `key_name` field in the parsed result. If false, the field will be removed. | `false` |
 | `reserve_data` | Keep all other original fields in the parsed result. If false, all other original fields will be removed. | `false` |
-| `Unescape_key` | Deprecated. This option is retained only for backward compatibility and should not be used in new configurations. | _deprecated_ |
+| `Unescape_key` | Deprecated. This option is retained only for backward compatibility and shouldn't be used in new configurations. | _deprecated_ |
 
 ## Get started
 
@@ -27,7 +27,7 @@ The plugin needs a parser file which defines how to parse each field.
 This is an example of parsing a record `{"data":"100 0.5 true This is example"}`.
 
 {% tabs %}
-{% tab title="fluent-bit.yaml" %}
+{% tab title="parser.yaml" %}
 
 ```yaml
 parsers:
@@ -37,7 +37,7 @@ parsers:
 ```
 
 {% endtab %}
-{% tab title="fluent-bit.conf" %}
+{% tab title="parser.conf" %}
 
 ```text
 [PARSER]
@@ -55,8 +55,9 @@ The path of the parser file should be written in configuration file under the `[
 {% tab title="fluent-bit.yaml" %}
 
 ```yaml
-service:
-  parsers_file: /path/to/parsers.yaml
+# service:
+  # Provide the actual path here
+  # parsers_file: /path/to/parsers.yaml
 
 pipeline:
   inputs:
@@ -80,7 +81,7 @@ pipeline:
 
 ```text
 [SERVICE]
-  Parsers_File /path/to/parsers.conf
+  # Parsers_File /path/to/parsers.conf
 
 [INPUT]
   Name dummy
@@ -154,8 +155,9 @@ Now add `reserve_data` to the filter section of the corresponding configuration
 {% tab title="fluent-bit.yaml" %}
 
 ```yaml
-service:
-  parsers_file: /path/to/parsers.yaml
+# service:
+  # Provide the actual path here
+  # parsers_file: /path/to/parsers.yaml
 
 pipeline:
   inputs:
@@ -180,7 +182,7 @@ pipeline:
 
 ```text
 [SERVICE]
-  Parsers_File /path/to/parsers.conf
+  # Parsers_File /path/to/parsers.conf
 
 [INPUT]
   Name dummy
@@ -248,8 +250,9 @@ Now add `reserve_data` and `preserve_key` to the filter section of the correspon
 {% tab title="fluent-bit.yaml" %}
 
 ```yaml
-service:
-  parsers_file: /path/to/parsers.yaml
+# service:
+  # Provide the actual path here
+  # parsers_file: /path/to/parsers.yaml
 
 pipeline:
   inputs:
@@ -275,7 +278,7 @@ pipeline:
 
 ```text
 [SERVICE]
-  Parsers_File /path/to/parsers.conf
+  # Parsers_File /path/to/parsers.conf
 
 [INPUT]
   Name dummy
diff --git a/pipeline/inputs/blob.md b/pipeline/inputs/blob.md
index aa393a36f..d02704ca2 100644
--- a/pipeline/inputs/blob.md
+++ b/pipeline/inputs/blob.md
@@ -177,8 +177,8 @@ This example excludes certain file patterns and uses filesystem storage for bett
 pipeline:
   inputs:
     - name: blob
-      path: /data/artifacts/**/*
-      exclude_pattern: *.tmp,*.bak,*.old
+      path: '/data/artifacts/**/*'
+      exclude_pattern: '*.tmp,*.bak,*.old'
       storage.type: filesystem
       storage.pause_on_chunks_overlimit: true
       mem_buf_limit: 50M
diff --git a/pipeline/inputs/cpu-metrics.md b/pipeline/inputs/cpu-metrics.md
index 7546e7f5b..669ab7702 100644
--- a/pipeline/inputs/cpu-metrics.md
+++ b/pipeline/inputs/cpu-metrics.md
@@ -82,7 +82,7 @@ pipeline:
 {% endtab %}
 {% tab title="fluent-bit.conf" %}
 
-```shell
+```text
 [INPUT]
   Name cpu
   Tag  my_cpu
diff --git a/pipeline/inputs/exec-wasi.md b/pipeline/inputs/exec-wasi.md
index 1af674f36..b0e0de697 100644
--- a/pipeline/inputs/exec-wasi.md
+++ b/pipeline/inputs/exec-wasi.md
@@ -67,7 +67,8 @@ Then, you can specify the `parsers.conf` in the main Fluent Bit configuration:
 service:
   flush: 1
   daemon: off
-  parsers_file: parsers.yaml
+  # Configure this to load your custom parser if required
+  # parsers_file: parsers.yaml
   log_level: info
   http_server: off
   http_listen: 0.0.0.0
@@ -94,7 +95,8 @@ pipeline:
 [SERVICE]
   Flush        1
   Daemon       Off
-  Parsers_File parsers.conf
+  # Configure this to load your custom parser if required
+  # Parsers_File parsers.conf
   Log_Level    info
   HTTP_Server  Off
   HTTP_Listen  0.0.0.0
diff --git a/pipeline/inputs/kafka.md b/pipeline/inputs/kafka.md
index 9b460ec5f..404d06e9c 100644
--- a/pipeline/inputs/kafka.md
+++ b/pipeline/inputs/kafka.md
@@ -95,8 +95,16 @@ pipeline:
   filters:
     - name: lua
       match: '*'
-      script: kafka.lua
       call: modify_kafka_message
+      code: |
+        local count = 0
+        function modify_kafka_message(tag, timestamp, record)
+            count = count + 1
+            local payload = record.payload
+            payload.topic = record.topic
+            payload.status = 'processed by fluent-bit, total records: '..tostring(count)
+            return 1, timestamp, payload
+        end
 
   outputs:
     - name: kafka
@@ -118,8 +126,8 @@ pipeline:
 [FILTER]
   Name    lua
   Match   *
-  Script  kafka.lua
   Call    modify_kafka_message
+  Code    local count = 0 function modify_kafka_message(tag, timestamp, record) count = count + 1 local payload = record.payload payload.topic = record.topic payload.status = 'processed by fluent-bit, total records: '..tostring(count) return 1, timestamp, payload end
 
 [OUTPUT]
   Name    kafka
@@ -134,7 +142,18 @@ The previous example will connect to the broker listening on `kafka-broker:9092`
 
 Since the payload will be in JSON format, the plugin is configured to parse the payload with `format json`.
 
-Every message received is then processed with `kafka.lua` and sent back to the `fb-sink` topic of the same broker.
+Every message received is then processed with `kafka.lua` and sent back to the `fb-sink` topic of the same broker, this is shown inline for each configuration but is as follows:
+
+```lua
+local count = 0
+function modify_kafka_message(tag, timestamp, record)
+    count = count + 1
+    local payload = record.payload
+    payload.topic = record.topic
+    payload.status = 'processed by fluent-bit, total records: '..tostring(count)
+    return 1, timestamp, payload
+end
+```
 
 The example can be executed locally with `make start` in the `examples/kafka_filter` directory (`docker/compose` is used).
 
diff --git a/pipeline/inputs/standard-input.md b/pipeline/inputs/standard-input.md
index a8bf2ca1d..ec267ff28 100644
--- a/pipeline/inputs/standard-input.md
+++ b/pipeline/inputs/standard-input.md
@@ -204,8 +204,9 @@ You can then use the parsers file in a `stdin` plugin in the main Fluent Bit con
 {% tab title="fluent-bit.yaml" %}
 
 ```yaml
-service:
-  parsers_file: parsers.yaml
+# service:
+  # Configure this to load your custom parser if required
+  # parsers_file: parsers.yaml
 
 pipeline:
   inputs:
@@ -223,7 +224,8 @@ pipeline:
 
 ```text
 [SERVICE]
-  Parsers_File parsers.conf
+  # Configure this to load your custom parser if required
+  # Parsers_File parsers.conf
 
 [INPUT]
   Name    stdin
diff --git a/pipeline/inputs/syslog.md b/pipeline/inputs/syslog.md
index e5faa5cb6..b29139468 100644
--- a/pipeline/inputs/syslog.md
+++ b/pipeline/inputs/syslog.md
@@ -60,7 +60,6 @@ In your main configuration file append the following sections:
 service:
   flush: 1
   log_level: info
-  parsers_file: parsers.yaml
 
 pipeline:
   inputs:
@@ -82,7 +81,6 @@ pipeline:
 [SERVICE]
   Flush               1
   Log_Level           info
-  Parsers_File        parsers.conf
 
 [INPUT]
   Name                syslog
@@ -141,7 +139,6 @@ Put the following content in your configuration file:
 ```yaml
 service:
   flush: 1
-  parsers_file: parsers.yaml
 
 pipeline:
   inputs:
@@ -162,7 +159,6 @@ pipeline:
 ```text
 [SERVICE]
   Flush        1
-  Parsers_File parsers.conf
 
 [INPUT]
   Name     syslog
@@ -207,7 +203,6 @@ Put the following content in your Fluent Bit configuration:
 ```yaml
 service:
   flush: 1
-  parsers_file: parsers.yaml
 
 pipeline:
   inputs:
@@ -228,7 +223,6 @@ pipeline:
 ```text
 [SERVICE]
   Flush        1
-  Parsers_File parsers.conf
 
 [INPUT]
   Name      syslog
diff --git a/pipeline/inputs/systemd.md b/pipeline/inputs/systemd.md
index 783db3420..0e521442b 100644
--- a/pipeline/inputs/systemd.md
+++ b/pipeline/inputs/systemd.md
@@ -53,7 +53,6 @@ In your main configuration file append the following sections:
 service:
   flush: 1
   log_level: info
-  parsers_file: parsers.yaml
 
 pipeline:
   inputs:
@@ -72,7 +71,6 @@ pipeline:
 [SERVICE]
   Flush        1
   Log_Level    info
-  Parsers_File parsers.conf
 
 [INPUT]
   Name            systemd
diff --git a/pipeline/inputs/tail.md b/pipeline/inputs/tail.md
index ddb9ab636..6118106fe 100644
--- a/pipeline/inputs/tail.md
+++ b/pipeline/inputs/tail.md
@@ -168,7 +168,7 @@ systemctl edit fluent-bit.service
 
 When the Linux inotify event queue overflows (indicated by an `IN_Q_OVERFLOW` event), Fluent Bit automatically reconciles all monitored files. During reconciliation it:
 
-- Detects rotated files by comparing inodes and file names and re-registers watches as needed.
+- Detects rotated files by comparing `inode` numbers and file names and re-registers watches as needed.
 - Resets offset tracking for files that have been truncated.
 - Retries watch registration for files that previously failed, for example due to `ENOSPC` when `fs.inotify.max_user_watches` is exhausted.
 
@@ -273,8 +273,8 @@ pipeline:
       path: /var/log/syslog
 
   outputs:
-    - stdout:
-      match: *
+    - name: stdout
+      match: '*'
 ```
 
 {% endtab %}
@@ -369,13 +369,13 @@ pipeline:
 {% tab title="fluent-bit.conf" %}
 
 ```text
-# Note this is generally added to parsers.conf and referenced in [SERVICE]
-[PARSER]
-  Name multiline
-  Format regex
-  Regex /(?<time>[A-Za-z]+ \d+ \d+\:\d+\:\d+)(?<message>.*)/
-  Time_Key  time
-  Time_Format %b %d %H:%M:%S
+# Note this is added to parsers.conf and referenced in [SERVICE]
+# [PARSER]
+#   Name multiline
+#   Format regex
+#   Regex /(?<time>[A-Za-z]+ \d+ \d+\:\d+\:\d+)(?<message>.*)/
+#   Time_Key  time
+#   Time_Format %b %d %H:%M:%S
 
 [INPUT]
   Name             tail
@@ -514,7 +514,7 @@ This parameter controls how Fluent Bit reads the path, not how it reads the cont
 The following example enables UTF-8 path handling. Write the `path` value as UTF-8, and save your configuration file with UTF-8 encoding so that Fluent Bit receives the path as you intended:
 
 {% tabs %}
-{% tab title="fluent-bit.yaml" %}
+{% tab title="windows-fluent-bit.yaml" %}
 
 ```yaml
 pipeline:
@@ -525,7 +525,7 @@ pipeline:
 ```
 
 {% endtab %}
-{% tab title="fluent-bit.conf" %}
+{% tab title="windows-fluent-bit.conf" %}
 
 ```text
 [INPUT]
diff --git a/pipeline/outputs/dynatrace.md b/pipeline/outputs/dynatrace.md
index 0b2ca0cb2..550d16d92 100644
--- a/pipeline/outputs/dynatrace.md
+++ b/pipeline/outputs/dynatrace.md
@@ -33,45 +33,48 @@ To get started with sending logs to Dynatrace:
 {% tabs %}
 {% tab title="fluent-bit.yaml" %}
 
-   ```yaml
-   pipeline:
-
-     outputs:
-       - name: http
-         match: '*'
-         header:
-           - 'Content-Type application/json; charset=utf-8'
-           - 'Authorization Api-Token {your-API-token-here}'
-         allow_duplicated_headers: false
-         host: {your-environment-id}.live.dynatrace.com
-         port: 443
-         uri: /api/v2/logs/ingest
-         format: json
-         json_date_format: iso8601
-         json_date_key: timestamp
-         tls: on
-         tls.verify: on
-   ```
+```yaml
+pipeline:
+  inputs:
+    - name: dummy
+      tag: test
+
+  outputs:
+    - name: http
+      match: '*'
+      header:
+        - 'Content-Type application/json; charset=utf-8'
+        - 'Authorization Api-Token {your-API-token-here}'
+      allow_duplicated_headers: false
+      host: '{your-environment-id}.live.dynatrace.com'
+      port: 443
+      uri: /api/v2/logs/ingest
+      format: json
+      json_date_format: iso8601
+      json_date_key: timestamp
+      tls: on
+      tls.verify: on
+```
 
 {% endtab %}
 {% tab title="fluent-bit.conf" %}
 
-   ```text
-   [OUTPUT]
-     Name                     http
-     Match                    *
-     Header                   Content-Type application/json; charset=utf-8
-     Header                   Authorization Api-Token {your-API-token-here}
-     Allow_Duplicated_Headers false
-     Host                     {your-environment-id}.live.dynatrace.com
-     Port                     443
-     Uri                      /api/v2/logs/ingest
-     Format                   json
-     Json_Date_Format         iso8601
-     Json_Date_Key            timestamp
-     Tls                      On
-     Tls.verify               On
-   ```
+```text
+[OUTPUT]
+  Name                     http
+  Match                    *
+  Header                   Content-Type application/json; charset=utf-8
+  Header                   Authorization Api-Token {your-API-token-here}
+  Allow_Duplicated_Headers false
+  Host                     {your-environment-id}.live.dynatrace.com
+  Port                     443
+  Uri                      /api/v2/logs/ingest
+  Format                   json
+  Json_Date_Format         iso8601
+  Json_Date_Key            timestamp
+  Tls                      On
+  Tls.verify               On
+```
 
 {% endtab %}
 {% endtabs %}
diff --git a/pipeline/outputs/gelf.md b/pipeline/outputs/gelf.md
index e7c5d7e38..c20bfcda5 100644
--- a/pipeline/outputs/gelf.md
+++ b/pipeline/outputs/gelf.md
@@ -67,13 +67,6 @@ If you're using Fluent Bit for shipping Kubernetes logs, you can use something l
 {% tab title="fluent-bit.yaml" %}
 
 ```yaml
-parsers:
-  - name: docker
-    format: json
-    time_key: time
-    time_format: '%Y-%m-%dT%H:%M:%S.%L'
-    time_keep: off
-
 pipeline:
   inputs:
     - name: tail
@@ -142,13 +135,6 @@ pipeline:
     Port                    12201
     Mode                    tcp
     Gelf_Short_Message_Key  data
-
-[PARSER]
-    Name                    docker
-    Format                  json
-    Time_Key                time
-    Time_Format             %Y-%m-%dT%H:%M:%S.%L
-    Time_Keep               Off
 ```
 
 {% endtab %}
diff --git a/pipeline/outputs/kafka.md b/pipeline/outputs/kafka.md
index 91d2a3911..c2bd0a4be 100644
--- a/pipeline/outputs/kafka.md
+++ b/pipeline/outputs/kafka.md
@@ -95,7 +95,9 @@ pipeline:
 
 ### Avro support
 
-Fluent Bit comes with support for Avro encoding for the `out_kafka` plugin. Avro support is optional and must be activated at build time by using a build def with `cmake`: `-DFLB_AVRO_ENCODER=On` such as in the following example which activates:
+Fluent Bit comes with support for Avro encoding for the `out_kafka` plugin but this isn't enabled by default for releases.
+
+Avro support is optional and must be activated at build time by using a build definition with `cmake`: `-DFLB_AVRO_ENCODER=On` such as in the following example which activates:
 
 - `out_kafka` with Avro encoding
 - Fluent Bit Prometheus
@@ -112,7 +114,7 @@ cmake -DFLB_DEV=On -DFLB_OUT_KAFKA=On -DFLB_TLS=On -DFLB_TESTS_RUNTIME=On -DFLB_
 In this example, the Fluent Bit configuration tails Kubernetes logs, updates the log lines with Kubernetes metadata using the Kubernetes filter. It then sends the updated log lines to a Kafka broker encoded with a specific Avro schema.
 
 {% tabs %}
-{% tab title="fluent-bit.yaml" %}
+{% tab title="AVRO enabled: fluent-bit.yaml" %}
 
 ```yaml
 pipeline:
@@ -141,6 +143,7 @@ pipeline:
       match: '*'
       brokers: 192.168.1.3:9092
       topics: test
+      # AVRO support must be enabled for schema support
       schema_str:  '{"name":"avro_logging","type":"record","fields":[{"name":"timestamp","type":"string"},{"name":"stream","type":"string"},{"name":"log","type":"string"},{"name":"kubernetes","type":{"name":"krec","type":"record","fields":[{"name":"pod_name","type":"string"},{"name":"namespace_name","type":"string"},{"name":"pod_id","type":"string"},{"name":"labels","type":{"type":"map","values":"string"}},{"name":"annotations","type":{"type":"map","values":"string"}},{"name":"host","type":"string"},{"name":"container_name","type":"string"},{"name":"docker_id","type":"string"},{"name":"container_hash","type":"string"},{"name":"container_image","type":"string"}]}},{"name":"cluster_name","type":"string"},{"name":"fabric","type":"string"}]}'
       schema_id: some_schema_id
       rdkafka.client.id: some_client_id
@@ -158,7 +161,7 @@ pipeline:
 ```
 
 {% endtab %}
-{% tab title="fluent-bit.conf" %}
+{% tab title="AVRO enabled: fluent-bit.conf" %}
 
 ```text
 [INPUT]
@@ -186,6 +189,7 @@ pipeline:
   Match       *
   Brokers     192.168.1.3:9092
   Topics      test
+  # AVRO support must be enabled for schema support
   Schema_Str  {"name":"avro_logging","type":"record","fields":[{"name":"timestamp","type":"string"},{"name":"stream","type":"string"},{"name":"log","type":"string"},{"name":"kubernetes","type":{"name":"krec","type":"record","fields":[{"name":"pod_name","type":"string"},{"name":"namespace_name","type":"string"},{"name":"pod_id","type":"string"},{"name":"labels","type":{"type":"map","values":"string"}},{"name":"annotations","type":{"type":"map","values":"string"}},{"name":"host","type":"string"},{"name":"container_name","type":"string"},{"name":"docker_id","type":"string"},{"name":"container_hash","type":"string"},{"name":"container_image","type":"string"}]}},{"name":"cluster_name","type":"string"},{"name":"fabric","type":"string"}]}
   Schema_Id some_schema_id
   rdkafka.client.id some_client_id
@@ -229,7 +233,7 @@ Except for `schema_registry_framing`, each of these settings also accepts a dott
 The following example resolves the latest version of the `fluent-bit-logs-value` subject from either of two registry endpoints:
 
 {% tabs %}
-{% tab title="fluent-bit.yaml" %}
+{% tab title="avro-fluent-bit.yaml" %}
 
 ```yaml
 pipeline:
@@ -247,7 +251,7 @@ pipeline:
 ```
 
 {% endtab %}
-{% tab title="fluent-bit.conf" %}
+{% tab title="avro-fluent-bit.conf" %}
 
 ```text
 [OUTPUT]
diff --git a/pipeline/outputs/loki.md b/pipeline/outputs/loki.md
index 5a31811e4..61fb6dd27 100644
--- a/pipeline/outputs/loki.md
+++ b/pipeline/outputs/loki.md
@@ -553,7 +553,7 @@ pipeline:
       tls: on
       tls.verify: on
       http_user: XXX
-      http_password: XXX
+      http_passwd: XXX
 ```
 
 {% endtab %}
diff --git a/pipeline/outputs/s3.md b/pipeline/outputs/s3.md
index e7b97e0ce..00ca8d4eb 100644
--- a/pipeline/outputs/s3.md
+++ b/pipeline/outputs/s3.md
@@ -850,7 +850,7 @@ pipeline:
   inputs:
     - name:  dummy
       tag:   dummy.local
-      dummy {"boolean": false, "int": 1, "long": 1, "float": 1.1, "double": 1.1, "bytes": "foo", "string": "foo"}
+      dummy: '{"boolean": false, "int": 1, "long": 1, "float": 1.1, "double": 1.1, "bytes": "foo", "string": "foo"}'
 
   outputs:
     - name: s3
diff --git a/pipeline/parsers.md b/pipeline/parsers.md
index 6b6cc0190..65acb4eaa 100644
--- a/pipeline/parsers.md
+++ b/pipeline/parsers.md
@@ -22,7 +22,7 @@ For example, a parser can turn an unstructured log entry like this:
 192.168.2.20 - - [28/Jul/2006:10:27:10 -0300] "GET /cgi-bin/try/ HTTP/1.0" 200 3395
 ```
 
-...into a structured JSON object like this:
+The parser turns that entry into a structured JSON object like this:
 
 ```json
 {
@@ -65,13 +65,11 @@ For example, the following configuration file adds the default [`apache` parser]
 pipeline:
   inputs:
     - name: tail
-      path: /input/input.log
-      refresh_interval: 1
+      path: /var/log/apache.log
       parser: apache
 
-    - name: http
-      listen: 0.0.0.0
-      port: 8888
+    - name: tail
+      path: /var/log/custom.log
       parser: custom_parser1
 ```
 
diff --git a/pipeline/parsers/decoders.md b/pipeline/parsers/decoders.md
index f1c0a31ff..385be5667 100644
--- a/pipeline/parsers/decoders.md
+++ b/pipeline/parsers/decoders.md
@@ -121,7 +121,9 @@ Decoder example Fluent Bit configuration files:
 
 ```yaml
 service:
-  parsers_file: parsers.yaml
+  # Replace with the correct value
+  # parsers_file: /fluent-bit/etc/parsers.yaml
+  parsers_file: /fluent-bit/etc/parsers.conf
 
 pipeline:
   inputs:
@@ -139,7 +141,7 @@ pipeline:
 
 ```text
 [SERVICE]
-  Parsers_File parsers.conf
+  Parsers_File /fluent-bit/etc/parsers.conf
 
 [INPUT]
   Name        tail
diff --git a/pipeline/parsers/multiline-parsing.md b/pipeline/parsers/multiline-parsing.md
index b99e5e351..87530409a 100644
--- a/pipeline/parsers/multiline-parsing.md
+++ b/pipeline/parsers/multiline-parsing.md
@@ -119,7 +119,8 @@ This is the primary Fluent Bit YAML configuration file. It includes the `parsers
 service:
   flush: 1
   log_level: info
-  parsers_file: parsers_multiline.yaml
+  # Set the correct value here and ensure it is mounted in to a container
+  # parsers_file: /fluent-bit/etc/parsers_multiline.yaml
 
 pipeline:
   inputs:
@@ -142,7 +143,7 @@ This is the primary Fluent Bit classic configuration file. It includes the `pars
 [SERVICE]
   Flush        1
   Log_Level    info
-  Parsers_File parsers_multiline.conf
+  # Parsers_File /fluent-bit/etc/parsers_multiline.conf
 
 [INPUT]
   Name             tail
@@ -296,7 +297,7 @@ This is the primary Fluent Bit YAML configuration file. It includes the `parsers
 service:
   flush: 1
   log_level: info
-  parsers_file: parsers_multiline.yaml
+  # parsers_file: /fluent-bit/etc/parsers_multiline.yaml
 
 pipeline:
   inputs:
@@ -325,7 +326,7 @@ This is the primary Fluent Bit classic configuration file. It includes the `pars
 [SERVICE]
   Flush        1
   Log_Level    info
-  Parsers_File parsers_multiline.conf
+  # Parsers_File /fluent-bit/etc/parsers_multiline.conf
 
 [INPUT]
   Name             tail
diff --git a/pipeline/processors/conditional-processing.md b/pipeline/processors/conditional-processing.md
index 3a7c8e5b9..422794843 100644
--- a/pipeline/processors/conditional-processing.md
+++ b/pipeline/processors/conditional-processing.md
@@ -17,9 +17,6 @@ You can turn a standard processor into a conditional processor by adding a `cond
 
 These `condition` blocks use the following syntax:
 
-{% tabs %}
-{% tab title="fluent-bit.yaml" %}
-
 ```yaml
 pipeline:
   inputs:
@@ -41,9 +38,6 @@ pipeline:
         <...>
 ```
 
-{% endtab %}
-{% endtabs %}
-
 Each processor can only have a single `condition` block, but that condition can include multiple rules. These rules are stored as items in the `condition.rules` array.
 
 ### Condition evaluation
diff --git a/pipeline/processors/sql.md b/pipeline/processors/sql.md
index a6163b3a6..3897c3957 100644
--- a/pipeline/processors/sql.md
+++ b/pipeline/processors/sql.md
@@ -65,8 +65,8 @@ pipeline:
             key: "http.url"
             pattern: ^(?<http_protocol>https?):\/\/(?<http_domain>[^\/\?]+)(?<http_path>\/[^?]*)?(?:\?(?<http_query_params>.*))?
 
-    - name: sql
-      query: "SELECT http_domain FROM STREAM;"
+          - name: sql
+            query: "SELECT http_domain FROM STREAM;"
 
   outputs:
     - name : stdout
diff --git a/pipeline/router.md b/pipeline/router.md
index 1c6e7f620..76601538d 100644
--- a/pipeline/router.md
+++ b/pipeline/router.md
@@ -136,11 +136,11 @@ Routing also provides support for regular expressions with the `match_regex` pat
 ```yaml
 pipeline:
   inputs:
-    - name: temperature_sensor
-      tag: temp_sensor_A
+    - name: dummy
+      tag: temperature_sensor_A
 
-    - name: humidity_sensor
-      tag: humid_sensor_B
+    - name: dummy
+      tag: humidity_sensor_B
 
   outputs:
     - name: stdout
@@ -152,12 +152,12 @@ pipeline:
 
 ```text
 [INPUT]
-  Name temperature_sensor
-  Tag  temp_sensor_A
+  Name dummy
+  Tag  temperature_sensor_A
 
 [INPUT]
-  Name humidity_sensor
-  Tag  humid_sensor_B
+  Name dummy
+  Tag  humidity_sensor_B
 
 [OUTPUT]
   Name         stdout
@@ -207,7 +207,7 @@ When a record arrives, Fluent Bit evaluates the conditions for each route in ord
 The `routes` block uses the following syntax:
 
 {% tabs %}
-{% tab title="fluent-bit.yaml" %}
+{% tab title="routing.yaml" %}
 
 ```yaml
 pipeline:
@@ -345,12 +345,12 @@ pipeline:
                 - default_destination
 
   outputs:
-    - name: elasticsearch
+    - name: es
       alias: error_destination
       host: errors.example.com
       index: error-logs
 
-    - name: elasticsearch
+    - name: es
       alias: info_destination
       host: logs.example.com
       index: info-logs
@@ -405,7 +405,7 @@ pipeline:
     - name: splunk
       alias: critical_output
       host: splunk.example.com
-      token: ${SPLUNK_TOKEN}
+      splunk_token: '{SPLUNK_TOKEN}'
 
     - name: stdout
       alias: standard_output
@@ -461,7 +461,7 @@ pipeline:
       uri: /v2/enqueue
       format: json
 
-    - name: elasticsearch
+    - name: es
       alias: elasticsearch_output
       host: logs.example.com
       index: application-logs
@@ -513,7 +513,7 @@ pipeline:
       alias: security_output
       host: security-splunk.example.com
 
-    - name: elasticsearch
+    - name: es
       alias: general_output
       host: logs.example.com
 ```
@@ -583,7 +583,7 @@ pipeline:
                 - error_destination
 
   outputs:
-    - name: elasticsearch
+    - name: es
       alias: error_destination
       host: errors.example.com
       index: error-logs
@@ -599,7 +599,7 @@ pipeline:
   Tag  app.logs
 
 [OUTPUT]
-  Name  elasticsearch
+  Name  es
   Alias error_destination
   Host  errors.example.com
   Index error-logs
@@ -668,12 +668,12 @@ pipeline:
                 - dev_logs_output
 
   outputs:
-    - name: elasticsearch
+    - name: es
       alias: prod_logs_output
       host: prod-logs.example.com
       index: production-logs
 
-    - name: elasticsearch
+    - name: es
       alias: dev_logs_output
       host: dev-logs.example.com
       index: development-logs
diff --git a/scripts/README.md b/scripts/README.md
new file mode 100644
index 000000000..3ff6dacc5
--- /dev/null
+++ b/scripts/README.md
@@ -0,0 +1,228 @@
+# Documentation scripts
+
+This directory contains utility scripts for validating Fluent Bit configuration examples in the documentation.
+
+## Configuration validation
+
+### `test-config.sh`
+
+Validates all Fluent Bit configuration examples in Markdown files by running them through `fluent-bit --dry-run`.
+
+**Usage:**
+
+```bash
+./scripts/test-config.sh <markdown-file>
+```
+
+**How it works:**
+
+The script uses a **two-stage approach** to ensure reliable error reporting:
+
+1. **Count stage**: For each language (YAML, text), it counts how many examples exist using the `extract-config.sh count` mode
+2. **Validation stage**: It extracts and validates each example by index in a predictable way
+
+This approach ensures that extraction errors are always legitimate—never due to reaching the end of examples. Any extraction error indicates a genuine problem with the file structure.
+
+**Features:**
+
+- Supports multiple examples per Markdown file (processes all examples)
+- Validates both YAML (`fluent-bit.yaml`) and legacy `.conf` (`fluent-bit.conf`) formats
+- Reports all validation failures for a file (doesn't stop at first failure)
+- Respects a suppression list for known failing configurations
+- Requires Docker/Podman to run the Fluent Bit container
+- Only reports errors that are legitimate (malformed examples or configuration issues)
+
+**Example - validate a single file:**
+
+```bash
+./scripts/test-config.sh pipeline/inputs/tail.md
+```
+
+**Example - validate all documentation files:**
+
+```bash
+find . -type f -iname "*.md" | while read -r file; do
+    if ! ./scripts/test-config.sh "$file"; then
+        echo "FAILED: $file"
+    fi
+done
+```
+
+### `extract-config.sh`
+
+Extracts Fluent Bit configuration code blocks from Markdown files. This is used internally by `test-config.sh` but can also be called directly.
+
+**Usage:**
+
+```bash
+./scripts/extract-config.sh <markdown-file> <tab-title> <fence-language> [index|count]
+```
+
+**Parameters:**
+
+- `markdown-file`: Path to the Markdown file
+- `tab-title`: The tab title (for example, `"fluent-bit.yaml"` or `"fluent-bit.conf"`)
+- `fence-language`: The code fence language (for example, `yaml` or `text`)
+- `index|count` (Optional): Extract a specific example by index, or use `count` to get the total number of examples. Defaults to 1 (first example)
+
+**Features:**
+
+- Automatically removes common leading indentation from extracted examples
+- Handles indented tabs in Markdown (for example, nested within list items or other structures)
+- Preserves relative indentation within the configuration
+
+**Examples:**
+
+```bash
+# Count total YAML examples in a file
+./scripts/extract-config.sh pipeline/inputs/tail.md "fluent-bit.yaml" yaml count
+
+# Extract the first YAML example
+./scripts/extract-config.sh pipeline/inputs/tail.md "fluent-bit.yaml" yaml
+
+# Extract the second YAML example
+./scripts/extract-config.sh pipeline/inputs/tail.md "fluent-bit.yaml" yaml 2
+
+# Extract the third .conf example
+./scripts/extract-config.sh pipeline/inputs/tail.md "fluent-bit.conf" text 3
+```
+
+**Count mode:**
+
+The `count` parameter returns the total number of matching code fences for the specified language in the given tab. This is used by `test-config.sh` to:
+
+1. Determine how many examples to validate
+2. Avoid trying to extract examples that don't exist
+3. Ensure all extraction errors are legitimate
+
+### `validate-changed-files.sh`
+
+Validates configuration examples in Markdown files that have been changed relative to a base branch. This script is used by the CI/CD pipeline but can also be run locally before pushing changes.
+
+**Usage:**
+
+```bash
+./scripts/validate-changed-files.sh [base_ref] [head_ref]
+```
+
+**Parameters:**
+
+- `base_ref` (optional): The base commit/branch to compare against. Defaults to `origin/main`
+- `head_ref` (optional): The head commit/branch to compare to. Defaults to `HEAD`
+
+**How it works:**
+
+1. Uses `get-changed-files.sh` to identify Markdown files changed between the base and head refs
+2. Runs `test-config.sh` on each changed file
+3. Reports all validation failures
+4. Exits with non-zero status if any file validation fails
+
+**Examples:**
+
+```bash
+# Validate changes in current branch against origin/main
+./scripts/validate-changed-files.sh
+
+# Validate changes in a specific branch
+./scripts/validate-changed-files.sh origin/main origin/feature-branch
+
+# Validate changes between specific commits
+./scripts/validate-changed-files.sh abc123def456 xyz789abc123
+```
+
+### `get-changed-files.sh`
+
+Identifies Markdown files that have been changed between two commits or branches. This is used by `validate-changed-files.sh` but can also be called directly for scripting purposes.
+
+**Usage:**
+
+```bash
+./scripts/get-changed-files.sh [base_ref] [head_ref]
+```
+
+**Parameters:**
+
+- `base_ref` (optional): The base commit/branch to compare against. Defaults to `origin/main`
+- `head_ref` (optional): The head commit/branch to compare to. Defaults to `HEAD`
+
+**How it works:**
+
+Uses `git diff` to find files that have been Added, Modified, Copied, or Renamed (AMCR) between the two refs, filtering for `.md` files only.
+
+**Output:**
+
+Lists changed Markdown files, one per line.
+
+**Examples:**
+
+```bash
+# Find changes in current branch against origin/main
+./scripts/get-changed-files.sh
+
+# Find changes in a specific branch
+./scripts/get-changed-files.sh origin/main origin/feature-branch
+
+# Using commit range format (with three dots)
+./scripts/get-changed-files.sh origin/main...HEAD
+
+# Iterate over changed files for processing
+./scripts/get-changed-files.sh | while read -r file; do
+    echo "Processing: $file"
+    # Your processing logic here
+done
+```
+
+## Markdown format
+
+Configuration examples should be formatted using Gitbook-style tabs:
+
+````markdown
+{% tabs %}
+{% tab title="fluent-bit.yaml" %}
+```yaml
+service:
+  flush: 1
+```
+{% endtab %}
+{% tab title="fluent-bit.conf" %}
+```text
+[SERVICE]
+    Flush  1
+```
+{% endtab %}
+{% endtabs %}
+````
+
+Multiple examples in the same file are supported:
+
+````markdown
+## First example
+
+{% tabs %}
+{% tab title="fluent-bit.yaml" %}
+```yaml
+# First example YAML
+```
+{% endtab %}
+{% endtabs %}
+
+## Second example
+
+{% tabs %}
+{% tab title="fluent-bit.yaml" %}
+```yaml
+# Second example YAML
+```
+{% endtab %}
+{% endtabs %}
+````
+
+## Suppression list
+
+Some configuration examples are intentionally skipped in validation. These are configured in the `SUPPRESSED_FILES` array in `test-config.sh`. Files are suppressed if they:
+
+- Require additional plugins not included in the standard container image
+- Contain examples that aren't yet supported
+- Are Windows-specific configurations
+
+Refer to the comments in `test-config.sh` for the complete list and reasons for each suppression.
diff --git a/scripts/extract-config.sh b/scripts/extract-config.sh
new file mode 100755
index 000000000..2ca316f0f
--- /dev/null
+++ b/scripts/extract-config.sh
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+set -eu
+
+# This script extracts the contents of a code fence from a specific tab in a markdown file.
+# The intention is to extract code snippets from the documentation to then validate them in CI.
+# We are looking for a tab with a specific title and then a code fence with a specific language inside that tab.
+# For example, given the following markdown snippet:
+
+# The following example captures Fluent Bit internal logs and writes them to standard output:
+# {% tabs %}
+# {% tab title="fluent-bit.yaml" %}
+# ```yaml
+# service:
+#   flush: 1
+#   log_level: info
+# pipeline:
+#   inputs:
+#     - name: fluentbit_logs
+#       tag: internal.logs
+#   outputs:
+#     - name: stdout
+#       match: 'internal.logs'
+# ```
+# {% endtab %}
+# {% tab title="fluent-bit.conf" %}
+# ```text
+# [SERVICE]
+#     Flush     1
+#     Log_Level info
+# [INPUT]
+#     Name  fluentbit_logs
+#     Tag   internal.logs
+# [OUTPUT]
+#     Name  stdout
+#     Match internal.logs
+# ```
+# {% endtab %}
+# {% endtabs %}
+# To forward ...
+# END
+
+# We want to pull out the contents of the code fence with language "yaml"/"text" from the tab with title "fluent-bit.yaml"/"fluent-bit.conf".
+# Usage: ./extract-config.sh <file> <tab title> <fence language> [index|count]
+# e.g.
+#   ./extract-config.sh README.md "fluent-bit.yaml" yaml         # Extract first example
+#   ./extract-config.sh README.md "fluent-bit.yaml" yaml 2       # Extract second example
+#   ./extract-config.sh README.md "fluent-bit.yaml" yaml count   # Count total examples
+#
+
+FILE=${1:?"Usage: $0 FILE TAB_TITLE LANGUAGE [INDEX|count]"}
+TITLE=${2:?"Usage: $0 FILE TAB_TITLE LANGUAGE [INDEX|count]"}
+LANGUAGE=${3:?"Usage: $0 FILE TAB_TITLE LANGUAGE [INDEX|count]"}
+INDEX_OR_MODE=${4:-1}  # Extract the Nth matching code fence, or use "count" to get total count
+
+# We only use AWK to keep it simple and portable. 
+# We could use a more powerful parser, but that would require additional dependencies.
+# For macOS ensure AWK is GNU awk (gawk) and not the default BSD awk. You can install gawk via Homebrew: `brew install gawk`.
+
+awk -v wanted_title="$TITLE" -v wanted_language="$LANGUAGE" -v target_index_or_mode="$INDEX_OR_MODE" '
+BEGIN {
+    tab_marker = "{% tab title=\"" wanted_title "\" %}"
+    fence_marker = "```" wanted_language
+    fence_count = 0
+    count_mode = (target_index_or_mode == "count")
+    if (!count_mode) {
+        target_index = int(target_index_or_mode)
+    }
+    line_count = 0
+    min_indent = -1
+}
+
+{
+    # Remove a trailing carriage return from CRLF input.
+    line = $0
+    sub(/\r$/, "", line)
+
+    # Ignore whitespace surrounding directives and fences.
+    marker = line
+    sub(/^[[:space:]]+/, "", marker)
+    sub(/[[:space:]]+$/, "", marker)
+
+    if (!in_tab) {
+        if (marker == tab_marker) {
+            found_tab = 1
+            in_tab = 1
+        }
+        next
+    }
+
+    if (!in_fence) {
+        if (marker == "{% endtab %}") {
+            if (count_mode) {
+                # In count mode, reset in_tab to look for more tabs
+                in_tab = 0
+            } else if (fence_count < target_index) {
+                # Reset and look for the next tab if we havent found enough fences yet
+                in_tab = 0
+                found_tab = 1  # Keep looking for more tabs
+            }
+            next
+        }
+
+        if (marker == fence_marker) {
+            fence_count++
+            if (count_mode) {
+                # In count mode, just keep counting
+                next
+            }
+            if (fence_count == target_index) {
+                found_fence = 1
+                in_fence = 1
+            }
+        }
+
+        next
+    }
+
+    if (marker == "```") {
+        closed_fence = 1
+        exit
+    }
+
+    # Store line for later processing (to handle indentation removal)
+    if (!count_mode && in_fence && fence_count == target_index) {
+        lines[line_count] = line
+        
+        # Calculate minimum indentation from non-empty lines
+        if (line != "") {
+            # Count leading spaces
+            indent = 0
+            for (i = 1; i <= length(line); i++) {
+                if (substr(line, i, 1) == " ") {
+                    indent++
+                } else {
+                    break
+                }
+            }
+            if (min_indent == -1 || indent < min_indent) {
+                min_indent = indent
+            }
+        }
+        line_count++
+    }
+}
+
+END {
+    if (count_mode) {
+        # In count mode, output the count
+        print fence_count
+    } else {
+        # In extract mode, first validate that we found what we were looking for
+        if (found_tab && found_fence) {
+            if (!closed_fence) {
+                printf "ERROR: code fence was not closed in tab: %s\n", wanted_title > "/dev/stderr"
+                exit 1
+            }
+            # Print lines with common leading indentation removed
+            for (i = 0; i < line_count; i++) {
+                line = lines[i]
+                if (min_indent > 0 && line != "") {
+                    # Remove the common indentation
+                    line = substr(line, min_indent + 1)
+                }
+                print line
+            }
+        } else if (found_tab && !found_fence) {
+            printf "ERROR: %s code fence #%d not found in tab: %s\n", wanted_language, target_index, wanted_title > "/dev/stderr"
+            exit 1
+        }
+    }
+}
+' "$FILE"
\ No newline at end of file
diff --git a/scripts/get-changed-files.sh b/scripts/get-changed-files.sh
new file mode 100755
index 000000000..53103abcb
--- /dev/null
+++ b/scripts/get-changed-files.sh
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# This script identifies Markdown files that have been changed.
+# It can be used locally to find changes relative to a base branch,
+# or in CI/CD workflows to validate only the files that changed in a PR.
+#
+# Usage:
+#   ./scripts/get-changed-files.sh [base_ref] [head_ref]
+#
+# Parameters:
+#   base_ref (optional): The base commit/branch to compare against (default: origin/master)
+#   head_ref (optional): The head commit/branch to compare to (default: HEAD)
+#
+# Examples:
+#   # Compare current branch against origin/master
+#   ./scripts/get-changed-files.sh
+#
+#   # Compare specific commits
+#   ./scripts/get-changed-files.sh abc123def456...xyz789
+#
+#   # Compare origin/master to origin/feature-branch
+#   ./scripts/get-changed-files.sh origin/master origin/feature-branch
+#
+# Output:
+#   Lists changed Markdown files (one per line)
+#   Returns 0 if successful (even if no files changed)
+
+# Default values
+BASE_REF="${1:-origin/master}"
+HEAD_REF="${2:-HEAD}"
+
+# If a single argument contains three dots, it's a commit range (e.g., abc123...xyz789)
+# If two arguments are provided, they're treated as base and head
+if [[ $# -eq 1 && "$BASE_REF" == *"..."* ]]; then
+    # Using commit range format
+    COMMIT_RANGE="$BASE_REF"
+else
+    # Using base and head refs
+    COMMIT_RANGE="${BASE_REF}...${HEAD_REF}"
+fi
+
+echo "Finding changed Markdown files between $COMMIT_RANGE..." >&2
+
+# Validate that the refs exist before attempting git diff
+# This ensures we surface errors early if refs are invalid
+for ref in "${BASE_REF}" "${HEAD_REF}"; do
+    if ! git rev-parse --verify "$ref" &>/dev/null; then
+        echo "ERROR: Git reference '$ref' does not exist or is invalid" >&2
+        exit 1
+    fi
+done
+
+# Find files that have been Added, Modified, Copied, or Renamed (AMCR)
+# Filter for .md files
+# We must not suppress stderr here, as real errors should be visible
+if ! changed_files=$(git diff --name-only --diff-filter=AMCR "$COMMIT_RANGE" -- '*.md'); then
+    echo "ERROR: Failed to diff between $COMMIT_RANGE" >&2
+    exit 1
+fi
+
+if [ -z "$changed_files" ]; then
+    echo "No Markdown files changed." >&2
+    exit 0
+fi
+
+# Output the changed files (one per line)
+echo "$changed_files"
diff --git a/scripts/test-config.sh b/scripts/test-config.sh
new file mode 100755
index 000000000..35b7913fd
--- /dev/null
+++ b/scripts/test-config.sh
@@ -0,0 +1,163 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# This script is used to test configuration snippets extracted from the documentation.
+# It will run each extracted configuration through Fluent Bit's dry-run mode to validate it.
+# Supports multiple examples per Markdown file and reports all validation failures.
+# Errors are on stderr and the script will exit with a non-zero status if any validation fails.
+
+# To run for all Markdown files in the repository, you can use the following command:
+# find . -type f -iname "*.md" | while read -r file; do ./scripts/test-config.sh $file; done
+
+SOURCE=${BASH_SOURCE[0]}
+while [ -L "$SOURCE" ]; do
+  SCRIPT_DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
+  SOURCE=$(readlink "$SOURCE")
+  [[ $SOURCE != /* ]] && SOURCE=$SCRIPT_DIR/$SOURCE
+done
+SCRIPT_DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
+
+FILE=${1:?"Usage: $0 FILE"}
+if [ ! -f "${FILE}" ]; then
+    echo "ERROR: File $FILE does not exist or is not readable" >&2
+    exit 1
+fi
+
+# Check if the file is listed in the suppression list. If it is, we skip validation for this file.
+# We just use an array of suppressed files for now - add any new files to suppress to this list.
+SUPPRESSED_FILES=(
+    # These currently fail due to a known issue so skip them for now. See https://github.com/fluent/fluent-bit/issues/12113 and remove suppressions once this is in place.
+    "pipeline/outputs/azure_blob.md"
+    "pipeline/outputs/nats.md"
+    "pipeline/outputs/kafka-rest-proxy.md"
+    # Skip the examples for contribution.
+    "CONTRIBUTING.md"
+    # Requires the WASM filter to be built and loaded.
+    "pipeline/filters/wasm.md"
+    "development/wasm-filter-plugins.md"
+    # Requires loading the actual LUA scripts as well.
+    "pipeline/filters/lua.md"
+    # Exec is not supported in the container image.
+    "pipeline/inputs/exec.md"
+    # Requires custom golang plugins to be built and loaded.
+    "development/golang-output-plugins.md"
+    # Not currently supported in the container image.
+    "pipeline/filters/tensorflow.md"
+    "pipeline/inputs/ebpf.md"
+    # Windows plugins are not available in the Linux image.
+    "installation/downloads/windows.md"
+    "pipeline/inputs/windows-event-log-winevtlog.md"
+    "pipeline/inputs/windows-system-statistics.md"
+    "pipeline/inputs/windows-exporter-metrics.md"
+    "pipeline/inputs/windows-event-log.md"
+    "pipeline/inputs/event-tracing-windows.md"
+    # Windows-specific configuration examples are not supported in the Linux image.
+    "installation/downloads/kubernetes.md"
+)
+for suppressed_file in "${SUPPRESSED_FILES[@]}"; do
+    if [[ "$FILE" == "$suppressed_file" ]]; then
+        echo "INFO: Skipping validation for suppressed file $FILE"
+        exit 0
+    fi
+    # Use a wildcard match to check if the file path matches any of the suppressed files. This allows for more flexible matching.
+    if [[ "$FILE" == *"$suppressed_file"* ]]; then
+        echo "INFO: Skipping validation for suppressed file $FILE"
+        exit 0
+    fi
+    # Check if the file is in a subdirectory of any suppressed file. This allows for suppressing entire directories of files if needed.
+    if [[ "$FILE" == */"$suppressed_file" || "$FILE" == */"$suppressed_file"/* ]]; then
+        echo "INFO: Skipping validation for suppressed file $FILE"
+        exit 0
+    fi
+done
+
+# Override these to use a different default container runtime or Fluent Bit image for validation. 
+CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-docker}
+# This is useful for testing against a specific version of Fluent Bit or a custom build.
+VALIDATION_IMAGE=${VALIDATION_IMAGE:-fluent/fluent-bit:latest}
+# Always pull the latest Fluent Bit image to ensure we are validating against the most recent version.
+if ! $CONTAINER_RUNTIME pull "$VALIDATION_IMAGE" &>/dev/null; then
+    echo "ERROR: Failed to pull Fluent Bit container image $VALIDATION_IMAGE" >&2
+    exit 1
+fi
+
+FAILED_VALIDATIONS=()
+PASSED_VALIDATIONS=0
+
+# Write the extracted configuration to a private temporary directory.
+# We resolve the physical path because on macOS /tmp and $TMPDIR are symlinks into
+# /private, which the Docker Desktop file sharing cannot resolve. Bind mounting an
+# unresolved path silently mounts an empty directory instead of the configuration,
+# and every example then fails with a misleading YAML parse error.
+# A per-run directory also keeps concurrent invocations from overwriting each other.
+WORK_DIR=$(cd -P "$(mktemp -d)" && pwd -P)
+trap 'rm -rf "$WORK_DIR"' EXIT
+
+# Loop over YAML and legacy .conf configurations
+for LANGUAGE in "yaml" "text"; do
+    if [ "$LANGUAGE" = "yaml" ]; then
+        TAB_TITLE="fluent-bit.yaml"
+        OUTPUT_FILE="$WORK_DIR/fluent-bit.yaml"
+    else
+        TAB_TITLE="fluent-bit.conf"
+        OUTPUT_FILE="$WORK_DIR/fluent-bit.conf"
+    fi
+
+    # Stage 1: Count how many examples exist for this language in the file
+    # We do this so we know we should have X examples to validate, and we can report if any are missing or fail validation or extraction.
+    # A genuine extraction failure must not be reported as zero examples, otherwise a
+    # broken environment would quietly skip validation for every file and still pass.
+    if ! EXAMPLE_COUNT=$("$SCRIPT_DIR/extract-config.sh" "$FILE" "$TAB_TITLE" "$LANGUAGE" count 2>"$WORK_DIR/count-error.txt"); then
+        echo "ERROR: Failed to count $LANGUAGE examples in $FILE" >&2
+        cat "$WORK_DIR/count-error.txt" >&2
+        FAILED_VALIDATIONS+=("$LANGUAGE example count")
+        continue
+    fi
+
+    # No examples for this language in this file is a legitimate outcome, not a failure.
+    if [ "$EXAMPLE_COUNT" -eq 0 ]; then
+        continue
+    fi
+
+    # Stage 2: Extract and validate each example by index
+    for ((EXAMPLE_INDEX = 1; EXAMPLE_INDEX <= EXAMPLE_COUNT; EXAMPLE_INDEX++)); do
+        # Extract the configuration snippet from the Markdown file
+        if ! "$SCRIPT_DIR/extract-config.sh" "$FILE" "$TAB_TITLE" "$LANGUAGE" "$EXAMPLE_INDEX" > "$OUTPUT_FILE"; then
+            # Extraction should not fail at this point since we counted the examples
+            echo "ERROR: Failed to extract $LANGUAGE example $EXAMPLE_INDEX from $FILE (count was $EXAMPLE_COUNT)" >&2
+            FAILED_VALIDATIONS+=("$LANGUAGE example $EXAMPLE_INDEX")
+            continue
+        fi
+
+        # If the output file is empty, skip validation
+        if [ ! -s "$OUTPUT_FILE" ]; then
+            continue
+        fi
+       
+        # Use the Fluent Bit container to validate the configuration snippet
+        if ! $CONTAINER_RUNTIME run --rm -t -v "$OUTPUT_FILE":"$OUTPUT_FILE":ro "$VALIDATION_IMAGE" fluent-bit --dry-run --config="$OUTPUT_FILE" &>/dev/null; then
+            FAILED_VALIDATIONS+=("$LANGUAGE example $EXAMPLE_INDEX")
+            # Provide the configuration and failure output for debugging purposes on stderr
+            echo "ERROR: Validation failed for $LANGUAGE example $EXAMPLE_INDEX in $FILE" >&2
+            cat "$OUTPUT_FILE" >&2
+            $CONTAINER_RUNTIME run --rm -t -v "$OUTPUT_FILE":"$OUTPUT_FILE":ro "$VALIDATION_IMAGE" fluent-bit --dry-run --config="$OUTPUT_FILE" >&2 || true
+        else
+            PASSED_VALIDATIONS=$((PASSED_VALIDATIONS + 1))
+        fi
+    done
+done
+
+# Report results
+if [ ${#FAILED_VALIDATIONS[@]} -gt 0 ]; then
+    echo "ERROR: $FILE had ${#FAILED_VALIDATIONS[@]} validation failure(s):" >&2
+    for failed in "${FAILED_VALIDATIONS[@]}"; do
+        echo "  - $failed" >&2
+    done
+    exit 1
+fi
+
+if [ $PASSED_VALIDATIONS -eq 0 ]; then
+    echo "INFO: No configuration examples found in $FILE"
+else
+    echo "INFO: All $PASSED_VALIDATIONS check(s) passed for $FILE"
+fi
diff --git a/scripts/validate-changed-files.sh b/scripts/validate-changed-files.sh
new file mode 100755
index 000000000..a19cd8346
--- /dev/null
+++ b/scripts/validate-changed-files.sh
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# This script validates configuration examples in changed Markdown files.
+# It can be used locally to validate changes before pushing,
+# or in CI/CD workflows to validate only the files that changed in a PR.
+#
+# Usage:
+#   ./scripts/validate-changed-files.sh [base_ref] [head_ref]
+#
+# Parameters:
+#   base_ref (optional): The base commit/branch to compare against (default: origin/master)
+#   head_ref (optional): The head commit/branch to compare to (default: HEAD)
+#
+# Examples:
+#   # Validate changes in current branch against origin/master
+#   ./scripts/validate-changed-files.sh
+#
+#   # Validate changes in a specific branch
+#   ./scripts/validate-changed-files.sh origin/master origin/feature-branch
+#
+
+SOURCE=${BASH_SOURCE[0]}
+while [ -L "$SOURCE" ]; do
+  SCRIPT_DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
+  SOURCE=$(readlink "$SOURCE")
+  [[ $SOURCE != /* ]] && SOURCE=$SCRIPT_DIR/$SOURCE
+done
+SCRIPT_DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
+
+# Get the list of changed files
+BASE_REF="${1:-origin/master}"
+HEAD_REF="${2:-HEAD}"
+
+echo "Getting changed Markdown files..."
+# Do NOT suppress errors with || true - we need to know if get-changed-files.sh fails
+changed_files=$("$SCRIPT_DIR/get-changed-files.sh" "$BASE_REF" "$HEAD_REF")
+
+if [ -z "$changed_files" ]; then
+    echo "No Markdown files changed. Skipping validation."
+    exit 0
+fi
+
+echo "Files to validate:"
+echo "${changed_files/^/  /}"
+echo ""
+
+error_count=0
+
+# Validate each changed file
+while IFS= read -r file; do
+    if [ -z "$file" ]; then
+        continue
+    fi
+    
+    echo "Validating: $file"
+    if ! "$SCRIPT_DIR/test-config.sh" "$file"; then
+        error_count=$((error_count + 1))
+    fi
+done <<< "$changed_files"
+
+echo ""
+if [ $error_count -ne 0 ]; then
+    echo "ERROR: Validation failed for $error_count file(s)."
+    exit 1
+fi
+
+echo "All validations passed!"