aboutsummaryrefslogtreecommitdiffstats
path: root/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-08-16 16:23:30 -0700
committerGerald Combs <gerald@wireshark.org>2016-08-17 23:49:47 +0000
commite3daf4a66d5f14148494c28649fb78136807e417 (patch)
treefa2d2f007651839ae86a4d5da96550d798329bf4 /docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
parent72a3195c8649c315c301942da68e4ee31af17445 (diff)
Start recommending Python 3 on Windows.
Works fine here, including git-review. Change-Id: I8580a6b266fba09c711be8984a9f17e02a9f789f Reviewed-on: https://code.wireshark.org/review/17097 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc')
-rw-r--r--docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc17
1 files changed, 12 insertions, 5 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
index 1b8bc358f1..9ee4855d67 100644
--- a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
@@ -242,19 +242,26 @@ PS$>choco install winflexbison
==== Install Python
-Get the Python 2.7 installer from http://python.org/download/[] and install
-Python into the default location ('C:\Python27').
+Get the Python 3.5 or 2.7 installer from http://python.org/download/[] and
+install Python into the default location ('C:\Python35' or 'C:\Python27').
-Why is this recommended? Cygwin's Python package doesn't work on some machines,
-so the Win32 native package is recommended (and it's faster). Note that Python 3.x isn't currently supported.
+Why is this recommended? Cygwin's `/usr/bin/python` is a Cygwin-specific
+symbolic link which cannot be run from Windows. The native package is faster
+as well.
Alternatively you can install Python using Chocolatey:
----
+PS$>choco install python3
+----
+
+or
+
+----
PS$>choco install python2
----
-Chocolatey installs Python 2 in 'C:\tools\python2' by default.
+Chocolatey installs Python in 'C:\tools\python3' and 'C:\tools\python2' by default.
[[ChSetupGit]]