From acee862db2ac480384693009af5c2f1af87efdc6 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 2 Jul 2011 17:00:49 -0400 Subject: remove male pronoun --- docs/tutorials/wiki2/background.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/tutorials/wiki2/background.rst') diff --git a/docs/tutorials/wiki2/background.rst b/docs/tutorials/wiki2/background.rst index 880b5b219..79b39914b 100644 --- a/docs/tutorials/wiki2/background.rst +++ b/docs/tutorials/wiki2/background.rst @@ -10,7 +10,7 @@ people without any prior Python web framework experience. To code along with this tutorial, the developer will need a UNIX machine with development tools (Mac OS X with XCode, any Linux or BSD -variant, etc) *or* he will need a Windows system of any kind. +variant, etc) *or* a Windows system of any kind. This tutorial is targeted at :app:`Pyramid` version 1.0. -- cgit v1.2.3 From 4284a8b7ce3c54cc8a55b7d4798a1e3fe57ba7f0 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 22 Aug 2011 02:39:42 -0400 Subject: remove time bombs --- docs/tutorials/wiki2/background.rst | 2 -- 1 file changed, 2 deletions(-) (limited to 'docs/tutorials/wiki2/background.rst') diff --git a/docs/tutorials/wiki2/background.rst b/docs/tutorials/wiki2/background.rst index 79b39914b..ef459a93d 100644 --- a/docs/tutorials/wiki2/background.rst +++ b/docs/tutorials/wiki2/background.rst @@ -12,6 +12,4 @@ To code along with this tutorial, the developer will need a UNIX machine with development tools (Mac OS X with XCode, any Linux or BSD variant, etc) *or* a Windows system of any kind. -This tutorial is targeted at :app:`Pyramid` version 1.0. - Have fun! -- cgit v1.2.3 From 1e585bc07024b69e5fb792abcab4244b90a5b49e Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 17 Mar 2012 13:52:35 -0400 Subject: dont make a judgment as to whom this will be most familiar for --- docs/tutorials/wiki2/background.rst | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'docs/tutorials/wiki2/background.rst') diff --git a/docs/tutorials/wiki2/background.rst b/docs/tutorials/wiki2/background.rst index ef459a93d..17aaf755f 100644 --- a/docs/tutorials/wiki2/background.rst +++ b/docs/tutorials/wiki2/background.rst @@ -2,11 +2,10 @@ Background ========== -This tutorial presents a :app:`Pyramid` application that uses -technologies which will be familiar to someone with :term:`Pylons` -experience. It uses :term:`SQLAlchemy` as a persistence mechanism and -:term:`url dispatch` to map URLs to code. It can also be followed by -people without any prior Python web framework experience. +This tutorial presents a :app:`Pyramid` application that uses technologies +which will be familiar to someone with SQL database experience. It uses +:term:`SQLAlchemy` as a persistence mechanism and :term:`url dispatch` to map +URLs to code. To code along with this tutorial, the developer will need a UNIX machine with development tools (Mac OS X with XCode, any Linux or BSD -- cgit v1.2.3 From 32b61124d87531fa0f8b277ccff6d3ea43052773 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 17 Mar 2012 16:32:08 -0400 Subject: warn about python 3 --- docs/tutorials/wiki2/background.rst | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/tutorials/wiki2/background.rst') diff --git a/docs/tutorials/wiki2/background.rst b/docs/tutorials/wiki2/background.rst index 17aaf755f..9933adc27 100644 --- a/docs/tutorials/wiki2/background.rst +++ b/docs/tutorials/wiki2/background.rst @@ -11,4 +11,9 @@ To code along with this tutorial, the developer will need a UNIX machine with development tools (Mac OS X with XCode, any Linux or BSD variant, etc) *or* a Windows system of any kind. +.. warning:: + + This tutorial has been written for Python 2. It is unlikely to work + without modification under Python 3. + Have fun! -- cgit v1.2.3 From 168e94f0693600b122619222dd5cf2053b1d96ae Mon Sep 17 00:00:00 2001 From: Tshepang Lekhonkhobe Date: Sun, 6 Jan 2013 20:25:07 +0200 Subject: I have tested this on Python 3, and it works without modification --- docs/tutorials/wiki2/background.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'docs/tutorials/wiki2/background.rst') diff --git a/docs/tutorials/wiki2/background.rst b/docs/tutorials/wiki2/background.rst index 9933adc27..1f9582903 100644 --- a/docs/tutorials/wiki2/background.rst +++ b/docs/tutorials/wiki2/background.rst @@ -11,9 +11,8 @@ To code along with this tutorial, the developer will need a UNIX machine with development tools (Mac OS X with XCode, any Linux or BSD variant, etc) *or* a Windows system of any kind. -.. warning:: +.. note:: - This tutorial has been written for Python 2. It is unlikely to work - without modification under Python 3. + This tutorial runs on both Python 2 and 3 without modification. Have fun! -- cgit v1.2.3 From 3e6b601d9bc557b5b698d5fd4d6eb20b151a424f Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Mon, 25 May 2015 13:53:05 -0700 Subject: cherry pick from 1.5-branch --- docs/tutorials/wiki2/background.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'docs/tutorials/wiki2/background.rst') diff --git a/docs/tutorials/wiki2/background.rst b/docs/tutorials/wiki2/background.rst index 1f9582903..b8afb8305 100644 --- a/docs/tutorials/wiki2/background.rst +++ b/docs/tutorials/wiki2/background.rst @@ -2,10 +2,12 @@ Background ========== -This tutorial presents a :app:`Pyramid` application that uses technologies -which will be familiar to someone with SQL database experience. It uses +This version of the :app:`Pyramid` wiki tutorial presents a +:app:`Pyramid` application that uses technologies which will be +familiar to someone with SQL database experience. It uses :term:`SQLAlchemy` as a persistence mechanism and :term:`url dispatch` to map -URLs to code. +URLs to code. It can also be followed by people without any prior +Python web framework experience. To code along with this tutorial, the developer will need a UNIX machine with development tools (Mac OS X with XCode, any Linux or BSD -- cgit v1.2.3 From 6a2bdac1ec3b1fb6ed37bc8b92b807df6c0fa07d Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sun, 21 Feb 2016 03:21:10 -0800 Subject: wiki2 docs update WIP - minor grammar, .rst syntax - add pip to glossary - add pip instructions, commented until 1.7 is released --- docs/tutorials/wiki2/background.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/tutorials/wiki2/background.rst') diff --git a/docs/tutorials/wiki2/background.rst b/docs/tutorials/wiki2/background.rst index b8afb8305..2dac847d8 100644 --- a/docs/tutorials/wiki2/background.rst +++ b/docs/tutorials/wiki2/background.rst @@ -5,13 +5,13 @@ Background This version of the :app:`Pyramid` wiki tutorial presents a :app:`Pyramid` application that uses technologies which will be familiar to someone with SQL database experience. It uses -:term:`SQLAlchemy` as a persistence mechanism and :term:`url dispatch` to map +:term:`SQLAlchemy` as a persistence mechanism and :term:`URL dispatch` to map URLs to code. It can also be followed by people without any prior Python web framework experience. To code along with this tutorial, the developer will need a UNIX machine with development tools (Mac OS X with XCode, any Linux or BSD -variant, etc) *or* a Windows system of any kind. +variant, etc.) *or* a Windows system of any kind. .. note:: -- cgit v1.2.3 From 640d7779b69f49ab11d7e276a7548684524bc215 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sat, 9 Apr 2016 13:36:11 -0700 Subject: - add intersphinx targets --- docs/tutorials/wiki2/background.rst | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/tutorials/wiki2/background.rst') diff --git a/docs/tutorials/wiki2/background.rst b/docs/tutorials/wiki2/background.rst index 2dac847d8..ee7dfe36f 100644 --- a/docs/tutorials/wiki2/background.rst +++ b/docs/tutorials/wiki2/background.rst @@ -1,3 +1,5 @@ +.. _wiki2_background: + ========== Background ========== -- cgit v1.2.3