Permalink
Browse files

Merge branch 'master' of github.com:TurboGears/tgwebsite

  • Loading branch information...
pedersen committed Feb 13, 2013
2 parents 5eb2970 + 84f573d commit 7bb29e7ffcbe797d77a95ee000ffbe8e9aa4a3b0
Showing with 6 additions and 5 deletions.
  1. +6 −5 src/documentation.rst
View
@@ -2,22 +2,23 @@
Getting Started and Documentation Links
#########################################
-The TurboGears documentation is in a state of flux. We have a `new book`_ we're working on, and that should be your first stop. It's very light, but includes information on how to get started with TurboGears, and how to contribute.
+The TurboGears documentation is in a state of flux. We have a `new book`_ we're working on, and the and that should be your first stop. It's very light, but includes information on how to get started with TurboGears, and how to contribute.
After that, if your answer is not there, we recommend you check out the older documentation, which has more, but is going to be turned into that book.
-To install the current version of TurboGears, please review the `2.2 Installation`_ document. For doing more, please review `the book`_ and then the general index for `2.2 documentation`_.
+To install the current version of TurboGears, please review the `Installation`_ document. For doing more, please review the `TurboGears Documentation`_.
.. rst-class:: doclink
|batteriesincluded| `TurboGears2 Web Apps: Batteries Included`_
- |tgdocs| `TurboGears 2.2 Documentation`_
+ |tgdocs| `TurboGears Documentation`_
|tutorials| `CheatSheet`_ and `Poster`_
We have several older versions of TurboGears, and we continue to support all of them. As such, we also have several older versions of the documentation. While we will eventually reduce the 2.x documentation into a single set, we are not yet ready for this.
+- `2.2 Documentation`_ (`2.2 Installation`_)
- `2.1 Documentation`_ (`2.1 Installation`_)
- `2.0 Documentation`_ (`2.0 Installation`_)
- `1.5 Documentation`_ (`1.5 Installation`_)
@@ -27,10 +28,10 @@ We have several older versions of TurboGears, and we continue to support all of
.. |batteriesincluded| image:: _static/images/beginner.png
.. |tgdocs| image:: _static/images/extending.png
.. |tutorials| image:: _static/images/tutorials.png
-.. _`the book`: http://www.turbogears.org/book/
.. _`new book`: http://www.turbogears.org/book/
.. _`TurboGears2 Web Apps: Batteries Included`: http://www.turbogears.org/book/
-.. _`TurboGears 2.2 Documentation`: http://www.turbogears.org/2.2/docs
+.. _`TurboGears Documentation`: http://turbogears.readthedocs.org/en/latest/
+.. _`Installation`: http://turbogears.readthedocs.org/en/latest/main/DownloadInstall.html
.. _`CheatSheet`: http://www.turbogears.org/2.2/docs/Cheatsheet.pdf
.. _`Poster`: http://www.turbogears.org/2.2/docs/Poster.pdf
.. _`2.2 Documentation`: http://www.turbogears.org/2.2/docs

0 comments on commit 7bb29e7

Please sign in to comment.