Skip to content

Commit 76d3431

Browse files
committed
[FAB-4485] Expand prerequesites doc for Windows
Removed link to a make command that doesn't actually work. Added note on getting a new curl command required to successfully go through Getting Started. Change-Id: I92016c30d0c4b1e1f10189fcf45a23a292ed3bd7 Signed-off-by: Arnaud J Le Hors <[email protected]>
1 parent 85ef083 commit 76d3431

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

docs/source/prereqs.rst

+18-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ Install cURL
77
Download the `cURL <https://curl.haxx.se/download.html>`__ tool if not
88
already installed.
99

10+
.. note:: If you're on Windows please see the specific note on `Windows
11+
extras`_ below.
12+
1013
Docker and Docker Compose
1114
-------------------------
1215

@@ -71,10 +74,23 @@ installed.
7174
Windows extras
7275
--------------
7376

74-
If you are developng on Windows, you may also need the following which
77+
If you are developing on Windows, you may also need the following which
7578
provides a better alternative to the built-in Windows tools:
7679

7780
- `Git Bash <https://git-scm.com/downloads>`__
78-
- `make for MinGW <http://sourceforge.net/projects/mingw/files/MinGW/Extension/make/make-3.82.90-cvs/make-3.82.90-2-mingw32-cvs-20120902-bin.tar.lzma>`__ to be added to Git Bash
81+
82+
.. note:: On older versions of Windows, such as Windows 7, you
83+
typically get this as part of installing Docker
84+
Toolbox. However experience has shown this to be a poor
85+
development environment with limited functionality. It is
86+
suitable to run docker based scenarios, such as
87+
:doc:`getting_started`, but you may not be able to find a
88+
suitable ``make`` command.
89+
90+
.. note:: The ``curl`` command that comes with Git and Docker Toolbox
91+
is old and does not handle properly the redirect used in
92+
:doc:`getting_started`. Make sure you install and use a
93+
newer version from the `cURL downloads page
94+
<https://curl.haxx.se/download.html>`__
7995

8096
.. Licensed under Creative Commons Attribution 4.0 International License

0 commit comments

Comments
 (0)