Renamed paste-setup to paster; removed paste-server; fixed up docs and setup.py

4 files changed, 11 insertions, 15 deletions

diff --git a/docs/TodoTutorial.txt b/docs/TodoTutorial.txt
index 34cb537..c7b53c7 100644
--- a/docs/TodoTutorial.txt
+++ b/docs/TodoTutorial.txt
@@ -68,7 +68,7 @@ Let's start out quickly.  We'll be installing the application in
     >>> import sys
     >>> sys.path.append('/path/to/Paste')
     >>> clear_dir(BASE)
-    >>> run("paste-setup create --template=webkit_zpt %s" % BASE)
+    >>> run("paster create --template=webkit_zpt %s" % BASE)
     >>> os.chdir(BASE)
     >>> ls(recurse=True)
     __init__.py
@@ -88,7 +88,7 @@ Let's start out quickly.  We'll be installing the application in
 
     $ export PYTHONPATH=/path/to/Paste:$PYTHONPATH
     $ BASE=/var/www/example-builds/todo_sql
-    $ paste-setup create --template=webkit_zpt $BASE
+    $ paster create --template=webkit_zpt $BASE
     $ cd $BASE
     $ ls -R
     .:
diff --git a/docs/blog-tutorial.txt b/docs/blog-tutorial.txt
index 27a9d45..d0931e9 100644
--- a/docs/blog-tutorial.txt
+++ b/docs/blog-tutorial.txt
@@ -55,14 +55,14 @@ Setting Up The App
     >>> BASE = '/var/www/example-builds/wwblog'
     >>> import sys
     >>> clear_dir(BASE)
-    >>> run("paste-setup create --template=webkit_zpt %s" % BASE)
+    >>> run("paster create --template=webkit_zpt %s" % BASE)
     >>> os.chdir(BASE)
 
 ::
 
     $ export PYTHONPATH=/path/to/Paste:$PYTHONPATH
     $ BASE=/var/www/example-builds/wwblog
-    $ paste-setup create --template=webkit_zpt $BASE
+    $ paster create --template=webkit_zpt $BASE
     $ cd $BASE
 
 The Model
diff --git a/docs/roadmap.txt b/docs/roadmap.txt
index fab8e69..5dc24eb 100644
--- a/docs/roadmap.txt
+++ b/docs/roadmap.txt
@@ -16,12 +16,8 @@ particular order.
 To-Do
 =====
 
-paste-setup
------------
-
-* **Rename executable script**
-
-* **Remove ``paste-server``**
+paster
+------
 
 * **Package installation and upgrading.**
 
@@ -58,7 +54,7 @@ paste.tests.doctest_webapp
 --------------------------
 
 * Maybe move out of ``tests`` package.
-* Make it fail hard on certain errors (e.g., when ``paste-setup`` fail
+* Make it fail hard on certain errors (e.g., when ``paster`` fail
 
 paste.tests.fixture
 -------------------
diff --git a/docs/what-is-paste.txt b/docs/what-is-paste.txt
index f4595db..b55df9f 100644
--- a/docs/what-is-paste.txt
+++ b/docs/what-is-paste.txt
@@ -139,7 +139,7 @@ test.
 Application Templates
 ---------------------
 
-One facility in Paste is ``paste-setup`` a script to create
+One facility in Paste is ``paster`` a script to create
 application "templates".  Basically an empty application, with a
 little structure.  For instance, the Webware/Zope Page Template
 (webkit_zpt) application template sets up these files::
@@ -154,9 +154,9 @@ little structure.  For instance, the Webware/Zope Page Template
     web/static/stylesheet.css
 
 This is a kind of a minimal set up for a typical web application using
-these systems.  After the application is set up, ``paste-setup`` can
+these systems.  After the application is set up, ``paster`` can
 provide other commands.  For instance in a webkit_zpt application
-``paste-setup servlet edit`` will create ``web/edit.py`` and
+``paster servlet edit`` will create ``web/edit.py`` and
 ``web/edit.pt`` files.  Each template has control implement any
 commands how it sees fit, but some convenient functions and classes
 are provided to make implementation easier.
@@ -167,7 +167,7 @@ Distribution
 This is still an open issue, but I hope Paste will facilitate
 installation of multiple frameworks quickly.  Some of this is handled
 already: ``paste-server`` starts a server easily and quickly, and
-``paste-setup`` gives a user the basis for an application quickly.
+``paster`` gives a user the basis for an application quickly.
 Actual software installation is a little harder.  Right now the plan
 is to use `Python Eggs
 <http://peak.telecommunity.com/DevCenter/PythonEggs>`_, but it's just