From 156c7fa32d6bf6e7786967920ca89403b0eb16fd Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Mon, 1 May 2017 21:38:08 -0500 Subject: link to 1.9-branch in contributing --- contributing.md | 2 ++ 1 file changed, 2 insertions(+) (limited to 'contributing.md') diff --git a/contributing.md b/contributing.md index 9deeee035..82f60e7b8 100644 --- a/contributing.md +++ b/contributing.md @@ -26,6 +26,8 @@ listed below. * [master](https://github.com/Pylons/pyramid/) - The branch on which further development takes place. The default branch on GitHub. +* [1.9-branch](https://github.com/Pylons/pyramid/tree/1.9-branch) - The branch + classified as "alpha". * [1.8-branch](https://github.com/Pylons/pyramid/tree/1.8-branch) - The branch classified as "stable" or "latest". * [1.7-branch](https://github.com/Pylons/pyramid/tree/1.7-branch) - The oldest -- cgit v1.2.3 From 2cd6a6dbcdb517788ef3275af63feca703e73658 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Thu, 15 Jun 2017 21:59:18 -0700 Subject: Use HTTPS for pylonsproject.org --- contributing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contributing.md') diff --git a/contributing.md b/contributing.md index 82f60e7b8..c0f842e3e 100644 --- a/contributing.md +++ b/contributing.md @@ -3,7 +3,7 @@ Contributing All projects under the Pylons Projects, including this one, follow the guidelines established at [How to -Contribute](http://www.pylonsproject.org/community/how-to-contribute) and +Contribute](https://pylonsproject.org//community/how-to-contribute) and [Coding Style and Standards](http://docs.pylonsproject.org/en/latest/community/codestyle.html). -- cgit v1.2.3 From 80ce00e7a408fc295d9eb1ffef3cdc6073a01b5e Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Thu, 15 Jun 2017 22:04:05 -0700 Subject: remove trailing slash --- contributing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contributing.md') diff --git a/contributing.md b/contributing.md index c0f842e3e..83a3f5b6e 100644 --- a/contributing.md +++ b/contributing.md @@ -3,7 +3,7 @@ Contributing All projects under the Pylons Projects, including this one, follow the guidelines established at [How to -Contribute](https://pylonsproject.org//community/how-to-contribute) and +Contribute](https://pylonsproject.org/community/how-to-contribute) and [Coding Style and Standards](http://docs.pylonsproject.org/en/latest/community/codestyle.html). -- cgit v1.2.3 From d505174d3217025ea87a7b51d0adff73c5e9e199 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Thu, 15 Jun 2017 22:05:32 -0700 Subject: fix URL --- contributing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contributing.md') diff --git a/contributing.md b/contributing.md index 83a3f5b6e..5e0ac53bf 100644 --- a/contributing.md +++ b/contributing.md @@ -3,7 +3,7 @@ Contributing All projects under the Pylons Projects, including this one, follow the guidelines established at [How to -Contribute](https://pylonsproject.org/community/how-to-contribute) and +Contribute](https://pylonsproject.org/community-how-to-contribute.html) and [Coding Style and Standards](http://docs.pylonsproject.org/en/latest/community/codestyle.html). -- cgit v1.2.3 From 19d341b5be789e97000d3dcbd33de75d8b061829 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Mon, 26 Jun 2017 03:48:21 -0700 Subject: change http://docs.pylonsproject.org to https - use correct URL for code style - use correct Pyramid version for zodb wiki src file template --- contributing.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'contributing.md') diff --git a/contributing.md b/contributing.md index 5e0ac53bf..fec4f4f27 100644 --- a/contributing.md +++ b/contributing.md @@ -5,7 +5,7 @@ All projects under the Pylons Projects, including this one, follow the guidelines established at [How to Contribute](https://pylonsproject.org/community-how-to-contribute.html) and [Coding Style and -Standards](http://docs.pylonsproject.org/en/latest/community/codestyle.html). +Standards](https://pylonsproject.org/community-coding-style-standards.html). You can contribute to this project in several ways. @@ -51,7 +51,7 @@ Building documentation for a Pylons Project project improve the process for Windows users are welcome by submitting an issue or a pull request. Windows users may find it helpful to follow the guide [Installing Pyramid on a Windows -System](http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/install.html#installing-pyramid-on-a-windows-system). +System](https://docs.pylonsproject.org/projects/pyramid/en/latest/narr/install.html#installing-pyramid-on-a-windows-system). 1. Fork the repo on GitHub by clicking the [Fork] button. 2. Clone your fork into a workspace on your local machine. -- cgit v1.2.3 From 884eb55bbaef486deadb629d87abc0bf46a11719 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Tue, 27 Jun 2017 00:10:12 -0500 Subject: prep 1.10.dev0 --- contributing.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'contributing.md') diff --git a/contributing.md b/contributing.md index fec4f4f27..3b960c1e1 100644 --- a/contributing.md +++ b/contributing.md @@ -27,10 +27,8 @@ listed below. * [master](https://github.com/Pylons/pyramid/) - The branch on which further development takes place. The default branch on GitHub. * [1.9-branch](https://github.com/Pylons/pyramid/tree/1.9-branch) - The branch - classified as "alpha". -* [1.8-branch](https://github.com/Pylons/pyramid/tree/1.8-branch) - The branch classified as "stable" or "latest". -* [1.7-branch](https://github.com/Pylons/pyramid/tree/1.7-branch) - The oldest +* [1.8-branch](https://github.com/Pylons/pyramid/tree/1.8-branch) - The oldest actively maintained and stable branch. Older branches are not actively maintained. In general, two stable branches and -- cgit v1.2.3 From 7534d3d7f45658dd5acdca2d445d8a38ffc66451 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Mon, 26 Jun 2017 23:28:21 -0700 Subject: add 1.10 alpha branch --- contributing.md | 1 + 1 file changed, 1 insertion(+) (limited to 'contributing.md') diff --git a/contributing.md b/contributing.md index 3b960c1e1..f51e654d7 100644 --- a/contributing.md +++ b/contributing.md @@ -26,6 +26,7 @@ listed below. * [master](https://github.com/Pylons/pyramid/) - The branch on which further development takes place. The default branch on GitHub. +* [1.10-branch](https://github.com/Pylons/pyramid/tree/1.10-branch) - The branch classified as "alpha". * [1.9-branch](https://github.com/Pylons/pyramid/tree/1.9-branch) - The branch classified as "stable" or "latest". * [1.8-branch](https://github.com/Pylons/pyramid/tree/1.8-branch) - The oldest -- cgit v1.2.3 From e2110176fe0e6c6dd1891be2761fe33fc23fb650 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Mon, 26 Jun 2017 23:34:42 -0700 Subject: remove 1.10 alpha branch until it is actually released --- contributing.md | 1 - 1 file changed, 1 deletion(-) (limited to 'contributing.md') diff --git a/contributing.md b/contributing.md index f51e654d7..3b960c1e1 100644 --- a/contributing.md +++ b/contributing.md @@ -26,7 +26,6 @@ listed below. * [master](https://github.com/Pylons/pyramid/) - The branch on which further development takes place. The default branch on GitHub. -* [1.10-branch](https://github.com/Pylons/pyramid/tree/1.10-branch) - The branch classified as "alpha". * [1.9-branch](https://github.com/Pylons/pyramid/tree/1.9-branch) - The branch classified as "stable" or "latest". * [1.8-branch](https://github.com/Pylons/pyramid/tree/1.8-branch) - The oldest -- cgit v1.2.3