Merge remote-tracking branch 'origin/master'

This commit is contained in:
Jakub Roztocil 2013-04-17 13:52:02 -03:00
commit 63ed4d32a7

View File

@ -469,7 +469,7 @@ come). There are two flags that control authentication:
``basic`` so it can often be omitted.
=================== ======================================================
Authorization information from ``.netrc`` is honored as well.
Basic auth:
@ -494,6 +494,19 @@ With password prompt:
$ http -a username example.org
Authorization information from your ``.netrc`` file is honored as well:
.. code-block:: bash
$ cat .netrc
machine httpbin.org
login httpie
password test
$ http httpbin.org/basic-auth/httpie/test
HTTP/1.1 200 OK
[...]
=======
Proxies
=======