diff --git a/container-deployment/docker-compose.md b/container-deployment/docker-compose.md
index 395eaaaf..00b748e5 100644
--- a/container-deployment/docker-compose.md
+++ b/container-deployment/docker-compose.md
@@ -126,7 +126,9 @@ Then, create the Fluentd configuration file `fluentd/conf/fluent.conf`. The [`fo
     include_tag_key true
     type_name access_log
     tag_key @log_name
-    flush_interval 1s
+    <buffer>
+      flush_interval 1s
+    </buffer>
   </store>
 
   <store>
diff --git a/filter/geoip.md b/filter/geoip.md
index e04c7a9d..fd0d6ee7 100644
--- a/filter/geoip.md
+++ b/filter/geoip.md
@@ -168,7 +168,9 @@ Required plugins:
   port            9200
   type_name       apache
   logstash_format true
-  flush_interval  10s
+  <buffer>
+    flush_interval 10s
+  </buffer>
 </match>
 ```
 
diff --git a/how-to-guides/apache-to-minio.md b/how-to-guides/apache-to-minio.md
index 72c066de..18cd302b 100644
--- a/how-to-guides/apache-to-minio.md
+++ b/how-to-guides/apache-to-minio.md
@@ -33,9 +33,11 @@ In this example, we use the access log file as an input source, so save the foll
 ```text
 <source>
   @type tail
-  format apache2
   path /var/log/apache2/access.log
   pos_file /var/log/fluent/apache.access.log.pos
+  <parse>
+    @type apache2
+  </parse>
   tag minio.apache.access
 </source>
 ```
@@ -59,7 +61,6 @@ Now let's add settings for storing the incoming data in your Minio server. Since
   s3_endpoint ENDPOINT          # The endpoint URL (like "http://localhost:9000/")
   s3_region us-east-1           # See the region settings of your Minio server
   path logs/                    # This prefix is added to each file
-  time_slice_format %Y%m%d%H%M  # This timestamp is added to each file name
 
   <buffer time>
     @type file
diff --git a/how-to-guides/apache-to-s3.md b/how-to-guides/apache-to-s3.md
index e96dc0e8..45001252 100644
--- a/how-to-guides/apache-to-s3.md
+++ b/how-to-guides/apache-to-s3.md
@@ -104,8 +104,6 @@ The output destination will be Amazon S3. The output configuration should look l
     timekey_wait 10m
     chunk_limit_size 256m
   </buffer>
-
-  time_slice_format %Y%m%d%H
 </match>
 ```
 
diff --git a/how-to-guides/logs-to-sematext.md b/how-to-guides/logs-to-sematext.md
index ec104b3f..597f58c2 100644
--- a/how-to-guides/logs-to-sematext.md
+++ b/how-to-guides/logs-to-sematext.md
@@ -66,7 +66,7 @@ Now you'll configure the `fluent-package` \(Fluentd\) to interface properly with
     chunk_limit_size 250k
     flush_interval 50s
     flush_thread_count 1
-    retry_limit 5
+    retry_max_times 5
     retry_wait 60
   </buffer>
 </match>
diff --git a/output/file.md b/output/file.md
index b46ea0f5..99dacc33 100644
--- a/output/file.md
+++ b/output/file.md
@@ -198,7 +198,7 @@ Default: `false`
 
 ### `symlink_path`
 
-Creates symlink to temporary buffered file when `buffer_type` is `file`. No symlink is created by default. This is useful for tailing file content to check logs.
+Creates symlink to temporary buffered file. This requires a file buffer, which is the default buffer of `out_file`. No symlink is created by default. This is useful for tailing file content to check logs.
 
 This is disabled on Windows.
 
diff --git a/output/rewrite_tag_filter.md b/output/rewrite_tag_filter.md
index ca273185..4ee8e7a0 100644
--- a/output/rewrite_tag_filter.md
+++ b/output/rewrite_tag_filter.md
@@ -264,11 +264,13 @@ The plugins are required to be installed:
 # Forward to monitoring server
 <match apache.access>
   @type forward
-  flush_interval 5s
   <server>
     name server_name
     host 10.100.1.20
   </server>
+  <buffer>
+    flush_interval 5s
+  </buffer>
 </match>
 ```
 
@@ -348,11 +350,13 @@ The plugins are required to be installed:
 # Forward to monitoring server
 <match apache.access>
   @type forward
-  flush_interval 5s
   <server>
     name server_name
     host 10.100.1.20
   </server>
+  <buffer>
+    flush_interval 5s
+  </buffer>
 </match>
 ```
 
diff --git a/troubleshooting-guide.md b/troubleshooting-guide.md
index 4f2a7e24..a2b5889e 100644
--- a/troubleshooting-guide.md
+++ b/troubleshooting-guide.md
@@ -63,7 +63,7 @@ Missing data in your backend destination can also be a wildcard error that needs
 
 * Check that configuration is set correctly. For example, if you are reading from a file and you do not see records from the beginning of the file check if `read_from_head` is true
 * Check your log file for BufferOverflowError. You may be sending data at high throughput and data might be dropped due to a number of issues. Follow troubleshooting steps in BufferOverflowError section
-* Check existing buffers that have not flushed yet. If you are using a file buffer check if there is data that is present in `buffer_path` and has not been flushed
+* Check existing buffers that have not flushed yet. If you are using a file buffer check if there is data that is present in the `path` of the `<buffer>` section and has not been flushed
 
 ## My logs are being parsed incorrectly