Merge pull request realpython#17 from kisielk/intro

Kenneth Reitz · Kenneth Reitz · commit 134dc37525b5 · 2011-12-22T10:51:08.000-08:00
Refactored the Introduction section.
diff --git a/docs/contents.rst.inc b/docs/contents.rst.inc
@@ -9,7 +9,9 @@ background information about Python, then focuses on next steps.
 
    intro/duction
    intro/community
-   intro/resources
+   intro/learning
+   intro/documentation
+   intro/news
 
 
 Getting Started
@@ -81,4 +83,4 @@ Contibution notes and legal information are here (for those interested).
    :maxdepth: 2
 
    notes/contribute
-   notes/license
+   notes/license
diff --git a/docs/intro/documentation.rst b/docs/intro/documentation.rst
@@ -0,0 +1,20 @@
+Documentation
+=============
+
+Official Documentation
+----------------------
+
+The official Python Language and Library documentation can be found here:
+
+    - `Python 2.x <http://docs.python.org/>`_
+    - `Python 3.x <http://docs.python.org/py3k/>`_
+
+
+Read the Docs
+-------------
+
+Read the Docs is a popular community project, providing a single location for all documentation of popular and even more exotic Python modules.
+
+    `Read the Docs <http://readthedocs.org/>`_
+
+
diff --git a/docs/intro/duction.rst b/docs/intro/duction.rst
@@ -1,27 +1,4 @@
 Introduction
 ============
 
-
-Learning Python
-:::::::::::::::
-
-Beginners
-`````````
-
-* `learnpython.org <http://www.learnpython.org/>`_ - Learnpython.org is an easy non-intimidating way to get introduced to python. The website takes the same approach used on the popular `Try Ruby <http://tryruby.org/>`_ website, it has an interactive python interpreter built into the site that allows you to go through the lessons without having to install Python locally.
-
-* `Dive Into Python 3 <http://diveintopython3.ep.io/>`_ - Dive into Python 3 is a no non-sense approach to Python and is suited for someone that already knows how to program but now wants to learn Python.
-
-
-Learn Python the Hard Way
--------------------------
-
-
-Advanced
-````````
-
-Pro Python
-----------
-
-Expert Python Programming
--------------------------
+Someone should write a general blurb introducing the Python language here
diff --git a/docs/intro/learning.rst b/docs/intro/learning.rst
@@ -0,0 +1,55 @@
+Learning Python
+===============
+
+Beginner
+--------
+
+Learn Python Interactive Tutorial
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Learnpython.org is an easy non-intimidating way to get introduced to python. The website takes the same approach used on the popular `Try Ruby <http://tryruby.org/>`_ website, it has an interactive python interpreter built into the site that allows you to go through the lessons without having to install Python locally.
+
+    `Learn Python <http://www.learnpython.org/>`_
+
+Learn Python the Hard Way
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This is an excellent beginner programmer's guide to Python. It covers "hello world" from the console to the web.
+
+    `Learn Python the Hard Way <http://learnpythonthehardway.org/book/>`_
+
+
+Crash into Python
+~~~~~~~~~~~~~~~~~
+
+Also known as *Python for Programmers with 3 Hours*, this guide gives experienced developers from other languages a crash course on Python.
+
+    `Crash into Python <http://stephensugden.com/crash_into_python/>`_
+
+
+Dive Into Python 3
+~~~~~~~~~~~~~~~~~~
+
+Dive Into Python 3 is a good book for those ready to jump in to Python 3. It's a
+good read if you are moving from Python 2 to 3 or if you already have some
+experience programming in another language.
+
+    `Dive Into Python 3 <http://diveintopython3.ep.io/>`_
+
+
+Advanced
+--------
+
+Pro Python
+~~~~~~~~~~
+
+TODO: Write about this book
+
+    `Pro Python <http://propython.com/>`_
+
+Expert Python Programming
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+TODO: Write about this book
+
+    `Expert Python Programming <http://www.packtpub.com/expert-python-programming/book>`_
diff --git a/docs/intro/news.rst b/docs/intro/news.rst
@@ -0,0 +1,17 @@
+News
+====
+
+Planet Python
+~~~~~~~~~~~~~
+
+This is an aggregate of Python news from a growing number of developers.
+
+    `Planet Python <http://planet.python.org>`_
+
+/r/python
+~~~~~~~~~
+
+/r/python is the Reddit Python community where users contribute and vote on
+Python-related news.
+
+    `/r/python <http://reddit.com/r/python>`_
diff --git a/docs/intro/resources.rst b/docs/intro/resources.rst
