1103232 - Document proxy settings.

https://bugzilla.redhat.com/show_bug.cgi?id=1103232
1103232 - Reference Pulp docs for proxy settings.

https://bugzilla.redhat.com/show_bug.cgi?id=1103232
Removed a stray sentence.
Merge branch '2.4-dev' into 2.5-testing