Switch some AsciiDoc replacements to attributes.

Many of our AsciiDoc "macros" are simple string replacements. Start
converting them to attributes.

Update the release notes.

Change-Id: I23d9ffd311f13a34c16cde3b4898b7f7bb8ba638
Reviewed-on: https://code.wireshark.org/review/15778
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

3 files changed, 9 insertions, 9 deletions

diff --git a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
index 23d6d81555..593d6b308f 100644
--- a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
@@ -497,7 +497,7 @@ to build Wireshark.
 . For the older GTK version run `C:\Development\wsbuild32\run\RelWithDebInfo\wireshark-gtk.exe`.
 
 . Open 'Help -> About'. If it shows your "private" program
-version, e.g.: Version wireshark-major-minor-version:[].x-myprotocol123
+version, e.g.: Version {wireshark-version}-myprotocol123
 congratulations! You have compiled your own version of Wireshark!
 
 You may also open the Wireshark solution file (Wireshark.sln) in the Visual Studio IDE and build there.
@@ -524,7 +524,7 @@ Note: You should have successfully built Wireshark
 before doing the following.
 
 If you want to build your own
-'wireshark-win32-wireshark-major-minor-version:[].x-myprotocol123.exe',
+'Wireshark-win32-{wireshark-version}-myprotocol123.exe',
 you'll need NSIS.
 
 . NSIS:
@@ -557,7 +557,7 @@ to build a Wireshark installer.
 +
 --
 ----
-> C:\Development\wireshark\packaging\nsis\wireshark-win32-wireshark-major-minor-version:[].x-myprotocol123.exe
+> C:\Development\wireshark\packaging\nsis\wireshark-win32-{wireshark-version}-myprotocol123.exe
 ----
 to test your new installer. It's a good idea to test on a different machine
 than the developer machine. Note that if you've built an x64 version, the installer will be named accordingly.
diff --git a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
index 4ff8e57623..5d3676759f 100644
--- a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
@@ -1097,7 +1097,7 @@ It might take some time, even on fast machines.
 ====
 
 If everything went well, you will now find something like:
-'wireshark-setup-wireshark-version:[].exe' in
+'wireshark-setup-{wireshark-version}.exe' in
 the 'packaging/nsis' directory in the source tree.
 
 [[ChSrcPortableApps]]
@@ -1132,7 +1132,7 @@ It might take some time, even on fast machines.
 ====
 
 If everything went well, you will now find something like:
-'WiresharkPortable_wireshark-major-minor-version:[].paf.exe' in
+'WiresharkPortable_{wireshark-version}.paf.exe' in
 the 'packaging/portableapps' directory.
 
 ++++++++++++++++++++++++++++++++++++++
diff --git a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc b/docbook/wsdg_src/WSDG_chapter_tools.asciidoc
index 7e4d0542e4..ab4526d46a 100644
--- a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_tools.asciidoc
@@ -371,9 +371,9 @@ CMake Generator: `Visual Studio 10`
 Remarks:: Installers created using express editions require a $$C++$$ redistributable
 '$$vcredist_x86.exe$$' (3MB free
 download) is required to build
-Wireshark-win32-wireshark-major-minor-version:[].x.exe, and
+Wireshark-win32-{wireshark-version}.exe, and
 '$$vcredist_x64.exe$$' is required to build
-Wireshark-win64-wireshark-major-minor-version:[].x.exe. The version of
+Wireshark-win64-{wireshark-version}.exe. The version of
 '$$vcredist_x86.exe$$' or '$$vcredist_x64.exe$$' _must_ match the version for your
 compiler including any service packs installed for the compiler.]
 
@@ -1109,7 +1109,7 @@ installation should be straightforward.
 === Windows: NSIS (optional)
 
 The NSIS (Nullsoft Scriptable Install System) is used to generate
-'wireshark-win32-wireshark-major-minor-version:[].x.exe' from all the files
+'Wireshark-win32-{wireshark-version}.exe' from all the files
 needed to be installed, including all required DLLs, plugins, and supporting
 files.
 
@@ -1127,7 +1127,7 @@ You can find more instructions on using NSIS in <<ChSrcNSIS>>.
 === Windows: PortableApps (optional)
 
 The PortableApps.com Installer is used to generate
-'WiresharkPortable-wireshark-major-minor-version:[].paf.exe' from all the files
+'WiresharkPortable-{wireshark-version}.paf.exe' from all the files
 needed to be installed, including all required DLLs, plugins, and supporting
 files.