merge

Author: kennethreitz

docs/dev/env.rst

@@ -155,7 +155,7 @@ Edition (Apache 2.0 License) with fewer features.
 Python (on Visual Studio Code)
 ------------------------------
 
-`Python for Visual Studio <https://marketplace.visualstudio.com/items?itemName=donjayamanne.python>`_ is an extension for the `Visual Studio Code IDE <https://code.visualstudio.com>`_.
+`Python for Visual Studio <https://marketplace.visualstudio.com/items?itemName=ms-python.python>`_ is an extension for the `Visual Studio Code IDE <https://code.visualstudio.com>`_.
 This is a free, light weight, open source IDE, with support for Mac, Windows, and Linux.
 Built using open source technologies such as Node.js and Python, with compelling features such as Intellisense (autocompletion), local and remote debugging, linting, and the like.
 

docs/intro/learning.rst

@@ -51,6 +51,13 @@ resource for learning all aspects of the language.
     `Python for You and Me <https://pymbook.readthedocs.io/>`_
     `Learn Python Interactively with DataCamp! <https://www.datacamp.com/>`_
 
+Learn Python Step by Step
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Techbeamers.com provides step-by-step tutorials to teach Python. Each tutorial is supplemented with logically added coding snippets and equips with a follow-up quiz on the subject learned. There is a section for `Python interview questions <http://www.techbeamers.com/python-interview-questions-programmers>`_ to help job seekers. You can also read essential `Python tips <http://www.techbeamers.com/essential-python-tips-tricks-programmers>`_ and learn `best coding practices <http://www.techbeamers.com/python-code-optimization-tips-tricks>`_ for writing quality code. Here, you'll get the right platform to learn Python quickly.
+
+`Learn Python Basic to Advanced <http://www.techbeamers.com/python-tutorial-step-by-step>`_
+
 
 Online Python Tutor
 ~~~~~~~~~~~~~~~~~~~

docs/scenarios/web.rst

@@ -62,7 +62,7 @@ modules <http://djangopackages.com/>`_ that can be incorporated into a new
 project as-is, or customized to fit your needs.
 
 There are annual Django conferences `in the United States
-<http://djangocon.us>`_ and `in Europe <http://djangocon.eu>`_.
+<http://djangocon.us>`_, `Europe <http://djangocon.eu>`_, and `Australia <http://djangocon.com.au>`_.
 
 The majority of new Python web applications today are built with Django.
 

docs/starting/install3/win.rst

@@ -5,10 +5,10 @@ Installing Python 3 on Windows
 
 .. image:: https://farm5.staticflickr.com/4276/34435689480_2e6f358510_k_d.jpg
 
-First, download the `latest version <https://www.python.org/ftp/python/3.6.3/python-3.6.3.exe>`_
+First, download the `latest version <https://www.python.org/ftp/python/3.6.4/python-3.6.4.exe>`_
 of Python 3.6 from the official website. If you want to be sure you are installing a fully
 up-to-date version, click the Downloads > Windows link from the home page of the
-`Python.org web site <http://python.org>`_ .
+`Python.org web site <http://python.org>`_.
 
 By design, Python installs to a directory with the version number embedded,
 e.g. Python version 3.6 will install at :file:`C:\\Python36\\`, so that you can