[2.7] bpo-33518: Add PEP entry to documentation glossary (GH-6860). by andresdelfino · Pull Request #6936

[2.7] bpo-33518: Add PEP entry to documentation glossary (GH-6860). by andresdelfino · Pull Request #6936 · python/cpython

…).

(cherry picked from commit d5f1442)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>

Choose a reason for hiding this comment

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

LGTM.

There was an issue, maybe a conflict. I clicked on [Update branch] button.

Oh. All tests passed, but I still cannot merge because "This branch is out-of-date with the base branch". Crap. Let me try to click on [Update branch] again :-(

@andresdelfino: I have some troubles to merge this PR. Ping me if I don't merge it.

Should I create a new PR from scratch with an up to date 2.7 branch?

I have merged the latest commits, perhaps we can try again?

The [Squash and merge] button is still grey. Now it says "Required statuses must pass before merging", GitHub is waiting on AppVeyor: "Pending — Waiting for AppVeyor build to complete"... The build started 1 min ago.

@vstinner: Please replace # with GH- in the commit message next time. Thanks!

Finally. I succeded to merge this PR. I don't know why it was so hard to merge a simple doc change...