Skip to content

bpo-25910: Link redirections in docs #1933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 21 commits into from
Jan 20, 2018
Merged

bpo-25910: Link redirections in docs #1933

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
26485fe
bpo-25910: Fixes some redirection links in docs
CuriousLearner Jun 3, 2017
e013f38
bpo-25910: Fixes more redirection links in docs
CuriousLearner Jun 3, 2017
06fa4f3
Minor fixes to links
CuriousLearner Jun 3, 2017
1d99ca4
bpo-25910: Address review comments
CuriousLearner Jun 4, 2017
0f96435
bpo-25910: Address review comments
CuriousLearner Jun 5, 2017
cc1b307
bpo-25910: Minor fix to gettext.rst doc
CuriousLearner Jun 5, 2017
bf9d3f8
bpo-25910: Minor link fix in installing/index.rst doc
CuriousLearner Jun 5, 2017
92f023f
bpo-25910: Fixes redirection issues in whatsnew/* doc
CuriousLearner Jun 5, 2017
32b6617
bpo-25910: Address review commits for url redirections
CuriousLearner Jun 5, 2017
91060c3
bpo-25910: Minor fix for building docs succesfully
CuriousLearner Jun 5, 2017
23cc93c
bpo-25910: Reverts change to not lose git blame on docs
CuriousLearner Dec 2, 2017
79930f2
Merge master into fix-issue25910; resolve conflicts
CuriousLearner Dec 6, 2017
4b3f488
Revert changes that might change git blame
CuriousLearner Dec 6, 2017
2bb0157
Minor fix to bitbucket link
CuriousLearner Dec 6, 2017
b44cc3f
Address review comments
CuriousLearner Dec 13, 2017
3f6c78a
Address review comments
CuriousLearner Dec 16, 2017
3f6344e
Update link label in ssl.rst docs
CuriousLearner Dec 17, 2017
3cd462f
Address review comments
CuriousLearner Jan 7, 2018
a021d33
Merge branch master; resolve conflicts
CuriousLearner Jan 7, 2018
353d5bc
Fix issues in ssl.rst docs
CuriousLearner Jan 17, 2018
ceb3581
bpo-25910: Address review comments
CuriousLearner Jan 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update link label in ssl.rst docs
  • Loading branch information
@CuriousLearner
CuriousLearner committed Dec 17, 2017
commit 3f6344e70207d6f0f120bd4f2a94bb9552c26971
4 changes: 2 additions & 2 deletions Doc/library/ssl.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ Constants
.. data:: HAS_NPN

Whether the OpenSSL library has built-in support for *Next Protocol
Negotiation* as described in the `NPN draft specification
Negotiation* as described in the `Application Layer Protocol Negotiation
<https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation >`_. When true,
you can use the :meth:`SSLContext.set_npn_protocols` method to advertise
which protocols you want to support.
Expand Down Expand Up @@ -1501,7 +1501,7 @@ to speed up repeated connections from the same clients.
Specify which protocols the socket should advertise during the SSL/TLS
handshake. It should be a list of strings, like ``['http/1.1', 'spdy/2']``,
ordered by preference. The selection of a protocol will happen during the
handshake, and will play out according to the `NPN draft specification
handshake, and will play out according to the `Application Layer Protocol Negotiation
<https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation >`_. After a

@vstinner vstinner Dec 16, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto

successful handshake, the :meth:`SSLSocket.selected_npn_protocol` method will
return the agreed-upon protocol.
Expand Down