From 6b1555f8679f07db1476215e09f16da2a67ddc71 Mon Sep 17 00:00:00 2001
From: aaron <devnull@localhost>
Date: Mon, 8 Dec 2008 06:10:45 +0100
Subject: [PATCH] [svn r8082] Remove MEDIA_ROOT from settings.py because it
 belongs in local settings, and comment out urlconf line for unfinished edit
 form which I haven't checked in.

---
 troggle/settings.py | 1 -
 troggle/urls.py     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/troggle/settings.py b/troggle/settings.py
index 2dd7cc004..11e907334 100644
--- a/troggle/settings.py
+++ b/troggle/settings.py
@@ -30,7 +30,6 @@ USE_I18N = True
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
 # MOVED TO LOCALSETTINGS
-MEDIA_ROOT = 'C:/Expo/expoweb/troggle/media/'
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
diff --git a/troggle/urls.py b/troggle/urls.py
index 0afaa3b10..739b29a8b 100644
--- a/troggle/urls.py
+++ b/troggle/urls.py
@@ -9,7 +9,7 @@ urlpatterns = patterns('',
     (r'^cave/$', caveindex),
     (r'^cave/(?P<cave_id>[^/]+)/$', cave),
     (r'^cave/(?P<cave_id>[^/]+)/(?P<ent_letter>[^/]?)$', ent),
-    (r'^cave/(?P<cave_id>[^/]+)/edit/$', edit_cave),
+    #(r'^cave/(?P<cave_id>[^/]+)/edit/$', edit_cave),
     (r'^cavesearch/$', caveSearch),
     
     (r'^survex/(?P<survex_file>.*)\.index$', index),