Merge branch 'master' into update-toc

Conflicts:
	docs/aspnet5/index.rst
	docs/index.rst

.gitignore

@@ -197,3 +197,4 @@ FakesAssemblies/
 # Visual Studio 6 workspace options file
 *.opt
 samples/MigratingFromMvc5/NewMvc6Project/src/NewMvc6Project/wwwroot/lib/
+samples/AngularSample/src/AngularSample/wwwroot/lib

docs/_authors/noel-rice.rst

@@ -0,0 +1,17 @@
+.. :orphan: 
+
+.. _Author:
+
+Author
+^^^^^^
+.. container:: author
+
+	.. container:: photo
+
+		.. image:: /_authors/photos/noel-rice.jpg
+
+	.. container:: bio
+
+		Noel Rice is an author of books, blogs, and articles, and a Master Consultant at `Falafel Software`_. You can follow him at http://blog.falafel.com/author/noel-rice.
+
+.. _`Falafel Software`: http://falafel.com/

docs/aspnet5/dnx/dnx-console/dnx-console.rst

@@ -0,0 +1,68 @@
+Creating a Cross-Platform Console App with DNX
+==============================================
+By `Steve Smith`_ | Originally Published: 1 June 2015 
+
+.. _`Steve Smith`: Author_
+
+Using the .NET Execution environment (DNX), it's very easy to run a simple console application.
+
+This article covers the following topics:
+	- `Creating a Console App`_
+	- `Specifying Project Settings`_
+	- `Running the App`_
+
+You can `view and download the source <https://github.com/aspnet/Docs/tree/master/samples/CreatingConsoleAppWithDNX>`_ from the project created in this article.
+
+Creating a Console App
+----------------------
+
+Before you begin, make sure you have successfully installed DNX on your system:
+	- :doc:`Installing on Windows </getting-started/installation/installing-on-windows/installing-on-windows>`
+	- :doc:`Installing on Mac OS X </getting-started/installation/installing-on-mac/installing-on-mac>`
+
+Open a console or terminal window in an empty working folder, where ``dnx`` is configured.
+
+Creating a console application is extremely straightforward. For this article, we're going to use the following C# class, which has just one line of executable code:
+
+.. literalinclude:: ../../../../samples/CreatingConsoleAppWithDNX/Program.cs
+	:linenos:
+	:language: c#
+
+It really doesn't get any simpler than this. Create a file with these contents and save it as ``Program.cs`` in your current folder.
+
+Specifying Project Settings
+---------------------------
+
+Next, we need to provide the project settings DNX will use. Create a new ``project.json`` file in the same folder, and edit it to match the listing shown here:
+
+.. literalinclude:: ../../../../samples/CreatingConsoleAppWithDNX/project.json
+	:linenos:
+	:language: javascript
+
+Save your changes.
+
+Running the App
+---------------
+
+At this point, we're ready to run the app. You can do this by simply entering ``dnx . run`` from the command prompt. You should see a result like this one:
+
+.. image:: _static/dnx-run.png
+
+..note:: ``dnx`` references several `environment variables <https://github.com/aspnet/Home/wiki/Environment-Variables>`_, such as ``DNX_TRACE``, that affect its behavior.
+
+Set the ``DNX_TRACE`` environment variable to 1, and run the application again. You should see a great deal more output:
+
+.. image:: _static/dnx-trace-run.png
+
+In this example, running on the Windows platform, the default behavior for DNX is to run on the full .NET Framework. You can switch to use the CoreCLR by running ``dnvm upgrade -r CoreCLR``. To return to using .NET CLR, run ``dnvm upgrade -r CLR``.
+
+You can see the app continues to run after switching to use CoreCLR:
+
+.. image:: _static/dnx-trace-coreclr-run.png
+
+Summary
+-------
+
+Creating and running your first console application on DNX is very simple, and only requires two files.
+
+.. include:: /_authors/steve-smith.rst

docs/contribute/style-guide/style-guide.rst

@@ -7,12 +7,11 @@ By `Steve Smith`_ | Originally Published: 15 April 2015
 This document provides an overview of how articles published on `docs.asp.net <http://docs.asp.net>`_ should be formatted. You can actually use this file, itself, as a template when contributing articles.
 
 This article covers the following topics:
-	- Article Structure
-	- ReStructuredText Syntax
-	- Additional Reading
+	- `Article Structure`_
+	- `ReStructuredText Syntax`_
 
 Article Structure
-^^^^^^^^^^^^^^^^^
+-----------------
 
 Articles should be submitted as individual text files with a **.rst** extension. Authors should be sure they are familiar with the `Sphinx Style Guide <http://documentation-style-guide-sphinx.readthedocs.org/en/latest/style-guide.html>`_, but where there are disagreements, this document takes precedence. The article should begin with its title on line 1, followed by a line of === characters. Next, the author and publication date should be displayed. The author name appears in 3 places in an article document: line 3, line 5 (an alias to the Author_ target), and on the very last line, where the appropriate author.rst file is included (e.g. steve-smith.rst).
 
@@ -21,27 +20,28 @@ Articles should typically begin with a brief abstract describing what will be co
 Articles should typically include a Summary section at the end, and optionally additional sections like Next Steps or Additional Resources. These should not be included in the bulleted list of topics, however.
 
 Headings
---------
+^^^^^^^^
 
 Typically articles will use at most 3 levels of headings. The title of the document is the highest level heading and must appear on lines 1-2 of the document. The title is designated by a row of === characters.
 
