Skip to content
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.

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

Docs cookiecutter changes only - Quick Tutorial and all other files #2889

Merged
merged 29 commits into from
Jan 3, 2017

Conversation

stevepiercy
Copy link
Member

@stevepiercy stevepiercy commented Dec 27, 2016

ref: #2384. I rewrote tutorial_approach twice because it was klunky and inaccurate. There were a few other minor corrections as well. Otherwise this is all that was needed for Quick Tutorial.

@stevepiercy stevepiercy self-assigned this Dec 27, 2016
@stevepiercy stevepiercy added this to the 1.8 milestone Dec 27, 2016
@stevepiercy stevepiercy changed the title Docs cookiecutter changes only - Quick Tutorial Docs cookiecutter changes only - Quick Tutorial and all other files Dec 28, 2016
Copy link
Member

@mmerickel mmerickel left a comment

Choose a reason for hiding this comment

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

looks good, one unrelated tweak I saw to waitress if you could make it quick

@@ -1063,7 +1063,7 @@ Glossary

Waitress
A :term:`WSGI` server that runs on UNIX and Windows under Python 2.6+
and Python 3.2+. Projects generated via Pyramid scaffolding use
and Python 3.2+. Projects generated via Pyramid cookiecutters use
Copy link
Member

Choose a reason for hiding this comment

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

3.3+

Copy link
Member Author

Choose a reason for hiding this comment

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

Heh, looks like the deprecations include 2.6 as well as 3.2, but the narrative docs for Waitress still say 2.6 and 3.2. I'll take care of that bit of housekeeping in that repo.

@mmerickel mmerickel merged commit f01e74d into Pylons:master Jan 3, 2017
stevepiercy added a commit to stevepiercy/pyramid that referenced this pull request Jan 3, 2017
stevepiercy added a commit that referenced this pull request Jan 3, 2017
add changelog and whatsnew entry for #2888 and #2889
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants