aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/ADMIN.md10
-rw-r--r--doc/CHANGES.md2
2 files changed, 5 insertions, 7 deletions
diff --git a/doc/ADMIN.md b/doc/ADMIN.md
index 07fe9398d..6248e6cfc 100644
--- a/doc/ADMIN.md
+++ b/doc/ADMIN.md
@@ -11,11 +11,9 @@ If you want to work on the CSS, you'll want to use
$ gem install compass
$ compass compile --config .compass/config.rb
-The javascript is included in a funky way
-[for reasons explained in this commit](https://github.com/sebbacon/adminbootstraptheme/commit/45a73d53fc9e8f0b728933ff58764bd8d0612dab).
-To change it, edit the coffeescript at
-`lib/view/general/admin.coffee`, and then do something like:
+To change the JavaScript, edit `public/admin/javascripts/admin.coffee`
+and then run:
- $ coffee -o /tmp/ -c app/views/admin_general/admin.coffee
- $ mv /tmp/admin.js app/views/admin_general/admin_js.erb
+ $ coffee -c public/admin/javascripts/admin.coffee
+That will update `public/admin/javascripts/admin.js`. \ No newline at end of file
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index 4720e5283..e9a53ddee 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -11,7 +11,7 @@
## Upgrade notes
* Check out this version and run `rails-post-deploy` as usual.
-* This release includes an update to the commonlib submodule - you should now be warned about this on running `rails-post-deploy`. You can update to the nw version with `git submodule update`.
+* This release includes an update to the commonlib submodule - you should now be warned about this on running `rails-post-deploy`. You can update to the new version with `git submodule update`.
* After deploying, run `rake temp:fix_bad_request_states` to find and list requests that have an inconsistent history - run `rake temp:fix_bad_request_states DRYRUN=0` to fix them.
# Version 0.12