diff --git a/doc/sphinx/configuration/suricata-yaml.rst b/doc/sphinx/configuration/suricata-yaml.rst index 6a2867fe28..f318e1c5ed 100644 --- a/doc/sphinx/configuration/suricata-yaml.rst +++ b/doc/sphinx/configuration/suricata-yaml.rst @@ -276,9 +276,9 @@ integration with tools like logstash. #- drop - ssh -For more advanced configuration options, see [[**FIXME** EveJSONOutput]]. -.. FIXME jsonformat ref -The format is documented in :ref:`Eve JSON Format ` +For more advanced configuration options, see :ref:`Eve JSON Output `. + +The format is documented in :ref:`Eve JSON Format `. Log output for use with Barnyard (unified.log) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -350,7 +350,7 @@ This log keeps track of all HTTP-traffic events. It contains the HTTP request, hostname, URI and the User-Agent. This information will be stored in the http.log (default name, in the suricata log directory). This logging can also be performed through the use of the -[[**FIXME** EveJSONFormat|Eve-log capability]]. +:ref:`Eve-log capability `. Example of a HTTP-log line with non-extended logging: @@ -384,7 +384,7 @@ This log keeps track of all DNS events (queries and replies). It contains the type of DNS activity that has been performed, the requested / replied domain name and relevant data suck as client, server, ttl, resource record data. This logging can also be performed -through the use of the [[EveJSONFormat|Eve-log capability]] which +through the use of the :ref:`Eve-log capability ` which offers easier parsing. Example of the apperance of a DNS log of a query with a preceding reply: diff --git a/doc/sphinx/output/.custom-http-logging.rst.swp b/doc/sphinx/output/.custom-http-logging.rst.swp deleted file mode 100644 index 8f40092872..0000000000 Binary files a/doc/sphinx/output/.custom-http-logging.rst.swp and /dev/null differ diff --git a/doc/sphinx/output/.index.rst.swp b/doc/sphinx/output/.index.rst.swp deleted file mode 100644 index cfd3102008..0000000000 Binary files a/doc/sphinx/output/.index.rst.swp and /dev/null differ diff --git a/doc/sphinx/output/.mongodb.rst.swp b/doc/sphinx/output/.mongodb.rst.swp deleted file mode 100644 index e07477ba33..0000000000 Binary files a/doc/sphinx/output/.mongodb.rst.swp and /dev/null differ diff --git a/doc/sphinx/output/.syslog-alerting-comp.rst.swp b/doc/sphinx/output/.syslog-alerting-comp.rst.swp deleted file mode 100644 index 24ad1a76e3..0000000000 Binary files a/doc/sphinx/output/.syslog-alerting-comp.rst.swp and /dev/null differ diff --git a/doc/sphinx/output/eve/eve-json-format.rst b/doc/sphinx/output/eve/eve-json-format.rst index a3d68ef67f..61a4f33433 100644 --- a/doc/sphinx/output/eve/eve-json-format.rst +++ b/doc/sphinx/output/eve/eve-json-format.rst @@ -1,3 +1,5 @@ +.. _eve-json-format: + Eve JSON Format =============== diff --git a/doc/sphinx/output/eve/eve-json-output.rst b/doc/sphinx/output/eve/eve-json-output.rst index 2606f6c929..8d42930d86 100644 --- a/doc/sphinx/output/eve/eve-json-output.rst +++ b/doc/sphinx/output/eve/eve-json-output.rst @@ -1,3 +1,5 @@ +.. _eve-json-output: + Eve JSON Output =============== diff --git a/doc/sphinx/output/files-json-log-output/.files-json-log-output.rst.swp b/doc/sphinx/output/files-json-log-output/.files-json-log-output.rst.swp deleted file mode 100644 index b00f05e585..0000000000 Binary files a/doc/sphinx/output/files-json-log-output/.files-json-log-output.rst.swp and /dev/null differ diff --git a/doc/sphinx/output/files-json-log-output/logstash-kibana-and-suricata-json-output.rst b/doc/sphinx/output/files-json-log-output/logstash-kibana-and-suricata-json-output.rst index 10e5d87f25..adbb73aa66 100644 --- a/doc/sphinx/output/files-json-log-output/logstash-kibana-and-suricata-json-output.rst +++ b/doc/sphinx/output/files-json-log-output/logstash-kibana-and-suricata-json-output.rst @@ -41,7 +41,7 @@ Make sure your Suricata is compiled/installed with libjansson support enabled: CUDA enabled: no ... -If it isn't check out the [[**FIXME** Suricata_installation]] page to install or compile Suricata for your distribution. +If it isn't check out the `Suricata Installation `_ page to install or compile Suricata for your distribution. **NOTE:** you will need these packages installed -> **libjansson4** and *libjansson-dev* before compilation. Configure suricata diff --git a/doc/sphinx/rules/payload-keywords.rst b/doc/sphinx/rules/payload-keywords.rst index b5f400ac45..6104c5ba79 100644 --- a/doc/sphinx/rules/payload-keywords.rst +++ b/doc/sphinx/rules/payload-keywords.rst @@ -228,9 +228,7 @@ The first example illustrates a signature which searches for byte 512 of the payload. The second example illustrates a signature searching for byte 50 after the last match. -You can also use the negation (!) before isdataat. Suricata does not -support using it yet, but will support it in future versions of the -engine. For more information see **fixme: what is this supposed to link to**. +You can also use the negation (!) before isdataat. .. image:: payload-keywords/isdataat1.png diff --git a/doc/sphinx/rules/pcre.rst b/doc/sphinx/rules/pcre.rst index 9af5484214..784b56681c 100644 --- a/doc/sphinx/rules/pcre.rst +++ b/doc/sphinx/rules/pcre.rst @@ -79,10 +79,6 @@ Suricata has its own specific pcre modifiers. These are: relative to the previous match so both matches have to be in the HTTP-raw-uri buffer. Read more about :doc:`http-uri-normalization`. -** FIXME - image is missing on wiki: .. image:: pcre/pcre7.png - -** FIXME - image is missing on wiki: .. image:: pcre/pcre8.png - * ``P``: Makes pcre match on the HTTP- request-body. So, it matches on the same buffer as http_client_body. P can be combined with /R. Note that R is relative to the previous match so both matches have to be