diff options
41 files changed, 52 insertions, 52 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 57e010ec5c..d520b8b728 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3560,7 +3560,7 @@ if(ENABLE_APPLICATION_BUNDLE AND BUILD_wireshark) COMMAND ${ASCIIDOCTOR_EXECUTABLE} --backend html --out-file ${_wireshark_read_me_first} - --attribute include-dir=${CMAKE_SOURCE_DIR}/docbook + --attribute include-dir=${CMAKE_SOURCE_DIR}/doc --attribute min-macos-version=${MIN_MACOS_VERSION} ${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Wireshark_read_me_first.adoc DEPENDS @@ -3574,7 +3574,7 @@ if(ENABLE_APPLICATION_BUNDLE AND BUILD_wireshark) COMMAND ${ASCIIDOCTOR_EXECUTABLE} --backend html --out-file ${_wireshark_donate} - --attribute include-dir=${CMAKE_SOURCE_DIR}/docbook + --attribute include-dir=${CMAKE_SOURCE_DIR}/doc --attribute min-macos-version=${MIN_MACOS_VERSION} ${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Donate_to_the_Wireshark_Foundation.adoc DEPENDS @@ -3588,7 +3588,7 @@ if(ENABLE_APPLICATION_BUNDLE AND BUILD_wireshark) COMMAND ${ASCIIDOCTOR_EXECUTABLE} --backend html --out-file ${_wireshark_dsym_installation} - --attribute include-dir=${CMAKE_SOURCE_DIR}/docbook + --attribute include-dir=${CMAKE_SOURCE_DIR}/doc ${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Wireshark_dsym_installation.adoc DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Wireshark_dsym_installation.adoc @@ -3628,7 +3628,7 @@ if(ENABLE_APPLICATION_BUNDLE AND BUILD_logray) COMMAND ${ASCIIDOCTOR_EXECUTABLE} --backend html --out-file ${_logray_read_me_first} - --attribute include-dir=${CMAKE_SOURCE_DIR}/docbook + --attribute include-dir=${CMAKE_SOURCE_DIR}/doc --attribute min-macos-version=${MIN_MACOS_VERSION} ${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logray_read_me_first.adoc DEPENDS @@ -3642,7 +3642,7 @@ if(ENABLE_APPLICATION_BUNDLE AND BUILD_logray) COMMAND ${ASCIIDOCTOR_EXECUTABLE} --backend html --out-file ${_logray_dsym_installation} - --attribute include-dir=${CMAKE_SOURCE_DIR}/docbook + --attribute include-dir=${CMAKE_SOURCE_DIR}/doc ${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logray_dsym_installation.adoc DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logray_dsym_installation.adoc diff --git a/cmake/modules/FindAsciidoctor.cmake b/cmake/modules/FindAsciidoctor.cmake index 07d7e840eb..fd9db9da11 100644 --- a/cmake/modules/FindAsciidoctor.cmake +++ b/cmake/modules/FindAsciidoctor.cmake @@ -78,7 +78,7 @@ if(ASCIIDOCTOR_EXECUTABLE) --out-file ${_output_xml} ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} DEPENDS - ${CMAKE_SOURCE_DIR}/docbook/attributes.adoc + ${CMAKE_SOURCE_DIR}/doc/attributes.adoc ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} ${ARGN} ) @@ -110,7 +110,7 @@ if(ASCIIDOCTOR_EXECUTABLE) --out-file ${_output_html} ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} DEPENDS - ${CMAKE_SOURCE_DIR}/docbook/attributes.adoc + ${CMAKE_SOURCE_DIR}/doc/attributes.adoc ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} ${ARGN} ) @@ -132,7 +132,7 @@ if(ASCIIDOCTOR_EXECUTABLE) > ${_output_txt} DEPENDS ${MAN_INCLUDES} - ${CMAKE_SOURCE_DIR}/docbook/attributes.adoc + ${CMAKE_SOURCE_DIR}/doc/attributes.adoc ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} ${_output_html} ${ARGN} @@ -160,7 +160,7 @@ if(ASCIIDOCTOR_EXECUTABLE) ${_input_adoc} DEPENDS ${MAN_INCLUDES} - ${CMAKE_SOURCE_DIR}/docbook/attributes.adoc + ${CMAKE_SOURCE_DIR}/doc/attributes.adoc ${_input_adoc} ) unset(_src_file) @@ -187,7 +187,7 @@ if(ASCIIDOCTOR_EXECUTABLE) ${_input_adoc} DEPENDS ${MAN_INCLUDES} - ${CMAKE_SOURCE_DIR}/docbook/attributes.adoc + ${CMAKE_SOURCE_DIR}/doc/attributes.adoc ${_input_adoc} ) unset(_src_file) @@ -232,7 +232,7 @@ if(ASCIIDOCTOR_EXECUTABLE) --out-file "${_output_pdf}" ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} DEPENDS - ${CMAKE_SOURCE_DIR}/docbook/attributes.adoc + ${CMAKE_SOURCE_DIR}/doc/attributes.adoc ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} ${ARGN} VERBATIM @@ -283,7 +283,7 @@ if(ASCIIDOCTOR_EXECUTABLE) --out-file "${_output_epub}" ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} DEPENDS - ${CMAKE_SOURCE_DIR}/docbook/attributes.adoc + ${CMAKE_SOURCE_DIR}/doc/attributes.adoc ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} ${ARGN} VERBATIM diff --git a/doc/androiddump.adoc b/doc/androiddump.adoc index d68a3a3ac9..39e199255b 100644 --- a/doc/androiddump.adoc +++ b/doc/androiddump.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = androiddump(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/asn2deb.adoc b/doc/asn2deb.adoc index db97652296..c04e23badc 100644 --- a/doc/asn2deb.adoc +++ b/doc/asn2deb.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = asn2deb(1) :doctype: manpage :stylesheet: ws.css diff --git a/docbook/attributes.adoc b/doc/attributes.adoc index ded54845fe..ded54845fe 100644 --- a/docbook/attributes.adoc +++ b/doc/attributes.adoc diff --git a/doc/capinfos.adoc b/doc/capinfos.adoc index 4dec8136eb..848013a11b 100644 --- a/doc/capinfos.adoc +++ b/doc/capinfos.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = capinfos(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/captype.adoc b/doc/captype.adoc index 11eb6bf044..f8c8e985b7 100644 --- a/doc/captype.adoc +++ b/doc/captype.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = captype(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/ciscodump.adoc b/doc/ciscodump.adoc index b721b28436..4a09c10f1d 100644 --- a/doc/ciscodump.adoc +++ b/doc/ciscodump.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = ciscodump(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/dpauxmon.adoc b/doc/dpauxmon.adoc index cf98cecbdd..d091c76644 100644 --- a/doc/dpauxmon.adoc +++ b/doc/dpauxmon.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = dpauxmon(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/dumpcap.adoc b/doc/dumpcap.adoc index 672599bceb..a8116a0d77 100644 --- a/doc/dumpcap.adoc +++ b/doc/dumpcap.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = dumpcap(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/editcap.adoc b/doc/editcap.adoc index 20fadc1a4f..9ac5c8a36f 100644 --- a/doc/editcap.adoc +++ b/doc/editcap.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = editcap(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/etwdump.adoc b/doc/etwdump.adoc index b1070d38b8..4798c54930 100644 --- a/doc/etwdump.adoc +++ b/doc/etwdump.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = etwdump(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/extcap.adoc b/doc/extcap.adoc index 511a59cc48..96aa1fa9d0 100644 --- a/doc/extcap.adoc +++ b/doc/extcap.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = extcap(4) :doctype: manpage :stylesheet: ws.css diff --git a/doc/falcodump.adoc b/doc/falcodump.adoc index cecca0176a..72bd06695b 100644 --- a/doc/falcodump.adoc +++ b/doc/falcodump.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = falcodump(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/faq.adoc b/doc/faq.adoc index 6cbd55d2e3..43cfa20764 100644 --- a/doc/faq.adoc +++ b/doc/faq.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] :stylesheet: ws.css :linkcss: :copycss: {stylesheet} diff --git a/doc/idl2deb.adoc b/doc/idl2deb.adoc index 146672fda9..eabac0d00a 100644 --- a/doc/idl2deb.adoc +++ b/doc/idl2deb.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = idl2deb(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/idl2wrs.adoc b/doc/idl2wrs.adoc index c046c536e8..43a910fc2a 100644 --- a/doc/idl2wrs.adoc +++ b/doc/idl2wrs.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = idl2wrs(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/mergecap.adoc b/doc/mergecap.adoc index a5c9a6c3bd..014331ca8d 100644 --- a/doc/mergecap.adoc +++ b/doc/mergecap.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = mergecap(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/mmdbresolve.adoc b/doc/mmdbresolve.adoc index 4b8804012b..2509c54b56 100644 --- a/doc/mmdbresolve.adoc +++ b/doc/mmdbresolve.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = mmdbresolve(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/randpkt.adoc b/doc/randpkt.adoc index 97104b7010..0d399e140b 100644 --- a/doc/randpkt.adoc +++ b/doc/randpkt.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = randpkt(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/randpktdump.adoc b/doc/randpktdump.adoc index 3e13a77f60..03763c8e1d 100644 --- a/doc/randpktdump.adoc +++ b/doc/randpktdump.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = randpktdump(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/rawshark.adoc b/doc/rawshark.adoc index 180c256f7b..b0976e2db1 100644 --- a/doc/rawshark.adoc +++ b/doc/rawshark.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = rawshark(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/release-notes.adoc b/doc/release-notes.adoc index 883cb6246f..5f3e479d8b 100644 --- a/doc/release-notes.adoc +++ b/doc/release-notes.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] :stylesheet: ws.css :linkcss: :copycss: {stylesheet} diff --git a/doc/reordercap.adoc b/doc/reordercap.adoc index fd57b0a7c7..71069a0afc 100644 --- a/doc/reordercap.adoc +++ b/doc/reordercap.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = reordercap(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/sdjournal.adoc b/doc/sdjournal.adoc index bf9a36892d..d81c5e3355 100644 --- a/doc/sdjournal.adoc +++ b/doc/sdjournal.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = sdjournal(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/sshdump.adoc b/doc/sshdump.adoc index 8acacd1f81..ec9abf1345 100644 --- a/doc/sshdump.adoc +++ b/doc/sshdump.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = sshdump(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/text2pcap.adoc b/doc/text2pcap.adoc index ab8947479d..213eb348c4 100644 --- a/doc/text2pcap.adoc +++ b/doc/text2pcap.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = text2pcap(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/tshark.adoc b/doc/tshark.adoc index a9f844734e..d688a6d9c8 100644 --- a/doc/tshark.adoc +++ b/doc/tshark.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = tshark(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/udpdump.adoc b/doc/udpdump.adoc index 8739ab6fa9..4c68488ae6 100644 --- a/doc/udpdump.adoc +++ b/doc/udpdump.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = udpdump(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/wifidump.adoc b/doc/wifidump.adoc index e202d05a78..930ee27a37 100644 --- a/doc/wifidump.adoc +++ b/doc/wifidump.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = wifidump(1) :doctype: manpage :stylesheet: ws.css diff --git a/doc/wireshark-filter.adoc b/doc/wireshark-filter.adoc index 6fcbf24716..3ff6f0e901 100644 --- a/doc/wireshark-filter.adoc +++ b/doc/wireshark-filter.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = wireshark-filter(4) :doctype: manpage :stylesheet: ws.css diff --git a/doc/wireshark.adoc b/doc/wireshark.adoc index ca34f549bb..91c87ff689 100644 --- a/doc/wireshark.adoc +++ b/doc/wireshark.adoc @@ -1,4 +1,4 @@ -include::../docbook/attributes.adoc[] +include::attributes.adoc[] = wireshark(1) :doctype: manpage :stylesheet: ws.css diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt index df1827e481..991702f672 100644 --- a/docbook/CMakeLists.txt +++ b/docbook/CMakeLists.txt @@ -334,7 +334,7 @@ ADD_CUSTOM_COMMAND( set( WSDG_BUILT_DEPS copy_ws.css wsluarm ) set( ASCIIDOC_CONF_FILES - attributes.adoc + ${CMAKE_SOURCE_DIR}/doc/attributes.adoc # XXX Add macros ) diff --git a/docbook/wsdg_src/developer-guide.adoc b/docbook/wsdg_src/developer-guide.adoc index 8f4bcbbe2c..aca4ff25ca 100644 --- a/docbook/wsdg_src/developer-guide.adoc +++ b/docbook/wsdg_src/developer-guide.adoc @@ -1,5 +1,5 @@ :doctype: book -include::../attributes.adoc[] +include::../../doc/attributes.adoc[] // Electronic book attributes :author: Ulf Lamping, Graham Bloice diff --git a/docbook/wsug_src/user-guide.adoc b/docbook/wsug_src/user-guide.adoc index 7c80cf7b1d..859f390e7c 100644 --- a/docbook/wsug_src/user-guide.adoc +++ b/docbook/wsug_src/user-guide.adoc @@ -1,5 +1,5 @@ :doctype: book -include::../attributes.adoc[] +include::../../doc/attributes.adoc[] // Electronic book attributes :author: Richard Sharpe, Ed Warnicke, Ulf Lamping diff --git a/packaging/macosx/Donate_to_the_Wireshark_Foundation.adoc b/packaging/macosx/Donate_to_the_Wireshark_Foundation.adoc index 3c461d5d1b..c8d255352d 100644 --- a/packaging/macosx/Donate_to_the_Wireshark_Foundation.adoc +++ b/packaging/macosx/Donate_to_the_Wireshark_Foundation.adoc @@ -2,7 +2,7 @@ // include-dir include::{include-dir}/attributes.adoc[] -:stylesheet: {include-dir}/ws.css +:stylesheet: {include-dir}/../docbook/ws.css == The Wireshark Founation diff --git a/packaging/macosx/Logray_dsym_installation.adoc b/packaging/macosx/Logray_dsym_installation.adoc index 6ca4f2f82e..e9d1f9ff76 100644 --- a/packaging/macosx/Logray_dsym_installation.adoc +++ b/packaging/macosx/Logray_dsym_installation.adoc @@ -2,7 +2,7 @@ // include-dir include::{include-dir}/attributes.adoc[] -:stylesheet: {include-dir}/ws.css +:stylesheet: {include-dir}/../docbook/ws.css == Debugging Symbols for Logray diff --git a/packaging/macosx/Logray_read_me_first.adoc b/packaging/macosx/Logray_read_me_first.adoc index 498b039e98..f5fb0febb6 100644 --- a/packaging/macosx/Logray_read_me_first.adoc +++ b/packaging/macosx/Logray_read_me_first.adoc @@ -3,7 +3,7 @@ // min-macos-version include::{include-dir}/attributes.adoc[] -:stylesheet: {include-dir}/ws.css +:stylesheet: {include-dir}/../docbook/ws.css == Before You Begin diff --git a/packaging/macosx/Wireshark_dsym_installation.adoc b/packaging/macosx/Wireshark_dsym_installation.adoc index a7c1b99e2e..370354d6dd 100644 --- a/packaging/macosx/Wireshark_dsym_installation.adoc +++ b/packaging/macosx/Wireshark_dsym_installation.adoc @@ -2,7 +2,7 @@ // include-dir include::{include-dir}/attributes.adoc[] -:stylesheet: {include-dir}/ws.css +:stylesheet: {include-dir}/../docbook/ws.css == Debugging Symbols for Wireshark diff --git a/packaging/macosx/Wireshark_read_me_first.adoc b/packaging/macosx/Wireshark_read_me_first.adoc index 1f6073ded3..2ea92a65ba 100644 --- a/packaging/macosx/Wireshark_read_me_first.adoc +++ b/packaging/macosx/Wireshark_read_me_first.adoc @@ -3,7 +3,7 @@ // min-macos-version include::{include-dir}/attributes.adoc[] -:stylesheet: {include-dir}/ws.css +:stylesheet: {include-dir}/../docbook/ws.css == Before You Begin diff --git a/tools/make-version.py b/tools/make-version.py index 42a047170d..cb6050c09a 100755 --- a/tools/make-version.py +++ b/tools/make-version.py @@ -110,9 +110,9 @@ def create_version_file(version_f, repo_data): def update_attributes_asciidoc(src_dir, repo_data): - # Read docbook/attributes.adoc, then write it back out with an updated + # Read doc/attributes.adoc, then write it back out with an updated # wireshark-version replacement line. - asiidoc_filepath = os.path.join(src_dir, "docbook", "attributes.adoc") + asiidoc_filepath = os.path.join(src_dir, "doc", "attributes.adoc") with open(asiidoc_filepath, encoding='utf-8') as fh: asciidoc_contents = fh.read() @@ -418,7 +418,7 @@ def read_repo_info(src_dir, tagged_version_extra, untagged_version_extra): def main(): parser = argparse.ArgumentParser(description='Wireshark file and package versions') action_group = parser.add_mutually_exclusive_group() - action_group.add_argument('--set-version', '-v', metavar='<x.y.z>', type=parse_versionstring, help='Set the major, minor, and patch versions in the top-level CMakeLists.txt, docbook/attributes.adoc, packaging/debian/changelog, and the CMakeLists.txt for all libraries to the provided version number') + action_group.add_argument('--set-version', '-v', metavar='<x.y.z>', type=parse_versionstring, help='Set the major, minor, and patch versions in the top-level CMakeLists.txt, doc/attributes.adoc, packaging/debian/changelog, and the CMakeLists.txt for all libraries to the provided version number') action_group.add_argument('--set-release', '-r', action='store_true', help='Set the extra release information in the top-level CMakeLists.txt based on either default or command-line specified options.') setrel_group = parser.add_argument_group() setrel_group.add_argument('--tagged-version-extra', '-t', default="", help="Extra version information format to use when a tag is found. No format \ |