Merge lp:~sinzui/launchpad/reg-docs-1 into lp:launchpad
Status: | Merged | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Brad Crittenden | ||||||||||||
Approved revision: | no longer in the source branch. | ||||||||||||
Merged at revision: | 12332 | ||||||||||||
Proposed branch: | lp:~sinzui/launchpad/reg-docs-1 | ||||||||||||
Merge into: | lp:launchpad | ||||||||||||
Diff against target: |
45 lines (+5/-4) 3 files modified
lib/lp/code/interfaces/branch.py (+2/-1) lib/lp/code/interfaces/branchmergeproposal.py (+2/-2) lib/lp/registry/help/openpgp-keys.html (+1/-1) |
||||||||||||
To merge this branch: | bzr merge lp:~sinzui/launchpad/reg-docs-1 | ||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brad Crittenden (community) | code | Approve | |
Review via email: mp+48627@code.launchpad.net |
Description of the change
Fix the protocol in the gpg documentation and branch and MP api docs.
Launchpad bug:
https:/
https:/
https:/
Pre-
Test command: None
Bug #710054 [opengpg keys help gives incorrect protocol in instructions]
Poolie: We do indeed need to say hkp rather than http in the instructions.
Bug #530476 [branch_
https:/
say who proposed the branch
Poolie: Apparently yes, it's just the docstring is wrong and
registrant_link is the mp registrant.
Bug #530477 [branch.url is empty?]
https:/
empty? Maybe it's not set for hosted branches; if so maybe the doc could
mention that.
-------
RULES
I already updated the wiki page on help.launchpad.net
* Update the inline help to use hkp://keyserver... instead of
http://
* Update the IBranchMergePro
* Update the IBranch url description to mention that the value is None
for Lp hosted branches.
QA
* Visit https:/
* Verify that P"ublishing your key" uses htk://keyserver...
* Visit https:/
* Verify that #branch_
registred the MP.
* Verify that #branch explains that the url is None when Lp hosts the
branch
LINT
lib/lp/
lib/lp/
lib/lp/
IMPLEMENTATION
Updated the documentation. There are no tests for these.
lib/lp/
lib/lp/
lib/lp/
Great collection of fixes Curtis. I do wonder whether we need to specify port 11371. I raise the question and leave it to your unassailable judgment.