diff options
| author | Adam <adam@adambard.com> | 2015-10-19 14:28:03 +0800 | 
|---|---|---|
| committer | Adam <adam@adambard.com> | 2015-10-19 14:28:03 +0800 | 
| commit | e6573af645792cb434a16440f60cce8935fea95c (patch) | |
| tree | a3ac540a41f977dcbda046c8faa332cd8864f2b3 /markdown.html.markdown | |
| parent | 6af01029e450fd2f82f0d056806ccb63a6e48ec9 (diff) | |
| parent | ba5f3ebc112b52797a9a21fdbba1846885feac2c (diff) | |
Merge branch 'master' of github.com:adambard/learnxinyminutes-docs
Diffstat (limited to 'markdown.html.markdown')
| -rw-r--r-- | markdown.html.markdown | 16 | 
1 files changed, 11 insertions, 5 deletions
| diff --git a/markdown.html.markdown b/markdown.html.markdown index 7541f904..2333110f 100644 --- a/markdown.html.markdown +++ b/markdown.html.markdown @@ -70,7 +70,7 @@ I'm in paragraph three!  <!-- Should you ever want to insert an HTML <br /> tag, you can end a paragraph  with two or more spaces and then begin a new paragraph. --> -I end with two spaces (highlight me to see them).   +I end with two spaces (highlight me to see them).  There's a <br /> above me! @@ -97,7 +97,7 @@ or  + Item  + One more item -or  +or  - Item  - Item @@ -129,7 +129,7 @@ render the numbers in order, but this may not be a good idea -->  <!-- There are even task lists. This creates HTML checkboxes. -->  Boxes below without the 'x' are unchecked HTML checkboxes. -- [ ] First task to complete.  +- [ ] First task to complete.  - [ ] Second task that needs done  This checkbox below will be a checked HTML checkbox.  - [x] This task has been completed @@ -160,7 +160,7 @@ def foobar  end  \`\`\` <!-- here too, no backslashes, just ``` --> -<-- The above text doesn't require indenting, plus Github will use syntax +<!-- The above text doesn't require indenting, plus Github will use syntax  highlighting of the language you specify after the ``` -->  <!-- Horizontal rule (<hr />) --> @@ -169,7 +169,7 @@ with or without spaces. -->  ***  --- -- - -  +- - -  ****************  <!-- Links --> @@ -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: --> | 
