Skip to content

Commit de0b966

Browse files
committed
Merge branch 'master' of github.com:BrianPainter/python-guide
Conflicts: docs/starting/installation.rst
2 parents 4c852e3 + 8d48118 commit de0b966

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

docs/starting/installation.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,21 @@ Prerequisites:
9292
Step 1: Set PATH variables
9393
--------------------------
9494
If you haven't set your PATH variables as part of the Python2.7 install, now is the time to do that. Right click on My Computer and select properties.
95+
<<<<<<< HEAD
9596
**Windows 7**
9697
* Click Advanced System Settings from left hand list (Advanced Tab on Windows XP)
98+
=======
99+
100+
* Click Advanced System Settings from left hand list (On Windows XP click the Advanced Tab)
101+
>>>>>>> 8d48118a5f4a1e855614a8862ba0c7d27c78294a
97102
* Click the Environment Variables button at the bottom
98103
* In the System variables section double click on the variable line named Path
99104
* Scroll to the end of the variable value field
100105
* add semicolon (;) if one doesn't exist and then type ``C:\Python27\;C:\Python27\Scripts\``
106+
<<<<<<< HEAD
107+
=======
108+
109+
>>>>>>> 8d48118a5f4a1e855614a8862ba0c7d27c78294a
101110

102111

103112
Step 2: Install Distribute & Pip

0 commit comments

Comments
 (0)