diff --git a/docs/static/command-line-flags.asciidoc b/docs/static/command-line-flags.asciidoc index b76578806..f80281971 100644 --- a/docs/static/command-line-flags.asciidoc +++ b/docs/static/command-line-flags.asciidoc @@ -5,7 +5,7 @@ Logstash has the following flags. You can use the `--help` flag to display this You can also control Logstash execution by specifying options in the Logstash settings file. For more info, see <>. -coming[5.0.0-alpha3, Command-line flags have dots instead of dashes in their names] +added[5.0.0-alpha3, Command-line flags have dots instead of dashes in their names] *`-f, --path.config CONFIGFILE`*:: Load the Logstash config from a specific file or directory, or a wildcard. If diff --git a/docs/static/contributing-to-logstash.asciidoc b/docs/static/contributing-to-logstash.asciidoc index 05bdeade5..063be8244 100644 --- a/docs/static/contributing-to-logstash.asciidoc +++ b/docs/static/contributing-to-logstash.asciidoc @@ -24,7 +24,7 @@ deploying your own plugins: * <> [float] -==== Plugin API Changes added[2.0] +==== Plugin API Changes The 2.0 release of Logstash changes how input plugins shut down to increase shutdown reliability. There are three methods for plugin shutdown: `stop`, `stop?`, and `close`. diff --git a/docs/static/monitoring-apis.asciidoc b/docs/static/monitoring-apis.asciidoc index 6771c48f0..d9333220c 100644 --- a/docs/static/monitoring-apis.asciidoc +++ b/docs/static/monitoring-apis.asciidoc @@ -69,7 +69,7 @@ consumption. The default for the `human` flag is [[node-info-api]] === Node Info API -coming[5.0.0-alpha4] +added[5.0.0-alpha4] experimental[] @@ -240,7 +240,7 @@ Gets JVM stats, including stats about threads. added[5.0.0-alpha3,Adds thread co `process`:: Gets process stats, including stats about file descriptors, memory consumption, and CPU usage. added[5.0.0-alpha3] `mem`:: -Gets memory usage stats. coming[5.0.0-alpha4] +Gets memory usage stats. added[5.0.0-alpha4] ==== Event Stats @@ -367,7 +367,7 @@ Logstash monitoring APIs. [[pipeline-stats-api]] === Pipeline Stats API -coming[5.0.0-alpha4,Stats for input stages are not yet available] +added[5.0.0-alpha4,Stats for input stages are not yet available] experimental[] diff --git a/docs/static/setting-up-logstash.asciidoc b/docs/static/setting-up-logstash.asciidoc index 9790f8674..50d9fe04a 100644 --- a/docs/static/setting-up-logstash.asciidoc +++ b/docs/static/setting-up-logstash.asciidoc @@ -16,7 +16,7 @@ This section includes additional information on how to set up and run Logstash, This section describes the default directory structure that is created when you unpack the Logstash installation packages. -coming[5.0.0-alpha3, Includes breaking changes to the Logstash directory structure] +added[5.0.0-alpha3, Includes breaking changes to the Logstash directory structure] [[zip-targz-layout]] ==== Directory Layout of `.zip` and `.tar.gz` Archives @@ -118,7 +118,7 @@ See <> for more info. ==== Settings Files -coming[5.0.0-alpha3] +added[5.0.0-alpha3] The settings files are already defined in the Logstash installation. Logstash includes the following settings files: @@ -140,7 +140,7 @@ The settings files are already defined in the Logstash installation. Logstash in [[running-logstash]] === Running Logstash as a Service on Debian or RPM -coming[5.0.0-alpha3] +added[5.0.0-alpha3] Logstash is not started automatically after installation. How to start and stop Logstash depends on whether your system uses systemd, upstart, or SysV. diff --git a/docs/static/settings-file.asciidoc b/docs/static/settings-file.asciidoc index 748b0e79c..267f5f48e 100644 --- a/docs/static/settings-file.asciidoc +++ b/docs/static/settings-file.asciidoc @@ -1,7 +1,7 @@ [[logstash-settings-file]] === Settings File -coming[5.0.0-alpha3] +added[5.0.0-alpha3] You can set options in the Logstash settings file, `logstash.yml`, to control Logstash execution. Each setting in the `logstash.yml` file corresponds to a <>.