Permalink
Browse files

Merge branch 'master' of github.com:edgecase/dieter

Conflicts:
	README.md
  • Loading branch information...
2 parents 058c837 + e9d9190 commit 95b85968eb07c5fe49a0efb8a063e83ed84d69fd @pbiggar pbiggar committed Jan 5, 2013
Showing with 3 additions and 3 deletions.
  1. +3 −3 README.md
View
@@ -5,7 +5,7 @@ Dieter [dee-ter] is a clojure interpretation of the ruby Sprockets library.
## Usage
Dieter provides you with a ring middleware which will compile certain
-static assets. Currently it supports concatiating javascript and CSS
+static assets. Currently it supports concatenating javascript and CSS
files, compiling
[LESS CSS](http://lesscss.org/),
[CoffeeScript](http://jashkenas.github.com/coffee-script/) and
@@ -29,7 +29,7 @@ Or if you use noir
(server/add-middleware asset-pipeline config-options)
```
-Concatination of assets is handled by a Dieter manifest file.
+Concatenation of assets is handled by a Dieter manifest file.
A manifest is a file whose name ends in .dieter and whose contents are
a clojure vector of file names / directories to concatenate.
@@ -113,4 +113,4 @@ Distributed under the Eclipse Public License, the same as Clojure.
* Add mime type headers for dieter files
### Version 0.2.0
-* Handlebars templates are now a separate library. [dieter-ember](https://github.com/edgecase/dieter-ember)
+* Handlebars templates are now a separate library. [dieter-ember](https://github.com/edgecase/dieter-ember)

0 comments on commit 95b8596

Please sign in to comment.