Merge remote branch 'upstream/master'

bgooren · Dec 5, 2011 · 4199cf1 · 4199cf1
2 parents 02bfb8c + 0cb97c4
commit 4199cf1
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/conf/routes b/conf/routes
@@ -1,23 +1,23 @@
 # This file defines all module routes (Higher priority routes first)
 #
-# import these routes in the main app as :
+# import these routes in the main app as:
 # *     /                       module:elasticsearch
 #
 # ~~~~
 
-GET     /?                      elasticsearch.ElasticSearchAdmin.index
+GET     /?                                      elasticsearch.ElasticSearchAdmin.index
 
-*     /admin/                       module:crud
-GET   /public/              	   staticDir:public
+*       /admin/                                 module:crud
+GET     /public                                 staticDir:public
 
-#{elasticsearch.types}
-GET			/?											${type.controllerClass.name.substring(12).replace('$','')}.index
-GET			/${type.controllerName}/search				${type.controllerClass.name.substring(12).replace('$','')}.search
-POST		/${type.controllerName}/search				${type.controllerClass.name.substring(12).replace('$','')}.search
-#{/elasticsearch.types}
+#{elasticSearch.types}
+GET     /?                                      ${type.controllerClass.name.substring(12).replace('$','')}.index
+GET     /${type.controllerName}/search          ${type.controllerClass.name.substring(12).replace('$','')}.search
+POST    /${type.controllerName}/search          ${type.controllerClass.name.substring(12).replace('$','')}.search
+#{/elasticSearch.types}
 
 
-GET     /es-admin               						elasticsearch.ElasticSearchAdmin.index
-GET     /es-admin/               						elasticsearch.ElasticSearchAdmin.index
+GET     /es-admin                               elasticsearch.ElasticSearchAdmin.index
+GET     /es-admin/                              elasticsearch.ElasticSearchAdmin.index
 
-*       /{controller}/{action}                  		{controller}.{action}
+*       /{controller}/{action}                  {controller}.{action}