Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Clean up pages, making more easy to grasp core content

  • Loading branch information...
commit bf5d19a10ee651530765aa9bc7e9c3892a76aece 1 parent bb98137
@amol- amol- authored
Showing with 52 additions and 100 deletions.
  1. +34 −21 src/current-status.rst
  2. +17 −78 src/resources.rst
  3. +1 −1  src/themes/w3/layout.html
View
55 src/current-status.rst
@@ -1,35 +1,48 @@
########################
- Current Project Status
+Project Status
########################
-TurboGears was first released in 2005. Due to that age, we actually have two major release versions in production.
+TurboGears was first released in 2005. Due to that age, TurboGears has always had two branches of development
+for a lot of time. We recommend new projects start on TurboGears2 which is the currently actively under development
+branch of TurboGears.
-TurboGears 1, or TG1 for short, is our legacy version. It is fully supported, and even still being enhanced to allow installation on new versions of Python, and on new OSes. Note that we do not recommend new development occurring on TG1.
+Latest stable release: 2.2.2 - released Jan 30, 2013
-TurboGears 2, or TG2 for short, is the current production version. It is being maintained, new features are being added, and we are actively working to make TG2 the best of breed out there. Note that we do recommend all new development occur on TG2.
+Release announcement available at: http://codersbuffet.blogspot.it/search/label/turbogears
-#####################
- TurboGears 2 Status
-#####################
+***************************
+Contributing to TurboGears
+***************************
-Latest stable release: 2.2.0 - released Aug 23, 2012
+All the TurboGears related projects are available on GitHub under the `TurboGears`_ account,
+if you want to take a look at TurboGears source code you can start there.
+In particular, we have several repositories for public use. The main ones are:
-We've just released 2.2.0.
+- `TG2.x Core (Git)`_ - The actual framework code lives here
+- `TG2.x Devtools (Git)`_ - Useful tools used during development
+- `TG2.x Docs (Git)`_ - The documentation repository
-See our release announcement for details.
+For continuous integration work, we use `Travis`_.
-#####################
- TurboGears 1 Status
-#####################
+Development happens on two core branches: the ``development`` one where major changes for
+the upcoming scheduled release happens and ``master`` branch which will point to the
+current stable release. Minor bugfix releases are branched from master on demand and merge
+back into the master branch when the release happens.
-Latest stable release: 1.5
+To create your development environment you can perform:
-We have also moved all of TG1 onto the new server. The documentation which has been collected first in the Trac wiki and then in the MoinMoin wiki, has now been migrated to static Sphinx format docs.
+.. code-block:: bash
-################
- Overall Status
-################
+ virtualenv --no-site-packages ${HOME}/tg2env
+ source ${HOME}/tg2env/bin/activate
+ git clone git@github.com:TurboGears/tg2.git
+ cd tg2
+ python setup.py tgdevelop
+ python setup.py tgtesting
+ python setup.py tgnose
-We've been using `Google+`_ more and more to update on what's going. Please follow us there to keep up to date.
-
-.. _Google+: http://plus.ly/turbogears
+.. _`TG2.x Core (Git)`: https://github.com/TurboGears/tg2
+.. _`TG2.x Devtools (Git)`: https://github.com/TurboGears/tg2devtools
+.. _`TG2.x Docs (Git)`: https://github.com/TurboGears/tg2docs
+.. _`Travis`: https://travis-ci.org/TurboGears/tg2
+.. _`TurboGears`: https://github.com/TurboGears
View
95 src/resources.rst
@@ -1,96 +1,35 @@
-#########################
- Resources and Community
-#########################
+##########################
+ Community and Consulting
+##########################
-For the TurboGears project, we use a great many resources that are available to the community.
+This page gathers a list of resources available to the TurboGears community,
+mailing lists and chats where they gather and references for companies who
+need training or consulting.
***********************************
- Community Projects and Extensions
+Community Projects and Extensions
***********************************
-For community made projects related to TurboGears take a look at the `CogBin`_, to have your project listed there just put it on PyPi and provide the right keywords.
+For community made projects related to TurboGears take a look at the `CogBin`_,
+to have your project listed there just put it on PyPi and provide the right keywords.
-****************
- Project Status
-****************
+*****************************
+News, Mailing Lists and IRC
+*****************************
-We have moved `TurboGears 2`_ over to `Github`_. `TurboGears 1`_ will, for the foreseeable future, remain on `Sourceforge`_. All main development is happening on `Github`_, so please track the goings on there.
+Most of the TurboGears related news are available on the TurboGears `Google+`_ channel.
-***********************
- Mailing Lists and IRC
-***********************
-
-For our mailing lists, we use Google Groups, both for the `development`_ and `end user`_ lists.
+Questions and support requests, or plain discussion about TurboGears can be
+addressed on the TurboGears `end user`_ mailing list, while discussions about
+future development of the framework happens on the `development`_ list.
Finally, we also have an `irc channel`_.
As you can see, we're on a lot of places. We hope to see you on one of them!
-*******************
- How To Contribute
-*******************
-
-For source code management and issue tracking, we use Github. In particular, we have several repositories for public use. The main ones are:
-
-- `TG2.x Core (Git)`_ - The actual framework code lives here
-- `TG2.x Devtools (Git)`_ - Useful tools used during development
-- `TG2.x Docs (Git)`_ - The documentation repository
-
-For continuous integration work, we use `Jenkins`_.
-
-As you can see, we are sharing this instance with other projects, but we still get quite a bit of good work out of it.
-
-To create your development environment you can perform:
-
-.. code-block:: bash
-
- virtualenv --no-site-packages ${HOME}/tg2env
- source ${HOME}/tg2env/bin/activate
- git clone git@github.com:TurboGears/tg2.git
- cd tg2
- python setup.py tgdevelop
- python setup.py tgtesting
- python setup.py tgnose
-
-For contributing to TG1 the available resources are:
-
-- `TG1 Issues`_ - The Sourceforge Issue Tracker for TG1
-- `TG1 (SVN)`_ - All TurboGears1 code lives here
-
-*********************************************
- How do I provide translations for the site?
-*********************************************
-
-The site is managed by a CMS known as tgext.pages. There are no .po or .pot files to manage or update. Instead, if you wish to provide a translation to your language for any given page, you need to send an email to our Google Group mailing list with the following information:
-
-- The URL of the page you are translating
-- The two character language code of the language you are translating to
-- The title of the page in that language
-- The name that will appear in the menu bar in that language
-- The text of that page in that language.
-
-For instance, to translate the welcome page to French, you would send an email looking like the following::
-
- Subject: Translation of welcome page
- URL: http://beta.turbogears.org/en/welcome
- Title: Bienvenue
- Menu Name: Bienvenue
- Page Text:
- Bienvenue sur notre site. Ce site est le site de TurboGears.
-
-And we would then upload the translation for that page.
.. _`CogBin`: http://turbogears.org/cogbin
-.. _`TurboGears 2`: https://www.github.com/TurboGears/
-.. _`Github`: https://www.github.com/
-.. _`TurboGears 1`: https://sourceforge.net/p/turbogears2/turbogears1/
-.. _`Sourceforge`: https://www.sf.net/
+.. _`Google+`: https://plus.google.com/115723575598932631951
.. _`development`: http://groups.google.com/group/turbogears-trunk
.. _`end user`: http://groups.google.com/group/turbogears
.. _`irc channel`: irc://irc.freenode.net/turbogears
-.. _`TG2.x Core (Git)`: https://github.com/TurboGears/tg2
-.. _`TG2.x Devtools (Git)`: https://github.com/TurboGears/tg2devtools
-.. _`TG2.x Docs (Git)`: https://github.com/TurboGears/tg2docs
-.. _`Jenkins`: http://jenkins.turbogears.org/view/TurboGears%20Hosted/
-.. _`TG1 Issues`: http://sourceforge.net/p/turbogears1/tickets/
-.. _`TG1 (SVN)`: http://sourceforge.net/p/turbogears1/code/
View
2  src/themes/w3/layout.html
@@ -33,7 +33,7 @@
<li><a href="{{ pathto('documentation') }}">Documentation</a></li>
<li><a href="{{ pathto('resources') }}">Community</a></li>
<li><a href="{{ pathto('whos-using') }}">Who's Using It?</a></li>
- <li><a href="{{ pathto('current-status') }}">Current Status</a></li>
+ <li><a href="{{ pathto('current-status') }}">Project Status & Contributing</a></li>
<li><a href="{{ pathto('cogbin') }}">The CogBin</a></li>
<li><a href="http://planet.turbogears.org/">Planet</a></li>
</ul>
Please sign in to comment.
Something went wrong with that request. Please try again.