Merge pull request #4 from davidbgk/better-documentation

Better documentation
opendatateam · Apr 9, 2015 · d2213c8 · d2213c8
2 parents c506ee8 + 161174c
commit d2213c8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/README.rst b/README.rst
@@ -41,6 +41,11 @@ or with easy_install:
 
     $ easy_install udata
 
+Then install npm dependencies with bower:
+
+.. code-block:: console
+
+    $ bower install
 
 ElasticSearch
 =============
@@ -50,6 +55,17 @@ The ICU plugin is required for ElasticSearch.
 ICU Analysis: https://github.com/elasticsearch/elasticsearch-analysis-icu
 
 
+Running
+=======
+
+To run the development server:
+
+.. code-block:: console
+
+    $ python manage.py serve
+
+Your instance should be available at http://127.0.0.1:6666/
+
 
 Documentation
 =============

diff --git a/bower.json b/bower.json
@@ -15,7 +15,7 @@
     "tests"
   ],
   "resolutions": {
-    "jquery": "~2.1.1"
+    "bootstrap": "~3.3.1"
   },
   "dependencies": {
     "jquery": "~2.1.1",

diff --git a/udata/templates/footer.html b/udata/templates/footer.html
@@ -2,7 +2,7 @@
   <div class="container">
     <div class="row">
       <div class="col-lg-12">
-        <p>Copyright &copy; Company 2013</p>
+        <p>Copyright &copy; Company 2015</p>
       </div>
     </div>
   </div>