merge master into dev

edit
Hakim El Hattab 2014-03-25 21:37:51 +01:00
commit 17d8f0b77c
2 changed files with 16 additions and 16 deletions

View File

@ -885,28 +885,28 @@ Some reveal.js features, like external markdown and speaker notes, require that
2. Install [Grunt](http://gruntjs.com/getting-started#installing-the-cli) 2. Install [Grunt](http://gruntjs.com/getting-started#installing-the-cli)
4. Clone the reveal.js repository 4. Clone the reveal.js repository
```sh ```sh
$ git clone https://github.com/hakimel/reveal.js.git $ git clone https://github.com/hakimel/reveal.js.git
``` ```
5. Navigate to the reveal.js folder 5. Navigate to the reveal.js folder
```sh ```sh
$ cd reveal.js $ cd reveal.js
``` ```
6. Install dependencies 6. Install dependencies
```sh ```sh
$ npm install $ npm install
``` ```
7. Serve the presentation and monitor source files for changes 7. Serve the presentation and monitor source files for changes
```sh ```sh
$ grunt serve $ grunt serve
``` ```
8. Open <http://localhost:8000> to view your presentation 8. Open <http://localhost:8000> to view your presentation
You can change the port by using `grunt serve --port 8001`. You can change the port by using `grunt serve --port 8001`.
### Folder Structure ### Folder Structure

6
js/reveal.min.js vendored

File diff suppressed because one or more lines are too long