Merge branch 'master' into doc-s3-updates

Author: zsoltgyulai94

_data/navigation.yml

@@ -379,11 +379,6 @@ admin-guide-nav:
         url: /admin-guide/070_Destinations/081_http/002_Python_http_header_plugin
       - title: "The Azure auth header plugin"
         url: /admin-guide/070_Destinations/081_http/003_Azure_auth_header_plugin
-    - title: "http-java"
-      url: /admin-guide/070_Destinations/085_http-java/README
-      subnav:
-      - title: "HTTP Java destination options"
-        url: /admin-guide/070_Destinations/085_http-java/000_http_java_options
     - title: "kafka"
       url: /admin-guide/070_Destinations/100_Kafka-c/README
       subnav:

_includes/doc/admin-guide/notes/wildcard-option-warning.md

@@ -0,0 +1,3 @@
+**NOTE:** 
+This option is only available for the `wildcard-file()` source but unavailable for the `file()` source.
+{: .notice--info}

doc/_admin-guide/030_Installing_syslog-ng/000_Compiling_syslog-ng_from_source.md

@@ -33,8 +33,8 @@ and other platforms, see {{ site.product.name }} installation packages.
     - The {{ site.product.short_name }} application now uses PCRE-type regular
         expressions by default. It requires the libpcre library package.
 
-    - If you want to use the Java-based modules of {{ site.product.short_name }} (for
-        example, the Elasticsearch, HDFS, or Kafka destinations), you
+    - If you want to use a Java-based module of {{ site.product.short_name }} (for
+        example, the HDFS), you
         must compile {{ site.product.short_name }} with Java support.
 
         - Download and install the Java Runtime Environment (JRE), 1.7
@@ -59,8 +59,7 @@ and other platforms, see {{ site.product.name }} installation packages.
 3. If you want to post log messages as HTTP requests using the http()
     destination, install the development files of the *libcurl* library.
     This library is not needed if you use the \--disable-http compile
-    option. Alternatively, you can use a Java-based implementation of
-    the HTTP destination.
+    option.
 
 4. If you want to use the spoof-source function of {{ site.product.short_name }}, install
     the development files of the libnet library.

doc/_admin-guide/030_Installing_syslog-ng/001_Compiling_options.md

@@ -54,7 +54,7 @@ compiling options.
 
 - *\--enable-ipv6* Enable IPv6 support.
 
-- *\--enable-java* Enable support for Java-based modules. For other
+- *\--enable-java* Enable support for the Java-based module. For other
     requirements, see the description of the Java-based module (for
     example,
     [[HDFS prerequisites|adm-dest-hdfs-pre]]) that you want to use.
@@ -134,7 +134,7 @@ compiling options.
 
 - *\--with-libcurl* Specifies the path to the libcurl library. For
     details on using this destination, see
-    [[http: Posting messages over HTTP without Java]].
+    [[http: Posting messages over HTTP]].
 
 - *\--with-libhiredis* Specifies the path to the libhiredis library
     (0.11 or newer). For details on using this destination, see

doc/_admin-guide/060_Sources/020_File/000_File_source_options.md

@@ -1,10 +1,10 @@
 ---
-title: 'file: Collecting messages from text files (DEPRECATED)'
-short_title: file (DEPRECATED)
+title: 'file: Collecting messages from text files'
+short_title: file
 id: adm-src-file
 description: >-
-    The file() source has been deprecated. For a more stable performance, use the [[wildcard-file() source|adm-src-wild]] instead. Collects log messages from plain-text files, for example, from the logfiles of
-    an Apache webserver. If you want to use wildcards in the filename, use the [[wildcard-file() source|adm-src-wild]].
+    Collects log messages from plain-text files, for example, from the logfiles of
+    an Apache webserver. If you want to use wildcards in the filename, use the [[wildcard-file() source|adm-src-wild]]. Currently, {{ site.product.short_name }} supports the file() source to maintain certain compatibilities, but it is advised to use the wildcard-file() source for longevity reasons and more configuration options.
 ---
 
 The {{ site.product.short_name }} application notices if a file is renamed or replaced with
@@ -49,3 +49,5 @@ treats messages received from files as sent by the kern facility. Use
 the **default-facility()** and **default-priority()** options in the
 source definition to assign a different facility if needed.
 {: .notice--info}
+
+For the configuration options available in the `file()` source, see wildcard-file() source options.

doc/_admin-guide/060_Sources/020_File/002_Notes_on_reading_kernel_messages.md renamed to doc/_admin-guide/060_Sources/020_File/000_Notes_on_reading_kernel_messages.md

@@ -10,6 +10,8 @@ The wildcard-file() driver has the following options:
 
 ## base-dir()
 
+{% include doc/admin-guide/notes/wildcard-option-warning.md %}
+
 |Type:|      path without filename|
 |Default:||
 
@@ -39,6 +41,8 @@ source s_files {
 
 ## filename-pattern()
 
+{% include doc/admin-guide/notes/wildcard-option-warning.md %}
+
 |Type:|filename without path|
 |Default:||
 

doc/_admin-guide/060_Sources/020_File/README.md

@@ -5,8 +5,8 @@ description: >-
     To send messages from {{ site.product.short_name }} to HDFS, complete the following steps.
 ---
 
-1. If you want to use the Java-based modules of {{ site.product.short_name }} (for
-    example, the Elasticsearch, HDFS, or Kafka destinations), you must
+1. If you want to use the Java-based module of {{ site.product.short_name }} (for
+    example, HDFS destination), you must
     compile {{ site.product.short_name }} with Java support.
 
     - Download and install the Java Runtime Environment (JRE), 1.7 (or