From 1c5f7e04f80fc9be35ad8046d98fded1f11db93f Mon Sep 17 00:00:00 2001 From: BrianPainter Date: Wed, 18 Jan 2012 08:26:33 -0500 Subject: [PATCH 1/6] Update docs/starting/installation.rst --- docs/starting/installation.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/starting/installation.rst b/docs/starting/installation.rst index f567f38..43f729c 100644 --- a/docs/starting/installation.rst +++ b/docs/starting/installation.rst @@ -92,7 +92,9 @@ Prerequisites: Step 1: Set PATH variables -------------------------- 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. -**Windows 7**: + +**Windows 7** + * Click Advanced System Settings from left hand list * Click the Environment Variables button at the bottom * In the System variables section double click on the variable line named Path From e5e124e851358088efb189af98e88e0a59174412 Mon Sep 17 00:00:00 2001 From: BrianPainter Date: Wed, 18 Jan 2012 08:27:34 -0500 Subject: [PATCH 2/6] Update docs/starting/installation.rst --- docs/starting/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/starting/installation.rst b/docs/starting/installation.rst index 43f729c..2f64d6e 100644 --- a/docs/starting/installation.rst +++ b/docs/starting/installation.rst @@ -99,7 +99,7 @@ If you haven't set your PATH variables as part of the Python2.7 install, now is * Click the Environment Variables button at the bottom * In the System variables section double click on the variable line named Path * Scroll to the end of the variable value field -* add semicolon (;) if one doesn't exist and then type **C:\Python27\;C:\Python27\Scripts\** +* add semicolon (;) if one doesn't exist and then type ``C:\Python27\;C:\Python27\Scripts\`` Step 2: Install Distribute & Pip From 8d48118a5f4a1e855614a8862ba0c7d27c78294a Mon Sep 17 00:00:00 2001 From: BrianPainter Date: Wed, 18 Jan 2012 08:32:16 -0500 Subject: [PATCH 3/6] Update docs/starting/installation.rst --- docs/starting/installation.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/starting/installation.rst b/docs/starting/installation.rst index 2f64d6e..aa2c9e7 100644 --- a/docs/starting/installation.rst +++ b/docs/starting/installation.rst @@ -93,15 +93,14 @@ Step 1: Set PATH variables -------------------------- 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. -**Windows 7** - -* Click Advanced System Settings from left hand list +* Click Advanced System Settings from left hand list (On Windows XP click the Advanced Tab) * Click the Environment Variables button at the bottom * In the System variables section double click on the variable line named Path * Scroll to the end of the variable value field * add semicolon (;) if one doesn't exist and then type ``C:\Python27\;C:\Python27\Scripts\`` + Step 2: Install Distribute & Pip -------------------------------- From 4c852e31b5bfc893ad591dfeadfbb40b84f7e4a1 Mon Sep 17 00:00:00 2001 From: Brian Painter Date: Wed, 18 Jan 2012 08:49:26 -0500 Subject: [PATCH 4/6] Fixed Style First time using the style --- docs/starting/installation.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/starting/installation.rst b/docs/starting/installation.rst index f567f38..433a73f 100644 --- a/docs/starting/installation.rst +++ b/docs/starting/installation.rst @@ -92,12 +92,12 @@ Prerequisites: Step 1: Set PATH variables -------------------------- 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. -**Windows 7**: -* Click Advanced System Settings from left hand list +**Windows 7** +* Click Advanced System Settings from left hand list (Advanced Tab on Windows XP) * Click the Environment Variables button at the bottom * In the System variables section double click on the variable line named Path * Scroll to the end of the variable value field -* add semicolon (;) if one doesn't exist and then type **C:\Python27\;C:\Python27\Scripts\** +* add semicolon (;) if one doesn't exist and then type ``C:\Python27\;C:\Python27\Scripts\`` Step 2: Install Distribute & Pip From 8aadcc9f108fcf867ef4846659c817fd1d1f8211 Mon Sep 17 00:00:00 2001 From: Brian Painter Date: Wed, 18 Jan 2012 09:02:26 -0500 Subject: [PATCH 5/6] Fixed formatting First time using this formatting, fixed my errors --- docs/starting/installation.rst | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/docs/starting/installation.rst b/docs/starting/installation.rst index c1ab595..545b49c 100644 --- a/docs/starting/installation.rst +++ b/docs/starting/installation.rst @@ -92,22 +92,14 @@ Prerequisites: Step 1: Set PATH variables -------------------------- 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. -<<<<<<< HEAD + **Windows 7** * Click Advanced System Settings from left hand list (Advanced Tab on Windows XP) -======= - * Click Advanced System Settings from left hand list (On Windows XP click the Advanced Tab) ->>>>>>> 8d48118a5f4a1e855614a8862ba0c7d27c78294a * Click the Environment Variables button at the bottom * In the System variables section double click on the variable line named Path * Scroll to the end of the variable value field * add semicolon (;) if one doesn't exist and then type ``C:\Python27\;C:\Python27\Scripts\`` -<<<<<<< HEAD -======= - ->>>>>>> 8d48118a5f4a1e855614a8862ba0c7d27c78294a - Step 2: Install Distribute & Pip -------------------------------- From 7be91a60e6389a808eb074a34d17673ceba10545 Mon Sep 17 00:00:00 2001 From: BrianPainter Date: Wed, 18 Jan 2012 09:05:30 -0500 Subject: [PATCH 6/6] Update docs/starting/installation.rst --- docs/starting/installation.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/starting/installation.rst b/docs/starting/installation.rst index 545b49c..099dc27 100644 --- a/docs/starting/installation.rst +++ b/docs/starting/installation.rst @@ -93,7 +93,6 @@ Step 1: Set PATH variables -------------------------- 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. -**Windows 7** * Click Advanced System Settings from left hand list (Advanced Tab on Windows XP) * Click Advanced System Settings from left hand list (On Windows XP click the Advanced Tab) * Click the Environment Variables button at the bottom