Fixed conflict

olasitarska · olasitarska · commit 9b568a9d062d · 2014-07-14T09:45:14.000+02:00
diff --git a/django_installation/README.md b/django_installation/README.md
@@ -22,7 +22,7 @@ where `C:\Python34\python` is folder in which you previously installed Python an
 
 Creating `virtualenv` in both Linux and OS X is as simple as typing in console (remember, that we expect that you have python 3.4 installed):
 
-    ~$ python -m venv blog
+    ~$ python3 -m venv blog
 
 ### Working with virtualenv
 
@@ -46,7 +46,9 @@ or:
 
 so the prefix `(blog)` appears!
 
-OK, we have all important things in place. We can finally install Django!
+When working within a virtual environment, `python` will automatically refer to the correct version so you can use `python` instead of `python3`.
+
+Ok, we have all important things in place. We can finally install Django!
 
 ## Installing Django
 
@@ -75,5 +77,3 @@ depending on whether you have 32 or 64 bit Windows.
 Once it's completed execute `python -c "import psycopg2"`. If you get no errors, everything works.
 
 That's it! Now you are finally ready to create a Django application! But to do that, you need some nice program to edit the code...
-
-
diff --git a/python_installation/README.md b/python_installation/README.md
@@ -20,7 +20,7 @@ You can download Python for Windows from the website https://www.python.org/down
 
 It is very likely that you already have Python installed out of the box. To check if you have it installed (and which version it is), you type in a console:
 
-    $ python --version
+    $ python3 --version
     Python 3.4.1
 
 If you don't have Python installed or you want a different version, you can install it as follows.
diff --git a/python_introduction/README.md b/python_introduction/README.md
@@ -6,19 +6,34 @@ Let's write some code!
 
 ## Python prompt
 
-To start tinkering with Python, we need to open up a *prompt* on your computer. On Mac OS X you can do this by launching the `Terminal` application (it's in Applications → Utilities). On Windows you need to go to Start menu → All Programs → Accessories → Command Prompt. On Linux, it's probably under Applications → Accessories → Terminal.
+To start tinkering with Python, we need to open up a *prompt* on your computer. How you get there depends on the operating system but once it's open, everything is equal.
 
-A window should pop up on your screen. This window is a prompt, waiting for commands from you. We want to open up a Python console, so type in `python` and hit Enter.
+### Windows
 
-    (workshops) ~$ python
+On Windows you need to go to Start menu → All Programs → Accessories → Command Prompt.
+
+A window should pop up on your screen. This window is a prompt, waiting for commands from you. We want to open up a Python console, so type in `python3` and hit Enter.
+
+    C:\Users\Name> C:\Python34\python
     Python 3.4.1 (...)
     Type "copyright", "credits" or "license" for more information.
     >>>
 
-After running the python command, the prompt changed to `>>>`. For us it means that for now we may only use commands in the Python language. You don't have to type in `>>>` - Python will do that for you.
+### Linux and OX X
+
+On Mac OS X you can do this by launching the `Terminal` application (it's in Applications → Utilities). On Linux, it's probably under Applications → Accessories → Terminal.
+
+A window should pop up on your screen. This window is a prompt, waiting for commands from you. We want to open up a Python console, so type in `python3` and hit Enter.
+
+    $ python3
+    Python 3.4.1 (...)
+    Type "copyright", "credits" or "license" for more information.
+    >>>
 
 ## Your first Python command!
 
+After running the Python command, the prompt changed to `>>>`. For us it means that for now we may only use commands in the Python language. You don't have to type in `>>>` - Python will do that for you.
+
 Let's start with something really simple. For example, try typing some math, like `2 + 3` and hit Enter.
 
     >>> 2 + 3
