Commit Graph

890 Commits

Author SHA1 Message Date
kennethreitz fcf806d298 Merge pull request #330 from kuyan/master
Link to `fpm` (see #328)
2014-01-08 11:18:32 -08:00
Natan L 16b62e72f5 Merge pull request #1 from JensRantil/fix-328
Link to `alien`. Fully resolves kennethreitz/python-guide#328 .
2013-10-29 19:52:44 -07:00
Jens Rantil eb950d52c9 Link to alien
This fully fixes #328.
2013-10-29 08:27:30 +01:00
Kenneth Reitz be9ffbbad5 Merge remote-tracking branch 'origin/master' 2013-10-24 18:16:51 -04:00
Kenneth Reitz 525c834d59 Get Updates 2013-10-24 18:16:48 -04:00
kuyan 4e1b3771e5 Link to fpm (see #328) 2013-10-14 15:20:29 -07:00
kennethreitz 41bc074df1 Merge pull request #310 from kuyan/patch-2
Link fixes.
2013-10-13 22:58:46 -07:00
kennethreitz 0c986dba4e Merge pull request #323 from AloisMahdal/i322
Clarify presence of a two-element tuple.
2013-10-13 22:58:06 -07:00
Alois Mahdal f32ef5f38f Reworded per rgbkrk's suggestion 2013-09-24 22:28:12 +02:00
Alois Mahdal 239909dc4c Clarify presence of a two-element tuple. 2013-09-24 14:02:54 +02:00
kuyan 78a1284a09 Merge branch 'patch-2' of github.com:kuyan/python-guide into patch-2
* 'patch-2' of github.com:kuyan/python-guide:
  Add link to 'Python in a Nutshell'.
  Update link to 'A Byte of Python'.
  Update virtualenvwrapper documentation links.
  Update link to Gondor documentation.
  Update Gunicorn help link.
  Add Qt link.
  Use Wayback Machine to resolve a dead link.
  Update Travis CI URL because always https.
  Update tox URL.
  Update Buildbot URL.

Conflicts:
	docs/intro/learning.rst
2013-09-16 18:36:37 -07:00
kuyan 2cd385e61c Add link to 'Python in a Nutshell'. 2013-09-16 18:35:55 -07:00
kuyan f51141c973 Update link to 'A Byte of Python'. 2013-09-16 18:35:30 -07:00
kuyan cf93e79274 Update virtualenvwrapper documentation links. 2013-09-16 18:35:30 -07:00
kuyan 788390e74f Update link to Gondor documentation. 2013-09-16 18:35:30 -07:00
kuyan 55fc9b08e4 Update Gunicorn help link. 2013-09-16 18:35:30 -07:00
kuyan 7098237078 Add Qt link. 2013-09-16 18:35:30 -07:00
kuyan edf7f04e49 Use Wayback Machine to resolve a dead link. 2013-09-16 18:35:30 -07:00
kuyan 8b9e3bb877 Update Travis CI URL because always https. 2013-09-16 18:35:30 -07:00
kuyan e094175bd6 Update tox URL. 2013-09-16 18:35:30 -07:00
kuyan 56924481c2 Update Buildbot URL. 2013-09-16 18:35:29 -07:00
Kenneth Reitz 6b53b2f0a2 Merge pull request #311 from martinblech/master
Add xmltodict to xml scenario.
2013-09-16 16:03:03 -07:00
Kenneth Reitz e66ca84616 Merge pull request #312 from eluck/patch-1
fix broken tornado link in web.rst
2013-09-16 16:02:41 -07:00
Kenneth Reitz 6b23faf0ce Merge pull request #319 from JeffPaine/patch-1
Update brew installation commands
2013-09-16 16:02:20 -07:00
Kenneth Reitz 353b3aa9b5 Merge pull request #321 from AnSavvides/master
Adding link to Python in a Nutshell
2013-09-16 16:01:46 -07:00
Andreas Savvides 40f41a9e26 Adding link to Python in a Nutshell 2013-09-16 23:46:00 +01:00
Jeff Paine 4842bbb1a1 Add back export PATH=/usr/local/share/python:$PATH section 2013-09-15 09:59:04 -04:00
Jeff Paine eafdcd9a61 Update brew installation commands 2013-09-14 00:39:31 -04:00
Kenneth Reitz 12cd425989 Merge pull request #313 from jeroendierckx/master
Added Camelot information to gui.rst
2013-09-13 13:54:12 -07:00
Kenneth Reitz 1812744f5b Merge pull request #318 from rgbkrk/patch-1
Linked explicitly to 2.x documentation
2013-09-13 13:54:03 -07:00
Kyle Kelley 0852469bca Linked explicitly to 2.x documentation 2013-09-13 15:51:25 -05:00
Kenneth Reitz b07a194f19 Merge pull request #315 from MalcolmEvershed/patch-1
New Pip requires Setuptools instead of Distribute
2013-09-09 02:14:12 -07:00
MalcolmEvershed ddef4fc72d New Pip requires Setuptools instead of Distribute
Also remove --distribute option from virtualenv since that is obsolete.
2013-09-08 16:13:39 -07:00
Jeroen Dierckx c6de99f95b Added Camelot information to gui.rst 2013-09-04 13:49:24 +02:00
Kenneth Reitz ad9a6568a7 python for you and me
@kushaldas
2013-09-01 10:31:33 +05:30
eluck 0d259afbda fix broken tornado link in web.rst 2013-08-30 01:27:54 -07:00
Martín Blech bbbb24d3e5 Add xmltodict 2013-08-29 20:29:42 -03:00
kuyan 4cc1d119f1 Add link to 'Python in a Nutshell'. 2013-08-24 11:56:16 -07:00
kuyan 8bd2c12965 Update link to 'A Byte of Python'. 2013-08-24 11:54:40 -07:00
kuyan c5e37675ce Update virtualenvwrapper documentation links. 2013-08-24 11:50:43 -07:00
kuyan 0b897088fc Update link to Gondor documentation. 2013-08-24 11:44:32 -07:00
kuyan 1e38672e66 Update Gunicorn help link. 2013-08-24 11:42:32 -07:00
kuyan c52c9187ae Add Qt link. 2013-08-24 01:27:22 -07:00
kuyan 920aa3725c Use Wayback Machine to resolve a dead link. 2013-08-24 01:26:15 -07:00
kuyan 5982ec650a Update Travis CI URL because always https. 2013-08-24 01:25:54 -07:00
kuyan 5609bc8bbf Update tox URL. 2013-08-24 01:22:47 -07:00
kuyan 580e32fb6a Update Buildbot URL. 2013-08-24 01:21:46 -07:00
Kenneth Reitz 036c8031d7 Merge pull request #309 from UtahDave/patch-1
Correct Salt Docs url. Ensure apache service is enabled and set proper require
2013-08-23 16:52:09 -07:00
David Boucha 95c7db9697 Correct Salt Docs url. Ensure apache service is enable and set proper require 2013-08-23 12:20:00 -06:00
Kenneth Reitz 3073466df6 Merge pull request #306 from ugurthemaster/patch-1
Update learning.rst
2013-08-21 11:38:42 -07:00