summaryrefslogtreecommitdiff
path: root/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-02-02 14:32:28 -0800
committerGerald Combs <gerald@wireshark.org>2015-02-02 22:47:28 +0000
commit71fd34da6cb9e7a9f1a0f4c783b1b6811b1dc9ff (patch)
treea55c8a72810113f98385d4912638d4670495b5e5 /docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
parent37a2cd0e847ee5921a00b494fd5d0563cef84b80 (diff)
downloadwireshark-71fd34da6cb9e7a9f1a0f4c783b1b6811b1dc9ff.tar.gz
WSUG: Chocolatey updates.
Move PowerShell and Chocolatey to the top of the quick setup since most of the instructions now have a "Chocolatey" example. Use "choco install" instead of "cinst" to match the pages at chocolatey.org/packages. Show how to install Cygwin and Python using Chocolatey. MAC = Media Access Control (among other things). Mac = Macintosh. Change-Id: Ic6aabacdd3a86b4e8ca556cc6f3daa62c3e5986b Reviewed-on: https://code.wireshark.org/review/6924 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc')
-rw-r--r--docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc3
1 files changed, 1 insertions, 2 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc b/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
index 4768e8398a..3cf223c927 100644
--- a/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
@@ -228,7 +228,7 @@ for the following systems:
obtains an .rpm file from which the package manager checks the dependencies
and installs the software.
-* MAC OS X (.dmg file). The typical MAC OS X end user is used to get a .dmg file
+* Mac OS X (.dmg file). The typical Mac OS X end user is used to get a .dmg file
which will install all the required things for him. The other requirement is
to have the X11.app installed.
@@ -583,4 +583,3 @@ corresponding "Wireshark-win__bits__-_x_._y_._z_.exe" installer packages.
++++++++++++++++++++++++++++++++++++++
<!-- End of WSDG Chapter Introduction -->
++++++++++++++++++++++++++++++++++++++
-