-Section headings should correspond to the bulleted list of topics set out after the article abstract. `Article Structure`, above, is an example of a section heading. A section heading should appear on its own line, followed by a line consisting of ^^^ characters.
+Section headings should correspond to the bulleted list of topics set out after the article abstract. `Article Structure`, above, is an example of a section heading. A section heading should appear on its own line, followed by a line consisting of --- characters.
 
-Subsection headings can be used to organize content within a section. `Headings`, above, is an example of a subsection heading. A subsection heading should appear on its own line, followed by a line of --- characters.
+Subsection headings can be used to organize content within a section. `Headings`, above, is an example of a subsection heading. A subsection heading should appear on its own line, followed by a line of ^^^ characters.
 
 For section headings, only the first word should be capitalized:
 - This heading follow the style
 - This Heading Does Note
 
-
+More on sections and headings in ReStructuredText:
+http://sphinx-doc.org/rest.html#sections
 
 ReStructuredText Syntax
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+-----------------------
 
 The following ReStructuredText elements are commonly used in ASP.NET documentation articles. Note that **indentation and blank lines are significant!**
 
 Inline Markup
--------------
+^^^^^^^^^^^^^
 
 Surround text with:
 
@@ -68,7 +68,7 @@ Format specific items using these rules:
 	- Language keywords
 
 Links
------
+^^^^^
 
 Inline hyperlinks are formatted like this:
 
@@ -91,7 +91,7 @@ For example, here is a link to the `Inline Markup`_ section, above.
 Any element that is rendered as a link should not have any additional formatting or styling.
 
 Lists
------
+^^^^^
 
 Lists can be started with a ``-`` or ``*`` character:
 
@@ -111,7 +111,7 @@ Numbered lists can start with a number, or they can be autonumbered by starting
 	#. Auto-numbered two.
 
 Source Code
------------
+^^^^^^^^^^^
 
 Of course, source code is very commonly included in these articles. Images should never be used to display source code - instead use ``code-block`` or ``literalinclude``. You can refer to it using the ``code-block`` element, which must be declared precisely as shown, including spaces, blank lines, and indentation:
 
@@ -141,7 +141,7 @@ The code block ends when you begin a new paragraph without indentation. `Sphinx
 
 .. _Captions: 
 
-Code blocks also support line numbers and emphasizing or highlighting certain lines, as well as captions and names. Captions are displayed, names can be used as link targets (e.g. `Foo Method`_):
+Code blocks also support line numbers and emphasizing or highlighting certain lines, as well as captions and names (in v1.3 of Sphinx). Captions are displayed, names can be used as link targets (e.g. `Foo Method`_):
 
 .. code-block:: rst
 
@@ -171,7 +171,7 @@ This results in:
 
 
 Images
-------
+^^^^^^
 
 Images such as screen shots and explanatory figures or diagrams should be placed in a ``_static`` folder at the same level as the article file. References to images should therefore always be made using relative references, e.g. ``_static/asp-net.png``. Note that images should always be saved as all lower-case file names, using hyphens to separate words, if necessary.
 
@@ -192,7 +192,7 @@ Here's an example using the above syntax:
 Images are responsively sized according to the browser viewport when using this directive. Currently the maximum width supported by the http://docs.asp.net theme is 697px.
 
 Notes
------
+^^^^^
 
 To add a note callout, like the ones shown in this document, use the ``.. note::`` directive.
 
@@ -205,7 +205,7 @@ This results in:
 .. note:: This is a note.
 
 Including External Source Files
--------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 One nice feature of ReStructuredText is its ability to reference external files. This allows actual sample source files to be referenced from documentation articles, reducing the chances of the documentation content getting out of sync with the actual, working code sample (assuming the code sample works, of course). However, if documentation articles are referencing samples by filename and line number, it is important that the documentation articles be reviewed whenever changes are made to the source code, otherwise these references may be broken or point to the wrong line number. For this reason, it is recommended that samples be specific to individual articles, so that updates to the sample will only affect a single article (at most, an article series could reference a common sample). Samples should be committed to ``/aspnet/docs/samples/`` in a folder named to correspond with the article referencing the sample.
 
@@ -238,12 +238,12 @@ This would include the first and fourth line, and then line 20 through the end o
 Literal includes also support `Captions`_ and names, as with ``code-block`` elements. If the ``caption`` is left blank, the file name will be used as the caption.
 
 Tables
-------
+^^^^^^
 
 Tables can be constructed using grid-like "ASCII Art" style text. In general they should only be used where it makes sense to present some tabular data. Rather than include all of the syntax options here, you will find a detailed reference at `<http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#grid-tables>`_.
 
 UI navigation
--------------
+^^^^^^^^^^^^^
 
 When documenting how a user should navigate a series of menus, use the ``:menuselection:`` directive:
 
@@ -254,15 +254,15 @@ When documenting how a user should navigate a series of menus, use the ``:menuse
 This will result in :menuselection:`Windows --> Views --> Other...`.
 
 Additional Reading
-^^^^^^^^^^^^^^^^^^
+------------------
 
 Learn more about Sphinx and ReStructuredText:
 	- `Sphinx documentation <http://sphinx-doc.org/contents.html>`_
 	- `RST Quick Reference <http://docutils.sourceforge.net/docs/user/rst/quickref.html>`_
 
 
 Summary
-^^^^^^^
+-------
 
 This style guide is intended to help contributors quickly create new articles for `docs.asp.net <http://docs.asp.net>`_. It includes the most common RST syntax elements that are used, as well as overall document organization guidance. If you discover mistakes or gaps in this guide, please `submit an issue <https://github.com/aspnet/docs/issues>`_.