Skip to content
This repository
Browse code

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

Conflicts:
	README.md
  • Loading branch information...
commit 95b85968eb07c5fe49a0efb8a063e83ed84d69fd 2 parents 058c837 + e9d9190
Paul Biggar authored January 04, 2013

Showing 1 changed file with 3 additions and 3 deletions. Show diff stats Hide diff stats

  1. 6  README.md
6  README.md
Source Rendered
@@ -5,7 +5,7 @@ Dieter [dee-ter] is a clojure interpretation of the ruby Sprockets library.
5 5
 ## Usage
6 6
 
7 7
 Dieter provides you with a ring middleware which will compile certain
8  
-static assets. Currently it supports concatiating javascript and CSS
  8
+static assets. Currently it supports concatenating javascript and CSS
9 9
 files, compiling
10 10
 [LESS CSS](http://lesscss.org/),
11 11
 [CoffeeScript](http://jashkenas.github.com/coffee-script/) and
@@ -29,7 +29,7 @@ Or if you use noir
29 29
 (server/add-middleware asset-pipeline config-options)
30 30
 ```
31 31
 
32  
-Concatination of assets is handled by a Dieter manifest file.
  32
+Concatenation of assets is handled by a Dieter manifest file.
33 33
 A manifest is a file whose name ends in .dieter and whose contents are
34 34
 a clojure vector of file names / directories to concatenate.
35 35
 
@@ -113,4 +113,4 @@ Distributed under the Eclipse Public License, the same as Clojure.
113 113
 * Add mime type headers for dieter files
114 114
 
115 115
 ### Version 0.2.0
116  
-* Handlebars templates are now a separate library. [dieter-ember](https://github.com/edgecase/dieter-ember)
  116
+* Handlebars templates are now a separate library. [dieter-ember](https://github.com/edgecase/dieter-ember)

0 notes on commit 95b8596

Please sign in to comment.
Something went wrong with that request. Please try again.