From: Hakim El Hattab Date: Sun, 17 Mar 2013 11:50:57 +0000 (-0400) Subject: merge conflict X-Git-Tag: 2.4.0~70 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5ba8440dca722f55729fac9138c7a03fb13b7ccf;p=reveal.js.git merge conflict --- 5ba8440dca722f55729fac9138c7a03fb13b7ccf diff --cc README.md index 34c9e71,c7c2b3f..ab6660c --- a/README.md +++ b/README.md @@@ -423,11 -423,10 +423,11 @@@ Reveal.initialize( }); ``` - ```multiplex.secret``` should only be configured on those pages you wish to be able to control slide navigation for all clients. Multi-master configurations work, but if you don't want your audience to be able to control your slides, set the secret to ``null``. In this master/slave setup, you should create a publicly accessible page with secret set to ``null``, and a protected page containing your secret. -```multiplex.secret``` should only be configured on those pages you wish to be able to control slide navigation for all clients. Multi-master configurations work, but if you don't wish your audience to be able to control your slides, set the secret to null. In this master/slave setup, you should create a publicly accessible page with secret set to null, and a protected page containing your secret. ++```multiplex.secret``` should only be configured on those pages you wish to be able to control slide navigation for all clients. Multi-master configurations work, but if you don't wish your audience to be able to control your slides, set the secret to ``null``. In this master/slave setup, you should create a publicly accessible page with secret set to ``null``, and a protected page containing your secret. - You are very welcome to use the server running at reveal.jit.su, however availability and stability are not guaranteed. For anything mission critical I recommend you run your own server. It is simple to deploy to nodejitsu or run on your own environment. + You are very welcome to use the socketio server running at reveal.jit.su, however availability and stability are not guaranteed. For anything mission critical I recommend you run your own server. It is simple to deploy to nodejitsu or run on your own environment. + ## Theming The framework comes with a few different themes included: