From b1492d24aba4b3af7e24cc725b5e6410a97d988d Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Wed, 23 Nov 2011 20:35:43 -0800
Subject: [PATCH] catch a few more mapnik2 references

---
 plugins/input/templates/helloworld/README | 2 +-
 utils/epydoc_config/build_epydoc.sh       | 2 +-
 utils/epydoc_config/test_build_epydoc.sh  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/input/templates/helloworld/README b/plugins/input/templates/helloworld/README
index 51483d65a..90fbd736f 100644
--- a/plugins/input/templates/helloworld/README
+++ b/plugins/input/templates/helloworld/README
@@ -31,7 +31,7 @@ the middle of any map tile and display a "hello world!" label if used like:
 
 Or used in python like:
 
-from mapnik2 import *
+from mapnik import *
 m = Map(600,400)
 m.background = Color('white')
 s = Style()
diff --git a/utils/epydoc_config/build_epydoc.sh b/utils/epydoc_config/build_epydoc.sh
index 3644c8a2a..c491cf24b 100755
--- a/utils/epydoc_config/build_epydoc.sh
+++ b/utils/epydoc_config/build_epydoc.sh
@@ -11,7 +11,7 @@ fi
 epydoc --no-private \
     --no-frames \
     --no-sourcecode \
-    --name mapnik2 \
+    --name mapnik \
     --url http://mapnik.org \
     --css mapnik_epydoc.css mapnik2 \
     -o $API_DOCS_DIR
diff --git a/utils/epydoc_config/test_build_epydoc.sh b/utils/epydoc_config/test_build_epydoc.sh
index dd03d8725..98e7ec042 100755
--- a/utils/epydoc_config/test_build_epydoc.sh
+++ b/utils/epydoc_config/test_build_epydoc.sh
@@ -1,2 +1,2 @@
 rm -rf test_api
-epydoc --no-private --no-frames --no-sourcecode --name mapnik2 --url http://mapnik.org --css mapnik_epydoc.css mapnik2 -o test_api
+epydoc --no-private --no-frames --no-sourcecode --name mapnik --url http://mapnik.org --css mapnik_epydoc.css mapnik2 -o test_api