Skip to content

Commit

Permalink
Merge pull request PowerShell#1885 from pborreli/typos
Browse files Browse the repository at this point in the history
Fixed typos
  • Loading branch information
TravisEz13 committed Aug 18, 2016
2 parents f8afd47 + dcce344 commit 6fd9a1b
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docs/building/osx.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ start a `powershell` session, and use `Start-PSBuild` from the module.
The output directory will be slightly different because your runtime identifier is different.
PowerShell will be at `./src/powershell-unix/bin/Linux/netcoreapp1.0/osx.10.11-x64/powershell`,
or `osx.10.10` depending on your operating system version.
Note that configration is still `Linux` because it would be silly to make yet another separate configuration when it's used soley to work-around a CLI issue.
Note that configuration is still `Linux` because it would be silly to make yet another separate configuration when it's used soley to work-around a CLI issue.
2 changes: 1 addition & 1 deletion docs/debugging/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ The script is self-documented and contains a link to the
corehost
========

The native executable prouduced by .NET CLI will produce trace output
The native executable produced by .NET CLI will produce trace output
if launched with `COREHOST_TRACE=1 ./powershell`.

CoreCLR PAL
Expand Down
4 changes: 2 additions & 2 deletions docs/dev-process/coding-guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ Here are some general guidelines
* Use of `this` is neither encouraged nor discouraged.
* Avoid more than one blank empty line.
* Public members should use [doc comments](https://msdn.microsoft.com/en-us/library/b2s063f7.aspx),
internal members may use doc comments but it is not enouraged.
internal members may use doc comments but it is not encouraged.
* Public members in a namespace that ends with `Internal`,
for example `System.Management.Automation.Internal` are not considered a supported public API.
Such members are necessarily public as implementation details in code shared between C# and PowerShell script,
or must be available publically by generated code.
or must be available publicly by generated code.
* File encoding should be ASCII (preferred)
or UTF8 (with BOM) if absolutely necessary.

Expand Down
2 changes: 1 addition & 1 deletion docs/dev-process/map-json-files.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ And in PowerShell/PowerShell it mapped into `src/System.Management.Automation/en
Our dev module contains a number of functions to work that can be used to work with this mapping file.

* `Copy-MappedFiles` -- copies files from psl-monad into PowerShell/PowerShell. Used for "sd -> github" integration.
* `Send-GitDiffToSd` -- applies patch from git to **admin** enslistment with respect to all `map.json` files.
* `Send-GitDiffToSd` -- applies patch from git to **admin** enlistment with respect to all `map.json` files.
It supports `-WhatIf` switch.

```
Expand Down
2 changes: 1 addition & 1 deletion docs/dev-process/resx-files.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ A resource file is a simple XML file, and it's easy to edit.
## Convert `.txt` resource files into `.resx` files

`dotnet cli` doesn't support embedding old-fashioned `.txt` resource.
You can do a one-time convertion of `.txt` resources into `.resx` files with a helper function:
You can do a one-time conversion of `.txt` resources into `.resx` files with a helper function:

```
# example, converting all .txt resources under src\Microsoft.WSMan.Management\resources
Expand Down

0 comments on commit 6fd9a1b

Please sign in to comment.