From 319a266941ea627ed6033b71233bce595a94706e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Wed, 2 Dec 2015 11:30:49 -0800 Subject: [PATCH] Merge pull request #5559 from shogunsea/docs-add-marked [docs]Add marked source in tutorial doc (cherry picked from commit 0be7786e1cdd0fa682ff3c78236ab3f3971ed691) --- docs/docs/tutorial.md | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/docs/docs/tutorial.md b/docs/docs/tutorial.md index c130adb801..4f6d5ac3aa 100755 --- a/docs/docs/tutorial.md +++ b/docs/docs/tutorial.md @@ -31,7 +31,7 @@ For sake of simplicity, the server we will run uses a `JSON` file as a database. ### Getting started -For this tutorial, we're going to make it as easy as possible. Included in the server package discussed above is an HTML file which we'll work in. Open up `public/index.html` in your favorite editor. It should look something like this (with perhaps some minor differences, we'll add an additional ` +
@@ -221,22 +222,7 @@ Note that we have passed some data from the parent `CommentList` component to th Markdown is a simple way to format your text inline. For example, surrounding text with asterisks will make it emphasized. -First, add the third-party library **marked** to your application. This is a JavaScript library which takes Markdown text and converts it to raw HTML. This requires a script tag in your head (which we have already included in the React playground): - -```html{9} - - - - React Tutorial - - - - - - -``` - -Next, let's convert the comment text to Markdown and output it: +In this tutorial we use a third-party library **marked** which takes Markdown text and converts it to raw HTML. We already included this library with the original markup for the page, so we can just start using it. Let's convert the comment text to Markdown and output it: ```javascript{9} // tutorial6.js