transversal: remove suricata-ids.org references

(cherry picked from commit e101384e7b5ca919c79f80e108c3e6a90b96960b)

diff --git a/doc/userguide/output/custom-tls-logging.rst b/doc/userguide/output/custom-tls-logging.rst
index 9ffd0102593dda6ef61066ba67e2c744df25c180..a1f8a45024c42c577dc1aa8eaccd413b12062945 100644 (file)
--- a/doc/userguide/output/custom-tls-logging.rst
+++ b/doc/userguide/output/custom-tls-logging.rst
@@ -17,7 +17,7 @@ And in your tls.log file you would get the following, for example:
 
 ::
 
- 12/03/16-19:20:14.85859 10.10.10.4:58274 -> 192.0.78.24:443 VERSION='TLS 1.2' suricata-ids.org NOTBEFORE='2016-10-27T20:36:00' NOTAFTER='2017-01-25T20:36:00'
+ 12/03/16-19:20:14.85859 10.10.10.4:58274 -> 192.0.78.24:443 VERSION='TLS 1.2' suricata.io NOTBEFORE='2016-10-27T20:36:00' NOTAFTER='2017-01-25T20:36:00'
 
 ::
  12/03/16-19:20:20.36849 10.10.10.4:39472 -> 192.30.253.113:443 VERSION='TLS 1.2' github.com NOTBEFORE='2016-03-10T00:00:00' NOTAFTER='2018-05-17T12:00:00'

diff --git a/doc/userguide/output/eve/eve-json-format.rst b/doc/userguide/output/eve/eve-json-format.rst
index c17fed24b7b9323808c29d8ad05c25de8ed53cd5..2a2e557480cced366f8ae971c5f31797418be3be 100644 (file)
--- a/doc/userguide/output/eve/eve-json-format.rst
+++ b/doc/userguide/output/eve/eve-json-format.rst
@@ -492,19 +492,19 @@ Example of a DNS answer with "detailed" format:
       "rcode": "NOERROR",
       "answers": [
         {
-          "rrname": "www.suricata-ids.org",
+          "rrname": "www.suricata.io",
           "rrtype": "CNAME",
           "ttl": 3324,
-          "rdata": "suricata-ids.org"
+          "rdata": "suricata.io"
         },
         {
-          "rrname": "suricata-ids.org",
+          "rrname": "suricata.io",
           "rrtype": "A",
           "ttl": 10,
           "rdata": "192.0.78.24"
         },
         {
-          "rrname": "suricata-ids.org",
+          "rrname": "suricata.io",
           "rrtype": "A",
           "ttl": 10,
           "rdata": "192.0.78.25"
@@ -531,7 +531,7 @@ Example of a DNS answer with "grouped" format:
           "192.0.78.25"
         ],
         "CNAME": [
-          "suricata-ids.org"
+          "suricata.io"
         ]
       }
   }

diff --git a/doc/userguide/output/eve/eve-json-output.rst b/doc/userguide/output/eve/eve-json-output.rst
index a195a021bdf83baa24955ac713b0043c1614564c..5cd9e62192c43abf9082897a5579bed0c3a4c7ed 100644 (file)
--- a/doc/userguide/output/eve/eve-json-output.rst
+++ b/doc/userguide/output/eve/eve-json-output.rst
@@ -502,4 +502,4 @@ YAML::
       community-id-seed: 0
 
 
-.. _deprecation policy: https://suricata-ids.org/about/deprecation-policy/
+.. _deprecation policy: https://suricata.io/our-story/deprecation-policy/

diff --git a/qa/prscript.py b/qa/prscript.py
index 1768d8adde0a5533e44f688c9fc02fe6f65cd246..232f56f81fa92abe6094469a2cea8daed3528ce2 100755 (executable)
--- a/qa/prscript.py
+++ b/qa/prscript.py
@@ -217,7 +217,7 @@ def FindBuild(branch, extension = "", builder_name = None):
 def GetBuildStatus(builder, buildid, extension="", builder_name = None):
     if builder_name == None:
         builder_name = username + extension
-    # https://buildbot.suricata-ids.org/json/builders/build%20deb6/builds/11
+    # https://buildbot.oisf.net/json/builders/build%20deb6/builds/11
     request = urllib.request.Request(JSON_BUILDERS_URI + builder_name + '/builds/' + str(buildid))
     page = urllib.request.urlopen(request)
     result = page.read()

diff --git a/src/detect-parse.c b/src/detect-parse.c
index dbb27087f2e205d5016f2d316aaae95d833b869c..020917e663b3691ead2e1d41eed424826092524e 100644 (file)
--- a/src/detect-parse.c
+++ b/src/detect-parse.c
@@ -719,7 +719,7 @@ static int SigParseOptions(DetectEngineCtx *de_ctx, Signature *s, char *optstr,
     s->init_data->negated = false;
 
     if (st->flags & SIGMATCH_INFO_DEPRECATED) {
-#define URL "https://suricata-ids.org/about/deprecation-policy/"
+#define URL "https://suricata.io/our-story/deprecation-policy/"
         if (st->alternative == 0)
             SCLogWarning(SC_WARN_DEPRECATED, "keyword '%s' is deprecated "
                     "and will be removed soon. See %s", st->name, URL);