Merge pull request realpython#10 from Ookami86/master

Kenneth Reitz · Kenneth Reitz · commit 541d81ae1f68 · 2011-10-19T11:33:20.000-07:00
Some small fixes and additions
diff --git a/AUTHORS b/AUTHORS
@@ -0,0 +1,2 @@
+Kenneth Reitz
+Johannes Seitz
diff --git a/docs/intro/community.rst b/docs/intro/community.rst
@@ -62,12 +62,12 @@ Submitting a PEP
 Python Conferences 
 --------------------------
 
-The major venue of the Python community are developer conferences. The two most notable conferences are PyCon, which is held in the US and it's overseas sibling EuroPython.
+The major venue of the Python community are developer conferences. The two most notable conferences are PyCon, which is held in the US and it's european sibling, called EuroPython.
 
-A comprehensive list of conferences is maintained `here <http://www.pycon.org/>`_.
+A comprehensive list of conferences is maintained `at pycon.org <http://www.pycon.org/>`_.
 
 
 Python User Groups
 --------------------------
 
-User Groups are where a  bunch of Python developers meet to present or talk about python topics of interest. A list of local user groups is maintained in the `Python Software Foundation Wiki <http://wiki.python.org/moin/LocalUserGroups>`_.
+User Groups are where a bunch of Python developers meet to present or talk about Python topics of interest. A list of local user groups is maintained at the `Python Software Foundation Wiki <http://wiki.python.org/moin/LocalUserGroups>`_.
diff --git a/docs/intro/resources.rst b/docs/intro/resources.rst
@@ -1,3 +1,23 @@
+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/>`_
+
+
 Resources
 =========
 
diff --git a/docs/scenarios/ci.rst b/docs/scenarios/ci.rst
@@ -5,6 +5,11 @@ Continuous Integration
 Why?
 ----
 
+Martin Folwer, who first wrote about Continuous Integration (short: CI) together with Kent Beck, describes the CI as follows:
+
+    Continuous Integration is a software development practice where members of a team integrate their work frequently, usually each person integrates at least daily - leading to multiple integrations per day. Each integration is verified by an automated build (including test) to detect integration errors as quickly as possible. Many teams find that this approach leads to significantly reduced integration problems and allows a team to develop cohesive software more rapidly. This article is a quick overview of Continuous Integration summarizing the technique and its current usage.
+
+Source: http://martinfowler.com/articles/continuousIntegration.html
 
 Jenkins
 -------
diff --git a/docs/starting/dev-env.rst b/docs/starting/dev-env.rst
@@ -1,9 +1,6 @@
 Your Development Environment
 ============================
 
-Testing your code is very important.
-
-
 
 Text Editors
 ::::::::::::
