Merge branch 'main' into checker-timerange-report

docs/csaf_checker.md

@@ -6,6 +6,7 @@
 Usage:
   csaf_checker [OPTIONS] domain...
 
+Application Options:
 Application Options:
   -o, --output=REPORT-FILE       File name of the generated report
   -f, --format=[json|html]       Format of report (default: json)
@@ -17,7 +18,7 @@ Application Options:
   -r, --rate=                    The average upper limit of https operations per second (defaults to unlimited)
   -y, --years=YEARS              Number of years to look back from now
   -t, --timerange=RANGE          RANGE of time from which advisories to download
-  -i, --ignorepattern=PATTERN    Dont download files if there URLs match any of the given PATTERNs
+  -i, --ignorepattern=PATTERN    Do not download files if their URLs match any of the given PATTERNs
   -H, --header=                  One or more extra HTTP header fields
       --validator=URL            URL to validate documents remotely
       --validatorcache=FILE      FILE to cache remote validations
@@ -100,8 +101,16 @@ It is only allowed to specify one off them.
 All interval boundaries are inclusive.
 
 You can ignore certain advisories while checking by specifying a list
+<<<<<<< HEAD
 of regular expressions to match their URLs by using the `ignorepattern` option. 
 E.g. `-i='.*white.*' -i='*.red.*'` will ignore files which URLs contain the sub strings **white** or **red**.
+=======
+of regular expressions to match their URLs by using the `ignorepattern`
+option.
+
+E.g. `-i='.*white.*' -i='*.red.*'` will ignore files which URLs contain
+the sub strings **white** or **red**.
+>>>>>>> main
 In the config file this has to be noted as:
 ```
 ignorepattern = [".*white.*", ".*red.*"]