Hello React<\/title>\n@@ -209,7 +215,7 @@ Markdown is a simple way to format your text inline. For example, surrounding te\n First, add the third-party **Showdown** library 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):\n \n ```html{7}\n-\n+\n <head>\n <title>Hello React<\/title>\n <script src=\"http:\/\/fb.me\/react-{{site.react_version}}.js\"><\/script>\n@@ -379,7 +385,7 @@ When the component is first created, we want to GET some JSON from the server an\n \n We'll use jQuery to help make an asynchronous request to the server.\n \n-Note: because this is becoming an AJAX application you'll need to develop your app using a web server rather than as a file sitting on your file system. The easiest way to do this is to run `python -m SimpleHTTPServer` in your application's directory.\n+Note: because this is becoming an AJAX application you'll need to develop your app using a web server rather than as a file sitting on your file system. [As mentioned above](#running-a-server), we have provided serveral servers you can use [on GitHub](https:\/\/github.com\/reactjs\/react-tutorial\/). They provide the functionality you need for the rest of this tutorial.\n \n ```javascript{6-17}\n \/\/ tutorial13.js\n","body":"[docs] Talk about running a server in tutorial"}</article></body></html>

{"parents":["1428ea78235f9694709550eeb13b4938e86bbb0c","8babd0ada35b889bdbc992ec855905c53fb0e9b0"],"files":[{"status":"M","path":"docs\/docs\/tutorial.md"}],"commit":{"revision":"69d40d1be3f19a354e4f547e1ccc187778559c62","authorName":"Paul O’Shannessy","authorEmail":"paul@oshannessy.com","shortRevision":"69d40d1be3","authoredAt":"2015-01-16T13:05:19-08:00","subject":"Merge pull request #2824 from zpao\/docs-tutorial-server"},"patch":"diff --git a\/docs\/docs\/tutorial.md b\/docs\/docs\/tutorial.md\nindex b903cc79f9..9abfbe0637 100644\n--- a\/docs\/docs\/tutorial.md\n+++ b\/docs\/docs\/tutorial.md\n@@ -23,12 +23,18 @@ It'll also have a few neat features:\n \n [It's all on GitHub.](https:\/\/github.com\/reactjs\/react-tutorial)\n \n+### Running a server\n+\n+While it's not necessary to get started with this tutorial, later on we'll be adding functionality that requires `POST`ing to a running server. If this is something you are intimately familiar with and want to create your own server, please do. For the rest of you who might want to focus on learning about React without having to worry about the server-side aspects, we have written simple servers in a number of languages - JavaScript (using Node.js), Python, and Ruby. These are all available on GitHub. You can [view the source](https:\/\/github.com\/reactjs\/react-tutorial\/) or [download a zip file](https:\/\/github.com\/reactjs\/react-tutorial\/archive\/master.zip) to get started.\n+\n+To get started using the tutorial download, just start editing `public\/index.html`.\n+\n ### Getting started\n \n For this tutorial, we'll use prebuilt JavaScript files on a CDN. Open up your favorite editor and create a new HTML document:\n \n ```html\n-\n+\n \n \n Hello React<\/title>\n@@ -209,7 +215,7 @@ Markdown is a simple way to format your text inline. For example, surrounding te\n First, add the third-party **Showdown** library 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):\n \n ```html{7}\n-\n+\n <head>\n <title>Hello React<\/title>\n <script src=\"http:\/\/fb.me\/react-{{site.react_version}}.js\"><\/script>\n@@ -379,7 +385,7 @@ When the component is first created, we want to GET some JSON from the server an\n \n We'll use jQuery to help make an asynchronous request to the server.\n \n-Note: because this is becoming an AJAX application you'll need to develop your app using a web server rather than as a file sitting on your file system. The easiest way to do this is to run `python -m SimpleHTTPServer` in your application's directory.\n+Note: because this is becoming an AJAX application you'll need to develop your app using a web server rather than as a file sitting on your file system. [As mentioned above](#running-a-server), we have provided serveral servers you can use [on GitHub](https:\/\/github.com\/reactjs\/react-tutorial\/). They provide the functionality you need for the rest of this tutorial.\n \n ```javascript{6-17}\n \/\/ tutorial13.js\n","body":"[docs] Talk about running a server in tutorial"}</article></body></html>

dillon1000/react

Files changed