Wireshark · Wireshark-commits: [Wireshark-commits] master-2.6 224bd77: Asciidoctor: Remove underscores from macro names.

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=224bd77be5b87b737f3f47f50af2c2463e97e0fe
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.6
Repository: wireshark

Commits:

224bd77 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    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.
    
    Conflicts:
    	docbook/release-notes.asciidoc
    
    Change-Id: I32d8a4ec695b9e17a80ac720ee9faf62dbb362d3
    (cherry picked from commit 585f45cb36853fd3eeaa5b0e2d046f8a818d9acd)
    Reviewed-on: https://code.wireshark.org/review/27790
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  61438fe   Makefile (ui/cli): fix duplicat entry for tap-endpoints.
    adds  224bd77   Asciidoctor: Remove underscores from macro names.


Summary of changes:
 cmake/modules/FindAsciidoctor.cmake                |  6 +-
 docbook/Makefile.am                                |  6 +-
 docbook/asciidoc.conf                              | 79 ----------------------
 ...k-inline-macro.rb => cveidlink-inline-macro.rb} |  2 +-
 .../extension.rb                                   |  4 +-
 ...k-inline-macro.rb => wsbuglink-inline-macro.rb} |  2 +-
 .../extension.rb                                   |  4 +-
 ...nk-inline-macro.rb => wssalink-inline-macro.rb} |  2 +-
 .../extension.rb                                   |  4 +-
 docbook/release-notes.asciidoc                     | 24 +++----
 tools/gen-bugnote                                  |  2 +-
 11 files changed, 28 insertions(+), 107 deletions(-)
 delete mode 100644 docbook/asciidoc.conf
 rename docbook/asciidoctor-macros/{cve_idlink-inline-macro.rb => cveidlink-inline-macro.rb} (61%)
 rename docbook/asciidoctor-macros/{cve_idlink-inline-macro => cveidlink-inline-macro}/extension.rb (93%)
 rename docbook/asciidoctor-macros/{ws_buglink-inline-macro.rb => wsbuglink-inline-macro.rb} (61%)
 rename docbook/asciidoctor-macros/{ws_buglink-inline-macro => wsbuglink-inline-macro}/extension.rb (93%)
 rename docbook/asciidoctor-macros/{ws_salink-inline-macro.rb => wssalink-inline-macro.rb} (61%)
 rename docbook/asciidoctor-macros/{ws_salink-inline-macro => wssalink-inline-macro}/extension.rb (93%)