remove conceptual (#1535)

* remove conceptual

* move api

* fix stuff

* INtroduction

aspnet/conceptual-overview/index.rst

@@ -1,8 +0,0 @@
-Conceptual Overview
--------------------
-
-.. toctree::
-  :titlesonly:
-
-  aspnet
-  choosing-the-right-dotnet

aspnet/fundamentals/index.rst

@@ -19,4 +19,5 @@ Fundamentals
     servers
     request-features
     owin
+    choosing-the-right-dotnet
 

aspnet/fundamentals/static-files.rst

@@ -15,7 +15,7 @@ Static files, such as HTML, CSS, image, and JavaScript, are assets that an ASP.N
 Serving static files
 --------------------
 
-Static files are typically located in the ``web root`` (*<content-root>/wwwroot*) folder. See Content root and Web root in  :doc:`/conceptual-overview/aspnet` for more information. You generally set the content root to be the current directory so that your project's ``web root`` will be found while in development.
+Static files are typically located in the ``web root`` (*<content-root>/wwwroot*) folder. See Content root and Web root in  :doc:`/intro` for more information. You generally set the content root to be the current directory so that your project's ``web root`` will be found while in development.
 
 .. literalinclude:: ../../common/samples/WebApplication1/src/WebApplication1/Program.cs
   :language: c#
@@ -43,7 +43,7 @@ In order for static files to be served, you must configure the :doc:`middleware`
 
 You must include "Microsoft.AspNetCore.StaticFiles" in the *project.json* file.
 
-.. note:: ``web root`` defaults to the *wwwroot* directory, but you can set the ``web root`` directory with :dn:method:`~Microsoft.AspNetCore.Hosting.HostingAbstractionsWebHostBuilderExtensions.UseWebRoot`. See :doc:`/conceptual-overview/aspnet` for more information.
+.. note:: ``web root`` defaults to the *wwwroot* directory, but you can set the ``web root`` directory with :dn:method:`~Microsoft.AspNetCore.Hosting.HostingAbstractionsWebHostBuilderExtensions.UseWebRoot`. See :doc:`/intro` for more information.
 
 Suppose you have a project hierarchy where the static files you wish to serve are outside the ``web root``. For example:
 
@@ -260,4 +260,4 @@ Additional Resources
 --------------------
 
 - :doc:`middleware`
-- :doc:`/conceptual-overview/aspnet` 
+- :doc:`/intro` 

aspnet/index.rst

@@ -18,10 +18,9 @@ Topics
 .. toctree::
     :titlesonly:
 
-    getting-started
-    API <https://docs.asp.net/projects/api>
+    Introduction <intro> 
+    getting-started     
     tutorials/index
-    conceptual-overview/index
     fundamentals/index
     mvc/index
     testing/index
@@ -33,6 +32,7 @@ Topics
     security/index
     performance/index
     migration/index
+    API <https://docs.asp.net/projects/api>
     contribute/index
     
 

aspnet/publishing/iis.rst

@@ -296,6 +296,6 @@ Troubleshooting
 Additional resources
 --------------------
 
-- :doc:`/conceptual-overview/aspnet`
+- :doc:`/intro`
 - `The Official Microsoft IIS Site <http://www.iis.net/>`__
 - `Microsoft TechNet Library: Windows Server <https://technet.microsoft.com/en-us/library/bb625087.aspx>`__

aspnet/tutorials/publish-to-azure-webapp-using-vs.rst

@@ -177,5 +177,5 @@ Next steps
 -----------
 
 - :doc:`/tutorials/first-mvc-app/start-mvc`
-- :doc:`/conceptual-overview/aspnet`
+- :doc:`/intro`
 - :doc:`/fundamentals/index`