diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-03-15 18:25:07 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-03-15 18:25:07 +0000 |
| commit | 72486af19ab1671c2c3a49ebcbd7eaef1e50aca7 (patch) | |
| tree | aba7b8da69eba8ca10608328144d256de9ddfe66 /docbook/asciidoc.conf | |
| parent | 32799db42c65f2aa0d9b30212a2bde20b9d96d41 (diff) | |
Use the correct inline macro form for the ws-buglink and cve-idlink
macros. Add an optional bug text attribute to ws-buglink.
svn path=/trunk/; revision=48325
Diffstat (limited to 'docbook/asciidoc.conf')
| -rw-r--r-- | docbook/asciidoc.conf | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf index e01b678c52..d69db4c6ef 100644 --- a/docbook/asciidoc.conf +++ b/docbook/asciidoc.conf @@ -1,19 +1,22 @@ [macros] -# bugs.wireshark.org -# ws-buglink:<dddd> -(?su)(?<!\w)[\\]?ws-buglink:(?P<target>\d+)=ws-buglink +# bugs.wireshark.org link +# ws-buglink:<dddd>[<bug text>] +# Default bug text is "Bug". +# Examples: ws-buglink:5000[] ws-buglink:[Wireshark bug number] +(?su)(?<!\w)[\\]?(?P<name>ws-buglink):(?P<target>\d+)\[(?P<attrlist>.*?)(?<!\\)\]= -# CVE ID -# cve-idlink:<dddd-dddd> -(?su)(?<!\w)[\\]?cve-idlink:(?P<target>\d{4}-\d+)=cve-idlink +# CVE ID link +# cve-idlink:<dddd-dddd>[] +# Example: cve-idlink:2013:0001 +(?su)(?<!\w)[\\]?(?P<name>cve-idlink):(?P<target>\d{4}-\d+)\[\]= ifdef::backend-docbook45[] [ws-buglink-inlinemacro] -<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id={target}">Bug {target}</ulink> +<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id={target}">{0=Bug} {target}</ulink> [cve-idlink-inlinemacro] <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-{target}">CVE-{target}</ulink> @@ -24,7 +27,7 @@ endif::backend-docbook45[] ifdef::backend-html4,backend-html5,backend-xhtml11[] [ws-buglink-inlinemacro] -<a href="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id={target}">Bug {target}</a> +<a href="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id={target}">{0=Bug} {target}</a> [cve-idlink-inlinemacro] <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-{target}">CVE-{target}</a> |