Skip to content

Commit 22f3c8a

Browse files
lusassl-msftdpaulson45
lusassl-msft
authored and
dpaulson45
committed
Fix spelling and case issues
1 parent af71647 commit 22f3c8a

7 files changed

Lines changed: 45 additions & 37 deletions

File tree

‎.build/cspell-words.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ Eventlog
4141
evtx
4242
Exchweb
4343
exfiltration
44+
exopf
45+
exov
4446
fabrikam
4547
FIPFS
4648
fips
@@ -81,6 +83,7 @@ ldifde
8183
Liant
8284
Linq
8385
LOCALAPPDATA
86+
lockdown
8487
logman
8588
lsass
8689
Lync
@@ -89,6 +92,9 @@ Mbps
8992
mbxs
9093
Mddhhmm
9194
Mddhhmmss
95+
mepf
96+
mepfdns
97+
mepfs
9298
meso
9399
mesos
94100
mfcmapi
@@ -151,6 +157,7 @@ Sids
151157
Snapin
152158
SPDLT
153159
STMP
160+
subfolders
154161
syncall
155162
tcpip
156163
TDSDSA
@@ -159,6 +166,7 @@ UCMA
159166
unconfigured
160167
unrequired
161168
USERDNSDOMAIN
169+
validatemepf
162170
Vianet
163171
Visio
164172
vmxnet

