Commit Graph

137 Commits

Author SHA1 Message Date
Jeff Forcier a183cd3bb1 Merge branch '1.13' 2014-03-21 11:23:13 -07:00
Jeff Forcier 6875bfd795 Merge branch '1.12' into 1.13 2014-03-21 11:23:09 -07:00
Jeff Forcier 3780c0314c Merge branch '1.11' into 1.12 2014-03-21 11:23:06 -07:00
Jeff Forcier 2c0544fc35 Changelog re #284 2014-03-21 11:23:03 -07:00
Jeff Forcier ebc1f38611 Merge branch 'python3' 2014-03-15 15:00:20 -07:00
Jeff Forcier fe9171661a Merge branch '1.12' into 1.13
Conflicts:
	paramiko/file.py
	paramiko/server.py
	paramiko/sftp_client.py
	sites/www/changelog.rst
2014-03-13 21:54:12 -07:00
Jeff Forcier a8ad23e61a Merge branch '1.11' into 1.12
Conflicts:
	sites/www/changelog.rst
2014-03-13 21:52:56 -07:00
Jeff Forcier 9ad2dec32a Improve string type testing in Python 2.x versions 2014-03-13 21:52:34 -07:00
Jeff Forcier e032541b78 Changelog for 1.13.0 2014-03-13 21:37:02 -07:00
Jeff Forcier 9695500303 Merge branch '1.12' into 1.13
Conflicts:
	sites/www/changelog.rst
2014-03-13 21:36:48 -07:00
Jeff Forcier b94af130b5 Changelog for 1.12.3 2014-03-13 21:36:26 -07:00
Jeff Forcier 005cfb8b25 Merge branch '1.11' into 1.12
Conflicts:
	sites/www/changelog.rst
2014-03-13 21:36:05 -07:00
Jeff Forcier 4e9efe4830 Changelog for 1.11.5 2014-03-13 21:35:48 -07:00
Jeff Forcier c538a00012 Merge branch '1.10' into 1.11.
Also bump versions like a dummy.

Conflicts:
	paramiko/__init__.py
	setup.py
2014-03-13 21:27:46 -07:00
Jeff Forcier 4fdb4b5ae5 Cut 1.10.7 2014-03-13 21:25:44 -07:00
Jeff Forcier b0b6a827b9 Update docs to reflect Python 2.6+, 3.3+ compat 2014-03-13 21:05:32 -07:00
Jeff Forcier 120071283d Fix accidental Markdown formatting miss for an older entry 2014-03-13 11:15:34 -07:00
Jeff Forcier 8463053fa5 Add changelog re #16 2014-03-13 11:15:20 -07:00
Jeff Forcier 073c71a822 Attempt to fix docs for py3 2014-03-07 18:46:40 -08:00
Jeff Forcier 7a776b1757 Testing out intersphinx in changelog 2014-03-04 17:43:30 -08:00
Jeff Forcier 32975af9a6 Merge branch '1.12' 2014-03-04 16:16:38 -08:00
Jeff Forcier 38785d9cd2 Merge branch '1.11' into 1.12 2014-03-04 16:16:36 -08:00
Jeff Forcier d5ed558c21 Merge branch '1.10' into 1.11 2014-03-04 16:16:33 -08:00
Jeff Forcier 798e3689dd Note Sphinx docs issue was backported 2014-03-04 16:16:29 -08:00
Jeff Forcier f9fef01e76 Merge branch '1.12' 2014-03-04 15:56:49 -08:00
Jeff Forcier 247ef7f6f7 Merge branch '1.11' into 1.12 2014-03-04 15:56:46 -08:00
Jeff Forcier 8f22672926 Merge branch '1.10' into 1.11 2014-03-04 15:54:16 -08:00
Jeff Forcier f295840191 Semi no-op fix to test RTD hooks 2014-03-04 15:45:01 -08:00
Jeff Forcier b9cea90581 Merge branch '1.12' 2014-03-04 11:45:12 -08:00
Jeff Forcier fac6cde874 Merge branch '1.11' into 1.12
Conflicts:
	paramiko/hostkeys.py
2014-03-04 11:44:57 -08:00
Jeff Forcier 72a73f55fa Merge branch '1.10' into 1.11
Conflicts:
	fabfile.py
	paramiko/__init__.py
2014-03-03 18:24:04 -08:00
Jeff Forcier 056323979d Re-enable Intersphinx from www -> docs 2014-03-03 18:22:33 -08:00
Jeff Forcier 83f09e634f Changelog re #256 2014-03-03 17:30:15 -08:00
Jeff Forcier 9ae46dcbfa Fix up AgentSSH vs Agent classes/docstrings, sigh 2014-02-24 17:00:53 -08:00
Jeff Forcier 4bcac18d17 Host key docs (order + tweaks) 2014-02-24 10:08:46 -08:00
Jeff Forcier 24cc59b64d Reorder config doc 2014-02-24 10:01:03 -08:00
Jeff Forcier c23579526b Tweak order of System doc page 2014-02-24 09:49:30 -08:00
Jeff Forcier 9ae62eb47a Wow there's a lot of SFTP crap. 2014-02-21 19:15:36 -08:00
Jeff Forcier 6d9b28c56c Remove win_pageant from docs for now :( too many freakin errors 2014-02-21 16:56:13 -08:00
Jeff Forcier 333dd249b0 Start in on the SFTP section 2014-02-21 16:37:16 -08:00
Jeff Forcier 0b2d523665 Connect to Python stdlib intersphinx 2014-02-21 15:35:22 -08:00
Jeff Forcier 0e9a5a4b46 Move module level docstring into Sphinx docs 2014-02-21 14:31:08 -08:00
Jeff Forcier f40bf59ff3 Source ordering updates for Transport 2014-02-21 10:25:56 -08:00
Jeff Forcier eb332c781b Reorganize Client so API doc flows better 2014-02-21 10:21:19 -08:00
Jeff Forcier d4148ab6f3 Tweak core-class doc titles 2014-02-21 10:20:57 -08:00
Jeff Forcier 635108aab2 Formatting 2014-02-21 10:05:40 -08:00
Jeff Forcier 88140996a7 Too much 'handling' 2014-02-21 09:58:19 -08:00
Jeff Forcier a58cf80139 Un-derp header levels 2014-02-21 09:56:14 -08:00
Jeff Forcier 0af6df924a First stab at segmented TOCtrees.
Makes sidebar TOC a little funny tho.
2014-02-14 18:20:47 -08:00
Jeff Forcier 22766e96a6 Last of headers! 2014-02-14 17:18:36 -08:00