44 files changed, 137 insertions, 138 deletions

diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt
index e1296b991f..ad17689850 100644
--- a/docbook/CMakeLists.txt
+++ b/docbook/CMakeLists.txt
@@ -8,7 +8,6 @@
 #
 
 # To do:
-# - Rename *.asciidoc to *.adoc
 # - Make the build targets top-level on Windows, similar to the NSIS,
 #   WiX, and PortableApps targets?
 
@@ -52,7 +51,7 @@ else()
 endif()
 
 set(COMMON_FILES
-	common_src/GPL_appendix.asciidoc
+	common_src/GPL_appendix.adoc
 )
 
 set(COMMON_GRAPHICS
@@ -74,24 +73,24 @@ add_custom_target(update_tools_help
 set_docbook_target_properties(update_tools_help)
 
 set(WSUG_FILES
-	wsug_src/WSUG_app_files.asciidoc
-	wsug_src/WSUG_app_howitworks.asciidoc
-	wsug_src/WSUG_app_protocols.asciidoc
-	wsug_src/WSUG_app_messages.asciidoc
-	wsug_src/WSUG_app_tools.asciidoc
-	wsug_src/WSUG_chapter_advanced.asciidoc
-	wsug_src/WSUG_chapter_build_install.asciidoc
-	wsug_src/WSUG_chapter_capture.asciidoc
-	wsug_src/WSUG_chapter_customize.asciidoc
-	wsug_src/WSUG_chapter_introduction.asciidoc
-	wsug_src/WSUG_chapter_io.asciidoc
-	wsug_src/WSUG_chapter_mate.asciidoc
-	wsug_src/WSUG_chapter_statistics.asciidoc
-	wsug_src/WSUG_chapter_telephony.asciidoc
-	wsug_src/WSUG_chapter_troubleshoot.asciidoc
-	wsug_src/WSUG_chapter_use.asciidoc
-	wsug_src/WSUG_chapter_work.asciidoc
-	wsug_src/WSUG_preface.asciidoc
+	wsug_src/WSUG_app_files.adoc
+	wsug_src/WSUG_app_howitworks.adoc
+	wsug_src/WSUG_app_protocols.adoc
+	wsug_src/WSUG_app_messages.adoc
+	wsug_src/WSUG_app_tools.adoc
+	wsug_src/WSUG_chapter_advanced.adoc
+	wsug_src/WSUG_chapter_build_install.adoc
+	wsug_src/WSUG_chapter_capture.adoc
+	wsug_src/WSUG_chapter_customize.adoc
+	wsug_src/WSUG_chapter_introduction.adoc
+	wsug_src/WSUG_chapter_io.adoc
+	wsug_src/WSUG_chapter_mate.adoc
+	wsug_src/WSUG_chapter_statistics.adoc
+	wsug_src/WSUG_chapter_telephony.adoc
+	wsug_src/WSUG_chapter_troubleshoot.adoc
+	wsug_src/WSUG_chapter_use.adoc
+	wsug_src/WSUG_chapter_work.adoc
+	wsug_src/WSUG_preface.adoc
 	wsug_src/capinfos-h.txt
 	wsug_src/dumpcap-h.txt
 	wsug_src/editcap-F.txt
@@ -258,19 +257,19 @@ set(WSUG_GRAPHICS
 )
 
 set(WSDG_FILES
-	wsdg_src/WSDG_chapter_build_intro.asciidoc
-	wsdg_src/WSDG_chapter_capture.asciidoc
-	wsdg_src/WSDG_chapter_dissection.asciidoc
-	wsdg_src/WSDG_chapter_env_intro.asciidoc
-	wsdg_src/WSDG_chapter_libraries.asciidoc
-	wsdg_src/WSDG_chapter_quick_setup.asciidoc
-	wsdg_src/WSDG_chapter_sources.asciidoc
-	wsdg_src/WSDG_chapter_tests.asciidoc
-	wsdg_src/WSDG_chapter_tools.asciidoc
-	wsdg_src/WSDG_chapter_userinterface.asciidoc
-	wsdg_src/WSDG_chapter_works.asciidoc
-	wsdg_src/WSDG_preface.asciidoc
-	wsluarm.asciidoc
+	wsdg_src/WSDG_chapter_build_intro.adoc
+	wsdg_src/WSDG_chapter_capture.adoc
+	wsdg_src/WSDG_chapter_dissection.adoc
+	wsdg_src/WSDG_chapter_env_intro.adoc
+	wsdg_src/WSDG_chapter_libraries.adoc
+	wsdg_src/WSDG_chapter_quick_setup.adoc
+	wsdg_src/WSDG_chapter_sources.adoc
+	wsdg_src/WSDG_chapter_tests.adoc
+	wsdg_src/WSDG_chapter_tools.adoc
+	wsdg_src/WSDG_chapter_userinterface.adoc
+	wsdg_src/WSDG_chapter_works.adoc
+	wsdg_src/WSDG_preface.adoc
+	wsluarm.adoc
 	${COMMON_FILES}
 )
 
@@ -360,18 +359,18 @@ ADD_CUSTOM_COMMAND(
 set( WSDG_BUILT_DEPS copy_ws.css wsluarm )
 
 set( ASCIIDOC_CONF_FILES
-	attributes.asciidoc
+	attributes.adoc
 	# XXX Add macros
 )
 
 if(ASCIIDOCTOR_FOUND)
 	# Generate the DocBook sources of user and developer guides
 
-	ASCIIDOCTOR2DOCBOOK(user-guide.asciidoc ${ASCIIDOC_CONF_FILES} ${WSUG_SOURCE} ${WSUG_BUILT_DEPS})
+	ASCIIDOCTOR2DOCBOOK(user-guide.adoc ${ASCIIDOC_CONF_FILES} ${WSUG_SOURCE} ${WSUG_BUILT_DEPS})
 	add_custom_target(user_guide_docbook DEPENDS generate_user-guide.xml)
 	set_docbook_target_properties(user_guide_docbook)
 
-	ASCIIDOCTOR2DOCBOOK(developer-guide.asciidoc ${ASCIIDOC_CONF_FILES} ${WSDG_SOURCE} ${WSDG_BUILT_DEPS})
+	ASCIIDOCTOR2DOCBOOK(developer-guide.adoc ${ASCIIDOC_CONF_FILES} ${WSDG_SOURCE} ${WSDG_BUILT_DEPS})
 	add_custom_target(developer_guide_docbook DEPENDS generate_developer-guide.xml)
 	set_docbook_target_properties(developer_guide_docbook)
 
@@ -416,7 +415,7 @@ if(ASCIIDOCTOR_FOUND AND XSLTPROC_EXECUTABLE)
 endif()
 
 if(ASCIIDOCTOR_FOUND AND ASCIIDOCTOR_PDF_EXECUTABLE)
-	ASCIIDOCTOR2PDF(user-guide.asciidoc ${WSUG_SOURCE} ${WSUG_BUILT_DEPS})
+	ASCIIDOCTOR2PDF(user-guide.adoc ${WSUG_SOURCE} ${WSUG_BUILT_DEPS})
 
 	add_custom_target(
 		user_guide_pdf
@@ -468,7 +467,7 @@ if(ASCIIDOCTOR_FOUND AND XSLTPROC_EXECUTABLE)
 endif()
 
 if(ASCIIDOCTOR_FOUND AND ASCIIDOCTOR_PDF_EXECUTABLE)
-	ASCIIDOCTOR2PDF(developer-guide.asciidoc ${WSDG_SOURCE} ${WSDG_BUILT_DEPS})
+	ASCIIDOCTOR2PDF(developer-guide.adoc ${WSDG_SOURCE} ${WSDG_BUILT_DEPS})
 
 	add_custom_target(
 		developer_guide_pdf
@@ -531,8 +530,8 @@ add_custom_target(
 set_docbook_target_properties(news)
 
 if( ASCIIDOCTOR_FOUND )
-	ASCIIDOCTOR2HTML( release-notes.asciidoc copy_ws.css )
-	ASCIIDOCTOR2TXT( release-notes.asciidoc )
+	ASCIIDOCTOR2HTML( release-notes.adoc copy_ws.css )
+	ASCIIDOCTOR2TXT( release-notes.adoc )
 endif()
 
 # FAQ
diff --git a/docbook/README.adoc b/docbook/README.adoc
index 908e96915b..28a7c96c67 100644
--- a/docbook/README.adoc
+++ b/docbook/README.adoc
@@ -109,9 +109,9 @@ https://asciidoctor.org/docs/editing-asciidoc-with-live-preview/[Live
 Preview] documentation for more information.
 
 Note that our documentation depends on attributes defined in
-_attributes.asciidoc_. The User’s Guide and Developer’s Guide are split
-across several files, and only the top-level _user-guide.asciidoc_ and
-_developer-guide.asciidoc_ include _attributes.asciidoc_. As a result,
+_attributes.adoc_. The User’s Guide and Developer’s Guide are split
+across several files, and only the top-level _user-guide.adoc_ and
+_developer-guide.adoc_ include _attributes.adoc_. As a result,
 some markup will be incomplete. You can work around this somewhat by
 adding some attributes such as `compat-mode experimental` to your Live
 Preview settings.
diff --git a/docbook/attributes.asciidoc b/docbook/attributes.adoc
index cfd98dab25..cfd98dab25 100644
--- a/docbook/attributes.asciidoc
+++ b/docbook/attributes.adoc
diff --git a/docbook/common_src/GPL_appendix.asciidoc b/docbook/common_src/GPL_appendix.adoc
index 83744d3f6f..83744d3f6f 100644
--- a/docbook/common_src/GPL_appendix.asciidoc
+++ b/docbook/common_src/GPL_appendix.adoc
diff --git a/docbook/common_src/typographic_conventions.asciidoc b/docbook/common_src/typographic_conventions.adoc
index ccb4f3a752..05f1aed4b2 100644
--- a/docbook/common_src/typographic_conventions.asciidoc
+++ b/docbook/common_src/typographic_conventions.adoc
@@ -4,7 +4,7 @@
 
 The following table shows the typographic conventions that are used in this guide.
 
-// https://github.com/oreillymedia/orm_book_samples/blob/master/asciidoc_only/preface.asciidoc
+// https://github.com/oreillymedia/orm_book_samples/blob/master/asciidoc_only/preface.adoc
 
 // AsciiDoc allows alternative markup for some styles, specifially
 // 'single quotes' and _underlines_ for italics and +plus signs+ and
diff --git a/docbook/developer-guide.asciidoc b/docbook/developer-guide.adoc
index 771e363954..d34fed5359 100644
--- a/docbook/developer-guide.asciidoc
+++ b/docbook/developer-guide.adoc
@@ -1,6 +1,6 @@
 //v1.0, February 2014: Finished conversion from DocBook to AsciiDoc
 :doctype: book
-include::attributes.asciidoc[]
+include::attributes.adoc[]
 = Wireshark Developer’s Guide: Version {wireshark-version}
 
 // Attributes
@@ -13,9 +13,9 @@ include::attributes.asciidoc[]
 ["preface",id="Preface"]
 == Preface
 
-include::wsdg_src/WSDG_preface.asciidoc[]
+include::wsdg_src/WSDG_preface.adoc[]
 
-include::common_src/typographic_conventions.asciidoc[]
+include::common_src/typographic_conventions.adoc[]
 
 [[PartEnvironment]]
 = Wireshark Build Environment
@@ -27,15 +27,15 @@ The first part describes how to set up the tools, libraries and source needed to
 generate Wireshark and how to do some typical development tasks.
 --
 
-include::wsdg_src/WSDG_chapter_env_intro.asciidoc[]
+include::wsdg_src/WSDG_chapter_env_intro.adoc[]
 
-include::wsdg_src/WSDG_chapter_quick_setup.asciidoc[]
+include::wsdg_src/WSDG_chapter_quick_setup.adoc[]
 
-include::wsdg_src/WSDG_chapter_sources.asciidoc[]
+include::wsdg_src/WSDG_chapter_sources.adoc[]
 
-include::wsdg_src/WSDG_chapter_tools.asciidoc[]
+include::wsdg_src/WSDG_chapter_tools.adoc[]
 
-include::wsdg_src/WSDG_chapter_libraries.asciidoc[]
+include::wsdg_src/WSDG_chapter_libraries.adoc[]
 
 [[PartDevelopment]]
 = Wireshark Development
@@ -47,18 +47,18 @@ The second part describes how the Wireshark sources are structured and how to
 change the sources such as adding a new dissector.
 --
 
-include::wsdg_src/WSDG_chapter_works.asciidoc[]
+include::wsdg_src/WSDG_chapter_works.adoc[]
 
-include::wsdg_src/WSDG_chapter_build_intro.asciidoc[]
+include::wsdg_src/WSDG_chapter_build_intro.adoc[]
 
-include::wsdg_src/WSDG_chapter_capture.asciidoc[]
+include::wsdg_src/WSDG_chapter_capture.adoc[]
 
-include::wsdg_src/WSDG_chapter_dissection.asciidoc[]
+include::wsdg_src/WSDG_chapter_dissection.adoc[]
 
-include::wsluarm.asciidoc[]
+include::wsluarm.adoc[]
 
-include::wsdg_src/WSDG_chapter_userinterface.asciidoc[]
+include::wsdg_src/WSDG_chapter_userinterface.adoc[]
 
-include::wsdg_src/WSDG_chapter_tests.asciidoc[]
+include::wsdg_src/WSDG_chapter_tests.adoc[]
 
-include::common_src/GPL_appendix.asciidoc[]
+include::common_src/GPL_appendix.adoc[]
diff --git a/docbook/make-wsluarm.pl b/docbook/make-wsluarm.pl
index b29d644d24..785787aecb 100755
--- a/docbook/make-wsluarm.pl
+++ b/docbook/make-wsluarm.pl
@@ -306,7 +306,7 @@ my $asciidoc_template = {
 
 
 my $template_ref = $asciidoc_template;
-my $out_extension = "asciidoc";
+my $out_extension = "adoc";
 
 # It's said that only perl can parse perl... my editor isn't perl...
 # if unencoded this causes my editor's autoindent to bail out so I encoded in octal
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.adoc
index 9c41deab80..ab66afdcec 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.adoc
@@ -1,4 +1,4 @@
-include::attributes.asciidoc[]
+include::attributes.adoc[]
 :stylesheet: ws.css
 :linkcss:
 
diff --git a/docbook/user-guide.adoc b/docbook/user-guide.adoc
new file mode 100644
index 0000000000..b91fd207f1
--- /dev/null
+++ b/docbook/user-guide.adoc
@@ -0,0 +1,57 @@
+//v1.0, February 2014: Finished conversion from DocBook to AsciiDoc
+:doctype: book
+include::attributes.adoc[]
+= Wireshark User’s Guide: Version {wireshark-version}
+
+[[Preface]]
+["preface",id="Preface"]
+== Preface
+
+include::wsug_src/WSUG_preface.adoc[]
+
+include::common_src/typographic_conventions.adoc[]
+
+// Chapters
+
+include::wsug_src/WSUG_chapter_introduction.adoc[]
+
+include::wsug_src/WSUG_chapter_build_install.adoc[]
+
+include::wsug_src/WSUG_chapter_use.adoc[]
+
+include::wsug_src/WSUG_chapter_capture.adoc[]
+
+include::wsug_src/WSUG_chapter_io.adoc[]
+
+include::wsug_src/WSUG_chapter_work.adoc[]
+
+include::wsug_src/WSUG_chapter_advanced.adoc[]
+
+include::wsug_src/WSUG_chapter_statistics.adoc[]
+
+include::wsug_src/WSUG_chapter_telephony.adoc[]
+
+include::wsug_src/WSUG_chapter_wireless.adoc[]
+
+include::wsug_src/WSUG_chapter_customize.adoc[]
+
+include::wsug_src/WSUG_chapter_mate.adoc[]
+
+// Needs to be reworked
+//include::wsug_src/WSUG_chapter_troubleshoot.adoc[]
+
+// Appendices
+include::wsug_src/WSUG_app_messages.adoc[]
+
+include::wsug_src/WSUG_app_files.adoc[]
+
+include::wsug_src/WSUG_app_protocols.adoc[]
+
+// Needs to be reworked
+//include::wsug_src/WSUG_app_howitworks.adoc[]
+
+include::wsug_src/WSUG_app_tools.adoc[]
+
+// License
+
+include::common_src/GPL_appendix.adoc[]
diff --git a/docbook/user-guide.asciidoc b/docbook/user-guide.asciidoc
deleted file mode 100644
index 6b61d54184..0000000000
--- a/docbook/user-guide.asciidoc
+++ /dev/null
@@ -1,57 +0,0 @@
-//v1.0, February 2014: Finished conversion from DocBook to AsciiDoc
-:doctype: book
-include::attributes.asciidoc[]
-= Wireshark User’s Guide: Version {wireshark-version}
-
-[[Preface]]
-["preface",id="Preface"]
-== Preface
-
-include::wsug_src/WSUG_preface.asciidoc[]
-
-include::common_src/typographic_conventions.asciidoc[]
-
-// Chapters
-
-include::wsug_src/WSUG_chapter_introduction.asciidoc[]
-
-include::wsug_src/WSUG_chapter_build_install.asciidoc[]
-
-include::wsug_src/WSUG_chapter_use.asciidoc[]
-
-include::wsug_src/WSUG_chapter_capture.asciidoc[]
-
-include::wsug_src/WSUG_chapter_io.asciidoc[]
-
-include::wsug_src/WSUG_chapter_work.asciidoc[]
-
-include::wsug_src/WSUG_chapter_advanced.asciidoc[]
-
-include::wsug_src/WSUG_chapter_statistics.asciidoc[]
-
-include::wsug_src/WSUG_chapter_telephony.asciidoc[]
-
-include::wsug_src/WSUG_chapter_wireless.asciidoc[]
-
-include::wsug_src/WSUG_chapter_customize.asciidoc[]
-
-include::wsug_src/WSUG_chapter_mate.asciidoc[]
-
-// Needs to be reworked
-//include::wsug_src/WSUG_chapter_troubleshoot.asciidoc[]
-
-// Appendices
-include::wsug_src/WSUG_app_messages.asciidoc[]
-
-include::wsug_src/WSUG_app_files.asciidoc[]
-
-include::wsug_src/WSUG_app_protocols.asciidoc[]
-
-// Needs to be reworked
-//include::wsug_src/WSUG_app_howitworks.asciidoc[]
-
-include::wsug_src/WSUG_app_tools.asciidoc[]
-
-// License
-
-include::common_src/GPL_appendix.asciidoc[]
diff --git a/docbook/wsdg_src/WSDG_chapter_build_intro.asciidoc b/docbook/wsdg_src/WSDG_chapter_build_intro.adoc
index 43e1a4eddc..43e1a4eddc 100644
--- a/docbook/wsdg_src/WSDG_chapter_build_intro.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_build_intro.adoc
diff --git a/docbook/wsdg_src/WSDG_chapter_capture.asciidoc b/docbook/wsdg_src/WSDG_chapter_capture.adoc
index e394539a3c..e394539a3c 100644
--- a/docbook/wsdg_src/WSDG_chapter_capture.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_capture.adoc
diff --git a/docbook/wsdg_src/WSDG_chapter_dissection.asciidoc b/docbook/wsdg_src/WSDG_chapter_dissection.adoc
index 320321e723..320321e723 100644
--- a/docbook/wsdg_src/WSDG_chapter_dissection.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_dissection.adoc
diff --git a/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc b/docbook/wsdg_src/WSDG_chapter_env_intro.adoc
index dd4abbc8ea..dd4abbc8ea 100644
--- a/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_env_intro.adoc
diff --git a/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc b/docbook/wsdg_src/WSDG_chapter_libraries.adoc
index 32b596e0ca..32b596e0ca 100644
--- a/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_libraries.adoc
diff --git a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc b/docbook/wsdg_src/WSDG_chapter_quick_setup.adoc
index ed8b244018..ed8b244018 100644
--- a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_quick_setup.adoc
diff --git a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc b/docbook/wsdg_src/WSDG_chapter_sources.adoc
index b4a28fab18..a89d7119bd 100644
--- a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_sources.adoc
@@ -916,8 +916,8 @@ $ git cherry-pick -x 1ab2c3d4
 $ make
 $ ...
 
-# OPTIONAL: Add entries to docbook/release-notes.asciidoc.
-$ $EDITOR docbook/release-notes.asciidoc
+# OPTIONAL: Add entries to docbook/release-notes.adoc.
+$ $EDITOR docbook/release-notes.adoc
 
 # If you made any changes, update your commit:
 $ git commit --amend -a
diff --git a/docbook/wsdg_src/WSDG_chapter_tests.asciidoc b/docbook/wsdg_src/WSDG_chapter_tests.adoc
index 55efacfe88..55efacfe88 100644
--- a/docbook/wsdg_src/WSDG_chapter_tests.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_tests.adoc
diff --git a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc b/docbook/wsdg_src/WSDG_chapter_tools.adoc
index ec405843b4..ec405843b4 100644
--- a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_tools.adoc
diff --git a/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc b/docbook/wsdg_src/WSDG_chapter_userinterface.adoc
index c709e0e4c4..c709e0e4c4 100644
--- a/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_userinterface.adoc
diff --git a/docbook/wsdg_src/WSDG_chapter_works.asciidoc b/docbook/wsdg_src/WSDG_chapter_works.adoc
index f4b713c3eb..f4b713c3eb 100644
--- a/docbook/wsdg_src/WSDG_chapter_works.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_works.adoc
diff --git a/docbook/wsdg_src/WSDG_preface.asciidoc b/docbook/wsdg_src/WSDG_preface.adoc
index da4caad5c5..da4caad5c5 100644
--- a/docbook/wsdg_src/WSDG_preface.asciidoc
+++ b/docbook/wsdg_src/WSDG_preface.adoc
diff --git a/docbook/wsluarm.asciidoc b/docbook/wsluarm.adoc
index fcd55fc732..af428910fc 100644
--- a/docbook/wsluarm.asciidoc
+++ b/docbook/wsluarm.adoc
@@ -204,19 +204,19 @@ Trying to access a non-existing property, function or method currently gives an
 error, but do not rely on it as the behavior may change in the future.
 
 
-include::{build_dir}/wsluarm_src/wslua_dumper.asciidoc[]
-include::{build_dir}/wsluarm_src/wslua_field.asciidoc[]
-include::{build_dir}/wsluarm_src/wslua_gui.asciidoc[]
-include::{build_dir}/wsluarm_src/wslua_listener.asciidoc[]
-include::{build_dir}/wsluarm_src/wslua_pinfo.asciidoc[]
-include::{build_dir}/wsluarm_src/wslua_proto.asciidoc[]
-include::{build_dir}/wsluarm_src/wslua_tree.asciidoc[]
-include::{build_dir}/wsluarm_src/wslua_tvb.asciidoc[]
-include::{build_dir}/wsluarm_src/wslua_file.asciidoc[]
-include::{build_dir}/wsluarm_src/wslua_dir.asciidoc[]
-include::{build_dir}/wsluarm_src/wslua_util.asciidoc[]
-include::{build_dir}/wsluarm_src/wslua_int64.asciidoc[]
-include::{build_dir}/wsluarm_src/wslua_struct.asciidoc[]
+include::{build_dir}/wsluarm_src/wslua_dumper.adoc[]
+include::{build_dir}/wsluarm_src/wslua_field.adoc[]
+include::{build_dir}/wsluarm_src/wslua_gui.adoc[]
+include::{build_dir}/wsluarm_src/wslua_listener.adoc[]
+include::{build_dir}/wsluarm_src/wslua_pinfo.adoc[]
+include::{build_dir}/wsluarm_src/wslua_proto.adoc[]
+include::{build_dir}/wsluarm_src/wslua_tree.adoc[]
+include::{build_dir}/wsluarm_src/wslua_tvb.adoc[]
+include::{build_dir}/wsluarm_src/wslua_file.adoc[]
+include::{build_dir}/wsluarm_src/wslua_dir.adoc[]
+include::{build_dir}/wsluarm_src/wslua_util.adoc[]
+include::{build_dir}/wsluarm_src/wslua_int64.adoc[]
+include::{build_dir}/wsluarm_src/wslua_struct.adoc[]
 
 [[lua_module_GRegex]]
 
diff --git a/docbook/wsug_src/WSUG_app_files.asciidoc b/docbook/wsug_src/WSUG_app_files.adoc
index a19a641008..a19a641008 100644
--- a/docbook/wsug_src/WSUG_app_files.asciidoc
+++ b/docbook/wsug_src/WSUG_app_files.adoc
diff --git a/docbook/wsug_src/WSUG_app_howitworks.asciidoc b/docbook/wsug_src/WSUG_app_howitworks.adoc
index cb52ec4f90..cb52ec4f90 100644
--- a/docbook/wsug_src/WSUG_app_howitworks.asciidoc
+++ b/docbook/wsug_src/WSUG_app_howitworks.adoc
diff --git a/docbook/wsug_src/WSUG_app_messages.asciidoc b/docbook/wsug_src/WSUG_app_messages.adoc
index 045295a58e..045295a58e 100644
--- a/docbook/wsug_src/WSUG_app_messages.asciidoc
+++ b/docbook/wsug_src/WSUG_app_messages.adoc
diff --git a/docbook/wsug_src/WSUG_app_protocols.asciidoc b/docbook/wsug_src/WSUG_app_protocols.adoc
index 2535e84a4d..2535e84a4d 100644
--- a/docbook/wsug_src/WSUG_app_protocols.asciidoc
+++ b/docbook/wsug_src/WSUG_app_protocols.adoc
diff --git a/docbook/wsug_src/WSUG_app_tools.asciidoc b/docbook/wsug_src/WSUG_app_tools.adoc
index 01d2979252..01d2979252 100644
--- a/docbook/wsug_src/WSUG_app_tools.asciidoc
+++ b/docbook/wsug_src/WSUG_app_tools.adoc
diff --git a/docbook/wsug_src/WSUG_chapter_advanced.asciidoc b/docbook/wsug_src/WSUG_chapter_advanced.adoc
index a1114d6030..a1114d6030 100644
--- a/docbook/wsug_src/WSUG_chapter_advanced.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_advanced.adoc
diff --git a/docbook/wsug_src/WSUG_chapter_build_install.asciidoc b/docbook/wsug_src/WSUG_chapter_build_install.adoc
index e0054297de..e0054297de 100644
--- a/docbook/wsug_src/WSUG_chapter_build_install.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_build_install.adoc
diff --git a/docbook/wsug_src/WSUG_chapter_capture.asciidoc b/docbook/wsug_src/WSUG_chapter_capture.adoc
index 6e3ddd403b..6e3ddd403b 100644
--- a/docbook/wsug_src/WSUG_chapter_capture.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_capture.adoc
diff --git a/docbook/wsug_src/WSUG_chapter_customize.asciidoc b/docbook/wsug_src/WSUG_chapter_customize.adoc
index f4c86811a2..f4c86811a2 100644
--- a/docbook/wsug_src/WSUG_chapter_customize.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_customize.adoc
diff --git a/docbook/wsug_src/WSUG_chapter_introduction.asciidoc b/docbook/wsug_src/WSUG_chapter_introduction.adoc
index 90ff984e6b..90ff984e6b 100644
--- a/docbook/wsug_src/WSUG_chapter_introduction.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_introduction.adoc
diff --git a/docbook/wsug_src/WSUG_chapter_io.asciidoc b/docbook/wsug_src/WSUG_chapter_io.adoc
index 5877c6575e..5877c6575e 100644
--- a/docbook/wsug_src/WSUG_chapter_io.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_io.adoc
diff --git a/docbook/wsug_src/WSUG_chapter_mate.asciidoc b/docbook/wsug_src/WSUG_chapter_mate.adoc
index 92f6f1f3d7..92f6f1f3d7 100644
--- a/docbook/wsug_src/WSUG_chapter_mate.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_mate.adoc
diff --git a/docbook/wsug_src/WSUG_chapter_statistics.asciidoc b/docbook/wsug_src/WSUG_chapter_statistics.adoc
index 3a66fe51aa..3a66fe51aa 100644
--- a/docbook/wsug_src/WSUG_chapter_statistics.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_statistics.adoc
diff --git a/docbook/wsug_src/WSUG_chapter_telephony.asciidoc b/docbook/wsug_src/WSUG_chapter_telephony.adoc
index e9aafa6a74..e9aafa6a74 100644
--- a/docbook/wsug_src/WSUG_chapter_telephony.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_telephony.adoc
diff --git a/docbook/wsug_src/WSUG_chapter_troubleshoot.asciidoc b/docbook/wsug_src/WSUG_chapter_troubleshoot.adoc
index abd298e38d..abd298e38d 100644
--- a/docbook/wsug_src/WSUG_chapter_troubleshoot.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_troubleshoot.adoc
diff --git a/docbook/wsug_src/WSUG_chapter_use.asciidoc b/docbook/wsug_src/WSUG_chapter_use.adoc
index 341294a07e..341294a07e 100644
--- a/docbook/wsug_src/WSUG_chapter_use.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_use.adoc
diff --git a/docbook/wsug_src/WSUG_chapter_wireless.asciidoc b/docbook/wsug_src/WSUG_chapter_wireless.adoc
index a6d9c28103..a6d9c28103 100644
--- a/docbook/wsug_src/WSUG_chapter_wireless.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_wireless.adoc
diff --git a/docbook/wsug_src/WSUG_chapter_work.asciidoc b/docbook/wsug_src/WSUG_chapter_work.adoc
index 6bf8c94832..6bf8c94832 100644
--- a/docbook/wsug_src/WSUG_chapter_work.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_work.adoc
diff --git a/docbook/wsug_src/WSUG_preface.asciidoc b/docbook/wsug_src/WSUG_preface.adoc
index 599105aa7a..599105aa7a 100644
--- a/docbook/wsug_src/WSUG_preface.asciidoc
+++ b/docbook/wsug_src/WSUG_preface.adoc
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 44cf550364..8c7cc4c7a2 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -1838,7 +1838,7 @@ tcp_analyze_get_acked_struct(guint32 frame, guint32 seq, guint32 ack, gboolean c
  * New segments are always added to the head of the fwd/rev lists.
  *
  * Changes below should be synced with ChAdvTCPAnalysis in the User's
- * Guide: docbook/wsug_src/WSUG_chapter_advanced.asciidoc
+ * Guide: docbook/wsug_src/WSUG_chapter_advanced.adoc
  */
 static void
 tcp_analyze_sequence_number(packet_info *pinfo, guint32 seq, guint32 ack, guint32 seglen, guint16 flags, guint32 window, struct tcp_analysis *tcpd)
diff --git a/tools/make-version.pl b/tools/make-version.pl
index c579e69c94..bf64bcecca 100755
--- a/tools/make-version.pl
+++ b/tools/make-version.pl
@@ -418,14 +418,14 @@ sub update_cmakelists_txt
 	print "$filepath has been updated.\n";
 }
 
-# Read docbook/attributes.asciidoc, then write it back out with an updated
+# Read docbook/attributes.adoc, then write it back out with an updated
 # wireshark-version replacement line.
 sub update_attributes_asciidoc
 {
 	my $line;
 	my $contents = "";
 	my $version = "";
-	my $filepath = "$src_dir/docbook/attributes.asciidoc";
+	my $filepath = "$src_dir/docbook/attributes.adoc";
 
 	open(ADOC_CONF, "< $filepath") || die "Can't read $filepath!";
 	while ($line = <ADOC_CONF>) {
@@ -747,7 +747,7 @@ Print the vcs version to standard output
 =item --set-version=<x.y.z>, -v <x.y.z>
 
 Set the major, minor, and micro versions in the top-level
-CMakeLists.txt, configure.ac, docbook/attributes.asciidoc,
+CMakeLists.txt, configure.ac, docbook/attributes.adoc,
 debian/changelog, and the CMakeLists.txt for all libraries
 to the provided version number.