Improve http proxy documentation in knife.rb.
Improve http proxy documentation in knife.rb.
Merge branch 'other-http-proxy-options' of github.com:juliandunn/chef-docs into other-http-proxy-options

Conflicts:
	includes_config/includes_config_rb_knife_settings.rst
Merge pull request #60 from juliandunn/other-http-proxy-options

Improve http proxy documentation in knife.rb.