Merge remote-tracking branch 'mcw0933/b_linebreaksinhelpmd'

MacDownApp · Nov 5, 2016 · 7eadd3f · 7eadd3f
2 parents a7f63ff + 8212a5d
commit 7eadd3f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/MacDown/Localization/en.lproj/Credits.rtf b/MacDown/Localization/en.lproj/Credits.rtf
@@ -74,14 +74,18 @@ Open source Markdown editor for OS X.
 {\field{\*\fldinst{HYPERLINK "http://www.raizlabs.com"}}{\fldrslt \cf0 Blake Skinner}}\
 \pard\pardeftab720\partightenfactor0
 {\field{\*\fldinst{HYPERLINK "http://waldo.jaquith.org/"}}{\fldrslt \cf0 Waldo Jaquith}}\
-{\field{\*\fldinst{HYPERLINK "http://www.fabiancanas.com/"}}{\fldrslt Fabian Ca\'f1as}}\
-{\field{\*\fldinst{HYPERLINK "http://yulli.org/"}}{\fldrslt Justin Kim}}\
+\pard\pardeftab720\partightenfactor0
+{\field{\*\fldinst{HYPERLINK "http://www.fabiancanas.com/"}}{\fldrslt \cf0 Fabian Ca\'f1as}}\
+\pard\pardeftab720\partightenfactor0
+{\field{\*\fldinst{HYPERLINK "http://yulli.org/"}}{\fldrslt \cf0 Justin Kim}}\
 {\field{\*\fldinst{HYPERLINK "https://github.com/ronhippler"}}{\fldrslt Andreas Hippler}}\
 {\field{\*\fldinst{HYPERLINK "http://orta.io/"}}{\fldrslt Orta}}\
 {\field{\*\fldinst{HYPERLINK "https://cattail.me"}}{\fldrslt Chiyu Zhong}}\
 {\field{\*\fldinst{HYPERLINK "https://github.com/timtylin"}}{\fldrslt Tim T.Y. Lin}}\
 \pard\pardeftab720\partightenfactor0
 {\field{\*\fldinst{HYPERLINK "https://github.com/franklinyu"}}{\fldrslt \cf0 Franklin Yu}}\
+\pard\pardeftab720\partightenfactor0
+{\field{\*\fldinst{HYPERLINK "https://github.com/mcw0933"}}{\fldrslt \cf0 Matt C. Wilson}}\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
 

diff --git a/MacDown/Resources/help.md b/MacDown/Resources/help.md
@@ -30,12 +30,21 @@ Before I tell you about all the extra syntaxes and capabilities I have, I'll int
 ### Line Breaks
 To force a line break, put two spaces and a newline (return) at the end of the line.
 
-	These lines
-	won't break
+* This two-line bullet 
+won't break
 
-	These lines  
-	will break
+* This two-line bullet  
+will break
 
+Here is the code:
+
+```
+* This two-line bullet 
+won't break
+
+* This two-line bullet  
+will break
+```
 
 ### Strong and Emphasize