diff options
| author | willianjusten <willianjustenqui@gmail.com> | 2015-10-03 21:00:47 -0300 |
|---|---|---|
| committer | willianjusten <willianjustenqui@gmail.com> | 2015-10-03 21:00:47 -0300 |
| commit | 5578db0705e0fe05c40e5cad404fae47767eafa9 (patch) | |
| tree | b2588868f4ae66387dd78572a451f0230b03c561 /markdown.html.markdown | |
| parent | 46d509077f10fc9b04aaf69829526d4b8297798d (diff) | |
| parent | 9b46fe7e57bcf63785b67cdaffc49ff0d47d7476 (diff) | |
Merge remote-tracking branch 'upstream/master'
* upstream/master:
Add section on eunit in erlang doc
Add clarification on bind / match with = op in erlang. Fixes #1139
Removed random "r"
Add to contributors
Misc. typos and formatting
More explanation on virtual destructors
Clarify character literals
Fixing typo in julia-es.html.markdown
[xml/id] Translated JSON to Indonesian (json-id)
[xml/id] Translated XML to Indonesian (xml-id)
Aligned the comment block
[javascript] Fix for issue 1248
Fixed some grammatical issues/typos
Typos fixed in julia-es.html.markdown
[c++/pt-br] Fix translate on editing object as parameters
Update c++.html.markdown
Add lang: to header of Python3 cs-cz file.
All class constants can be accessed statically
Add `kbd` tag
Fixed the description of attributes and elements.
Diffstat (limited to 'markdown.html.markdown')
| -rw-r--r-- | markdown.html.markdown | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/markdown.html.markdown b/markdown.html.markdown index 7541f904..6d19710f 100644 --- a/markdown.html.markdown +++ b/markdown.html.markdown @@ -232,6 +232,12 @@ can be anything so long as they are unique. --> I want to type *this text surrounded by asterisks* but I don't want it to be in italics, so I do this: \*this text surrounded by asterisks\*. +<!-- Keyboard keys --> +<!-- In Github Flavored Markdown, you can use a <kbd> tag to represent keyboard keys --> + +Your computer crashed? Try sending a +<kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>Del</kbd> + <!-- Tables --> <!-- Tables are only available in Github Flavored Markdown and are slightly cumbersome, but if you really want it: --> |