Skip to content

Commit 7d7bda0

Browse files
HofiOneHofiOne
authored
Fix the broken table structures after the latest uniformization (#309)
A number of tables were broken by the latest table uniformization attempt; fixing them.
2 parents 0b95e36 + cab3d7a commit 7d7bda0

30 files changed

Lines changed: 128 additions & 128 deletions

File tree

‎_includes/doc/admin-guide/options/failover.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ destination d_network_tls{
6161

6262
### servers()
6363

64-
| Type: | list of IP addresses and fully-qualified domain names | \n |
65-
| Default: | empty | |
64+
| Type: | list of IP addresses and fully-qualified domain names |
65+
| Default: | empty |
6666

67-
*Description:* Specifies a secondary destination server where log messages are sent if the primary server becomes inaccessible. To list several failover servers, separate the address of the servers with comma. By default, {{ site.product.short_name }} waits for the a server before switching to the next failover server is set in the time-reopen() option.
67+
*Description:* Specifies a secondary destination server where log messages are sent if the primary server becomes inaccessible. To list several failover servers, separate the address of the servers with comma. By default, {{ site.product.short_name }} waits for the a server before switching to the next failover server is set in the time-reopen() option.
6868
If failback() is not set, {{ site.product.short_name }} does not attempt to return to the primary server even if it becomes available. In case the failover server fails, {{ site.product.short_name }} attempts to connect the next failover server in the list in round-robin fashion.
6969

7070
![]({{ site.baseurl}}/assets/images/caution.png) **CAUTION:**

‎_includes/doc/admin-guide/options/on-error.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## on-error()
22

33
| Accepted values: | `drop-message`, `drop-property`, `fallback-to-string`, `silently-drop-message`, `silently-drop-property`, `silently-fallback-to-string` |
4-
| Default: | {{ page.on_error | default: 'Use the global setting (which defaults to `drop-message`)' }} |
4+
| Default: | {{ page.on_error | default: 'Use the global setting (which defaults to `drop-message`)' }} |
55

66
*Description:* Controls what happens when type-casting fails and
77
{{ site.product.short_name }} cannot convert some data to the specified type. By

‎_includes/doc/admin-guide/options/peer-verify.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ is a combination of two properties of validation:
1414
The following table summarizes the possible options and their results
1515
depending on the certificate of the peer.
1616

17-
The remote peer has:
18-
19-
| no certificate | invalid certificate | valid certificate | | |
20-
| Local peer-verify() setting | optional-untrusted | TLS-encryption | TLS-encryption | TLS-encryption |
21-
| optional-trusted | TLS-encryption | rejected connection | TLS-encryption | |
22-
| required-untrusted | rejected connection | TLS-encryption | TLS-encryption | |
23-
| required-trusted | rejected connection | rejected connection | TLS-encryption | |
17+
| | | The remote peer has | |
18+
| Local peer-verify() setting | no certificate | invalid certificate | valid certificate |
19+
|-----------------------------|---------------------|---------------------|-------------------|
20+
|optional-untrusted | TLS-encryption | TLS-encryption | TLS-encryption |
21+
|optional-trusted | TLS-encryption | rejected connection | TLS-encryption |
22+
|required-untrusted | rejected connection | TLS-encryption | TLS-encryption |
23+
|required-trusted | rejected connection | rejected connection | TLS-encryption |
2424

2525
For untrusted certificates only the existence of the certificate is
2626
checked, but it does not have to be valid --- {{ site.product.short_name }} accepts the
@@ -38,8 +38,8 @@ configuration method for the peer-verify option, simply setting it to
3838
`yes` or `no`. The following table summarizes the possible options
3939
and their results depending on the certificate of the peer.
4040

41-
The remote peer has:
42-
43-
| no certificate | invalid certificate | valid certificate | | |
44-
| Local peer-verify() setting | no (optional-untrusted) | TLS-encryption | TLS-encryption | TLS-encryption |
45-
| yes (required-trusted) | rejected connection | rejected connection | TLS-encryption | |
41+
| | | The remote peer has | |
42+
| Local peer-verify() setting | no certificate | invalid certificate | valid certificate |
43+
|-----------------------------|---------------------|---------------------|-------------------|
44+
| no (optional-untrusted) | TLS-encryption | TLS-encryption | TLS-encryption |
45+
| yes (required-trusted) | rejected connection | rejected connection | TLS-encryption |

‎_includes/doc/admin-guide/options/qos.md‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,24 @@
11
## qos()
22

3-
| Type: | number |
4-
| Accepted values: | `0` - at most once (the fastest option) |
5-
| | `1` - at least once (a much slower option than 0) |
6-
| | `2` - exactly once (the slowest option) |
7-
| Default: | `0` |
3+
<table>
4+
<tr>
5+
<td>Type:</td>
6+
<td>number</td>
7+
</tr>
8+
<tr>
9+
<td rowspan="3" style="vertical-align: top;">Accepted values:</td>
10+
<td><code>0</code> - at most once (the fastest option)</td>
11+
</tr>
12+
<tr>
13+
<td><code>1</code> - at least once (a much slower option than 0)</td>
14+
</tr>
15+
<tr>
16+
<td><code>2</code> - exactly once (the slowest option)</td>
17+
</tr>
18+
<tr>
19+
<td>Default:</td>
20+
<td><code>0</code></td>
21+
</tr>
22+
</table>
823

924
*Description:* The Quality of Service (QoS) level in MQTT messaging is an agreement between sender and receiver on the guarantee of delivering a message.

‎_includes/doc/admin-guide/options/source-flags.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
incoming message stream is close to real time, and the timezone
2525
information is missing from the timestamp.
2626
- *ignore-aux-data*: This flag enables the source to ignore auxiliary data.
27-
- *kernel*: The kernel flag makes the source default to the LOG_KERN
28-
| LOG_NOTICE priority if not specified otherwise. |
27+
- *kernel*: The kernel flag makes the source default to the `LOG_KERN | LOG_NOTICE` priority if not specified otherwise.
2928

3029
- *no-header*: The no-header flag triggers {{ site.product.short_name }} to parse only
3130
the `PRI` field of incoming messages, and put the rest of the message

‎doc/_admin-guide/060_Sources/070_Network/001_Proxy_protocol_support/000_Proxy_protocol_working_mechanism.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ macros to every message the comes through the connection later on:
2929
>
3030
> [2020-11-20T17:33:22.189458] PROXY protocol header received; line='PROXYdsfj'
3131
> [2020-11-20T17:33:22.189475] Error parsing PROXY protocol header;
32-
> [2020-11-20T17:33:22.189517] Syslog connection closed; fd='13',
33-
> client='AF_INET(127.0.0.1:51665)', local='AF_INET(0.0.0.0:6666)'
32+
> [2020-11-20T17:33:22.189517] Syslog connection closed; fd='13', client='AF_INET(127.0.0.1:51665)', local='AF_INET(0.0.0.0:6666)'
3433
> [2020-11-20T17:33:22.189546] Freeing PROXY protocol source driver; driver='0x7fffcba5bcf0'
3534
> [2020-11-20T17:33:22.189600] Closing log transport fd; fd='13'
3635
{: .notice--info}

‎doc/_admin-guide/060_Sources/070_Network/001_Proxy_protocol_support/001_Proxy_protocol_configuration.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ the output.
7676
With the PROXY TCP4 192.168.1.1 10.10.0.1 1111 2222 input header, the
7777
output looks like this:
7878

79-
> {"SOURCE":"s_tcp_pp","PROXIED_SRCPORT":"1111","PROXIED_SRCIP":"192.168.1.1",
79+
>{"SOURCE":"s_tcp_pp","PROXIED_SRCPORT":"1111","PROXIED_SRCIP":"192.168.1.1",
8080
>"PROXIED_IP_VERSION":"4","PROXIED_DSTPORT":"2222","PROXIED_DSTIP":"10.10.0.1",
8181
>"PROGRAM":"TestMsg","MESSAGE":"","LEGACY_MSGHDR":"TestMsg",
8282
>"HOST_FROM":"localhost","HOST":"localhost"}
8383
84-
Note that the macros that {{ site.product.short_name }} adds to the message appear in the output.
84+
Note the macros that {{ site.product.short_name }} adds to the message appear in the output.

‎doc/_admin-guide/060_Sources/095_mqtt/002_mqtt_source_options.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ Syntax: \<protocol type\>://\<host\>:\<port\>
2424

2525
{% include doc/admin-guide/options/chain-hostnames.md %}
2626

27-
{% include doc/admin-guide/options/format.md %}
28-
29-
{% include doc/admin-guide/options/internal.md %}
27+
{% include doc/admin-guide/options/mqtt-cleansession.md %}
3028

3129
{% include doc/admin-guide/options/mqtt-client-id.md %}
3230

33-
{% include doc/admin-guide/options/mqtt-cleansession.md %}
31+
{% include doc/admin-guide/options/format.md %}
32+
33+
{% include doc/admin-guide/options/internal.md %}
3434

3535
{% include doc/admin-guide/options/http-proxy.md %}
3636

0 commit comments

Comments
 (0)