Skip to content

Commit 295126b

Browse files
committed
First bacth of alignments.
Signed-off-by: Zsolt Gyulai (zgyulai) <zsolt.gyulai@quest.com>
1 parent 5555ccc commit 295126b

File tree

4 files changed

+11
-38
lines changed

4 files changed

+11
-38
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
**NOTE:** The deprecated `{{ include.old }}()` option is an alias for the `{{ include.new }}()` option, retained for compatibility with earlier {{ site.product.short_name }} versions, but it may be removed at any time without further notice!
1+
**NOTE:** The deprecated `{{ include.old }}` option is an alias for the `{{ include.new }}` option, retained for compatibility with earlier {{ site.product.short_name }} versions, but it may be removed at any time without further notice!
22
{: .notice--info}

doc/_admin-guide/020_The_concepts_of_syslog-ng/010_Things_to_consider.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ There are two drivers you can use: the **network()** driver and the
2121
**syslog()** driver. The syslog() driver is for the syslog (RFC-5424)
2222
protocol and the network() driver is for the BSD (RFC-3164) protocol.
2323

24-
The tcp() and udp() drivers are now deprecated, they are essentially
25-
equivalent with the network(transport(tcp)) and network(transport(udp))
26-
drivers.
24+
{% include doc/admin-guide/options/deprecated-options.md old='tcp()' new='network(transport(tcp))' %}
25+
26+
{% include doc/admin-guide/options/deprecated-options.md old='udp()' new='network(transport(udp))' %}
2727

2828
In addition to selecting the driver to use, both drivers allow you to
2929
use different transport-layer protocols: TCP and UDP, and optionally

doc/_admin-guide/070_Destinations/130_MongoDB/README.md

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,4 @@ destination d_mongodb {
6363
};
6464
```
6565

66-
The following example shows the same setup using the deprecated
67-
libmongo-client syntax, and is equivalent with the previous example.
68-
69-
```config
70-
destination d_mongodb {
71-
mongodb(
72-
servers("localhost:27017")
73-
database("syslog")
74-
collection("messages")
75-
value-pairs(
76-
scope("selected-macros" "nv-pairs" "sdata")
77-
)
78-
);
79-
};
80-
```
66+
{% include doc/admin-guide/options/deprecated-options.md old='libmongo client syntax' new='mongodb' %}

doc/_admin-guide/090_Global_options/000_Global_options.md

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -276,12 +276,7 @@ Higher log-levels automatically include messages from lower log-levels:
276276
277277
## mark() (DEPRECATED)
278278
279-
| Accepted values:| number|
280-
|Default:| 1200|
281-
282-
*Description:* The mark-freq() option is an alias for the deprecated
283-
mark() option. This is retained for compatibility with {{ site.product.short_name }} version
284-
1.6.x.
279+
{% include doc/admin-guide/options/deprecated-options.md old='mark()' new='mark-freq()' %}
285280
286281
{% include doc/admin-guide/options/mark-freq.md %}
287282
@@ -306,7 +301,7 @@ configured to do so.
306301
307302
## pass-unix-credentials() (DEPRECATED)
308303
309-
The `pass-unix-credentials()` option has been deprecated in {{ site.product.short_name }} 3.35 and later versions. Use the `so-passcred()` option.
304+
{% include doc/admin-guide/options/deprecated-options.md old='pass-unix-credentials()' new='so-passcred()' %}
310305
311306
{% include doc/admin-guide/options/perm.md %}
312307
@@ -455,19 +450,19 @@ Possible values:
455450

456451
## stats-freq() (DEPRECATED)
457452

458-
This is a deprecated legacy option. Use stats(freq()) instead.
453+
{% include doc/admin-guide/options/deprecated-options.md old='stats-freq()' new='stats(freq())' %}
459454

460455
## stats-level() (DEPRECATED)
461456

462-
This is a deprecated legacy option. Use stats(level()) instead.
457+
{% include doc/admin-guide/options/deprecated-options.md old='stats-level()' new='stats(level())' %}
463458

464459
## stats-max-dynamics() (DEPRECATED)
465460

466-
This is a deprecated legacy option. Use stats(max-dynamics()) instead.
461+
{% include doc/admin-guide/options/deprecated-options.md old='stats-max-dynamics()' new='stats(max-dynamics())' %}
467462

468463
## sync() or sync-freq() (DEPRECATED)
469464

470-
Obsolete aliases for flush-lines().
465+
{% include doc/admin-guide/options/deprecated-options.md old='sync() and sync-freq()' new='flush-lines()' %}
471466

472467
## threaded()
473468

@@ -483,14 +478,6 @@ Multithreading and scaling in {{ site.product.short_name }}.
483478

484479
{% include doc/admin-guide/options/time-reopen.md %}
485480

486-
## time-sleep() (DEPRECATED)
487-
488-
| Accepted values:| number|
489-
|Default:| 0|
490-
491-
*Description:* The time to wait in milliseconds between each invocation
492-
of the poll() iteration.
493-
494481
{% include doc/admin-guide/options/time-zone.md %}
495482

496483
{% include doc/admin-guide/options/trim-large-messages.md %}

0 commit comments

Comments
 (0)