diff options
| author | Hakim El Hattab <hakim.elhattab@gmail.com> | 2016-01-11 10:05:25 +0100 |
|---|---|---|
| committer | Hakim El Hattab <hakim.elhattab@gmail.com> | 2016-01-11 10:05:25 +0100 |
| commit | fba12abd6ad1ecb86c1c7f30a4dfcdf99f9f6c4b (patch) | |
| tree | 505269213e645ce814947fd0175ba3d4025aee39 /README.md | |
| parent | 19a69b2c899eea4d1d71f55e04be2153e93701b1 (diff) | |
| parent | 3c46733a544e6fbd9754787bf2fd24ebf9fe5e8d (diff) | |
| download | fosdem-2018-presentation-fba12abd6ad1ecb86c1c7f30a4dfcdf99f9f6c4b.tar fosdem-2018-presentation-fba12abd6ad1ecb86c1c7f30a4dfcdf99f9f6c4b.tar.gz | |
Merge branch 'master' of github.com:hakimel/reveal.js into dev
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -596,9 +596,6 @@ Reveal.addEventListener( 'fragmenthidden', function( event ) { ### Code syntax highlighting -<<<<<<< HEAD -By default, Reveal is configured with [highlight.js](https://highlightjs.org/) for code syntax highlighting. Below is an example with clojure code that will be syntax highlighted. When the `data-trim` attribute is present surrounding whitespace is automatically removed. -======= By default, Reveal is configured with [highlight.js](https://highlightjs.org/) for code syntax highlighting. Below is an example with clojure code that will be syntax highlighted. When the `data-trim` attribute is present, surrounding whitespace is automatically removed. HTML will be escaped by default. To avoid this, for example if you are using `<mark>` to call out a line of code, add the `data-noescape` attribute to the `<code>` element. ```html |