Asciidoctor: Remove underscores from macro names.

AsciiDoc allows dashes in macro names but not underscores. Current
versions of AsciiDoctor allow the inverse. Remove underscores to allow
for easier copying and pasting.

Remove asciidoc.conf while we're here. It's no longer used.

Change-Id: I32d8a4ec695b9e17a80ac720ee9faf62dbb362d3
Reviewed-on: https://code.wireshark.org/review/27787
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>

6 files changed, 9 insertions, 9 deletions

diff --git a/docbook/asciidoctor-macros/cve_idlink-inline-macro.rb b/docbook/asciidoctor-macros/cveidlink-inline-macro.rb
index fc1a5e2c9f..beb19a3b55 100644
--- a/docbook/asciidoctor-macros/cve_idlink-inline-macro.rb
+++ b/docbook/asciidoctor-macros/cveidlink-inline-macro.rb
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 # Copied from https://github.com/asciidoctor/asciidoctor-extensions-lab/blob/master/lib/man-inline-macro.rb
 
-RUBY_ENGINE == 'opal' ? (require 'cve_idlink-inline-macro/extension') : (require_relative 'cve_idlink-inline-macro/extension')
+RUBY_ENGINE == 'opal' ? (require 'cveidlink-inline-macro/extension') : (require_relative 'cveidlink-inline-macro/extension')
 
 Extensions.register do
   inline_macro CVEIdLinkInlineMacro
diff --git a/docbook/asciidoctor-macros/cve_idlink-inline-macro/extension.rb b/docbook/asciidoctor-macros/cveidlink-inline-macro/extension.rb
index fcf1f4ec33..a087c4cde3 100644
--- a/docbook/asciidoctor-macros/cve_idlink-inline-macro/extension.rb
+++ b/docbook/asciidoctor-macros/cveidlink-inline-macro/extension.rb
@@ -7,12 +7,12 @@ include ::Asciidoctor
 #
 # Usage
 #
-#   cve_idlink:<cve-number>[]
+#   cveidlink:<cve-number>[]
 #
 class CVEIdLinkInlineMacro < Extensions::InlineMacroProcessor
   use_dsl
 
-  named :cve_idlink
+  named :cveidlink
 
   def process parent, cvenum, attrs
     cvename = "CVE-#{cvenum}"
diff --git a/docbook/asciidoctor-macros/ws_buglink-inline-macro.rb b/docbook/asciidoctor-macros/wsbuglink-inline-macro.rb
index 38da3048fc..3f192aab7f 100644
--- a/docbook/asciidoctor-macros/ws_buglink-inline-macro.rb
+++ b/docbook/asciidoctor-macros/wsbuglink-inline-macro.rb
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 # Copied from https://github.com/asciidoctor/asciidoctor-extensions-lab/blob/master/lib/man-inline-macro.rb
 
-RUBY_ENGINE == 'opal' ? (require 'ws_buglink-inline-macro/extension') : (require_relative 'ws_buglink-inline-macro/extension')
+RUBY_ENGINE == 'opal' ? (require 'wsbuglink-inline-macro/extension') : (require_relative 'wsbuglink-inline-macro/extension')
 
 Extensions.register do
   inline_macro WSBugLinkInlineMacro
diff --git a/docbook/asciidoctor-macros/ws_buglink-inline-macro/extension.rb b/docbook/asciidoctor-macros/wsbuglink-inline-macro/extension.rb
index 3bc22b47be..7d09caf8ab 100644
--- a/docbook/asciidoctor-macros/ws_buglink-inline-macro/extension.rb
+++ b/docbook/asciidoctor-macros/wsbuglink-inline-macro/extension.rb
@@ -7,13 +7,13 @@ include ::Asciidoctor
 #
 # Usage
 #
-#   ws_buglink:<number>[<bug text>]
+#   wsbuglink:<number>[<bug text>]
 #   Default bug text is "Bug".
 #
 class WSBugLinkInlineMacro < Extensions::InlineMacroProcessor
   use_dsl
 
-  named :ws_buglink
+  named :wsbuglink
   parse_content_as :text
   name_positional_attributes 'bugtext'
 
diff --git a/docbook/asciidoctor-macros/ws_salink-inline-macro.rb b/docbook/asciidoctor-macros/wssalink-inline-macro.rb
index 055ce64dfd..3172ea5078 100644
--- a/docbook/asciidoctor-macros/ws_salink-inline-macro.rb
+++ b/docbook/asciidoctor-macros/wssalink-inline-macro.rb
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 # Copied from https://github.com/asciidoctor/asciidoctor-extensions-lab/blob/master/lib/man-inline-macro.rb
 
-RUBY_ENGINE == 'opal' ? (require 'ws_salink-inline-macro/extension') : (require_relative 'ws_salink-inline-macro/extension')
+RUBY_ENGINE == 'opal' ? (require 'wssalink-inline-macro/extension') : (require_relative 'wssalink-inline-macro/extension')
 
 Extensions.register do
   inline_macro WSSALinkInlineMacro
diff --git a/docbook/asciidoctor-macros/ws_salink-inline-macro/extension.rb b/docbook/asciidoctor-macros/wssalink-inline-macro/extension.rb
index 2c87e4350f..1b8a078be0 100644
--- a/docbook/asciidoctor-macros/ws_salink-inline-macro/extension.rb
+++ b/docbook/asciidoctor-macros/wssalink-inline-macro/extension.rb
@@ -7,12 +7,12 @@ include ::Asciidoctor
 #
 # Usage
 #
-#   ws_salink:<dddd>[]
+#   wssalink:<dddd>[]
 #
 class WSSALinkInlineMacro < Extensions::InlineMacroProcessor
   use_dsl
 
-  named :'ws_salink'
+  named :'wssalink'
 
   def process parent, sanum, attrs
     satext = "wnpa-sec-#{sanum}"