Renamed webkit_dir to publish_dir

6 files changed, 8 insertions, 8 deletions

diff --git a/docs/Paste.txt b/docs/Paste.txt
index e822215..3cd24f0 100644
--- a/docs/Paste.txt
+++ b/docs/Paste.txt
@@ -72,7 +72,7 @@ like::
 
     host = 'localhost'
     port = 8080
-    webkit_dir = '/path/to/dir'
+    publish_dir = '/path/to/dir'
     database_name = 'app_data'
 
 And so on.  There's a default configuration file in
@@ -89,7 +89,7 @@ Some important configuration values:
     The (string) name of the server you want to use.  Right now there
     is ``"wsgiutils"`` and ``"twisted"``.
 
-``webkit_dir``:
+``publish_dir``:
     The base directory to find Webware servlets.  (In the future other
     frameworks will also be supported.)
 
diff --git a/examples/todo_sql/server.conf b/examples/todo_sql/server.conf
index 0b38b2a..fa99577 100644
--- a/examples/todo_sql/server.conf
+++ b/examples/todo_sql/server.conf
@@ -5,7 +5,7 @@ database = 'sqlite:%s/data.db' % os.path.dirname(__file__)
 
 app_template = 'webkit_zpt'
 app_name = 'todo_sql'
-webkit_dir = '/var/www/todo_sql/web'
+publish_dir = '/var/www/todo_sql/web'
 sys_path = ['/var/www']
 
 ## Server options:
diff --git a/paste/app_templates/webkit_zpt/template/server.conf b/paste/app_templates/webkit_zpt/template/server.conf
index 5935785..33cd9c4 100644
--- a/paste/app_templates/webkit_zpt/template/server.conf
+++ b/paste/app_templates/webkit_zpt/template/server.conf
@@ -4,7 +4,7 @@ import os
 
 app_template = $str_template_name
 app_name = $str_app_name
-webkit_dir = os.path.join($str_absolute_base_dir, 'web')
+publish_dir = os.path.join($str_absolute_base_dir, 'web')
 sys_path = [$str_absolute_parent]
 
 ## Server options:
diff --git a/paste/server.py b/paste/server.py
index 878a301..24a9b38 100755
--- a/paste/server.py
+++ b/paste/server.py
@@ -245,8 +245,8 @@ def console_server(conf, app):
 servers['console'] = console_server
 
 def make_app(conf):
-    if conf.get('webkit_dir'):
-        app = wsgiwebkit.webkit(conf['webkit_dir'], use_lint=conf.get('lint'))
+    if conf.get('publish_dir'):
+        app = wsgiwebkit.webkit(conf['publish_dir'], use_lint=conf.get('lint'))
     else:
         print "You must provide --webkit-dir"
         sys.exit(2)
diff --git a/paste/server_script_template.py b/paste/server_script_template.py
index 504e371..aa5c1cb 100644
--- a/paste/server_script_template.py
+++ b/paste/server_script_template.py
@@ -15,5 +15,5 @@ if conf.get('config_file'):
 if conf.get('sys_path'):
     server.update_sys_path(conf['sys_path'], conf['verbose'])
 
-app = wsgiwebkit.webkit(conf['webkit_dir'], use_lint=conf.get('lint'))
+app = wsgiwebkit.webkit(conf['publish_dir'], use_lint=conf.get('lint'))
 app = config_middleware(app, conf)
diff --git a/paste/webkit/wkrequest.py b/paste/webkit/wkrequest.py
index 6b1785e..63dfcd2 100644
--- a/paste/webkit/wkrequest.py
+++ b/paste/webkit/wkrequest.py
@@ -228,7 +228,7 @@ class HTTPRequest(object):
         raise NotImplementedError
 
     def serverSideContextPath(self, path=None):
-        base = self._environ['paste.config']['webkit_dir']
+        base = self._environ['paste.config']['publish_dir']
         if path:
             return os.path.join(base, path)
         else: