diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-06-05 23:43:56 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-06-05 23:43:56 +0000 |
| commit | 0c7b80da22ab92ab5b2b7f2000a89e027263794a (patch) | |
| tree | ab0332abd6cf7af42102ecb5aeb6da60ea653af1 /docbook/asciidoc.conf | |
| parent | 1cc0587d0045bc02e8ec7ce09125e6b14d719b38 (diff) | |
Forward-port part of r49794 from trunk-1.10.
svn path=/trunk/; revision=49799
Diffstat (limited to 'docbook/asciidoc.conf')
| -rw-r--r-- | docbook/asciidoc.conf | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf index ab109297d9..5a38f2f070 100644 --- a/docbook/asciidoc.conf +++ b/docbook/asciidoc.conf @@ -11,9 +11,15 @@ wireshark-version:\[\]=1.11.0 # bugs.wireshark.org link # ws-buglink:<dddd>[<bug text>] # Default bug text is "Bug". -# Examples: ws-buglink:5000[] ws-buglink:[Wireshark bug number] +# Examples: ws-buglink:5000[] ws-buglink:4000[Wireshark bug number] (?su)(?<!\w)[\\]?(?P<name>ws-buglink):(?P<target>\d+)\[(?P<attrlist>.*?)(?<!\\)\]= +# www.wireshark.org/security link +# ws-salink:<dddd-dd>[<advisory text>] +# Default advisory text is "". +# Examples: ws-salink:2013-32[] ws-salink:2013-12[Security advisory] +(?su)(?<!\w)[\\]?(?P<name>ws-salink):(?P<target>\d{4}-\d{2,3})\[(?P<attrlist>.*?)(?<!\\)\]= + # CVE ID link # cve-idlink:<dddd-dddd>[] # Example: cve-idlink:2013:0001 @@ -25,6 +31,9 @@ ifdef::backend-docbook45[] [ws-buglink-inlinemacro] <ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id={target}">{0=Bug} {target}</ulink> +[ws-salink-inlinemacro] +<ulink url="https://www.wireshark.org/security/wnpa-sec-{target}">{0=}wnpa-sec-{target}</ulink> + [cve-idlink-inlinemacro] <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-{target}">CVE-{target}</ulink> @@ -36,6 +45,9 @@ ifdef::backend-html4,backend-html5,backend-xhtml11[] [ws-buglink-inlinemacro] <a href="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id={target}">{0=Bug} {target}</a> +[ws-salink-inlinemacro] +<a href="https://www.wireshark.org/security/wnpa-sec-{target}">{0=}wnpa-sec-{target}</a> + [cve-idlink-inlinemacro] <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-{target}">CVE-{target}</a> |