Backport: PRs #3160, #3176, and #3173 (#3196)

* Add edits for docker module docs (#3176) * Restructure and edit processors content (#3160) * Deprecate filters option in metrictbeat
elastic · Dec 15, 2016 · a9844c4 · a9844c4
1 parent 70290cf
commit a9844c4
Show file tree

Hide file tree

Showing 30 changed files with 235 additions and 229 deletions.
diff --git a/filebeat/docs/reference/configuration.asciidoc b/filebeat/docs/reference/configuration.asciidoc
@@ -12,7 +12,6 @@ configuration settings, you need to restart {beatname_uc} to pick up the changes
 * <<configuration-filebeat-options>>
 * <<configuration-global-options>>
 * <<configuration-general>>
-* <<configuration-processors>>
 * <<elasticsearch-output>>
 * <<logstash-output>>
 * <<kafka-output>>
@@ -22,6 +21,7 @@ configuration settings, you need to restart {beatname_uc} to pick up the changes
 * <<configuration-output-ssl>>
 * <<configuration-path>>
 * <<configuration-logging>>
+* <<configuration-processors>>
 
 include::configuration/filebeat-options.asciidoc[]
 

diff --git a/filebeat/docs/reference/configuration/filebeat-options.asciidoc b/filebeat/docs/reference/configuration/filebeat-options.asciidoc
@@ -560,11 +560,11 @@ filebeat.shutdown_timeout: 5s
 
 include::../../../../libbeat/docs/generalconfig.asciidoc[]
 
-include::../../../../libbeat/docs/processors-config.asciidoc[]
-
 include::../../../../libbeat/docs/outputconfig.asciidoc[]
 
 include::../../../../libbeat/docs/shared-path-config.asciidoc[]
 
 include::../../../../libbeat/docs/loggingconfig.asciidoc[]
 
+include::../../../../libbeat/docs/processors-config.asciidoc[]
+