‎PublicFolders/MailPublicFolderSync/Sync-MailPublicFolders.ps1‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -89,22 +89,22 @@ function WriteVerboseMessage() {
8989

9090
# Writes an error importing a mail public folder to the CSV summary
9191
function WriteErrorSummary() {
92-
param ($folder, $operation, $errorMessage, $commandtext)
92+
param ($folder, $operation, $errorMessage, $commandText)
9393

94-
WriteOperationSummary -folder $folder.Guid -operation $operation -result $errorMessage -commandtext $commandtext
94+
WriteOperationSummary -folder $folder.Guid -operation $operation -result $errorMessage -commandText $commandText
9595
$script:errorsEncountered++
9696
}
9797

9898
# Writes the operation executed and its result to the output CSV
9999
function WriteOperationSummary() {
100-
param ($folder, $operation, $result, $commandtext)
100+
param ($folder, $operation, $result, $commandText)
101101

102102
$columns = @(
103103
(Get-Date).ToString(),
104104
$folder.Guid,
105105
$operation,
106106
(EscapeCsvColumn $result),
107-
(EscapeCsvColumn $commandtext)
107+
(EscapeCsvColumn $commandText)
108108
)
109109

110110
Add-Content $CsvSummaryFile -Value ("{0},{1},{2},{3},{4}" -f $columns)
@@ -185,7 +185,7 @@ function NewMailEnabledPublicFolder() {
185185
if ($localFolder.PrimarySmtpAddress.ToString() -eq "") {
186186
$errorMsg = ($LocalizedStrings.FailedToCreateMailPublicFolderEmptyPrimarySmtpAddress -f $localFolder.Guid)
187187
Write-Error $errorMsg
188-
WriteErrorSummary -folder $localFolder -operation $LocalizedStrings.CreateOperationName -errorMessage $errorMsg -commandtext ""
188+
WriteErrorSummary -folder $localFolder -operation $LocalizedStrings.CreateOperationName -errorMessage $errorMsg -commandText ""
189189
return
190190
}
191191

@@ -204,13 +204,13 @@ function NewMailEnabledPublicFolder() {
204204
try {
205205
# Assign to $null to suppress the cmdlet's pipeline output
206206
$null = &$script:NewSyncMailPublicFolderCommand @newParams
207-
WriteOperationSummary -folder $localFolder -operation $LocalizedStrings.CreateOperationName -result $LocalizedStrings.CsvSuccessResult -commandtext $commandText
207+
WriteOperationSummary -folder $localFolder -operation $LocalizedStrings.CreateOperationName -result $LocalizedStrings.CsvSuccessResult -commandText $commandText
208208

209209
if (-not $WhatIf) {
210210
$script:ObjectsCreated++
211211
}
212212
} catch {
213-
WriteErrorSummary -folder $localFolder -operation $LocalizedStrings.CreateOperationName -errorMessage $error[0].Exception.Message -commandtext $commandText
213+
WriteErrorSummary -folder $localFolder -operation $LocalizedStrings.CreateOperationName -errorMessage $error[0].Exception.Message -commandText $commandText
214214
Write-Error $_
215215
}
216216
}
@@ -237,13 +237,13 @@ function RemoveMailEnabledPublicFolder() {
237237

238238
try {
239239
&$script:RemoveSyncMailPublicFolderCommand @removeParams
240-
WriteOperationSummary -folder $remoteFolder -operation $LocalizedStrings.RemoveOperationName -result $LocalizedStrings.CsvSuccessResult -commandtext $commandText
240+
WriteOperationSummary -folder $remoteFolder -operation $LocalizedStrings.RemoveOperationName -result $LocalizedStrings.CsvSuccessResult -commandText $commandText
241241

242242
if (-not $WhatIf) {
243243
$script:ObjectsDeleted++
244244
}
245245
} catch {
246-
WriteErrorSummary -folder $remoteFolder -operation $LocalizedStrings.RemoveOperationName -errorMessage $_.Exception.Message -commandtext $commandText
246+
WriteErrorSummary -folder $remoteFolder -operation $LocalizedStrings.RemoveOperationName -errorMessage $_.Exception.Message -commandText $commandText
247247
Write-Error $_
248248
}
249249
}
@@ -273,13 +273,13 @@ function UpdateMailEnabledPublicFolder() {
273273

274274
try {
275275
&$script:SetMailPublicFolderCommand @setParams
276-
WriteOperationSummary -folder $remoteFolder -operation $LocalizedStrings.UpdateOperationName -result $LocalizedStrings.CsvSuccessResult -commandtext $commandText
276+
WriteOperationSummary -folder $remoteFolder -operation $LocalizedStrings.UpdateOperationName -result $LocalizedStrings.CsvSuccessResult -commandText $commandText
277277

278278
if (-not $WhatIf) {
279279
$script:ObjectsUpdated++
280280
}
281281
} catch {
282-
WriteErrorSummary -folder $remoteFolder -operation $LocalizedStrings.UpdateOperationName -errorMessage $_.Exception.Message -commandtext $commandText
282+
WriteErrorSummary -folder $remoteFolder -operation $LocalizedStrings.UpdateOperationName -errorMessage $_.Exception.Message -commandText $commandText
283283
Write-Error $_
284284
}
285285
}
@@ -586,7 +586,7 @@ DownloadValidateMEPFScriptFailed = Unable to download ValidateMailEnabledPublicF
586586
FoundInconsistenciesWithMEPFs = Found some inconsistencies with mail-enabled public folders. To fix them run Sync-MailPublicFolders.ps1 script with -FixInconsistencies parameter.
587587
MailDisablePublicFoldersInFile = Mail disabling public folders mentioned in {0}.
588588
DeleteOrphanedMailPublicFoldersInFile = Deleting orphaned mail public folders mentioned in {0}.
589-
DeleteDuplicateMailPublicFoldersinFile = Deleting duplicate mail public folders mentioned in {0}.
589+
DeleteDuplicateMailPublicFoldersInFile = Deleting duplicate mail public folders mentioned in {0}.
590590
AddAddressesFromDuplicates = Adding email addresses from duplicates...
591591
MailEnablePublicFoldersWithProxyGUIDinFile = Mail-enabling public folders mentioned in {0}.
592592
MailEnablePFAssociatedToDisconnectedMEPFsInFile = Resetting MailEnabled and MailRecipientGuid properties of public folders corresponding to disconnected mepfs mentioned in {0}.
@@ -740,7 +740,7 @@ try {
740740
break
741741
}
742742

743-
WriteErrorSummary -folder $next -operation $LocalizedStrings.UpdateOperationName -errorMessage ($LocalizedStrings.PrimarySmtpAddressUsedByAnotherFolder -f $local.PrimarySmtpAddress, $local.Guid) -commandtext ""
743+
WriteErrorSummary -folder $next -operation $LocalizedStrings.UpdateOperationName -errorMessage ($LocalizedStrings.PrimarySmtpAddressUsedByAnotherFolder -f $local.PrimarySmtpAddress, $local.Guid) -commandText ""
744744

745745
# If there were a previous match based on OnPremisesObjectId, remove the folder operation from add and update collections
746746
$pendingAdds.Remove($next.Guid)
@@ -755,7 +755,7 @@ try {
755755
$pendingUpdates.Remove($local.Guid)
756756
$localIndex += $duplicatesFound + 1
757757

758-
WriteErrorSummary -folder $local -operation $LocalizedStrings.UpdateOperationName -errorMessage ($LocalizedStrings.PrimarySmtpAddressUsedByOtherFolders -f $local.PrimarySmtpAddress, $duplicatesFound) -commandtext ""
758+
WriteErrorSummary -folder $local -operation $LocalizedStrings.UpdateOperationName -errorMessage ($LocalizedStrings.PrimarySmtpAddressUsedByOtherFolders -f $local.PrimarySmtpAddress, $duplicatesFound) -commandText ""
759759
WriteWarningMessage ($LocalizedStrings.SkippingFoldersWithDuplicateAddress -f ($duplicatesFound + 1), $local.PrimarySmtpAddress)
760760
} elseif ($pendingUpdates.Contains($local.Guid)) {
761761
# If we get here, it means two different remote objects match the same local object (one by OnPremisesObjectId and another by PrimarySmtpAddress).
@@ -764,7 +764,7 @@ try {
764764
$pendingUpdates.Remove($local.Guid)
765765

766766
$errorMessage = ($LocalizedStrings.AmbiguousLocalMailPublicFolderResolution -f $local.Guid, $ambiguousRemoteObj.Guid, $remote.Guid)
767-
WriteErrorSummary -folder $local -operation $LocalizedStrings.UpdateOperationName -errorMessage $errorMessage -commandtext ""
767+
WriteErrorSummary -folder $local -operation $LocalizedStrings.UpdateOperationName -errorMessage $errorMessage -commandText ""
768768
WriteWarningMessage $errorMessage
769769
} else {
770770
# Since there was no match originally using OnPremisesObjectId, the local object was treated as an add to Exchange Online.
@@ -810,10 +810,10 @@ try {
810810
}
811811
}
812812

813-
# Find out the authoritative AcceptedDomains on-premises so that we don't accidently remove cloud-only email addresses during updates
813+
# Find out the authoritative AcceptedDomains on-premises so that we don't accidentally remove cloud-only email addresses during updates
814814
$script:authoritativeDomains = @(Get-AcceptedDomain | Where-Object { $_.DomainType -eq "Authoritative" } | ForEach-Object { $_.DomainName.ToString() })
815815

816-
# Finally, let's perfom the actual operations against Exchange Online
816+
# Finally, let's perform the actual operations against Exchange Online
817817
$script:itemsProcessed = 0
818818
for ($i = 0; $i -lt $pendingRemoves.Length; $i++) {
819819
WriteProgress -statusFormat $LocalizedStrings.ProgressBarStatusRemoving -statusProcessed $i -statusTotal $pendingRemoves.Length

‎PublicFolders/Migration/ToMicrosoft365Groups/AddMembersToGroups.ps1‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# .DESCRIPTION
1010
# 1. It reads the permission entries from the backup file stored during lock down if public folders are locked, else uses 'Get-PublicFolderClientPermission' to get the permissions.
1111
# 2. It adds the users with permission roles, "Owner, PublishingEditor, Editor, PublishingAuthor, Author" as members to the group
12-
# 3. It also adds users having atleast "ReadItems, CreateItems, FolderVisible, EditOwnedItems, DeleteOwnedItems" access rights as members to the corresponding group.
12+
# 3. It also adds users having at least "ReadItems, CreateItems, FolderVisible, EditOwnedItems, DeleteOwnedItems" access rights as members to the corresponding group.
1313
# 4. It adds the users with permission role, "Owner" as owners to the group.
1414
# 5. It throws a warning when the default permission is Author and above, suggesting the user to make the group 'public'.
1515
#
@@ -141,7 +141,7 @@ function AddUserToList() {
141141
function ValidateAndAddRemoteUserToList() {
142142
param ([string]$user, [string]$smtpAddress, [string]$userType, [string]$accessRight)
143143

144-
# Using smtp address for uniqueness as "Name" will not be unique accross on-premises and exchange online
144+
# Using smtp address for uniqueness as "Name" will not be unique across on-premises and exchange online
145145
$recipient = Get-RemoteRecipient $smtpAddress -ErrorAction SilentlyContinue | Where-Object { $_.PrimarySmtpAddress -like $smtpAddress } | Select-Object RecipientType
146146

147147
if ($recipient) {
@@ -239,7 +239,7 @@ function WriteLog {
239239
[ValidateNotNullOrEmpty()]
240240
[string]$Message,
241241

242-
# Logfile location
242+
# Log file location
243243
[Parameter(Mandatory=$false)]
244244
[string]$Path="C:\Logs\",
245245

@@ -419,17 +419,17 @@ try {
419419
$permissionEntries = $PermissionList | Where-Object { [string]$_.Identity -eq $pfIdentity }
420420
if (!$permissionEntries) {
421421
if ($ArePublicFoldersLocked) {
422-
WriteLog -Path $logPath -Level Error -Message ($LocalizedStrings.PermissionEntriesMissingInFile -f $permissionListCsvPath, $pfidentity)
422+
WriteLog -Path $logPath -Level Error -Message ($LocalizedStrings.PermissionEntriesMissingInFile -f $permissionListCsvPath, $pfIdentity)
423423
} else {
424-
WriteLog -Path $logPath -Level Error -Message ($LocalizedStrings.PermissionEntriesMissing -f $pfidentity)
424+
WriteLog -Path $logPath -Level Error -Message ($LocalizedStrings.PermissionEntriesMissing -f $pfIdentity)
425425
}
426426

427427
continue
428428
}
429429

430430
$accessRightsOfSpecificUsers = $permissionEntries | Where-Object { !([string]$_.User -eq "Default" -or [string]$_.User -eq "Anonymous") }
431431
if (!$accessRightsOfSpecificUsers) {
432-
WriteLog -Path $logPath -Level Warn -Message ($LocalizedStrings.FolderHasOnlyDefaultPermissions -f $pfidentity, $group)
432+
WriteLog -Path $logPath -Level Warn -Message ($LocalizedStrings.FolderHasOnlyDefaultPermissions -f $pfIdentity, $group)
433433
}
434434

435435
# List of users to be added as owners of the group
@@ -467,7 +467,7 @@ try {
467467
# Validate the user in exchange online and add the user to list
468468
$isUserTypeInvalid = ValidateAndAddRemoteUserToList -user $userName -smtpAddress $smtpAddress -userType $userType -accessRight $accessRights
469469
} else {
470-
# Run Get-Recipient first to get the smtpAdress
470+
# Run Get-Recipient first to get the smtpAddress
471471
# smtpAddress will be null in 2010 as ADRecipient object is not available.
472472
$isUserTypeInvalid = ValidateAndAddUserToList -user $userName -smtpAddress $smtpAddress -userType $userType -accessRight $accessRights
473473
}

‎PublicFolders/Migration/ToMicrosoft365Groups/LockAndSavePublicFolderProperties.ps1‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ function WriteLog {
142142
[ValidateNotNullOrEmpty()]
143143
[string]$Message,
144144

145-
# Logfile location
145+
# Log file location
146146
[Parameter(Mandatory=$false)]
147147
[string]$Path="C:\Logs\",
148148

@@ -193,13 +193,13 @@ function WriteLog {
193193
"[$Date] [$LevelText] $Message" | Out-File -FilePath $Path -Append
194194
}
195195

196-
# Function to retry a specific scriptblock
196+
# Function to retry a specific ScriptBlock
197197
function ExecuteWithRetries {
198198
param(
199199

200200
[Parameter(Mandatory=$true)]
201201
[ValidateNotNullOrEmpty()]
202-
[scriptblock] $ScriptToRetry,
202+
[ScriptBlock] $ScriptToRetry,
203203

204204
[Parameter(Mandatory=$true)]
205205
[array] $ArgumentList,
@@ -427,7 +427,7 @@ try {
427427
# Exporting public folder Permissions to default backup location
428428
$accessRightsToExport = @()
429429
foreach ($accessRightItem in $accessRights) {
430-
$row = New-Object psobject -Property @{
430+
$row = New-Object PSObject -Property @{
431431
Identity = [string] $accessRightItem.Identity
432432
User = [string] $accessRightItem.User
433433
AccessRights = [string] $accessRightItem.AccessRights
@@ -467,7 +467,7 @@ try {
467467
# group's primary smtp address.
468468
$pfEmailIds = $pfEmailIds | ForEach-Object { "smtp:" + ([string]$_).Split(":")[1] }
469469
if ($isE14OnPrem) {
470-
# We can't set the externalEmailAddress for mail-enabled publicfolder in E14
470+
# We can't set the externalEmailAddress for mail-enabled public folder in E14
471471
$extEmailAddr = $null
472472
}
473473

@@ -552,7 +552,7 @@ try {
552552
$sendAsAddedByScript = $null
553553
}
554554

555-
$row = New-Object psobject -Property @{
555+
$row = New-Object PSObject -Property @{
556556
Identity = $pfToGrpMappingItem.FolderPath
557557
EmailAddresses = $pfEmailIds -join " "
558558
UnifiedGroup = $pfToGrpMappingItem.TargetGroupMailbox

‎PublicFolders/Migration/ToMicrosoft365Groups/UnlockAndRestorePublicFolderProperties.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ function WriteLog {
119119
[ValidateNotNullOrEmpty()]
120120
[string]$Message,
121121

122-
# Logfile location
122+
# Log file location
123123
[Parameter(Mandatory=$false)]
124124
[string]$Path="C:\Logs\",
125125

@@ -170,13 +170,13 @@ function WriteLog {
170170
"[$Date] [$LevelText] $Message" | Out-File -FilePath $Path -Append
171171
}
172172

173-
# Function to retry a specific scriptblock
173+
# Function to retry a specific ScriptBlock
174174
function ExecuteWithRetries {
175175
param(
176176

177177
[Parameter(Mandatory=$true)]
178178
[ValidateNotNullOrEmpty()]
179-
[scriptblock] $ScriptToRetry,
179+
[ScriptBlock] $ScriptToRetry,
180180

181181
[Parameter(Mandatory=$true)]
182182
[array] $ArgumentList,

‎PublicFolders/Move-PublicFolderBranch.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ param(
2626
[string] $OrganizationName,
2727

2828
[Parameter(Mandatory=$false)]
29-
[switch] $Whatif
29+
[switch] $WhatIf
3030
)
3131

3232
################ START OF DEFAULTS ################
@@ -41,7 +41,7 @@ FeasibilityToMove = Checking if it is possible to move contents to the given tar
4141
FeasibilityToMerge = Checking if it is possible to merge the given source mailbox
4242
SplitSizeInformation = Minimum percentage to split is {0} while percentage occupied by source mailbox is {1}.
4343
ImpossibleToSplit = Public folder mailbox {0} cannot be split at this point.
44-
ImpossibleToMove = Public folder mailbox {0} is not the right candidate to accomodate the moving contents.
44+
ImpossibleToMove = Public folder mailbox {0} is not the right candidate to accommodate the moving contents.
4545
ImpossibleToMerge = Public folder mailbox {0} cannot be merged at this point.
4646
RetrieveFoldersFromSourceMailbox = Determining folders that belong to source mailbox
4747
NotEnoughFoldersToSplit = There aren't enough folders residing in the mailbox {0} to split.
@@ -96,7 +96,7 @@ Write-Host
9696
Write-Host "[$($(Get-Date).ToString())]" $PublicFolderManagement_LocalizedStrings.MoveFolders
9797
$script:FoldersToMove | Format-Wide -Property MapiFolderPath -Column 1
9898

99-
if ($Whatif) {
99+
if ($WhatIf) {
100100
exit
101101
}
102102

‎docs/PublicFolders/Move-PublicFolderBranch.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Move-PublicFolderBranch.ps1
99
[-FolderRoot] <String>
1010
[-TargetPublicFolderMailbox] <String>
1111
[-OrganizationName <String>]
12-
[-Whatif]
12+
[-WhatIf]
1313
[<CommonParameters>]
1414
```
1515

0 commit comments

Comments
 (0)