From e16110ba38702ec8c3a18152c7056b09eaae3e4c Mon Sep 17 00:00:00 2001 From: Ben Monroe Date: Thu, 16 Apr 2015 06:31:32 +0900 Subject: [PATCH] Fixed several grammar and spelling mistakes. --- Documentation/dnx-instructions.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Documentation/dnx-instructions.md b/Documentation/dnx-instructions.md index 2ad29c1..888f13d 100644 --- a/Documentation/dnx-instructions.md +++ b/Documentation/dnx-instructions.md @@ -1,9 +1,9 @@ Creating a Custom DNX ===================== -These instructions will lead you through creating a custom [DNX](https://github.com/aspnet/dnx), using an official DNX and the results of CoreCLR build. The same approach can be be used with the CoreFX build, however, that part isn't explored with these instructions. CoreFX is a bit harder, too, since you need to worry more about depedencies. +These instructions will lead you through creating a custom [DNX](https://github.com/aspnet/dnx) using an official DNX and the results of CoreCLR build. The same approach can be be used with the CoreFX build; however, that part isn't explored with these instructions. CoreFX is a bit harder, too, since you need to worry more about dependencies. -These instructions are specific to Windows and assume that you've just completed the [Windows installation instructions](https://github.com/dotnet/coreclr/wiki/Windows-instructions). They use the same demo `C:\coreclr-demo` directory and assume the same artifacts. The same general idea will work on OS X and Linux, once .NET Core is supported more broadly on those OSes. +These instructions are specific to Windows and assume that you've just completed the [Windows installation instructions](https://github.com/dotnet/coreclr/wiki/Windows-instructions). They use the same demo `C:\coreclr-demo` directory and assume the same artifacts. The same general idea will work on OS X and Linux once .NET Core is supported more broadly on those OSes. Introduction to DNX =================== @@ -15,7 +15,7 @@ DNX is the ".NET Execution Environment". It's a concept that came out of the ASP - It is console-everything. - It is the base mechanism and set of concepts on which ASP.NET 5 is built. -You can have more than one DNX installed (under `.dnx`) on a machine will have a single one selected for use at any time. You use [DNVM](https://github.com/aspnet/dnvm), the .NET SDK Manager, to acquire and manage DNX instances. +You can have more than one DNX installed (under `.dnx`) on a machine and a single one will be selected for use at any time. You use [DNVM](https://github.com/aspnet/dnvm), the .NET SDK Manager, to acquire and manage DNX instances. DNX instances differ/disambiguate on the following axis: @@ -35,7 +35,7 @@ You can request to see which DNXs are available, with `dnvm list`, which will di Installing a DNX ================ -You install a DNX via DNVM. It's easy to install the lastest default DNX, using the upgrade command. +You install a DNX via DNVM. It's easy to install the latest default DNX, using the upgrade command. C:\coreclr-demo>dnvm upgrade @@ -74,7 +74,7 @@ You need one extra file for the demo to work, which is project.json. Add it besi } ``` -You need to restore any dependent nuget packages, with the dnu tool (comes with DNX). DNU will pull down NuGet packages from nuget.org or any other configured NuGet feed, such as MyGet. +You need to restore dependent nuget packages with the dnu tool (comes with DNX). DNU will pull down NuGet packages from nuget.org or any other configured NuGet feed, such as MyGet. C:\coreclr-demo>dnu restore @@ -85,7 +85,7 @@ You can now run the app, with dnx. Switching to CoreCLR ==================== -For the purpose of this demo, you need an x64 DNX hosted on (actually including) CoreCLR. The CoreCLR build only generates X64 artifacts currently. You can install the latest version of an X64 CoreCLR DNX with DNVM. You'll notice that the install process will crossgen the managed assemblies for you. Performance! +For the purpose of this demo, you need an x64 DNX hosted on (actually including) CoreCLR. The CoreCLR build only generates X64 artifacts currently. You can install the latest version of an X64 CoreCLR DNX with DNVM. You'll notice that the install process will crossgen the managed assemblies for you. Performance! C:\coreclr-demo>dnvm install latest -arch x64 -runtime coreclr @@ -106,7 +106,7 @@ You will need to repeat the steps above to run your app on CoreCLR (CoreCLR requ Creating a Custom DNX ===================== -By this point, the demo is working with an official DNX. You can now create a custom DNX with a custom build of CoreCLR. For the purpose of safe experimentation, you are recommended to copy and rename an existing DNX. Note that the version numbers in the example below might not match your current environment. You'll need to adjust. +By this point, the demo is working with an official DNX. You can now create a custom DNX with a custom build of CoreCLR. For the purpose of safe experimentation, you are recommended to copy and rename an existing DNX. Note that the version numbers in the example below might not match your current environment. You'll need to adjust them accordingly. C:\coreclr-demo>dir %USERPROFILE%\.dnx\runtimes Volume in drive C has no label. @@ -122,7 +122,7 @@ By this point, the demo is working with an official DNX. You can now create a cu 4 Dir(s) 94,895,509,504 bytes free -Copy and rename the X64 CoreCLR DNX. That's the one you'll target. You'll be able to see it with `dnvm list`. This time, you will need to explictly `use` this DNX in order to use it. +Copy and rename the X64 CoreCLR DNX. That's the one you'll target. You'll be able to see it with `dnvm list`. This time, you will need to explicitly `use` this DNX in order to use it. C:\coreclr-demo>xcopy /E /S %USERPROFILE%\.dnx\runtimes\dnx-coreclr-win-x64.1.0.0-beta5-11469 %USERPROFILE%\.dnx\runtimes\dnx-coreclr-win-x64.1.0.0-beta5-custom @@ -137,7 +137,7 @@ You now need to select the custom DNX as the use to 'use'. You can see the new D 1.0.0-beta5-11469 coreclr x64 C:\Users\rlander\.dnx\runtimes * 1.0.0-beta5-custom coreclr x64 C:\Users\rlander\.dnx\runtimes -Try running the app again, to validate that you have a working installation, with the custom DNX. +Try running the app again to validate that you have a working installation with the custom DNX. C:\coreclr-demo>dnx . run @@ -153,7 +153,7 @@ The custom CLR will invalidate all of the existing crossgen images. You need to C:\git\coreclr>del %USERPROFILE%\.dnx\runtimes\dnx-coreclr-win-x64.1.0.0-beta5-custom\bin\*.ni.dll -You should re-generate crossgen images for your DNX to provide the best performance, with the following command. Sadly, crossgen won't work until the [Issue 227](https://github.com/dotnet/coreclr/issues/227) is resolved (so skip this command for now). +You should re-generate crossgen images for your DNX to provide the best performance with the following command. Sadly, crossgen won't work until the [Issue 227](https://github.com/dotnet/coreclr/issues/227) is resolved (so skip this command for now). C:\Users\rlander\.dnx\runtimes\dnx-coreclr-win-x64.1.0.0-beta5-custom\bin>k-crossgen.cmd -- 2.7.4