From c469f2f89685dfcfe5d34a412979c807e3c35c88 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Wed, 21 Dec 2011 00:42:58 -0800 Subject: Split long run-on sentence into two. Attempt to make it more understandable, not sure of technical correctness. --- docs/narr/commandline.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst index b42a7ae9e..a1fcf12f5 100644 --- a/docs/narr/commandline.rst +++ b/docs/narr/commandline.rst @@ -670,9 +670,9 @@ script is installed. Because it's installed into the ``bin`` directory of a virtualenv when the distribution is installed, it's a convenient way to package and distribute functionality that you can call from the command-line. It's often more convenient to create a console script than it is to create a -``.py`` script and instruct people to call it with "the right Python -interpreter": because it generates a file that lives in ``bin``, when it's -invoked, it will always use "the right" Python environment, which means it +``.py`` script and instruct people to call it with the "right" Python +interpreter. A console script generates a file that lives in ``bin``, and when it's +invoked it will always use the "right" Python environment, which means it will always be invoked in an environment where all the libraries it needs (such as Pyramid) are available. -- cgit v1.2.3 From 98360d6f960e666ecc199728b55892eddcf586bb Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Tue, 27 Dec 2011 09:50:10 -0600 Subject: garden --- docs/tutorials/wiki/basiclayout.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst index 56f817a85..308c8e292 100644 --- a/docs/tutorials/wiki/basiclayout.rst +++ b/docs/tutorials/wiki/basiclayout.rst @@ -10,7 +10,7 @@ The source code for this tutorial stage can be browsed via `http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki/src/basiclayout/ `_. -Appplication Configuration with ``__init__.py`` +Application Configuration with ``__init__.py`` ------------------------------------------------ A directory on disk can be turned into a Python :term:`package` by containing -- cgit v1.2.3 From b010d8fc2716f8b08e676957dd4bf9834c369abd Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Sat, 31 Dec 2011 02:23:18 -0500 Subject: fixed typo in contributors --- docs/copyright.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/copyright.rst b/docs/copyright.rst index 9366bdf47..8f3a5f5e7 100644 --- a/docs/copyright.rst +++ b/docs/copyright.rst @@ -59,7 +59,7 @@ Contributors: Merickel, Eric Ongerth, Niall O'Higgins, Christoph Zwerschke, John Anderson, Atsushi Odagiri, Kirk Strauser, JD Navarro, Joe Dallago, Savoir-Faire Linux, Łukasz Fidosz, Christopher Lambacher, Claus Conrad, - Chris Beelby, Phil Jenvey and a number of people with only psuedonyms on + Chris Beelby, Phil Jenvey and a number of people with only pseudonyms on GitHub. Cover Designer: -- cgit v1.2.3 From 8794d59fea64095bdaf15968051c6d62efca79dc Mon Sep 17 00:00:00 2001 From: Mathieu Larose Date: Wed, 4 Jan 2012 15:03:58 -0500 Subject: Removed repetition of the word "the" in the Wiki Tutorial. --- docs/tutorials/wiki2/basiclayout.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst index 77658970d..e4200ae0f 100644 --- a/docs/tutorials/wiki2/basiclayout.rst +++ b/docs/tutorials/wiki2/basiclayout.rst @@ -145,7 +145,7 @@ package. As the result of this view configuration, when the pattern associated with the view named ``home`` is matched during a request, the function named -``my_view`` will be executed. The the function named ``my_view`` returns a +``my_view`` will be executed. The function named ``my_view`` returns a dictionary; the renderer will use the ``templates/mytemplate.pt`` template to create a response based on the values in the dictionary. -- cgit v1.2.3 From 4ded431cba6729e5f2ac1879df735905006555ac Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 4 Jan 2012 19:02:04 -0500 Subject: remove dependency on pysqlite from all scaffolding on platforms lt 2.6 --- docs/tutorials/wiki2/src/authorization/setup.py | 4 ---- docs/tutorials/wiki2/src/basiclayout/setup.py | 4 ---- docs/tutorials/wiki2/src/models/setup.py | 4 ---- docs/tutorials/wiki2/src/tests/setup.py | 4 ---- docs/tutorials/wiki2/src/views/setup.py | 4 ---- docs/tutorials/wiki2/tests.rst | 2 +- 6 files changed, 1 insertion(+), 21 deletions(-) (limited to 'docs') diff --git a/docs/tutorials/wiki2/src/authorization/setup.py b/docs/tutorials/wiki2/src/authorization/setup.py index 7f1ae10b1..964e39010 100644 --- a/docs/tutorials/wiki2/src/authorization/setup.py +++ b/docs/tutorials/wiki2/src/authorization/setup.py @@ -1,5 +1,4 @@ import os -import sys from setuptools import setup, find_packages @@ -18,9 +17,6 @@ requires = [ 'waitress', ] -if sys.version_info[:3] < (2,5,0): - requires.append('pysqlite') - setup(name='tutorial', version='0.0', description='tutorial', diff --git a/docs/tutorials/wiki2/src/basiclayout/setup.py b/docs/tutorials/wiki2/src/basiclayout/setup.py index 44796d4ad..fae1c25a8 100644 --- a/docs/tutorials/wiki2/src/basiclayout/setup.py +++ b/docs/tutorials/wiki2/src/basiclayout/setup.py @@ -1,5 +1,4 @@ import os -import sys from setuptools import setup, find_packages @@ -17,9 +16,6 @@ requires = [ 'waitress', ] -if sys.version_info[:3] < (2,5,0): - requires.append('pysqlite') - setup(name='tutorial', version='0.0', description='tutorial', diff --git a/docs/tutorials/wiki2/src/models/setup.py b/docs/tutorials/wiki2/src/models/setup.py index 44796d4ad..fae1c25a8 100644 --- a/docs/tutorials/wiki2/src/models/setup.py +++ b/docs/tutorials/wiki2/src/models/setup.py @@ -1,5 +1,4 @@ import os -import sys from setuptools import setup, find_packages @@ -17,9 +16,6 @@ requires = [ 'waitress', ] -if sys.version_info[:3] < (2,5,0): - requires.append('pysqlite') - setup(name='tutorial', version='0.0', description='tutorial', diff --git a/docs/tutorials/wiki2/src/tests/setup.py b/docs/tutorials/wiki2/src/tests/setup.py index d8be7539b..d05495fbd 100644 --- a/docs/tutorials/wiki2/src/tests/setup.py +++ b/docs/tutorials/wiki2/src/tests/setup.py @@ -1,5 +1,4 @@ import os -import sys from setuptools import setup, find_packages @@ -19,9 +18,6 @@ requires = [ 'WebTest', # add this ] -if sys.version_info[:3] < (2,5,0): - requires.append('pysqlite') - setup(name='tutorial', version='0.0', description='tutorial', diff --git a/docs/tutorials/wiki2/src/views/setup.py b/docs/tutorials/wiki2/src/views/setup.py index 05c7be2d7..834280118 100644 --- a/docs/tutorials/wiki2/src/views/setup.py +++ b/docs/tutorials/wiki2/src/views/setup.py @@ -1,5 +1,4 @@ import os -import sys from setuptools import setup, find_packages @@ -18,9 +17,6 @@ requires = [ 'docutils', ] -if sys.version_info[:3] < (2,5,0): - requires.append('pysqlite') - setup(name='tutorial', version='0.0', description='tutorial', diff --git a/docs/tutorials/wiki2/tests.rst b/docs/tutorials/wiki2/tests.rst index 25cf2c25e..92544404c 100644 --- a/docs/tutorials/wiki2/tests.rst +++ b/docs/tutorials/wiki2/tests.rst @@ -55,7 +55,7 @@ Change the ``requires`` list in ``setup.py`` to include ``WebTest``. .. literalinclude:: src/tests/setup.py :linenos: :language: python - :lines: 10-19 + :lines: 9-20 After we've added a dependency on WebTest in ``setup.py``, we need to rerun ``setup.py develop`` to get WebTest installed into our virtualenv. Assuming -- cgit v1.2.3