From 49c6d4ff00df28d96182fc162aeb2b526a1f0dfe Mon Sep 17 00:00:00 2001 From: Scott Addie Date: Sun, 27 Dec 2015 21:30:58 -0600 Subject: [PATCH] Convert to using Sphinx-style relative links Apply new labels to ASP.NET docs to support Sphinx links --- aspnet/client-side/bootstrap.rst | 2 ++ .../client-side/bundling-and-minification.rst | 2 ++ aspnet/client-side/index.rst | 2 ++ aspnet/client-side/using-gulp.rst | 2 ++ aspnet/conceptual-overview/dotnetcore.rst | 2 ++ .../understanding-aspnet5-apps.rst | 2 ++ aspnet/fundamentals/routing.rst | 2 ++ aspnet/fundamentals/startup.rst | 2 ++ mvc/aspnet.inv | Bin 2527 -> 2717 bytes mvc/migration/migratingfrommvc5.rst | 22 +++++++++--------- 10 files changed, 27 insertions(+), 11 deletions(-) diff --git a/aspnet/client-side/bootstrap.rst b/aspnet/client-side/bootstrap.rst index 36de6479ee..ef0f13a18b 100644 --- a/aspnet/client-side/bootstrap.rst +++ b/aspnet/client-side/bootstrap.rst @@ -1,3 +1,5 @@ +.. _bootstrap-index: + Building Beautiful, Responsive Sites with Bootstrap =================================================== diff --git a/aspnet/client-side/bundling-and-minification.rst b/aspnet/client-side/bundling-and-minification.rst index 593dc4066f..ce814f5521 100644 --- a/aspnet/client-side/bundling-and-minification.rst +++ b/aspnet/client-side/bundling-and-minification.rst @@ -1,5 +1,7 @@ .. include:: /../common/stub-topic.txt +.. _bundling-minification-index: + |stub-icon| Bundling and Minification ===================================== diff --git a/aspnet/client-side/index.rst b/aspnet/client-side/index.rst index 45d3775f0e..c4d48da666 100644 --- a/aspnet/client-side/index.rst +++ b/aspnet/client-side/index.rst @@ -1,3 +1,5 @@ +.. _client-side-development-index: + Client-Side Development ----------------------- diff --git a/aspnet/client-side/using-gulp.rst b/aspnet/client-side/using-gulp.rst index 1d7983d993..884ee1bc5f 100644 --- a/aspnet/client-side/using-gulp.rst +++ b/aspnet/client-side/using-gulp.rst @@ -1,3 +1,5 @@ +.. _using-gulp: + Using Gulp ========== diff --git a/aspnet/conceptual-overview/dotnetcore.rst b/aspnet/conceptual-overview/dotnetcore.rst index 35149270c9..ba5f168b82 100644 --- a/aspnet/conceptual-overview/dotnetcore.rst +++ b/aspnet/conceptual-overview/dotnetcore.rst @@ -1,3 +1,5 @@ +.. _introducing-dotnet-core: + Introducing .NET Core ===================== diff --git a/aspnet/conceptual-overview/understanding-aspnet5-apps.rst b/aspnet/conceptual-overview/understanding-aspnet5-apps.rst index ffa3f14120..4bd171b461 100644 --- a/aspnet/conceptual-overview/understanding-aspnet5-apps.rst +++ b/aspnet/conceptual-overview/understanding-aspnet5-apps.rst @@ -35,6 +35,8 @@ You can see which framework is currently being targeted in the web application p By default, the **Use Specific Runtime** checkbox within the **Debug** tab is unchecked. To target a specific version, check the box and choose the appropriate *Version*, *Platform*, and *Architecture*. +.. _the-project-json-file: + The project.json File --------------------- diff --git a/aspnet/fundamentals/routing.rst b/aspnet/fundamentals/routing.rst index 84b75caf25..47041ee7e9 100644 --- a/aspnet/fundamentals/routing.rst +++ b/aspnet/fundamentals/routing.rst @@ -1,5 +1,7 @@ .. include:: /../common/stub-topic.txt +.. _routing-index: + |stub-icon| Routing =================== diff --git a/aspnet/fundamentals/startup.rst b/aspnet/fundamentals/startup.rst index 67134501ac..736b003c2d 100644 --- a/aspnet/fundamentals/startup.rst +++ b/aspnet/fundamentals/startup.rst @@ -1,3 +1,5 @@ +.. _application-startup: + Application Startup =================== diff --git a/mvc/aspnet.inv b/mvc/aspnet.inv index 565d1e023d0cdfa9052dd9f01d2862f4f660c804..31239e36ab9cc7d35dc2fb99a63e20e7e36803ff 100644 GIT binary patch delta 2626 zcmV-I3cdB;6P*>1c7I#lkK4Erf7f3@p!d)MW!wXrhaQR^HtT#WdPx@ROLMQ3MBB_# zqDoTh_2K^b4!WwAhCQcv(}K-@BpnfCh@g@-6sXn(qsJ%( zZFEaG7Ee?@F}hm-5h`J5>(X*pO-=P{43VK6di04nL3U0=)``o|vG*=EF_WdLPn3(s zw4ZaN?GB$757n~A$O=(4;IN!=ruSIVhLggM7%8@_rhkugpBhlKXeEd)N}>sFq|mf5 zeqJO%iy@#uxQfuQ$6?9lD!hZV944x|yV%Tt3H@8SZ+Yh&jl-w06JR_ZF_a_ezXk2}RS zF6zxy?5`SHu=PIj!B?2=Vh5|qr}wi-xk0Jyf`3!~pZEpzQ``isZ;Dh6EX(nZT0<~g zX*M03jO1}aIL~1l`!2@((zk=a^>geJs~!a#7(c`NJ=%6bWSHIAcAcTrKo$Uw$4m+C z@{wye;@+WlIZlT@%7$HOmc%Rg5;W0$r+LaYE}0^^3Bnd47oZCayBFTjn#$|BWiUQe zTYp(^F@;N*s8otp;kNcd)9v;+ivgTK;Y(<68`_==QbPW=6^bJGVgMSGHInp6 zJks(E=cbhnD65NzdSytU%^-BU(7kJh)Yvu;G0;MZVEdY;kB6wFYtnMauc$UoyKFN# z1PSJrt{ts>`;m3X3+3K!#8~ees;<3aynpTRk;OkI@T@7EBYd(5xdO#jLri3n=r1Du ze#T0QT+;?lCfhwqRHhSxo<>Nm#dF24MGns}&tUD?LJDJ3!O{;LDLFpz zO=Wuk66JZO8Tsa!RB(|O*i4SyonWrojjF@YI*ooFnn(wA`<#)?;nXoJ7erYxv0 zQPSAj!sZr3km1Kmw)qgII$a7 zt_QudJ##o+A>NOmhM3(?b(m^%0}7(-=>;L@V0x6U#AMsy(A2@3xJ&n`e!ZJb786ol zm+(zlGV>dPFxhooNE-4^6ZNW@DN9edQ5vXT!wSWezv?J)0f)ZRn_a9&|94pQi^X7U{ip+q*V`{6F%nCZ|Jjcv#P~;EukfaQ`%NZ*X(FM z9$tKRVqLZ;duzP10_dF)$TqYdxZn(}P9MAke`f=7$>nFbSA30@qG-FN8uYY; zMZw-vmO?{F*>c1AXn%CVMz%ZN_E5;$GNr8S5pqUJ`6-_OVzSd(gkC?z=&H87FOBY`enjnX6}7KQSq4^V9QA^?%*fwQF0&m>KL{12Nm| zap>^j?Y1l*<^B#f+@6YjV1GEjkbO}mL_hmmV6*q6>!OG4tkGwCBRBu97xo8mb!9w1 zan!vAjI&cWMBEtsSxa!D$(H^y1I*~#F~FU=0d8~7)Hb{@f#sNs{qZTS7fT;f+;{EP zdCN{c^I>Y%UwrKOI(1;NHBw2iSG13*0ej)h;^Dg zIMK*LpRU`JL9PUcRN0-T$L?)YC72}Qkwt0s7`T%g-G88`!MizrYulnt+itSp>ux{1 zD-DF+PiHgXj`k!oa|rS?CqkNIU&6|5=dSO(gvG4~G4Fbq_W^Pu=ct^1K6Bctd3)yS zBHmc{tY*xp5(R_21EwUKYSXDWjs9YfnUM1K;6g;VI?pjq`dR{bUx95Yz5NoM+#dQwJho|>5zjY(IX`(Pe*o%rmn>mS|< zM=05wRYujwjPJoi4tkvoTJqU9yJLpuU9DZru*b}b|#NcOYs=P`zoD$&Y<&WMVjVm12b zrLGaph>FyFs@G@8Z zF~uK$S$f(?IQ08des3rR@wTARRE=&sYJ zh>{Xn7_^5m;HJgkwMNW$zP$bOUvWmIW?PmKO-H*eqJKXRBOZT;RCq6r*#2`A@>vZa z8-bwrQ5@0Y%hMWJ1qV_I&awuJzR>Lju>ejBd97JiD=iA_Sl=)zvAS`?ftkpj3iJ)Q znn7@IsKuF`co%0dUOPKy_)dV*zEF1=mxaeg9qt(0I4gH|vA?cp#C<7OI}_7Z~OPP6IUWF(I>!ubZ4`yXP= zFMUS{TtCNdvFcHcV=9DV)PZrBc)i*QFO4 zZ@0sl_uvEyUqgdSXbl%6hkedoD2m{V6=b^uMH@;>BasO-Ptx!om5gxq zJNhXNBWo9F6k3sfl68do} z$f+ibkL8u3&aa^czR4Uwog4~s*XWxx4L-qpO3qJwW7(d7MEg9`jC}J%DmdF@*ndZ-2XHf0Vw#7Cms6)9>JGwx1D}N-M3t!LE;lyrSyB_r3_Dtb)hj>4O>SMMV>o8Ss z3@C`Q!z)70!E`8XiOIIZp{a#8ahK+)ZoQjK788=+m+(WLGxHmQFv+?uBn^3|i8|Gp zDNDn!5UJ~GTJ;)MD5m^%M2<5!^j$80pU6fqZ4}Vd;=c6!b zCPIN+3u{QOuEQ+66nje zFP6;ETb&eAiti9$V}QJ*RS%sbKIZdp=!{SE3h=?)($o{uYb~F=hQ2QMckO;wlUOTR(|(+<-%O+5kCvC20ezp)EF1L z-C2D!!S@mY@>lmWMJZUGb9yB5(xT7_b*GlllENu%tE5|YHXjqfSghUc3HfZk$KI~4 ztpIv&1ZF#0_FUbDR;LeMg8yeda*@za?Y-h#v=mw0F4ePV*wRVLFMm;n@JkY*Rp=CL zx1|5A&E_yuDC0zd3rbd1RFB2=XgEQ`aNe|NIG}msXl=!w28<4KV|%Tuy4p!NqHHPA zHH?0myIxJW$HYmd9sY{PkD&Y2>Avr!H{+x(vwd4Py>c^5%L9|5G(SD>RNvh!yS8^!wv*C-sq&2A_UA8=IYmL6x3$y80 zv9NrDs|(}#k)!T4V4R)0A>zj1k6MBg&1U9L6TpnV9Ru8|8{m4wncCY`9+D}nmRvOF zhp0|$o=o*s+isn=Y}IEzOwIC0r7zEb2QNF|bPXH;F+TC3{C}(MdKcrTrX$GPO?RDV zra#5_GewEa_NO~p)8=D%?F3flJww>y+FL;QA?aW}B$8-%94 z-ED7_;IRF4C)A<4&{PQ`TRgL9t2zYkf+DZ83sr{{IaX*dETXm{L!1@%B@*5=SY@WhG|F613-e^tIOTTF?)$rmw1Fkj ziVQIczL^k6r|w+1mpbmL$drgmZTAoKO^g!jS3~NAMu;#;cc!{QMhC;_Fgr0=)Lb+3 zc*$EZpNJAs4p@FmT|#qC4-6om@?DFfH*C>?t9!R%T;|wKQ*)&^%N_R_~0O2#Rnj5 z9RU*Z>4PtK$Lh;XIXzG=Dtm``__, `Bower `__ and `Gulp `__ scripts should run on the ``prepublish`` stage. We'll talk about NPM, Bower, and Gulp later in the tutorial. Note the trailing "," added to the end of the ``publishExclude`` section. -For more information, see `project.json `_ and `Introducing .NET Core `_. +For more information, see :ref:`project.json ` and :ref:`Introducing .NET Core `. - Open the *Startup.cs* file and change the code to match the following: @@ -53,7 +53,7 @@ For more information, see `project.json `_ and `Routing `__. +``UseStaticFiles`` adds the static file handler. As mentioned previously, the ASP.NET runtime is modular, and you must explicitly opt in to serve static files. For more information, see :ref:`Application Startup ` and :ref:`Routing `. Add a controller and view ------------------------- @@ -133,7 +133,7 @@ Upon saving the file, Bower will automatically download the dependencies to the .. image:: migratingfrommvc5/_static/search.png -See `Manage Client-Side Packages with Bower `__ for more information. +See :ref:`Manage Client-Side Packages with Bower ` for more information. Gulp ---- @@ -155,7 +155,7 @@ The code above performs these functions: - Minifies the JavaScript and CSS files. - Bundles (concatenates) the JavaScript and CSS files. -See `Using Gulp with ASP.NET 5 and Visual Studio `__. +See :ref:`Using Gulp with ASP.NET 5 and Visual Studio `. NPM --- @@ -181,7 +181,7 @@ Open the *package.json* file, and replace the contents with the following: Right-click on *gulpfile.js* and select **Task Runner Explorer**. Double-click on a task to run it. -For more information, see `Client-Side Development in ASP.NET 5 `_. +For more information, see :ref:`Client-Side Development in ASP.NET 5 `. .. _migrate-layout-file: @@ -226,14 +226,14 @@ View the site in the browser. It should now load correctly, with the expected st Configure Bundling ------------------ -The MVC 5 starter web template utilized the MVC runtime support for bundling. In ASP.NET MVC 6, this functionality is performed as part of the build process using `Gulp `__. We've previously configured bundling and minification; all that's left is to change the references to Bootstrap, jQuery and other assets to use the bundled and minified versions. You can see how this is done in the layout file (*Views/Shared/_Layout.cshtml*) of the full template project. See `Bundling and Minification `__ for more information. +The MVC 5 starter web template utilized the MVC runtime support for bundling. In ASP.NET MVC 6, this functionality is performed as part of the build process using `Gulp `__. We've previously configured bundling and minification; all that's left is to change the references to Bootstrap, jQuery and other assets to use the bundled and minified versions. You can see how this is done in the layout file (*Views/Shared/_Layout.cshtml*) of the full template project. See :ref:`Bundling and Minification ` for more information. Additional Resources -------------------- - `Migrating an ASP.NET MVC 5 App to ASP.NET 5 `__ -- `Using Gulp `__ -- `Client-Side Development in ASP.NET 5 `_ -- `Manage Client-Side Packages with Bower `_ -- `Bundling and Minification `__ -- `Bootstrap for ASP.NET 5 `_ +- :ref:`Using Gulp ` +- :ref:`Client-Side Development in ASP.NET 5 ` +- :ref:`Manage Client-Side Packages with Bower ` +- :ref:`Bundling and Minification ` +- :ref:`Bootstrap for ASP.NET 5 `