Skip to content

Commit

Permalink
Merge pull request #179 from twitter/Makefile_and_Manifest
Browse files Browse the repository at this point in the history
Makefile and manifest
  • Loading branch information
fat committed Jun 9, 2014
2 parents d35700e + a565cf2 commit e2cc18e
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ dist:
#
# Make a new version of Hogan from the current dev version.
#
release: clean dist
release: clean test dist
@ echo "Creating a new version of Hogan."
@ mkdir -p web/builds/$(VERSION)
@ cp dist/*.* web/builds/$(VERSION)/.
Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Hogan.js - A mustache compiler. [![Build Status](https://secure.travis-ci.org/twitter/hogan.js.png)](http://travis-ci.org/twitter/hogan.js)

[Hogan.js](http://twitter.github.com/hogan.js/) is a compiler for the
[Mustache](http://mustache.github.com/) templating language. For information
[Hogan.js](http://twitter.github.io/hogan.js/) is a compiler for the
[Mustache](http://mustache.github.io/) templating language. For information
on Mustache, see the [manpage](http://mustache.github.com/mustache.5.html) and
the [spec](https://github.com/mustache/spec).

Expand Down Expand Up @@ -49,6 +49,10 @@ present. That means you can pre-compile your templates on the server, and
avoid shipping the compiler. However, the optional lambda features from the
Mustache spec require the compiler and the original template source to be present.

Hogan also supports [template inheritance](https://github.com/mustache/spec/pull/75),
and maintains compatibility with other implementations like [mustache.java](https://github.com/spullara/mustache.java),
[mustache.php](https://github.com/bobthecow/mustache.php), and [GRMustache](https://github.com/groue/GRMustache)

## Why Hogan.js?

Why another templating library?
Expand Down
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "hogan.js"
, "description": "A mustache compiler."
, "version": "3.0.0"
, "version": "3.0.1"
, "keywords": ["mustache", "template"]
, "main": "lib/hogan.js"
, "scripts": [
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "hogan.js"
, "description": "A mustache compiler."
, "version": "3.0.0"
, "version": "3.0.1"
, "keywords": ["mustache", "template"]
, "main": "./lib/hogan.js"
, "homepage": "http://twitter.github.com/hogan.js/"
Expand Down
6 changes: 3 additions & 3 deletions web/index.html.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<title>Hogan.js</title>
<meta name="description" content="">
<meta name="author" content="">
<script src="http://twitter.github.com/hogan.js/builds/{{version}}/hogan-{{version}}.js"></script>
<script src="http://twitter.github.io/hogan.js/builds/{{version}}/hogan-{{version}}.js"></script>
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
Expand Down Expand Up @@ -49,7 +49,7 @@
<div class="five columns">
<h4>Getting started</h4>
<p>
Hogan.js is a 2.5k JS templating engine developed at Twitter. Use it as a part of your asset packager to compile templates ahead of time or include it in your browser to handle dynamic templates.
Hogan.js is a 3.4k JS templating engine developed at Twitter. Use it as a part of your asset packager to compile templates ahead of time or include it in your browser to handle dynamic templates.
</p>
<p>
If you're developing with Node.js, just use NPM to add the Hogan package.
Expand Down Expand Up @@ -141,7 +141,7 @@

<div class="sixteen columns hogan-footer">
<span class="copyright">
Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/sayrer" target="_blank">@sayrer</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.<br />
Designed and built with all the love in the world <a href="https://twitter.com/twitter" target="_blank">@twitter</a> by <a href="https://twitter.com/sayrer" target="_blank">@sayrer</a> and <a href="https://twitter.com/fat" target="_blank">@fat</a>.<br />
Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.
</span>
<span class="colophon">
Expand Down

0 comments on commit e2cc18e

Please sign in to comment.