From 3b08042a4e51553efe982ef6c3113a17fb955dbd Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Sun, 13 Feb 2022 14:02:29 -0800 Subject: [PATCH] Remove README.windows. It was a placeholder that pointed people at the download page and the documentation page. There are plenty of references to those elsewhere. --- CMakeLists.txt | 2 +- INSTALL | 3 ++- README.windows | 23 ----------------------- packaging/nsis/wireshark.nsi | 1 - packaging/wix/ComponentGroups.wxi | 4 ---- 5 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 README.windows diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a7906dd61..57e010ec5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2365,7 +2365,7 @@ endif() set(copy_data_files_depends) if(WIN32) - foreach(_install_as_txt_file COPYING NEWS README.md README.windows) + foreach(_install_as_txt_file COPYING NEWS README.md) # On Windows, install some files with a .txt extension so that they're # double-clickable. string(REGEX REPLACE ".md$" "" _no_md_file ${_install_as_txt_file}) diff --git a/INSTALL b/INSTALL index db058a3b10..3f91b3af20 100644 --- a/INSTALL +++ b/INSTALL @@ -7,7 +7,8 @@ Installation These are installation instructions for Unix and Unix-like systems. These are not the installation instructions for Windows systems; see -README.windows for those instructions. +the Wireshark User's Guide and Wireshark Developer's Guide at +https://www.wireshark.org/docs/ for those. 0. This is software. Beware. diff --git a/README.windows b/README.windows deleted file mode 100644 index 5d64f0eae3..0000000000 --- a/README.windows +++ /dev/null @@ -1,23 +0,0 @@ -Installing Wireshark on Windows -=============================== - -To install Wireshark, simply download the appropriate installer program from - -https://www.wireshark.org/download.html - -and start it. Just keep the default settings and start Wireshark after the -installation finished (e.g. using the start menu entry). - -For detailed descriptions on how to install and use Wireshark and the -related command line tools, see the Wireshark User's Guide at: - -https://www.wireshark.org/docs/ - - -Compiling the Wireshark distribution from source -================================================ - -If you want to develop Wireshark code yourself, you can find -comprehensive information in the Developer's Guide at: - -https://www.wireshark.org/docs/ diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 60af9c4ac0..75c104117b 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -540,7 +540,6 @@ File "${STAGING_DIR}\libwsutil.dll" File "${STAGING_DIR}\COPYING.txt" File "${STAGING_DIR}\NEWS.txt" File "${STAGING_DIR}\README.txt" -File "${STAGING_DIR}\README.windows.txt" File "${STAGING_DIR}\wka" File "${STAGING_DIR}\pdml2html.xsl" File "${STAGING_DIR}\ws.css" diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi index 2a6d2875a0..b122e675ce 100644 --- a/packaging/wix/ComponentGroups.wxi +++ b/packaging/wix/ComponentGroups.wxi @@ -36,9 +36,6 @@ - - - @@ -79,7 +76,6 @@ -