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

2 files changed, 22 insertions, 18 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>
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 16393a4391..c46544556c 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -11,8 +11,9 @@ used for troubleshooting, analysis, development and education.
 
 The following bugs have been fixed:
 
-//* ws-buglink:5000
-//* cve-idlink:2013-2486
+* ws-buglink:5000[]
+* ws-buglink:6000[Wireshark bug]
+* cve-idlink:2013-2486[]
 
 === New and Updated Features
 
@@ -69,34 +70,34 @@ locations on your system.
 == Known Problems
 
 Dumpcap might not quit if Wireshark or TShark crashes.
-(ws-buglink:1419)
+(ws-buglink:1419[])
 
 The BER dissector might infinitely loop.
-(ws-buglink:1516)
+(ws-buglink:1516[])
 
 Capture filters aren't applied when capturing from named pipes.
 (ws-buglink:1814)
 
 Filtering tshark captures with display filters (-R) no longer works.
-(ws-buglink:2234)
+(ws-buglink:2234[])
 
 The 64-bit Windows installer does not support Kerberos decryption.
 (https://wiki.wireshark.org/Development/Win64[Win64 development page])
 
 Application crash when changing real-time option.
-(ws-buglink:4035)
+(ws-buglink:4035[])
 
 Hex pane display issue after startup.
-(ws-buglink:4056)
+(ws-buglink:4056[])
 
 Packet list rows are oversized.
-(ws-buglink:4357)
+(ws-buglink:4357[])
 
 Summary pane selected frame highlighting not maintained.
-(ws-buglink:4445)
+(ws-buglink:4445[])
 
 Wireshark and TShark will display incorrect delta times in some cases.
-(ws-buglink:4985)
+(ws-buglink:4985[])
 
 == Getting Help