From 97377547a7cdd7fd51e252729ad916bee5f47967 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 5 Apr 2017 12:26:26 -0700 Subject: [PATCH] More OS name cleanups. Use macOS when not referring to a particular release; use the appropriate name when referring to a particular release. Change-Id: I9293d4db7c91d7c859d7c067c0f0b3c9c482fcc5 Reviewed-on: https://code.wireshark.org/review/20935 Reviewed-by: Guy Harris --- packaging/macosx/Read_me_first.rtf | 2 +- .../Wireshark_package.pmdoc/index.xml.in | 2 +- packaging/macosx/dmg_set_style.scpt | Bin 7078 -> 7968 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/macosx/Read_me_first.rtf b/packaging/macosx/Read_me_first.rtf index 2bcce62b47..6ecc0d5421 100644 --- a/packaging/macosx/Read_me_first.rtf +++ b/packaging/macosx/Read_me_first.rtf @@ -15,7 +15,7 @@ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\f1\b0\fs24 \cf0 This release of Wireshark requires Macintosh OS X 10.5.5 or later. If you are running OS X 10.5.4 or older you can install using another packaging system such as MacPorts or Homebrew. +\f1\b0\fs24 \cf0 This release of Wireshark requires Mac OS X 10.5.5 or later. If you are running Mac OS X 10.5.4 or older you can install using another packaging system such as MacPorts or Homebrew. \f0\b\fs28 \ \ Quick Setup\ diff --git a/packaging/macosx/Wireshark_package.pmdoc/index.xml.in b/packaging/macosx/Wireshark_package.pmdoc/index.xml.in index ebd42c20fb..b03781d7dd 100644 --- a/packaging/macosx/Wireshark_package.pmdoc/index.xml.in +++ b/packaging/macosx/Wireshark_package.pmdoc/index.xml.in @@ -1 +1 @@ -WiresharkWireshark.pkgorg.wiresharkWireshark and associated command line utilities.COPYING.txtFailureThis package requires OS X @OSX_MIN_VERSION@ or later. If you cannot upgrade you might try installing using MacPorts or Fink.01wireshark.xml02chmodbpf.xml03utility.xmldescriptionproperties.titleproperties.anywhereDomainproperties.userDomainproperties.customizeOptionextraFilespostinstallActions.actionsproperties.systemDomain +WiresharkWireshark.pkgorg.wiresharkWireshark and associated command line utilities.COPYING.txtFailureThis package requires macOS @OSX_MIN_VERSION@ or later. If you cannot upgrade you might try installing using MacPorts or Fink.01wireshark.xml02chmodbpf.xml03utility.xmldescriptionproperties.titleproperties.anywhereDomainproperties.userDomainproperties.customizeOptionextraFilespostinstallActions.actionsproperties.systemDomain diff --git a/packaging/macosx/dmg_set_style.scpt b/packaging/macosx/dmg_set_style.scpt index d51df0884c2ec7828cc50257c3478466546c45c5..a5e17b776a14455af255f5a5a5b6ffda1415ffad 100755 GIT binary patch literal 7968 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 literal 7078 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