--- a/gpp/weblinks/urls.py	Wed Sep 15 01:01:40 2010 +0000
+++ b/gpp/weblinks/urls.py	Wed Sep 15 03:24:01 2010 +0000
@@ -3,20 +3,17 @@
 
 urlpatterns = patterns('weblinks.views',
    url(r'^$', 'link_index', name='weblinks-main'),
-   (r'^add/$', 'add_link'),
-   (r'^add/thanks/$', 'add_thanks'),
-   url(r'^category/(?P<category>\d+)/(?P<sort>title|date|rating|hits)/page/(?P<page>\d+)/$', 
+   url(r'^add/$', 'add_link', name='weblinks-add_link'),
+   url(r'^add/thanks/$', 'add_thanks', name='weblinks-add_thanks'),
+   url(r'^category/(?P<slug>[\w\d-]+)/(?P<sort>title|date|rating|hits)/$', 
       'view_links',
       name='weblinks-view_links'),
    url(r'^detail/(\d+)/$', 
       'link_detail',
       name='weblinks-link_detail'),
-   (r'^new/$', 'new_links'),
-   (r'^popular/$', 'popular_links'),
-   (r'^random/$', 'random_link'),
-   (r'^report/(\d+)/$', 'report_link'),
-   url(r'^search/page/(?P<page>\d+)/$', 
-      'search_links',
-      name="weblinks-search"),
+   url(r'^new/$', 'new_links', name='weblinks-new_links'),
+   url(r'^popular/$', 'popular_links', name='weblinks-popular_links'),
+   url(r'^random/$', 'random_link', name='weblinks-random_link'),
+   url(r'^report/(\d+)/$', 'report_link', name='weblinks-report_link'),
    url(r'^visit/(\d+)/$', 'visit', name="weblinks-visit"),
 )