From 1557d0ca739d8d687de20a3e060a7b79d42dc6c2 Mon Sep 17 00:00:00 2001 From: Kamil Kisiel Date: Thu, 22 Dec 2011 10:47:38 -0800 Subject: [PATCH] Refactored the Introduction section. Removed redundant links to learning resources and separated the learning, documentation, and news sections in to their own pages. --- docs/contents.rst.inc | 6 ++-- docs/intro/documentation.rst | 20 +++++++++++ docs/intro/duction.rst | 25 +------------ docs/intro/learning.rst | 55 ++++++++++++++++++++++++++++ docs/intro/news.rst | 17 +++++++++ docs/intro/resources.rst | 70 ------------------------------------ 6 files changed, 97 insertions(+), 96 deletions(-) create mode 100644 docs/intro/documentation.rst create mode 100644 docs/intro/learning.rst create mode 100644 docs/intro/news.rst delete mode 100644 docs/intro/resources.rst diff --git a/docs/contents.rst.inc b/docs/contents.rst.inc index 0c5f16017..4c6fc7bc2 100644 --- 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 \ No newline at end of file + notes/license diff --git a/docs/intro/documentation.rst b/docs/intro/documentation.rst new file mode 100644 index 000000000..3359f371b --- /dev/null +++ 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 `_ + - `Python 3.x `_ + + +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 `_ + + diff --git a/docs/intro/duction.rst b/docs/intro/duction.rst index 380228e4b..aa1cd771f 100644 --- a/docs/intro/duction.rst +++ b/docs/intro/duction.rst @@ -1,27 +1,4 @@ Introduction ============ - -Learning Python -::::::::::::::: - -Beginners -````````` - -* `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 `_ 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 `_ - 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 new file mode 100644 index 000000000..c2a86195d --- /dev/null +++ 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 `_ 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 `_ + +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 `_ + + +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 `_ + + +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 `_ + + +Advanced +-------- + +Pro Python +~~~~~~~~~~ + +TODO: Write about this book + + `Pro Python `_ + +Expert Python Programming +~~~~~~~~~~~~~~~~~~~~~~~~~ + +TODO: Write about this book + + `Expert Python Programming `_ diff --git a/docs/intro/news.rst b/docs/intro/news.rst new file mode 100644 index 000000000..aa90013ae --- /dev/null +++ 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 `_ + +/r/python +~~~~~~~~~ + +/r/python is the Reddit Python community where users contribute and vote on +Python-related news. + + `/r/python `_ diff --git a/docs/intro/resources.rst b/docs/intro/resources.rst deleted file mode 100644 index 5ecfc9027..000000000 --- a/docs/intro/resources.rst +++ /dev/null @@ -1,70 +0,0 @@ -Documentation -============= - -Official Documentation ----------------------- - -The official Python Language and Library documentation can be found here: - - - `Python 2.x `_ - - `Python 3.x `_ - - -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 `_ - - -Resources -========= - -News ----- - -Planet Python -~~~~~~~~~~~~~ - -This is an aggregate of Python news from a growing number of developers. - - `Planet Python `_ - -/r/python -~~~~~~~~~ - -/r/python is the Reddit Python community where users contribute and vote on -Python-related news. - - `/r/python `_ - - -Beginner's Guides ------------------ - - -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 `_ - - -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 `_ - - -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 `_