Skip to content

Some small fixes and additions #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 19, 2011
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Kenneth Reitz
Johannes Seitz
6 changes: 3 additions & 3 deletions docs/intro/community.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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>`_.
20 changes: 20 additions & 0 deletions docs/intro/resources.rst
Original file line number Diff line number Diff line change
@@ -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
=========

Expand Down
5 changes: 5 additions & 0 deletions docs/scenarios/ci.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
-------
Expand Down
4 changes: 2 additions & 2 deletions docs/shipping/freezing.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Freezing Your Code
==================

An alterinative to shipping your code is freezing it — shipping it as an
executable with a bundled Python enterpreter.
An alternative to shipping your code is freezing it — shipping it as an
executable with a bundled Python interpreter.

Many applications you use every day do this:

Expand Down
3 changes: 0 additions & 3 deletions docs/starting/dev-env.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
Your Development Environment
============================

Testing your code is very important.



Text Editors
::::::::::::
Expand Down