aboutsummaryrefslogtreecommitdiff
path: root/docs/_includes/css/code.html
diff options
context:
space:
mode:
authorJames Friend <[email protected]>2014-08-28 09:32:08 +0800
committerJames Friend <[email protected]>2014-08-28 09:32:08 +0800
commit9aeaf19b1dca68ee71e916ae415a0c270a47d301 (patch)
treebc8385acb8ec7a46bba03ff2ef7e4283cd9f1146 /docs/_includes/css/code.html
parente7991a9a1e2f474c8f1d8a2e0ed113816f1c5e82 (diff)
parent35f09315ed543a0479719afa2143240952c215db (diff)
downloadbootstrap-9aeaf19b1dca68ee71e916ae415a0c270a47d301.tar.xz
bootstrap-9aeaf19b1dca68ee71e916ae415a0c270a47d301.zip
Merge remote-tracking branch 'upstream/master' into node-requirable
Conflicts: Gruntfile.js
Diffstat (limited to 'docs/_includes/css/code.html')
-rw-r--r--docs/_includes/css/code.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/_includes/css/code.html b/docs/_includes/css/code.html
index 675ac10e9..ba2edc151 100644
--- a/docs/_includes/css/code.html
+++ b/docs/_includes/css/code.html
@@ -17,7 +17,8 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
To edit settings, press <kbd><kbd>ctrl</kbd> + <kbd>,</kbd></kbd>
</div>
{% highlight html %}
-To switch directories, type <kbd>cd</kbd> followed by the name of the directory.
+To switch directories, type <kbd>cd</kbd> followed by the name of the directory.<br>
+To edit settings, press <kbd><kbd>ctrl</kbd> + <kbd>,</kbd></kbd>
{% endhighlight %}
<h2 id="code-block">Basic block</h2>