Merge branch 'master' into darwinosl-options

Signed-off-by: Hofi <hofione@gmail.com>

Author: HofiOne

_includes/doc/admin-guide/options/log-fetch-delays.md

@@ -3,9 +3,9 @@
 |Type:|     integer|
 |Default:| `10000`|
 
-*Description:* Sets the time {{ site.product.short_name }} waits between reading and sending log messages. The dimension of this parameter is a fraction of a second, where `wait_time = 1 second / <defined value>`, so setting `1` would result that only about 1 log is sent in each second, and `1000000` means only 1 microsecond is the delay between read/write attempts. The maximum value of this parameter is `1000000`.
+*Description:* Sets the time {{ site.product.short_name }} waits between reading and sending log messages. The unit of this parameter is a fraction of a second, where `wait_time = 1 second / <defined value>`. For example, setting it to `1` results in approximately one log being read/sent per second, while `1000000` means a delay of only 1 microsecond between read/write attempts. The maximum value of this parameter is `1000000`.
 
-**NOTE:** Increasing the value of this parameter (which lowers delay time) can increase log feed performance, but at could increase system load.
+**NOTE:** Increasing the value of this parameter (which reduces the delay time) can improve log feed performance, but it may also increase system load.
 {: .notice--info}
 
 {% include doc/admin-guide/options/deprecated-options.md old='fetch-delay' new='log-fetch-delay' %}
@@ -15,6 +15,6 @@
 |Type:|     integer|
 |Default:| `1`|
 
-*Description:* Controls how many seconds {{ site.product.short_name }} spends idle before checking for new logs, in case no new logs were read the last time.
+*Description:* Controls how many seconds {{ site.product.short_name }} remains idle before checking for new logs, in case no new logs were read during the previous check.
 
 {% include doc/admin-guide/options/deprecated-options.md old='fetch-retry-delay' new='log-fetch-retry-delay' %}

doc/_admin-guide/060_Sources/085_macOS/000_darwin_oslog_options.md

@@ -2,7 +2,7 @@
 title: darwin-oslog() source options
 id: adm-src-darw-osl-opt
 description: >-
-    The `darwin-oslog()` source is based on the native OSLog Framework to read logs from the local store of the unified logging system on darwin OSes. The {{ site.product.short_name }} `system()` source automatically uses this new source on darwin platforms if the `darwinosl` plugin is available. This plugin is available only on macOS 10.15 Catalina and later versions. The 10.15 version is the first to support the OSLog API.
+    The `darwin-oslog()` source is based on the native OSLog Framework to read logs from the local store of the unified logging system on Darwin OSes. The {{ site.product.short_name }} `system()` source automatically uses this new source on Darwin platforms if the `darwinosl` plugin is available. This plugin is available only on macOS 10.15 Catalina and later versions. The 10.15 version is the first to support the OSLog API.
 ---
 
 **NOTE:** The persistent OSLog store keeps about 7 days of logs on the disk.
@@ -22,7 +22,7 @@ The `darwin-oslog()` source has the following options.
 |Type:|     boolean|
 |Default:| `no`|
 
-*Description:* By default, {{ site.product.short_name }} continues to read the logs from the last remembered position after a restart. If this option is set to `yes`, it always starts reading from the end or beginning of the available log list (depending on the setting of the `go-reverse()` option.
+*Description:* By default, {{ site.product.short_name }} continues to read the logs from the last remembered position after a restart. If this option is set to `yes`, it always starts reading from the end or beginning of the available log list (depending on the setting of the `go-reverse()` and the `read-old-records()` options.
 
 ## go-reverse()
 
@@ -40,11 +40,11 @@ The `darwin-oslog()` source has the following options.
 |Type:|     integer|
 |Default:| `0`(unlimited) [seconds]|
 
-*Description:* The maximum distance in seconds that a bookmark can point backwards. That is, if {{ site.product.short_name }} is stopped for 10 minutes (600 seconds) and `max-bookmark-distance()` is set to `60`, then {{ site.product.short_name }} starts reading the logs from 60 seconds before the startup, missing 9 minutes (540 seconds) worth of logs.
+*Description:* The maximum distance in seconds that a bookmark can point backward. That is, if {{ site.product.short_name }} is stopped for 10 minutes (600 seconds) and `max-bookmark-distance()` is set to `60`, then {{ site.product.short_name }} starts reading the logs from 60 seconds before the startup, missing 9 minutes (540 seconds) worth of logs.
 
 ## read-old-records()
 
 |Type:|     boolean|
 |Default:| `no`|
 
-*Description:* If set to yes, {{ site.product.short_name }} starts reading logs starting from the oldest available log when the system starts, or if there are no bookmarks present.
+*Description:* If set to yes, {{ site.product.short_name }} starts reading logs from the oldest available entry when the system starts, or if no bookmarks are present.

doc/_admin-guide/070_Destinations/100_Kafka-c/003_Kafka-c_options.md

@@ -149,6 +149,19 @@ key(\"${PROGRAM}\").
 
 {% include doc/admin-guide/options/local-time-zone.md %}
 
+## message()
+
+|  Type:|      message template|
+  |Default:|   ${ISODATE} ${HOST} ${MSGHDR}${MSG}\\n|
+
+*Description:* The message as published to Apache Kafka. You can use
+templates and template functions (for example, format-json()) to format
+the message, for example, template(\"$(format-json \--scope rfc5424
+\--exclude DATE \--key ISODATE)\").
+
+For details on formatting messages in JSON format, see
+[[format-json|adm-temp-func#format-json]].
+
 {% include doc/admin-guide/options/on-error.md %}
 
 {% include doc/admin-guide/options/persist-name.md %}
@@ -196,19 +209,6 @@ recommends that you set sync-send() to "yes", as this setting
 delivers messages to the Kafka client more reliably.
 {: .notice--danger}
 
-## message()
-
-|  Type:|      message template|
-  |Default:|   ${ISODATE} ${HOST} ${MSGHDR}${MSG}\\n|
-
-*Description:* The message as published to Apache Kafka. You can use
-templates and template functions (for example, format-json()) to format
-the message, for example, template(\"$(format-json \--scope rfc5424
-\--exclude DATE \--key ISODATE)\").
-
-For details on formatting messages in JSON format, see
-[[format-json|adm-temp-func#format-json]].
-
 {% include doc/admin-guide/options/throttle.md %}
 
 {% include doc/admin-guide/options/time-zone.md %}

doc/_dev-guide/chapter_4/section_2/macos-testing-status/system-source/01_collecting-native-logs.md

@@ -66,8 +66,6 @@ For more info, see [oslog](https://developer.apple.com/documentation/oslog?langu
         attempt to read/send once it's out of available logs
   - default value: `1`
 - `log-fetch-limit()`
-  - **Warning**: _This option is now disabled due to an [OSLog API bug](https://openradar.appspot.com/radar?id=5597032077066240), once it's fixed it_
-        _will be enabled again_
   - integer value, that limits the number of logs {{ site.product.short_name }} will send in one run
   - default value: `0`, which means no limit