Skip to content

Commit

Permalink
Merge pull request realpython#310 from kuyan/patch-2
Browse files Browse the repository at this point in the history
Link fixes.
  • Loading branch information
kennethreitz committed Oct 14, 2013
2 parents 0c986db + 78a1284 commit 41bc074
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 16 deletions.
6 changes: 3 additions & 3 deletions docs/dev/virtualenvs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ where they were placed.
virtualenvwrapper
-----------------

`virtualenvwrapper <http://www.doughellmann.com/projects/virtualenvwrapper/>`_
`virtualenvwrapper <http://virtualenvwrapper.readthedocs.org/en/latest/index.html>`_
provides a set of commands which makes working with virtual environments much
more pleasant. It also places all your virtual environments in one place.

Expand All @@ -72,7 +72,7 @@ To install (make sure **virtualenv** is already installed):
$ export WORKON_HOME=~/Envs
$ source /usr/local/bin/virtualenvwrapper.sh
(`Full virtualenvwrapper install instructions <http://www.doughellmann.com/docs/virtualenvwrapper/#introduction>`_.)
(`Full virtualenvwrapper install instructions <http://virtualenvwrapper.readthedocs.org/en/latest/install.html>`_.)

For Windows, you can use the `virtualenvwrapper-powershell <https://bitbucket.org/guillermooo/virtualenvwrapper-powershell>`_ clone.

Expand Down Expand Up @@ -136,7 +136,7 @@ Other useful commands
``lssitepackages``
Shows contents of ``site-packages`` directory.

`Full list of virtualenvwrapper commands <http://www.doughellmann.com/docs/virtualenvwrapper/command_ref.html#managing-environments>`_.
`Full list of virtualenvwrapper commands <http://virtualenvwrapper.readthedocs.org/en/latest/command_ref.html>`_.

autoenv
-------
Expand Down
3 changes: 1 addition & 2 deletions docs/intro/learning.rst
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ A free introductory book that teaches python at the beginner level, it assumes n
previous programming experience.

`A Byte of Python for Python 2.x <http://www.ibiblio.org/swaroopch/byteofpython/read/>`_
`A Byte of Python for Python 3.x <http://www.swaroopch.org/notes/Python_en:Table_of_Contents>`_
`A Byte of Python for Python 3.x <http://swaroopch.com/notes/Python_en-Preface/>`_


Advanced
Expand Down Expand Up @@ -162,7 +162,6 @@ as writing C extensions.

`Python in a Nutshell <http://shop.oreilly.com/product/9780596001889.do>`_


The Python Language Reference
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down
10 changes: 5 additions & 5 deletions docs/scenarios/ci.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ engine. Use it.

Buildbot
--------
`Buildbot <http://buildbot.net/buildbot/docs/current>`_ is a Python system to
`Buildbot <http://docs.buildbot.net/current/>`_ is a Python system to
automate the compile/test cycle to validate code changes.


Expand All @@ -38,7 +38,7 @@ Mule?
Tox
---

`tox <https://bitbucket.org/hpk42/tox>`_ is an automation tool providing
`tox <http://tox.readthedocs.org/en/latest/>`_ is an automation tool providing
packaging, testing and deployment of Python software right from the console or
CI server. It is a generic virtualenv management and test command line tool
which provides the following features:
Expand All @@ -53,7 +53,7 @@ which provides the following features:

Travis-CI
---------
`Travis-CI <http://travis-ci.org/>`_ is a distributed CI server which builds tests
`Travis-CI <https://travis-ci.org/>`_ is a distributed CI server which builds tests
for open source projects for free. It provides multiple workers to run Python tests
on and seamlessly integrates with Github. You can even have it comment on your Pull
Requests whether this particular changeset breaks the build or not. So if you are
Expand Down Expand Up @@ -83,6 +83,6 @@ notifications, before and after steps and much more. The
`travis-ci docs <http://about.travis-ci.org/docs/>`_ explain all of those and are very
thorough.

In order to activate testing for your project, go to `the travis-ci site <http://travis-ci.org/>`_
In order to activate testing for your project, go to `the travis-ci site <https://travis-ci.org/>`_
and login with your Github account. Then activate your project in your profile settings and that's
it. From now on, your project's tests will be run on every push to Github.
it. From now on, your project's tests will be run on every push to Github.
2 changes: 1 addition & 1 deletion docs/scenarios/db.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Nearly all Python database modules such as `sqlite3`, `psycopg` and

Tutorials that explain how to work with modules that conform to this interface can be found
`here <http://halfcooked.com/presentations/osdc2006/python_databases.html>`__ and
`here <http://www.amk.ca/python/writing/DB-API.html>`__.
`here <http://web.archive.org/web/20120815130844/http://www.amk.ca/python/writing/DB-API.html>`__.

SQLAlchemy
----------
Expand Down
2 changes: 1 addition & 1 deletion docs/scenarios/gui.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ GUI Applications

Qt
--
Qt is a cross-platform application framework that is widely used for developing
`Qt <http://qt-project.org/>`_ is a cross-platform application framework that is widely used for developing
software with a GUI but can also be used for non-GUI applications.

PySide
Expand Down
6 changes: 2 additions & 4 deletions docs/scenarios/web.rst
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ lightweight, easy to use, and uses many UNIX idioms. Gunicorn is not designed
to face the internet -- it was designed to run behind Nginx which buffers
slow requests and takes care of other important considerations. A sample
setup for Nginx + Gunicorn can be found in the
`Gunicorn help <http://gunicorn.org/deploy.html>`_.
`Gunicorn help <http://gunicorn.org/index.html#deployment>`_.

.. _uwsgi-ref:

Expand Down Expand Up @@ -235,9 +235,7 @@ and Pinax applications. Gondor supports Django versions 1.2 and 1.3 on
Python version 2.7, and can automatically configure your Django site if you
use ``local_settings.py`` for site-specific configuration information.

Gondor publishes guides to deploying `Django projects
<https://gondor.io/support/setting-up-django/>`_ and `Pinax projects
<https://gondor.io/support/setting-up-pinax/>`_ on their platform.
Gondor has a guide on deploying `Django projects <https://gondor.io/support/django/setup/>`_.


Templating
Expand Down

0 comments on commit 41bc074

Please sign in to comment.