From 5ee980aecf053c65eedb673480669749de12dc40 Mon Sep 17 00:00:00 2001 From: Rick Anderson Date: Mon, 27 Jun 2016 15:04:08 -0700 Subject: [PATCH] remove conceptual (#1535) * remove conceptual * move api * fix stuff * INtroduction --- aspnet/conceptual-overview/index.rst | 8 -------- .../choosing-the-right-dotnet.rst | 0 aspnet/fundamentals/index.rst | 1 + aspnet/fundamentals/static-files.rst | 6 +++--- aspnet/index.rst | 6 +++--- aspnet/{conceptual-overview/aspnet.rst => intro.rst} | 0 aspnet/publishing/iis.rst | 2 +- aspnet/tutorials/publish-to-azure-webapp-using-vs.rst | 2 +- 8 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 aspnet/conceptual-overview/index.rst rename aspnet/{conceptual-overview => fundamentals}/choosing-the-right-dotnet.rst (100%) rename aspnet/{conceptual-overview/aspnet.rst => intro.rst} (100%) diff --git a/aspnet/conceptual-overview/index.rst b/aspnet/conceptual-overview/index.rst deleted file mode 100644 index 94ad65d8c6..0000000000 --- a/aspnet/conceptual-overview/index.rst +++ /dev/null @@ -1,8 +0,0 @@ -Conceptual Overview -------------------- - -.. toctree:: - :titlesonly: - - aspnet - choosing-the-right-dotnet diff --git a/aspnet/conceptual-overview/choosing-the-right-dotnet.rst b/aspnet/fundamentals/choosing-the-right-dotnet.rst similarity index 100% rename from aspnet/conceptual-overview/choosing-the-right-dotnet.rst rename to aspnet/fundamentals/choosing-the-right-dotnet.rst diff --git a/aspnet/fundamentals/index.rst b/aspnet/fundamentals/index.rst index df0f2b9ec2..5541f8a9f8 100644 --- a/aspnet/fundamentals/index.rst +++ b/aspnet/fundamentals/index.rst @@ -19,4 +19,5 @@ Fundamentals servers request-features owin + choosing-the-right-dotnet diff --git a/aspnet/fundamentals/static-files.rst b/aspnet/fundamentals/static-files.rst index 8a68be0a99..37da23d978 100644 --- a/aspnet/fundamentals/static-files.rst +++ b/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`` (*/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`` (*/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` diff --git a/aspnet/index.rst b/aspnet/index.rst index a7dd04df30..9ecf093a3f 100644 --- a/aspnet/index.rst +++ b/aspnet/index.rst @@ -18,10 +18,9 @@ Topics .. toctree:: :titlesonly: - getting-started - API + Introduction + 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 contribute/index diff --git a/aspnet/conceptual-overview/aspnet.rst b/aspnet/intro.rst similarity index 100% rename from aspnet/conceptual-overview/aspnet.rst rename to aspnet/intro.rst diff --git a/aspnet/publishing/iis.rst b/aspnet/publishing/iis.rst index c7ce088e7f..5f43a05043 100644 --- a/aspnet/publishing/iis.rst +++ b/aspnet/publishing/iis.rst @@ -296,6 +296,6 @@ Troubleshooting Additional resources -------------------- -- :doc:`/conceptual-overview/aspnet` +- :doc:`/intro` - `The Official Microsoft IIS Site `__ - `Microsoft TechNet Library: Windows Server `__ diff --git a/aspnet/tutorials/publish-to-azure-webapp-using-vs.rst b/aspnet/tutorials/publish-to-azure-webapp-using-vs.rst index 2ee9967f49..492018befd 100644 --- a/aspnet/tutorials/publish-to-azure-webapp-using-vs.rst +++ b/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` \ No newline at end of file