Various documentation tweaks

Author: Daniel15

site/jekyll/_posts/2016-10-09-3.0.0-release.md

@@ -16,6 +16,7 @@ I'm happy to announce the release of ReactJS.NET 3.0! The major change in this r
 Other tweaks:
 
 * [#323](https://github.com/reactjs/React.NET/issues/323) - Upgraded to React 15.3.2
+* [#331](https://github.com/reactjs/React.NET/issues/331) - Added option to totally disable server-side rendering. This is useful when debugging your React components, as it's easier to debug client-side
 * [#316](https://github.com/reactjs/React.NET/issues/316) - Added option to use production version of React, and enabled it by default. You can call `SetUseDebugReact(true)` in your ReactJS.NET config to use the debug version. The production version of React is much faster than the debug build, but it has less useful error messages if something does go wrong.
 * [#299](https://github.com/reactjs/React.NET/issues/299) - Use file hash to check for file changes before transpiling. *Thanks to [Torben Rahbek Koch](https://github.com/TorbenRahbekKoch)*
 * [#317](https://github.com/reactjs/React.NET/issues/317) - Switched to [Paul Knopf](https://github.com/pauldotknopf)'s branch of VroomJs (V8 for Linux / Mac OS) rather than maintaining our own fork

site/jekyll/getting-started/aspnetcore.md

@@ -4,9 +4,9 @@ layout: docs
 title: Getting Started on ASP.NET Core
 ---
 
-Getting started with ReactJS.NET on ASP.NET Core requires a few more steps compared to previous versions of ASP.NET and MVC. A more fully featured tutorial will be released soon.
+Getting started with ReactJS.NET on ASP.NET Core requires a few more steps compared to previous versions of ASP.NET and MVC. If you want a step-by-step guide on configuring a brand new site, see [the ReactJS.NET tutorial for ASP.NET Core](/getting-started/tutorial.html).
 
-ReactJS.NET requires Visual Studio 2015 and ASP.NET Core RTM (final release). Additionally, ReactJS.NET does not support .NET Core at this point in time, so you will need to ensure your project is not referencing it. If you're creating a new website, use the "ASP.NET Core Web Application (.NET Framework)" project template. Otherwise, make sure your `project.json` references `net452` in its `frameworks` section, **not** `netcoreapp`.
+ReactJS.NET requires Visual Studio 2015 and ASP.NET Core RTM (final release). It is recommended to use .NET Framework, but ReactJS.NET also works with .NET Core.
 
 Install the `React.AspNet` package through NuGet. After the package is installed, ReactJS.NET needs to be initialised in your `Startup.cs` file (unfortunately this can not be done automatically like in previous versions of ASP.NET with WebActivator). At the top of the file, add:
 
@@ -66,4 +66,4 @@ Finally, add this to `Views\_ViewImports.cshtml` (or create it if it doesn't exi
 @using React.AspNet
 ```
 
-Once ReactJS.NET has been configured, you will be able to use [on-the-fly JSX to JavaScript compilation](http://reactjs.net/getting-started/usage.html) and [server-side rendering](http://reactjs.net/guides/server-side-rendering.html).
+Once ReactJS.NET has been configured, you will be able to use [on-the-fly JSX to JavaScript compilation](/getting-started/usage.html) and [server-side rendering](/guides/server-side-rendering.html).

site/jekyll/getting-started/tutorial_aspnet4.md

@@ -296,9 +296,9 @@ So far we've been inserting the comments directly in the source code. Instead, l
 
 ```javascript
 var data = [
-  { Author: "Daniel Lo Nigro", Text: "Hello ReactJS.NET World!" },
-  { Author: "Pete Hunt", Text: "This is one comment" },
-  { Author: "Jordan Walke", Text: "This is *another* comment" }
+  { Id: 1, Author: "Daniel Lo Nigro", Text: "Hello ReactJS.NET World!" },
+  { Id: 2, Author: "Pete Hunt", Text: "This is one comment" },
+  { Id: 3, Author: "Jordan Walke", Text: "This is *another* comment" }
 ];
 ```
 
@@ -355,6 +355,7 @@ namespace ReactDemo.Models
 {
 	public class CommentModel
 	{
+		public int Id { get; set; }
 		public string Author { get; set; }
 		public string Text { get; set; }
 	}
@@ -370,37 +371,40 @@ using ReactDemo.Models;
 
 namespace ReactDemo.Controllers
 {
-    public class HomeController : Controller
-    {
-	    private static readonly IList<CommentModel> _comments;
+	public class HomeController : Controller
+	{
+		private static readonly IList<CommentModel> _comments;
 
-	    static HomeController()
-	    {
+		static HomeController()
+		{
 			_comments = new List<CommentModel>
 			{
 				new CommentModel
 				{
+					Id = 1,
 					Author = "Daniel Lo Nigro",
 					Text = "Hello ReactJS.NET World!"
 				},
 				new CommentModel
 				{
+					Id = 2,
 					Author = "Pete Hunt",
 					Text = "This is one comment"
 				},
 				new CommentModel
 				{
+					Id = 3,
 					Author = "Jordan Walke",
 					Text = "This is *another* comment"
 				},
 			};
-	    }
+		}
 
-        public ActionResult Index()
-        {
-            return View();
-        }
-    }
+		public ActionResult Index()
+		{
+			return View();
+		}
+	}
 }
 ```
 
@@ -414,7 +418,7 @@ public ActionResult Comments()
 }
 ```
 
-The OutputCache attribute is used here to prevent browsers from caching the response. When designing a real world API, caching of API requests should be considered more carefully. For this tutorial it is easiest to simply disable caching.
+The `OutputCache` attribute is used here to prevent browsers from caching the response. When designing a real world API, caching of API requests should be considered more carefully. For this tutorial it is easiest to simply disable caching.
 
 Finally we add a corresponding route in `App_Start\RouteConfig.cs`:
 
@@ -461,6 +465,8 @@ ReactDOM.render(
 );
 ```
 
+Note that in a real app, you should generate the URL server-side (via `Url.Action` call) and pass it down, or use [RouteJs](http://dan.cx/projects/routejs) rather than hard-coding it. This tutorial hard-codes it for simplicity.
+
 This component is different from the prior components because it will have to re-render itself. The component won't have any data until the request from the server comes back, at which point the component may need to render some new comments.
 
 ### Reactive state
@@ -566,6 +572,8 @@ To accept new comments, we need to first add a controller action to handle it. T
 [HttpPost]
 public ActionResult AddComment(CommentModel comment)
 {
+	// Create a fake ID for this comment
+	comment.Id = _comments.Count + 1;
 	_comments.Add(comment);
 	return Content("Success :)");
 }
@@ -973,9 +981,9 @@ var CommentBox = React.createClass({
     var newComments = comments.concat([comment]);
     this.setState({data: newComments});
 
-	var data = new FormData();
-	data.append('Author', comment.Author);
-	data.append('Text', comment.Text);
+    var data = new FormData();
+    data.append('Author', comment.Author);
+    data.append('Text', comment.Text);
 
     var xhr = new XMLHttpRequest();
     xhr.open('post', this.props.submitUrl, true);
@@ -1002,6 +1010,16 @@ var CommentBox = React.createClass({
 });
 ```
 
+We also need to update the `Comment` component to use `Remarkable` from either `global` or `window`, due to a bug in Remarkable:
+```javascript{3}
+var Comment = React.createClass({
+	rawMarkup: function () {
+		var md = new (global.Remarkable || window.Remarkable)();
+		var rawMarkup = md.render(this.props.children.toString());
+		return { __html: rawMarkup };
+	},
+```
+
 In the view, we will accept the list of comments as the model, and use `Html.React` to render the component. This will replace the `ReactDOM.render` call that currently exists in Tutorial.jsx. All the props from the current `ReactDOM.render` call should be moved here, and the `ReactDOM.render` call should be deleted.
 
 ```html{1,10-16,21}
@@ -1053,12 +1071,15 @@ namespace ReactDemo
 		public static void Configure()
 		{
 			ReactSiteConfiguration.Configuration
+				.AddScript("~/js/remarkable.min.js")
 				.AddScript("~/Scripts/Tutorial.jsx");
 		}
 	}
 }
 ```
 
+Note that we need a copy of Remarkable in order to load it for server-side rendering. In a production app you'd probably use Bower or npm for this, but for our tutorial you can just [download the file from CDNJS](https://cdnjs.cloudflare.com/ajax/libs/remarkable/1.7.1/remarkable.min.js) and save it into `~/js`.
+
 That's it! Now if you build and refresh your application, you should notice that the comments box is rendered immediately rather than having a slight delay. If you view the source of the page, you will see the initial comments directly in the HTML itself:
 
 ```html

site/jekyll/guides/server-side-rendering.md

@@ -9,7 +9,7 @@ to wait for all the JavaScript to load before seeing the web page.
 
 To use server-side rendering in your application, follow the following steps:
 
-1 - Modify `App_Start\ReactConfig.cs` to reference your components:
+1 - Modify `App_Start\ReactConfig.cs` (for ASP.NET MVC 4 or 5) or `Startup.cs` (for ASP.NET Core) to reference your components:
 
 ```csharp
 namespace MyApp
@@ -72,12 +72,14 @@ code.
 The server-rendered HTML will automatically be reused by React client-side,
 meaning your initial render will be super fast.
 
+If you encounter any errors with the JavaScript, you may want to temporarily disable server-side rendering in order to debug your components in your browser. You can do this by calling `DisableServerSideRendering()` in your ReactJS.NET config.
+
 For a more in-depth example, take a look at the included sample application
 (**React.Samples.Mvc4**).
 
 5 - Server-side only rendering
 
-If there is no need to have a React application client side and you just want to use the server side rendering but without the React specific data attributes call `Html.React` and pass serverOnly parameter as true.
+If there is no need to have a React application client side and you just want to use the server side rendering but without the React specific data attributes, call `Html.React` and pass serverOnly parameter as true.
 
 ```csharp
 @Html.React("HelloWorld", new
@@ -86,7 +88,7 @@ If there is no need to have a React application client side and you just want to
 }, serverOnly: true)
 ```
 
-And the Html mark up will look like the one following which is a lot cleaner. In this case there is no need to load the React script or call the `Html.ReactInitJavaScript()` method.
+And the HTML will look like the one following which is a lot cleaner. In this case there is no need to load the React script or call the `Html.ReactInitJavaScript()` method.
 
 ```html
 <div id="react1">

site/jekyll/index.md

@@ -18,9 +18,9 @@ id: home
       [React](http://facebook.github.io/react/) and
       [JSX](http://facebook.github.io/react/docs/jsx-in-depth.html) from C# and
       other .NET languages, focusing specifically on ASP.NET MVC (although it
-      also works in other environments). It assumes you already have some basic
-      knowledge about React. It is cross-platform and can run on Linux via Mono.
-      Now with support for [ASP.NET 5 Beta](/getting-started/aspnet5.html)!
+      also works in other environments). It supports both ASP.NET 4 (with MVC 4 or 5),
+      and ASP.NET Core MVC. It is cross-platform and can run on Linux via Mono
+      or .NET Core.
       Take a look at [the tutorial](/getting-started/tutorial.html) to see how
       easy it is to get started with React and ReactJS.NET!
     </p>