diff options
| author | Mark Otto <[email protected]> | 2016-01-03 19:03:26 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-01-03 19:03:26 -0800 |
| commit | 16552b241cfbbed8302caf642ba7a5f52cafdbb4 (patch) | |
| tree | 77dd544b052338b5a64fcb1b3729cae9059b90f6 | |
| parent | ca6f6ca2f57bfbb4bc96d0723bb744575a7948b4 (diff) | |
| parent | efe2419fecc1236bc75a355f413dd82b88a4ef99 (diff) | |
| download | bootstrap-16552b241cfbbed8302caf642ba7a5f52cafdbb4.tar.xz bootstrap-16552b241cfbbed8302caf642ba7a5f52cafdbb4.zip | |
Merge pull request #18675 from patrickhlauke/docs-code1
Docs: tweaks to content code
| -rw-r--r-- | docs/content/code.md | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/docs/content/code.md b/docs/content/code.md index 4ce1e7fa3..79059a1d1 100644 --- a/docs/content/code.md +++ b/docs/content/code.md @@ -13,18 +13,20 @@ Styles for inline code snippets and longer, multiline blocks of code. ## Inline code -Wrap inline snippets of code with `code`. Be sure to escape HTML angle brackets. +Wrap inline snippets of code with `<code>`. Be sure to escape HTML angle brackets. {% example html %} For example, <code><section></code> should be wrapped as inline. {% endexample %} -## Preformatted text +## Code blocks -Or, code blocks. Use `<pre>`s for multiple lines of code. Once again, be sure to escape any angle brackets in the code for proper rendering. You may optionally add the `.pre-scrollable` class, which will set a max-height of 350px and provide a y-axis scrollbar. +Use `<pre>`s for multiple lines of code. Once again, be sure to escape any angle brackets in the code for proper rendering. You may optionally add the `.pre-scrollable` class, which will set a max-height of 350px and provide a y-axis scrollbar. {% example html %} -<pre><p>Sample text here...</p></pre> +<pre><code><p>Sample text here...</p> +<p>And another line of sample text here...</p> +</code></pre> {% endexample %} ## Variables @@ -46,7 +48,7 @@ To edit settings, press <kbd><kbd>ctrl</kbd> + <kbd>,</kbd></kbd> ## Sample output -For indicating blocks sample output from a program use the `<samp>` tag. +For indicating sample output from a program use the `<samp>` tag. {% example html %} <samp>This text is meant to be treated as sample output from a computer program.</samp> |
