Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ function New-PSOptions {
# Get the Options of the last build
function Get-PSOptions {
param(
[Parameter(HelpMessage='Defaults to New-PSOption if a build has not ocurred.')]
[Parameter(HelpMessage='Defaults to New-PSOption if a build has not occurred.')]
[switch]
$DefaultToNew
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -355,10 +355,10 @@
<value>The RepetitionInterval parameter cannot have a value of zero unless the RepetitionDuration parameter also has a zero value. A zero value removes repetition behavior from the Job trigger.</value>
</data>
<data name="ErrorRenamingScheduledJob" xml:space="preserve">
<value>An error occured while attempting to rename scheduled job from {0} to {1}.</value>
<value>An error occurred while attempting to rename scheduled job from {0} to {1}.</value>
</data>
<data name="ErrorRenamingScheduledJobWithMessage" xml:space="preserve">
<value>An error occured while attempting to rename scheduled job from {0} to {1} with error message: {2}.</value>
<value>An error occurred while attempting to rename scheduled job from {0} to {1} with error message: {2}.</value>
</data>
<data name="BrokenRenamingScheduledJob" xml:space="preserve">
<value>An unrecoverable error occurred while renaming the scheduled job from {0} to {1}. The scheduled job will be removed.</value>
Expand Down
4 changes: 2 additions & 2 deletions src/Schemas/PSMaml/ManagedDeveloper.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<annotation>
<documentation>
This schema describes MAML, the Microsoft Assistance Markup Language.
MAML is intended for software documentation. In particular, it is
intended to accomodate the needs of Microsoft documentation.
MAML is intended for software documentation. In particular, it is
intended to accommodate the needs of Microsoft documentation.
</documentation>
<documentation>
The schema is broken into three main areas: end user, developer and
Expand Down
4 changes: 2 additions & 2 deletions src/Schemas/PSMaml/ManagedDeveloperStructure.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<annotation>
<documentation>
This schema describes MAML, the Microsoft Assistance Markup Language.
MAML is intended for software documentation. In particular, it is
intended to accomodate the needs of Microsoft documentation.
MAML is intended for software documentation. In particular, it is
intended to accommodate the needs of Microsoft documentation.
</documentation>
<documentation>
The schema is broken into three main areas: end user, developer and
Expand Down
4 changes: 2 additions & 2 deletions tools/install-powershell.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ install(){
#bash <(curl -s https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.sh) <ARGUMENTS>


#Usage - if you do not have the ability to run scripts directly from the web,
#Usage - if you do not have the ability to run scripts directly from the web,
# pull all files in this repo folder and execute, this script
# automatically prefers local copies of sub-scripts

Expand Down Expand Up @@ -132,7 +132,7 @@ install(){
bash <(wget -qO- $gitreposcriptroot/appimage.sh) $@
fi
elif [ "$DistroBasedOn" == "redhat" ] || [ "$DistroBasedOn" == "debian" ] || [ "$DistroBasedOn" == "osx" ] || [ "$DistroBasedOn" == "suse" ] || [ "$DistroBasedOn" == "amazonlinux" ]; then
echo "Configuring PowerShell Core Enviornment for: $DistroBasedOn $DIST $REV"
echo "Configuring PowerShell Core Environment for: $DistroBasedOn $DIST $REV"
if [ -f $SCRIPTFOLDER/installpsh-$DistroBasedOn.sh ]; then
#Script files were copied local - use them
. $SCRIPTFOLDER/installpsh-$DistroBasedOn.sh
Expand Down