Skip to content
This repository has been archived by the owner on Oct 30, 2018. It is now read-only.

Commit

Permalink
Merge pull request #7 from okuryu/fix-docs
Browse files Browse the repository at this point in the history
Fix documents
  • Loading branch information
diervo committed May 17, 2012
2 parents cedbbb3 + 04d9935 commit 14011a8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -41,7 +41,7 @@ Edit application.json to configure the mojitDirs and the HTMLFrame so that it lo
[ [
{ {
"settings": [ "master" ], "settings": [ "master" ],
"mojitsDirs": ["mojits","node_modules/shaker/mojits"] "mojitsDirs": ["mojits","node_modules/mojito-shaker/mojits"],
"specs": { "specs": {
"htmlframe": { "htmlframe": {
"type": "ShakerHTMLFrameMojit" "type": "ShakerHTMLFrameMojit"
Expand Down Expand Up @@ -71,7 +71,7 @@ If you want to build and contribute to the documentation, you will have to insta


## Licensing and Contributions ## Licensing and Contributions


Shaker is licensed under a [BSD license](https://github.com/yahoo/shaker/blob/master/LICENSE.txt). Shaker is licensed under a [BSD license](https://github.com/yahoo/mojito-shaker/blob/master/LICENSE).


To contribute to the Shaker project, please review the [Mojito Contributor To contribute to the Shaker project, please review the [Mojito Contributor
License Agreement](http://developer.yahoo.com/cocktails/mojito/cla/). License Agreement](http://developer.yahoo.com/cocktails/mojito/cla/).
Expand Down
2 changes: 1 addition & 1 deletion docs/shaker_starting.rst
Expand Up @@ -48,7 +48,7 @@ Within a Mojito application root folder:
[ [
{ {
"settings": [ "master" ], "settings": [ "master" ],
"mojitsDirs": ["mojits","node_modules/shaker/mojits"] "mojitsDirs": ["mojits","node_modules/mojito-shaker/mojits"],
"specs": { "specs": {
"htmlframe": { "htmlframe": {
"type": "ShakerHTMLFrame" "type": "ShakerHTMLFrame"
Expand Down

0 comments on commit 14011a8

Please sign in to comment.