public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [Patch 0/6] Fix spelling mistake for occurred
@ 2020-08-01  1:04 Michael D Kinney
  2020-08-01  1:04 ` [Patch 1/6] EmulatorPkg: " Michael D Kinney
                   ` (6 more replies)
  0 siblings, 7 replies; 16+ messages in thread
From: Michael D Kinney @ 2020-08-01  1:04 UTC (permalink / raw)
  To: devel
  Cc: Ray Ni, Zhichao Gao, Jordan Justen, Andrew Fish, Jian J Wang,
	Hao A Wu, Liming Gao, Zhiguang Liu, Laszlo Ersek, Ard Biesheuvel,
	Qi Zhang, Rahul Kumar

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2361

Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Andrew Fish <afish@apple.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Qi Zhang <qi1.zhang@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>

Michael D Kinney (6):
  EmulatorPkg: Fix spelling mistake for occurred
  MdeModulePkg: Fix spelling mistake for occurred
  MdePkg: Fix spelling mistake for occurred
  OvmfPkg: Fix spelling mistake for occurred
  SecurityPkg: Fix spelling mistake for occurred
  ShellPkg: Fix spelling mistake for occurred

 EmulatorPkg/EmuGopDxe/GopScreen.c             |  2 +-
 EmulatorPkg/TimerDxe/Timer.c                  |  2 +-
 MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c      |  4 +-
 MdeModulePkg/Core/Dxe/FwVol/FwVol.c           |  2 +-
 .../Include/Protocol/GenericMemoryTest.h      |  4 +-
 .../Acpi/S3SaveStateDxe/S3SaveState.c         |  2 +-
 .../Acpi/SmmS3SaveState/SmmS3SaveState.c      |  2 +-
 .../Console/ConSplitterDxe/ConSplitter.h      |  4 +-
 .../ConSplitterDxe/ConSplitterGraphics.c      |  4 +-
 .../Universal/DebugPortDxe/DebugPort.c        |  2 +-
 .../Universal/DebugPortDxe/DebugPort.h        |  2 +-
 .../FvSimpleFileSystem.c                      |  2 +-
 .../Universal/LoadFileOnFv2/LoadFileOnFv2.c   |  2 +-
 .../GenericMemoryTestDxe/LightMemoryTest.c    |  4 +-
 .../GenericMemoryTestDxe/LightMemoryTest.h    |  4 +-
 MdePkg/Include/Protocol/UgaDraw.h             |  2 +-
 MdePkg/Library/BaseLib/FilePaths.c            |  2 +-
 OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c         |  2 +-
 OvmfPkg/Include/Protocol/Legacy8259.h         |  2 +-
 OvmfPkg/SioBusDxe/SioService.c                |  2 +-
 .../DxeImageVerificationLib.c                 |  2 +-
 ShellPkg/Include/Library/ShellLib.h           |  4 +-
 .../UefiShellBcfgCommandLib.c                 |  4 +-
 .../Edit/FileBuffer.c                         |  4 +-
 .../Edit/MainTextEditor.c                     | 34 ++++++-------
 .../Edit/MainTextEditor.h                     |  6 +--
 .../HexEdit/BufferImage.c                     |  8 ++--
 .../HexEdit/BufferImage.h                     |  6 +--
 .../HexEdit/Clipboard.c                       |  4 +-
 .../HexEdit/Clipboard.h                       |  4 +-
 .../HexEdit/DiskImage.c                       |  6 +--
 .../HexEdit/DiskImage.h                       |  6 +--
 .../HexEdit/FileImage.c                       |  4 +-
 .../HexEdit/FileImage.h                       |  4 +-
 .../HexEdit/MainHexEditor.c                   | 48 +++++++++----------
 .../HexEdit/MainHexEditor.h                   |  8 ++--
 .../HexEdit/MemImage.c                        |  6 +--
 .../HexEdit/MemImage.h                        |  6 +--
 .../UefiShellDebug1CommandsLib/HexEdit/Misc.c |  8 ++--
 .../UefiShellDebug1CommandsLib/HexEdit/Misc.h |  4 +-
 .../UefiShellDriver1CommandsLib/Drivers.c     |  2 +-
 .../Library/UefiShellLevel2CommandsLib/Rm.c   |  2 +-
 .../UefiShellLevel2CommandsLib.h              |  2 +-
 ShellPkg/Library/UefiShellLib/UefiShellLib.c  |  6 +--
 44 files changed, 120 insertions(+), 120 deletions(-)

-- 
2.21.0.windows.1


^ permalink raw reply	[flat|nested] 16+ messages in thread

* [Patch 1/6] EmulatorPkg: Fix spelling mistake for occurred
  2020-08-01  1:04 [Patch 0/6] Fix spelling mistake for occurred Michael D Kinney
@ 2020-08-01  1:04 ` Michael D Kinney
  2020-08-03  2:19   ` [edk2-devel] " Liming Gao
  2020-08-07  5:38   ` Ni, Ray
  2020-08-01  1:04 ` [Patch 2/6] MdeModulePkg: " Michael D Kinney
                   ` (5 subsequent siblings)
  6 siblings, 2 replies; 16+ messages in thread
From: Michael D Kinney @ 2020-08-01  1:04 UTC (permalink / raw)
  To: devel; +Cc: Jordan Justen, Andrew Fish, Ray Ni

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2361

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Andrew Fish <afish@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 EmulatorPkg/EmuGopDxe/GopScreen.c | 2 +-
 EmulatorPkg/TimerDxe/Timer.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/EmulatorPkg/EmuGopDxe/GopScreen.c b/EmulatorPkg/EmuGopDxe/GopScreen.c
index fbac649f8b..cbbb0db07f 100644
--- a/EmulatorPkg/EmuGopDxe/GopScreen.c
+++ b/EmulatorPkg/EmuGopDxe/GopScreen.c
@@ -177,7 +177,7 @@ EmuGopSetMode (
 
   @retval EFI_SUCCESS           The Blt operation completed.
   @retval EFI_INVALID_PARAMETER BltOperation is not valid.
-  @retval EFI_DEVICE_ERROR      A hardware error occured writting to the video buffer.
+  @retval EFI_DEVICE_ERROR      A hardware error occurred writting to the video buffer.
 
 **/
 EFI_STATUS
diff --git a/EmulatorPkg/TimerDxe/Timer.c b/EmulatorPkg/TimerDxe/Timer.c
index dfd92acc8c..8e2baaaa5b 100644
--- a/EmulatorPkg/TimerDxe/Timer.c
+++ b/EmulatorPkg/TimerDxe/Timer.c
@@ -301,7 +301,7 @@ Returns:
 
   EFI_OUT_OF_RESOURCES  - Not enough resources available to initialize driver.
 
-  EFI_DEVICE_ERROR      - A device error occured attempting to initialize the driver.
+  EFI_DEVICE_ERROR      - A device error occurred attempting to initialize the driver.
 
 **/
 {
-- 
2.21.0.windows.1


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [Patch 2/6] MdeModulePkg: Fix spelling mistake for occurred
  2020-08-01  1:04 [Patch 0/6] Fix spelling mistake for occurred Michael D Kinney
  2020-08-01  1:04 ` [Patch 1/6] EmulatorPkg: " Michael D Kinney
@ 2020-08-01  1:04 ` Michael D Kinney
  2020-08-07  3:28   ` [edk2-devel] " Wu, Hao A
  2020-08-01  1:04 ` [Patch 3/6] MdePkg: " Michael D Kinney
                   ` (4 subsequent siblings)
  6 siblings, 1 reply; 16+ messages in thread
From: Michael D Kinney @ 2020-08-01  1:04 UTC (permalink / raw)
  To: devel; +Cc: Jian J Wang, Hao A Wu

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2361

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c                      | 4 ++--
 MdeModulePkg/Core/Dxe/FwVol/FwVol.c                           | 2 +-
 MdeModulePkg/Include/Protocol/GenericMemoryTest.h             | 4 ++--
 MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c      | 2 +-
 MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c   | 2 +-
 MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h   | 4 ++--
 .../Universal/Console/ConSplitterDxe/ConSplitterGraphics.c    | 4 ++--
 MdeModulePkg/Universal/DebugPortDxe/DebugPort.c               | 2 +-
 MdeModulePkg/Universal/DebugPortDxe/DebugPort.h               | 2 +-
 .../Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c      | 2 +-
 MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.c          | 2 +-
 .../MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c         | 4 ++--
 .../MemoryTest/GenericMemoryTestDxe/LightMemoryTest.h         | 4 ++--
 13 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
index 12afbec852..e216418849 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
@@ -513,7 +513,7 @@ UhciCheckTdStatus (
       // terminate the transfer
       //
       if (!IsLow && (TdHw->ShortPacket == 1) && (Len < Td->DataLen)) {
-        DEBUG ((EFI_D_VERBOSE, "UhciCheckTdStatus: short packet read occured\n"));
+        DEBUG ((DEBUG_VERBOSE, "UhciCheckTdStatus: short packet read occurred\n"));
 
         Finished = TRUE;
         goto ON_EXIT;
@@ -590,7 +590,7 @@ UhciExecuteTransfer (
     Finished = UhciCheckTdStatus (Uhc, Td, IsLow, QhResult);
 
     //
-    // Transfer is OK or some error occured (TD inactive)
+    // Transfer is OK or some error occurred (TD inactive)
     //
     if (Finished) {
       break;
diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
index e2f58c4d82..cbf5c1c7b9 100644
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
@@ -572,7 +572,7 @@ Done:
   EFI_FIRMWARE_VOLUME2_PROTOCOL on the same handle.  This is the function where
   the actual initialization of the EFI_FIRMWARE_VOLUME2_PROTOCOL is done.
 
-  @param  Event                 The event that occured
+  @param  Event                 The event that occurred
   @param  Context               For EFI compatiblity.  Not used.
 
 **/
diff --git a/MdeModulePkg/Include/Protocol/GenericMemoryTest.h b/MdeModulePkg/Include/Protocol/GenericMemoryTest.h
index 61cab8c4ae..08157f35f5 100644
--- a/MdeModulePkg/Include/Protocol/GenericMemoryTest.h
+++ b/MdeModulePkg/Include/Protocol/GenericMemoryTest.h
@@ -54,12 +54,12 @@ EFI_STATUS
   @param  TestedMemorySize    Return the tested extended memory size.
   @param  TotalMemorySize     Return the whole system physical memory size.
                               The total memory size does not include memory in a slot with a disabled DIMM.
-  @param  ErrorOut            TRUE if the memory error occured.
+  @param  ErrorOut            TRUE if the memory error occurred.
   @param  IfTestAbort         Indicates that the user pressed "ESC" to skip the memory test.
 
   @retval EFI_SUCCESS         One block of memory passed the test.
   @retval EFI_NOT_FOUND       All memory blocks have already been tested.
-  @retval EFI_DEVICE_ERROR    Memory device error occured, and no agent can handle it.
+  @retval EFI_DEVICE_ERROR    Memory device error occurred, and no agent can handle it.
 
 **/
 typedef
diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
index cfa8ebbd2f..e342f73485 100644
--- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
+++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
@@ -889,7 +889,7 @@ BootScriptCompare (
 
   @retval EFI_OUT_OF_RESOURCES  No enough resource
   @retval EFI_SUCCESS           Succesfully installed the ScriptSave driver.
-  @retval other                 Errors occured.
+  @retval other                 Errors occurred.
 
 **/
 EFI_STATUS
diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
index fc6d29e48b..601c8218db 100644
--- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
+++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
@@ -887,7 +887,7 @@ BootScriptCompare (
 
   @retval EFI_OUT_OF_RESOURCES  No enough resource
   @retval EFI_SUCCESS           Succesfully installed the ScriptSave driver.
-  @retval other                 Errors occured.
+  @retval other                 Errors occurred.
 
 **/
 EFI_STATUS
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
index 419635c3f5..f26d2adb81 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
@@ -1852,7 +1852,7 @@ ConSplitterGraphicsOutputSetMode (
 
   @retval EFI_SUCCESS             The Blt operation completed.
   @retval EFI_INVALID_PARAMETER   BltOperation is not valid.
-  @retval EFI_DEVICE_ERROR        A hardware error occured writting to the video
+  @retval EFI_DEVICE_ERROR        A hardware error occurred writting to the video
                                   buffer.
 
 **/
@@ -1966,7 +1966,7 @@ ConSplitterUgaDrawSetMode (
 
   @retval EFI_SUCCESS            The Blt operation completed.
   @retval EFI_INVALID_PARAMETER  BltOperation is not valid.
-  @retval EFI_DEVICE_ERROR       A hardware error occured writting to the video buffer.
+  @retval EFI_DEVICE_ERROR       A hardware error occurred writting to the video buffer.
 
 **/
 EFI_STATUS
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
index ab1d2ddc4d..9323f31b63 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
@@ -238,7 +238,7 @@ ConSplitterGraphicsOutputSetMode (
 
   @retval EFI_SUCCESS             The Blt operation completed.
   @retval EFI_INVALID_PARAMETER   BltOperation is not valid.
-  @retval EFI_DEVICE_ERROR        A hardware error occured writting to the video
+  @retval EFI_DEVICE_ERROR        A hardware error occurred writting to the video
                                   buffer.
 
 **/
@@ -513,7 +513,7 @@ ConSplitterUgaDrawSetMode (
 
   @retval EFI_SUCCESS            The Blt operation completed.
   @retval EFI_INVALID_PARAMETER  BltOperation is not valid.
-  @retval EFI_DEVICE_ERROR       A hardware error occured writting to the video buffer.
+  @retval EFI_DEVICE_ERROR       A hardware error occurred writting to the video buffer.
 
 **/
 EFI_STATUS
diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
index c3e7db4c42..172c1cbca3 100644
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
+++ b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
@@ -632,7 +632,7 @@ DebugPortWrite (
                               the DebugPort interface.
   @retval EFI_NOT_READY       There are no characters ready to read from the
                               DebugPort interface
-  @retval EFI_DEVICE_ERROR    A hardware failure occured... (from SerialIo)
+  @retval EFI_DEVICE_ERROR    A hardware failure occurred... (from SerialIo)
 
 **/
 EFI_STATUS
diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
index 9fa2ae922d..12fca8e273 100644
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
+++ b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
@@ -378,7 +378,7 @@ DebugPortWrite (
                               the DebugPort interface.
   @retval EFI_NOT_READY       There are no characters ready to read from the
                               DebugPort interface
-  @retval EFI_DEVICE_ERROR    A hardware failure occured... (from SerialIo)
+  @retval EFI_DEVICE_ERROR    A hardware failure occurred... (from SerialIo)
 
 **/
 EFI_STATUS
diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c
index ac57a6c060..f33f7f7216 100644
--- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c
+++ b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c
@@ -362,7 +362,7 @@ RemoveLastItemFromPath (
 
   @param  Path          The pointer to the string containing the path.
 
-  @retval NULL          An error occured.
+  @retval NULL          An error occurred.
   @return Path in all other instances.
 
 **/
diff --git a/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.c b/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.c
index 43fa6ce128..58e658ee08 100644
--- a/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.c
+++ b/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.c
@@ -317,7 +317,7 @@ InstallFileLoadProtocol (
   EFI_FIRMWARE_VOLUME_PROTOCOL on the handle of the FFS. This notification function
   also handles the situation when LZMA decoder driver loaded later than FirmwareVolume driver.
 
-  @param  Event                 The event that occured
+  @param  Event                 The event that occurred
   @param  Context               Context of event. Not used in this nofication function.
 
 **/
diff --git a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c
index fe24e490d4..7fd383ab72 100644
--- a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c
+++ b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c
@@ -539,12 +539,12 @@ InitializeMemoryTest (
   @param[out] TestedMemorySize  Return the tested extended memory size.
   @param[out] TotalMemorySize   Return the whole system physical memory size.
                                 The total memory size does not include memory in a slot with a disabled DIMM.
-  @param[out] ErrorOut          TRUE if the memory error occured.
+  @param[out] ErrorOut          TRUE if the memory error occurred.
   @param[in]  IfTestAbort       Indicates that the user pressed "ESC" to skip the memory test.
 
   @retval EFI_SUCCESS         One block of memory passed the test.
   @retval EFI_NOT_FOUND       All memory blocks have already been tested.
-  @retval EFI_DEVICE_ERROR    Memory device error occured, and no agent can handle it.
+  @retval EFI_DEVICE_ERROR    Memory device error occurred, and no agent can handle it.
 
 **/
 EFI_STATUS
diff --git a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.h b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.h
index b9e2eaa1e5..72e58ae4a8 100644
--- a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.h
+++ b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.h
@@ -280,12 +280,12 @@ InitializeMemoryTest (
   @param[out] TestedMemorySize  Return the tested extended memory size.
   @param[out] TotalMemorySize   Return the whole system physical memory size.
                                 The total memory size does not include memory in a slot with a disabled DIMM.
-  @param[out] ErrorOut          TRUE if the memory error occured.
+  @param[out] ErrorOut          TRUE if the memory error occurred.
   @param[in]  IfTestAbort       Indicates that the user pressed "ESC" to skip the memory test.
 
   @retval EFI_SUCCESS         One block of memory passed the test.
   @retval EFI_NOT_FOUND       All memory blocks have already been tested.
-  @retval EFI_DEVICE_ERROR    Memory device error occured, and no agent can handle it.
+  @retval EFI_DEVICE_ERROR    Memory device error occurred, and no agent can handle it.
 
 **/
 EFI_STATUS
-- 
2.21.0.windows.1


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [Patch 3/6] MdePkg: Fix spelling mistake for occurred
  2020-08-01  1:04 [Patch 0/6] Fix spelling mistake for occurred Michael D Kinney
  2020-08-01  1:04 ` [Patch 1/6] EmulatorPkg: " Michael D Kinney
  2020-08-01  1:04 ` [Patch 2/6] MdeModulePkg: " Michael D Kinney
@ 2020-08-01  1:04 ` Michael D Kinney
  2020-08-03  2:12   ` [edk2-devel] " Liming Gao
  2020-08-01  1:04 ` [Patch 4/6] OvmfPkg: " Michael D Kinney
                   ` (3 subsequent siblings)
  6 siblings, 1 reply; 16+ messages in thread
From: Michael D Kinney @ 2020-08-01  1:04 UTC (permalink / raw)
  To: devel; +Cc: Liming Gao, Zhiguang Liu

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2361

Cc: Liming Gao <liming.gao@intel.com>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 MdePkg/Include/Protocol/UgaDraw.h  | 2 +-
 MdePkg/Library/BaseLib/FilePaths.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MdePkg/Include/Protocol/UgaDraw.h b/MdePkg/Include/Protocol/UgaDraw.h
index 3d423be052..47286bb684 100644
--- a/MdePkg/Include/Protocol/UgaDraw.h
+++ b/MdePkg/Include/Protocol/UgaDraw.h
@@ -127,7 +127,7 @@ typedef enum {
 
     @retval EFI_SUCCESS           - The Blt operation completed.
     @retval EFI_INVALID_PARAMETER - BltOperation is not valid.
-    @retval EFI_DEVICE_ERROR      - A hardware error occured writting to the video buffer.
+    @retval EFI_DEVICE_ERROR      - A hardware error occurred writting to the video buffer.
 
 **/
 typedef
diff --git a/MdePkg/Library/BaseLib/FilePaths.c b/MdePkg/Library/BaseLib/FilePaths.c
index 40e8d773ce..c2c561ac64 100644
--- a/MdePkg/Library/BaseLib/FilePaths.c
+++ b/MdePkg/Library/BaseLib/FilePaths.c
@@ -57,7 +57,7 @@ PathRemoveLastItem(
 
   @param[in] Path       The pointer to the string containing the path.
 
-  @return       Returns Path, otherwise returns NULL to indicate that an error has occured.
+  @return       Returns Path, otherwise returns NULL to indicate that an error has occurred.
 **/
 CHAR16*
 EFIAPI
-- 
2.21.0.windows.1


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [Patch 4/6] OvmfPkg: Fix spelling mistake for occurred
  2020-08-01  1:04 [Patch 0/6] Fix spelling mistake for occurred Michael D Kinney
                   ` (2 preceding siblings ...)
  2020-08-01  1:04 ` [Patch 3/6] MdePkg: " Michael D Kinney
@ 2020-08-01  1:04 ` Michael D Kinney
  2020-08-01 19:15   ` Laszlo Ersek
  2020-08-01  1:04 ` [Patch 5/6] SecurityPkg: " Michael D Kinney
                   ` (2 subsequent siblings)
  6 siblings, 1 reply; 16+ messages in thread
From: Michael D Kinney @ 2020-08-01  1:04 UTC (permalink / raw)
  To: devel; +Cc: Jordan Justen, Laszlo Ersek, Ard Biesheuvel

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2361

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c | 2 +-
 OvmfPkg/Include/Protocol/Legacy8259.h | 2 +-
 OvmfPkg/SioBusDxe/SioService.c        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c b/OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c
index 0760ffb722..672a67fbe1 100644
--- a/OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c
+++ b/OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c
@@ -226,7 +226,7 @@ EmuGopSetMode (
 
   @retval EFI_SUCCESS           The Blt operation completed.
   @retval EFI_INVALID_PARAMETER BltOperation is not valid.
-  @retval EFI_DEVICE_ERROR      A hardware error occured writting to the video buffer.
+  @retval EFI_DEVICE_ERROR      A hardware error occurred writting to the video buffer.
 
 **/
 EFI_STATUS
diff --git a/OvmfPkg/Include/Protocol/Legacy8259.h b/OvmfPkg/Include/Protocol/Legacy8259.h
index 74bbb674ed..7fde1c8537 100644
--- a/OvmfPkg/Include/Protocol/Legacy8259.h
+++ b/OvmfPkg/Include/Protocol/Legacy8259.h
@@ -58,7 +58,7 @@ typedef enum {
   @param  SlaveBase             The base vector for the Slave PIC in the 8259 controller.
 
   @retval EFI_SUCCESS           The new bases were programmed.
-  @retval EFI_DEVICE_ERROR      A device error occured programming the vector bases.
+  @retval EFI_DEVICE_ERROR      A device error occurred programming the vector bases.
 
 **/
 typedef
diff --git a/OvmfPkg/SioBusDxe/SioService.c b/OvmfPkg/SioBusDxe/SioService.c
index 407132ddcd..ab8fa7676f 100644
--- a/OvmfPkg/SioBusDxe/SioService.c
+++ b/OvmfPkg/SioBusDxe/SioService.c
@@ -265,7 +265,7 @@ SioModify (
   @param[in] DeviceIndex       Index of the device supported by this driver.
 
   @retval EFI_SUCCESS          The child device has been created successfully.
-  @retval Others               Error occured during the child device creation.
+  @retval Others               Error occurred during the child device creation.
 
 **/
 EFI_STATUS
-- 
2.21.0.windows.1


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [Patch 5/6] SecurityPkg: Fix spelling mistake for occurred
  2020-08-01  1:04 [Patch 0/6] Fix spelling mistake for occurred Michael D Kinney
                   ` (3 preceding siblings ...)
  2020-08-01  1:04 ` [Patch 4/6] OvmfPkg: " Michael D Kinney
@ 2020-08-01  1:04 ` Michael D Kinney
  2020-08-04 10:00   ` [edk2-devel] " Maciej Rabeda
  2020-08-18 16:42   ` Wang, Jian J
  2020-08-01  1:04 ` [Patch 6/6] ShellPkg: " Michael D Kinney
  2020-08-03  0:57 ` [edk2-devel] [Patch 0/6] " Guomin Jiang
  6 siblings, 2 replies; 16+ messages in thread
From: Michael D Kinney @ 2020-08-01  1:04 UTC (permalink / raw)
  To: devel; +Cc: Qi Zhang, Rahul Kumar

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2361

Cc: Qi Zhang <qi1.zhang@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 .../Library/DxeImageVerificationLib/DxeImageVerificationLib.c   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
index 36b87e16d5..b08fe24e85 100644
--- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
+++ b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
@@ -1465,7 +1465,7 @@ IsAllowedByDb (
 
   //
   // Fetch 'dbx' content. If 'dbx' doesn't exist, continue to check 'db'.
-  // If any other errors occured, no need to check 'db' but just return
+  // If any other errors occurred, no need to check 'db' but just return
   // not-allowed-by-db (FALSE) to avoid bypass.
   //
   DbxDataSize = 0;
-- 
2.21.0.windows.1


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [Patch 6/6] ShellPkg: Fix spelling mistake for occurred
  2020-08-01  1:04 [Patch 0/6] Fix spelling mistake for occurred Michael D Kinney
                   ` (4 preceding siblings ...)
  2020-08-01  1:04 ` [Patch 5/6] SecurityPkg: " Michael D Kinney
@ 2020-08-01  1:04 ` Michael D Kinney
  2020-08-03  4:49   ` [edk2-devel] " Gao, Zhichao
  2020-08-03  0:57 ` [edk2-devel] [Patch 0/6] " Guomin Jiang
  6 siblings, 1 reply; 16+ messages in thread
From: Michael D Kinney @ 2020-08-01  1:04 UTC (permalink / raw)
  To: devel; +Cc: Ray Ni, Zhichao Gao

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2361

Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 ShellPkg/Include/Library/ShellLib.h           |  4 +-
 .../UefiShellBcfgCommandLib.c                 |  4 +-
 .../Edit/FileBuffer.c                         |  4 +-
 .../Edit/MainTextEditor.c                     | 34 ++++++-------
 .../Edit/MainTextEditor.h                     |  6 +--
 .../HexEdit/BufferImage.c                     |  8 ++--
 .../HexEdit/BufferImage.h                     |  6 +--
 .../HexEdit/Clipboard.c                       |  4 +-
 .../HexEdit/Clipboard.h                       |  4 +-
 .../HexEdit/DiskImage.c                       |  6 +--
 .../HexEdit/DiskImage.h                       |  6 +--
 .../HexEdit/FileImage.c                       |  4 +-
 .../HexEdit/FileImage.h                       |  4 +-
 .../HexEdit/MainHexEditor.c                   | 48 +++++++++----------
 .../HexEdit/MainHexEditor.h                   |  8 ++--
 .../HexEdit/MemImage.c                        |  6 +--
 .../HexEdit/MemImage.h                        |  6 +--
 .../UefiShellDebug1CommandsLib/HexEdit/Misc.c |  8 ++--
 .../UefiShellDebug1CommandsLib/HexEdit/Misc.h |  4 +-
 .../UefiShellDriver1CommandsLib/Drivers.c     |  2 +-
 .../Library/UefiShellLevel2CommandsLib/Rm.c   |  2 +-
 .../UefiShellLevel2CommandsLib.h              |  2 +-
 ShellPkg/Library/UefiShellLib/UefiShellLib.c  |  6 +--
 23 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/ShellPkg/Include/Library/ShellLib.h b/ShellPkg/Include/Library/ShellLib.h
index 1dc41f2cc1..ed9b8f9105 100644
--- a/ShellPkg/Include/Library/ShellLib.h
+++ b/ShellPkg/Include/Library/ShellLib.h
@@ -1034,7 +1034,7 @@ ShellIsFileInPath(
   @param[in] String   String representation of a number.
 
   @return             The unsigned integer result of the conversion.
-  @retval (UINTN)(-1) An error occured.
+  @retval (UINTN)(-1) An error occurred.
 **/
 UINTN
 EFIAPI
@@ -1051,7 +1051,7 @@ ShellStrToUintn(
   @param[in] String   String representation of a number.
 
   @return             The unsigned integer result of the conversion.
-  @retval (UINTN)(-1) An error occured.
+  @retval (UINTN)(-1) An error occurred.
 **/
 UINTN
 EFIAPI
diff --git a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c
index f8bcaebe46..52d90e3c97 100644
--- a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c
+++ b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c
@@ -84,7 +84,7 @@ typedef struct {
   @param[in]      Target    The target of the operation.
 
   @retval EFI_SUCCESS       The data was sucessfully updated.
-  @retval other             A error occured.
+  @retval other             A error occurred.
 **/
 EFI_STATUS
 UpdateOptionalData(
@@ -170,7 +170,7 @@ UpdateOptionalData(
   @param[in]      BootIndex   The boot option index to CRC.
 
   @retval EFI_SUCCESS           The CRC was sucessfully returned.
-  @retval other                 A error occured.
+  @retval other                 A error occurred.
 **/
 EFI_STATUS
 GetBootOptionCrc(
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
index c9814e400c..5659ec9810 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
@@ -221,7 +221,7 @@ InternalEditorMiscLineRetreat (
                        >0 : advance
                        <0 : retreat
 
-  @retval NULL An error occured.
+  @retval NULL An error occurred.
   @return The line after advance/retreat.
 **/
 EFI_EDITOR_LINE *
@@ -2609,7 +2609,7 @@ RightCurrentScreen (
                      >0 : advance
                      <0: retreat
 
-  @retval NULL An error occured.
+  @retval NULL An error occurred.
   @return The line after advance/retreat.
 **/
 EFI_EDITOR_LINE *
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c
index df530f1119..a9423e0d10 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c
@@ -40,7 +40,7 @@ EFI_EDITOR_GLOBAL_EDITOR      MainEditor;
   Load a file from disk to editor
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
   @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
 **/
 EFI_STATUS
@@ -74,7 +74,7 @@ MainCommandGotoLine (
 
   @retval EFI_SUCCESS           The file was saved correctly.
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
-  @retval EFI_LOAD_ERROR          A file access error occured.
+  @retval EFI_LOAD_ERROR          A file access error occurred.
 **/
 EFI_STATUS
 MainCommandSaveFile (
@@ -96,7 +96,7 @@ MainCommandDisplayHelp (
 
   @retval EFI_SUCCESS             The operation was successful.
   @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 MainCommandExit (
@@ -108,7 +108,7 @@ MainCommandExit (
 
   @retval EFI_SUCCESS             The operation was successful.
   @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 MainCommandSearch (
@@ -120,7 +120,7 @@ MainCommandSearch (
 
   @retval EFI_SUCCESS             The operation was successful.
   @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 MainCommandSearchReplace (
@@ -132,7 +132,7 @@ MainCommandSearchReplace (
 
   @retval EFI_SUCCESS             The operation was successful.
   @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 MainCommandCutLine (
@@ -144,7 +144,7 @@ MainCommandCutLine (
 
   @retval EFI_SUCCESS             The operation was successful.
   @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 MainCommandPasteLine (
@@ -277,7 +277,7 @@ EDITOR_MENU_ITEM  MainMenuItems[] = {
   Load a file from disk to editor
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
   @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
 **/
 EFI_STATUS
@@ -465,7 +465,7 @@ MainCommandSwitchFileType (
 
   @retval EFI_SUCCESS             The operation was successful.
   @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 MainCommandCutLine (
@@ -503,7 +503,7 @@ MainCommandCutLine (
 
   @retval EFI_SUCCESS             The operation was successful.
   @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 MainCommandPasteLine (
@@ -535,7 +535,7 @@ MainCommandPasteLine (
 
   @retval EFI_SUCCESS             The operation was successful.
   @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 MainCommandSearch (
@@ -676,7 +676,7 @@ MainCommandSearch (
 
   @retval EFI_SUCCESS             The operation was successful.
   @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 MainCommandSearchReplace (
@@ -979,7 +979,7 @@ MainCommandSearchReplace (
 
   @retval EFI_SUCCESS             The operation was successful.
   @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 MainCommandExit (
@@ -1133,7 +1133,7 @@ MainCommandGotoLine (
 
   @retval EFI_SUCCESS           The file was saved correctly.
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
-  @retval EFI_LOAD_ERROR          A file access error occured.
+  @retval EFI_LOAD_ERROR          A file access error occurred.
 **/
 EFI_STATUS
 MainCommandSaveFile (
@@ -1439,7 +1439,7 @@ EFI_EDITOR_GLOBAL_EDITOR      MainEditorConst = {
   The initialization function for MainEditor.
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 MainEditorInit (
@@ -1585,7 +1585,7 @@ MainEditorInit (
   The cleanup function for MainEditor.
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 MainEditorCleanup (
@@ -1823,7 +1823,7 @@ MainEditorHandleMouseInput (
   Handle user key input. This routes to other functions for the actions.
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
   @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
 **/
 EFI_STATUS
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.h
index 766d7bba40..b22b6587bf 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.h
@@ -15,7 +15,7 @@
   The initialization function for MainEditor.
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 MainEditorInit (
@@ -26,7 +26,7 @@ MainEditorInit (
   The cleanup function for MainEditor.
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 MainEditorCleanup (
@@ -45,7 +45,7 @@ MainEditorRefresh (
   Handle user key input. This routes to other functions for the actions.
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
   @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
 **/
 EFI_STATUS
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
index 5db40eef4e..a730cc105c 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
@@ -72,7 +72,7 @@ BOOLEAN                           HBufferImageMouseNeedRefresh;
   Initialization function for HBufferImage
 
   @retval EFI_SUCCESS       The operation was successful.
-  @retval EFI_LOAD_ERROR    A load error occured.
+  @retval EFI_LOAD_ERROR    A load error occurred.
 **/
 EFI_STATUS
 HBufferImageInit (
@@ -730,7 +730,7 @@ HBufferImageRestorePosition (
   Refresh function for HBufferImage.
 
   @retval EFI_SUCCESS     The operation was successful.
-  @retval EFI_LOAD_ERROR  A Load error occured.
+  @retval EFI_LOAD_ERROR  A Load error occurred.
 
 **/
 EFI_STATUS
@@ -1314,7 +1314,7 @@ HBufferImageDoBackspace (
   @param[in] Char               The input char.
 
   @retval EFI_SUCCESS           The operation was successful.
-  @retval EFI_LOAD_ERROR        A load error occured.
+  @retval EFI_LOAD_ERROR        A load error occurred.
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
 **/
 EFI_STATUS
@@ -2376,7 +2376,7 @@ HBufferImageAdjustMousePosition (
                         INS
 
   @retval EFI_SUCCESS           The operation was successful.
-  @retval EFI_LOAD_ERROR        A load error occured.
+  @retval EFI_LOAD_ERROR        A load error occurred.
   @retval EFI_OUT_OF_RESOURCES  A Memory allocation failed.
 **/
 EFI_STATUS
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.h
index 3df22306ca..0599f293ec 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.h
@@ -16,7 +16,7 @@
   Initialization function for HBufferImage
 
   @retval EFI_SUCCESS       The operation was successful.
-  @retval EFI_LOAD_ERROR    A load error occured.
+  @retval EFI_LOAD_ERROR    A load error occurred.
 **/
 EFI_STATUS
 HBufferImageInit (
@@ -37,7 +37,7 @@ HBufferImageCleanup (
   Refresh function for HBufferImage.
 
   @retval EFI_SUCCESS     The operation was successful.
-  @retval EFI_LOAD_ERROR  A Load error occured.
+  @retval EFI_LOAD_ERROR  A Load error occurred.
 
 **/
 EFI_STATUS
@@ -57,7 +57,7 @@ HBufferImageRefresh (
                         INS
 
   @retval EFI_SUCCESS           The operation was successful.
-  @retval EFI_LOAD_ERROR        A load error occured.
+  @retval EFI_LOAD_ERROR        A load error occurred.
   @retval EFI_OUT_OF_RESOURCES  A Memory allocation failed.
 **/
 EFI_STATUS
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Clipboard.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Clipboard.c
index 6cb42764b6..c2d6c5fa9a 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Clipboard.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Clipboard.c
@@ -27,7 +27,7 @@ HEFI_EDITOR_CLIPBOARD HClipBoardConst = {
   Initialization function for HDiskImage.
 
   @param[in] EFI_SUCCESS      The operation was successful.
-  @param[in] EFI_LOAD_ERROR   A load error occured.
+  @param[in] EFI_LOAD_ERROR   A load error occurred.
 **/
 EFI_STATUS
 HClipBoardInit (
@@ -46,7 +46,7 @@ HClipBoardInit (
   Initialization function for HDiskImage.
 
   @param[in] EFI_SUCCESS      The operation was successful.
-  @param[in] EFI_LOAD_ERROR   A load error occured.
+  @param[in] EFI_LOAD_ERROR   A load error occurred.
 **/
 EFI_STATUS
 HClipBoardCleanup (
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Clipboard.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Clipboard.h
index 44399cfbb5..6e1e2d42cc 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Clipboard.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Clipboard.h
@@ -16,7 +16,7 @@
   Initialization function for HDiskImage
 
   @param[in] EFI_SUCCESS      The operation was successful.
-  @param[in] EFI_LOAD_ERROR   A load error occured.
+  @param[in] EFI_LOAD_ERROR   A load error occurred.
 **/
 EFI_STATUS
 HClipBoardInit (
@@ -27,7 +27,7 @@ HClipBoardInit (
   Initialization function for HDiskImage.
 
   @param[in] EFI_SUCCESS      The operation was successful.
-  @param[in] EFI_LOAD_ERROR   A load error occured.
+  @param[in] EFI_LOAD_ERROR   A load error occurred.
 **/
 EFI_STATUS
 HClipBoardCleanup (
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c
index e31b90b867..771a5c6840 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c
@@ -35,7 +35,7 @@ HEFI_EDITOR_DISK_IMAGE            HDiskImageConst = {
   Initialization function for HDiskImage.
 
   @retval EFI_SUCCESS     The operation was successful.
-  @retval EFI_LOAD_ERROR  A load error occured.
+  @retval EFI_LOAD_ERROR  A load error occurred.
 **/
 EFI_STATUS
 HDiskImageInit (
@@ -147,7 +147,7 @@ HDiskImageSetDiskNameOffsetSize (
 
   @retval EFI_SUCCESS           The operation was successful.
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
-  @retval EFI_LOAD_ERROR        A load error occured.
+  @retval EFI_LOAD_ERROR        A load error occurred.
   @retval EFI_INVALID_PARAMETER A parameter was invalid.
 **/
 EFI_STATUS
@@ -319,7 +319,7 @@ HDiskImageRead (
 
   @retval EFI_SUCCESS           The operation was successful.
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
-  @retval EFI_LOAD_ERROR        A load error occured.
+  @retval EFI_LOAD_ERROR        A load error occurred.
   @retval EFI_INVALID_PARAMETER A parameter was invalid.
 **/
 EFI_STATUS
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.h
index e5c6f42e15..d0a78e0a12 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.h
@@ -16,7 +16,7 @@
   Initialization function for HDiskImage.
 
   @retval EFI_SUCCESS     The operation was successful.
-  @retval EFI_LOAD_ERROR  A load error occured.
+  @retval EFI_LOAD_ERROR  A load error occurred.
 **/
 EFI_STATUS
 HDiskImageInit (
@@ -55,7 +55,7 @@ HDiskImageBackup (
 
   @retval EFI_SUCCESS           The operation was successful.
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
-  @retval EFI_LOAD_ERROR        A load error occured.
+  @retval EFI_LOAD_ERROR        A load error occurred.
   @retval EFI_INVALID_PARAMETER A parameter was invalid.
 **/
 EFI_STATUS
@@ -76,7 +76,7 @@ HDiskImageRead (
 
   @retval EFI_SUCCESS           The operation was successful.
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
-  @retval EFI_LOAD_ERROR        A load error occured.
+  @retval EFI_LOAD_ERROR        A load error occurred.
   @retval EFI_INVALID_PARAMETER A parameter was invalid.
 **/
 EFI_STATUS
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.c
index bb324ceafc..4f96cb6cb5 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.c
@@ -131,7 +131,7 @@ HFileImageSetFileName (
 
   @retval EFI_SUCCESS           The operation was successful.
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
-  @retval EFI_LOAD_ERROR        A load error occured.
+  @retval EFI_LOAD_ERROR        A load error occurred.
 **/
 EFI_STATUS
 HFileImageRead (
@@ -244,7 +244,7 @@ HFileImageRead (
 
   @retval EFI_SUCCESS           The operation was successful.
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
-  @retval EFI_LOAD_ERROR        A load error occured.
+  @retval EFI_LOAD_ERROR        A load error occurred.
 **/
 EFI_STATUS
 HFileImageSave (
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.h
index 7967144db3..9fb25ac5e9 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.h
@@ -52,7 +52,7 @@ HFileImageBackup (
 
   @retval EFI_SUCCESS           The operation was successful.
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
-  @retval EFI_LOAD_ERROR        A load error occured.
+  @retval EFI_LOAD_ERROR        A load error occurred.
 **/
 EFI_STATUS
 HFileImageRead (
@@ -67,7 +67,7 @@ HFileImageRead (
 
   @retval EFI_SUCCESS           The operation was successful.
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
-  @retval EFI_LOAD_ERROR        A load error occured.
+  @retval EFI_LOAD_ERROR        A load error occurred.
 **/
 EFI_STATUS
 HFileImageSave (
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
index a00df49d38..9f72da1193 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
@@ -243,8 +243,8 @@ HMainCommandGoToOffset (
   save to another file name.
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 HMainCommandSaveBuffer (
@@ -540,8 +540,8 @@ HMainCommandSaveBuffer (
   Load a disk buffer editor.
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 HMainCommandSelectStart (
@@ -578,8 +578,8 @@ HMainCommandSelectStart (
   Load a disk buffer editor.
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 HMainCommandSelectEnd (
@@ -616,8 +616,8 @@ HMainCommandSelectEnd (
   Cut current line to clipboard.
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 HMainCommandCut (
@@ -688,8 +688,8 @@ HMainCommandCut (
   Paste line to file buffer.
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 HMainCommandPaste (
@@ -748,8 +748,8 @@ HMainCommandPaste (
   Exit editor.
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 HMainCommandExit (
@@ -841,8 +841,8 @@ HMainCommandExit (
   Load a file from disk to editor.
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 HMainCommandOpenFile (
@@ -1074,8 +1074,8 @@ HMainCommandOpenFile (
   Load a disk buffer editor.
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
+  @retval EFI_LOAD_ERROR          A load error occurred.
   @retval EFI_NOT_FOUND           The disk was not found.
 **/
 EFI_STATUS
@@ -1319,8 +1319,8 @@ HMainCommandOpenDisk (
   Load memory content to editor
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
+  @retval EFI_LOAD_ERROR          A load error occurred.
   @retval EFI_NOT_FOUND           The disk was not found.
 **/
 EFI_STATUS
@@ -1623,7 +1623,7 @@ CONST EDITOR_MENU_ITEM HexEditorMenuItems[] = {
   Init function for MainEditor
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 HMainEditorInit (
@@ -1780,7 +1780,7 @@ HMainEditorInit (
   Cleanup function for MainEditor.
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 HMainEditorCleanup (
@@ -1932,8 +1932,8 @@ HMainEditorRefresh (
   @param[out] BeforeLeftButtonDown  helps with selections.
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
+  @retval EFI_LOAD_ERROR          A load error occurred.
   @retval EFI_NOT_FOUND           The disk was not found.
 **/
 EFI_STATUS
@@ -2091,8 +2091,8 @@ HMainEditorHandleMouseInput (
   Handle user key input. will route it to other components handle function.
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 HMainEditorKeyInput (
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.h
index e1a14a4b46..c77685c175 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.h
@@ -18,7 +18,7 @@
   Init function for MainEditor
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 HMainEditorInit (
@@ -29,7 +29,7 @@ HMainEditorInit (
   Cleanup function for MainEditor.
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 HMainEditorCleanup (
@@ -50,8 +50,8 @@ HMainEditorRefresh (
   Handle user key input. will route it to other components handle function.
 
   @retval EFI_SUCCESS             The operation was successful.
-  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
-  @retval EFI_LOAD_ERROR          A load error occured.
+  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
+  @retval EFI_LOAD_ERROR          A load error occurred.
 **/
 EFI_STATUS
 HMainEditorKeyInput (
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.c
index 224fbe7398..5e734f668a 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.c
@@ -34,7 +34,7 @@ HEFI_EDITOR_MEM_IMAGE             HMemImageConst = {
   Initialization function for HDiskImage.
 
   @retval EFI_SUCCESS       The operation was successful.
-  @retval EFI_LOAD_ERROR    A load error occured.
+  @retval EFI_LOAD_ERROR    A load error occurred.
 **/
 EFI_STATUS
 HMemImageInit (
@@ -106,7 +106,7 @@ HMemImageSetMemOffsetSize (
   @param[in] Size     The size.
   @param[in] Recover  if is for recover, no information print.
 
-  @retval EFI_LOAD_ERROR        A load error occured.
+  @retval EFI_LOAD_ERROR        A load error occurred.
   @retval EFI_SUCCESS           The operation was successful.
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
 **/
@@ -217,7 +217,7 @@ HMemImageRead (
   @param[in] Offset   The offset.
   @param[in] Size     The size.
 
-  @retval EFI_LOAD_ERROR        A load error occured.
+  @retval EFI_LOAD_ERROR        A load error occurred.
   @retval EFI_SUCCESS           The operation was successful.
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
 **/
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.h
index d17d1ee32c..090a3fc775 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.h
@@ -16,7 +16,7 @@
   Initialization function for HDiskImage.
 
   @retval EFI_SUCCESS       The operation was successful.
-  @retval EFI_LOAD_ERROR    A load error occured.
+  @retval EFI_LOAD_ERROR    A load error occurred.
 **/
 EFI_STATUS
 HMemImageInit (
@@ -56,7 +56,7 @@ HMemImageSetMemOffsetSize (
   @param[in] Size     The size.
   @param[in] Recover  if is for recover, no information print.
 
-  @retval EFI_LOAD_ERROR        A load error occured.
+  @retval EFI_LOAD_ERROR        A load error occurred.
   @retval EFI_SUCCESS           The operation was successful.
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
 **/
@@ -73,7 +73,7 @@ HMemImageRead (
   @param[in] Offset   The offset.
   @param[in] Size     The size.
 
-  @retval EFI_LOAD_ERROR        A load error occured.
+  @retval EFI_LOAD_ERROR        A load error occurred.
   @retval EFI_SUCCESS           The operation was successful.
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
 **/
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Misc.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Misc.c
index cc11f9e87c..10bf15cbfb 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Misc.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Misc.c
@@ -33,7 +33,7 @@ HLineFree (
 
   @param[in] Count      The line number to advance.
 
-  @retval NULL An error occured.
+  @retval NULL An error occurred.
   @return A pointer to the line after advance.
 **/
 HEFI_EDITOR_LINE *
@@ -68,7 +68,7 @@ HLineAdvance (
 
   @param[in] Count    The line number to retreat.
 
-  @retval NULL An error occured.
+  @retval NULL An error occurred.
   @return A pointer to the line after retreat.
 **/
 HEFI_EDITOR_LINE *
@@ -105,7 +105,7 @@ HLineRetreat (
                             >0 : advance
                             <0: retreat
 
-  @retval NULL An error occured.
+  @retval NULL An error occurred.
   @return A pointer to the line after move.
 **/
 HEFI_EDITOR_LINE *
@@ -138,7 +138,7 @@ HMoveLine (
                           >0 : advance
                           <0: retreat
 
-  @retval NULL An error occured.
+  @retval NULL An error occurred.
   @return A pointer to the line after move.
 **/
 HEFI_EDITOR_LINE *
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Misc.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Misc.h
index d5137ea139..02df65959c 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Misc.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Misc.h
@@ -18,7 +18,7 @@
                             >0 : advance
                             <0: retreat
 
-  @retval NULL An error occured.
+  @retval NULL An error occurred.
   @return A pointer to the line after move.
 **/
 HEFI_EDITOR_LINE *
@@ -33,7 +33,7 @@ HMoveLine (
                           >0 : advance
                           <0: retreat
 
-  @retval NULL An error occured.
+  @retval NULL An error occurred.
   @return A pointer to the line after move.
 **/
 HEFI_EDITOR_LINE *
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
index 27cd278cf0..99a7b0c8cd 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
@@ -22,7 +22,7 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
 
   @param[in] TheHandle      The handle to get the device path for.
 
-  @retval NULL    An error occured.
+  @retval NULL    An error occurred.
   @return         A pointer to the driver path as a string.  The callee must
                   free this memory.
 **/
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
index 59f7eec376..bc85039588 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
@@ -57,7 +57,7 @@ IsDirectoryEmpty (
   @retval SHELL_SUCCESS       The operation was successful.
   @retval SHELL_ACCESS_DENIED A file was read only.
   @retval SHELL_ABORTED       The abort message was received.
-  @retval SHELL_DEVICE_ERROR  A device error occured reading this Node.
+  @retval SHELL_DEVICE_ERROR  A device error occurred reading this Node.
 **/
 SHELL_STATUS
 CascadeDelete(
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
index 77be6f1a12..426b6490f4 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
@@ -351,7 +351,7 @@ CopySingleFile(
   @retval SHELL_SUCCESS       The operation was successful.
   @retval SHELL_ACCESS_DENIED A file was read only.
   @retval SHELL_ABORTED       The abort message was received.
-  @retval SHELL_DEVICE_ERROR  A device error occured reading this Node.
+  @retval SHELL_DEVICE_ERROR  A device error occurred reading this Node.
 **/
 SHELL_STATUS
 CascadeDelete(
diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
index 9f07a58eb2..c4749941a6 100644
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
@@ -3181,7 +3181,7 @@ ShellIsFileInPath(
   @param[in] String   String representation of a number.
 
   @return             The unsigned integer result of the conversion.
-  @retval (UINTN)(-1) An error occured.
+  @retval (UINTN)(-1) An error occurred.
 **/
 UINTN
 EFIAPI
@@ -3810,7 +3810,7 @@ InternalShellHexCharToUintn (
 
   @retval EFI_SUCCESS             The conversion was successful.
   @retval EFI_INVALID_PARAMETER   A parameter was NULL or invalid.
-  @retval EFI_DEVICE_ERROR        An overflow occured.
+  @retval EFI_DEVICE_ERROR        An overflow occurred.
 **/
 EFI_STATUS
 InternalShellStrHexToUint64 (
@@ -3911,7 +3911,7 @@ InternalShellStrHexToUint64 (
 
   @retval EFI_SUCCESS             The conversion was successful.
   @retval EFI_INVALID_PARAMETER   A parameter was NULL or invalid.
-  @retval EFI_DEVICE_ERROR        An overflow occured.
+  @retval EFI_DEVICE_ERROR        An overflow occurred.
 **/
 EFI_STATUS
 InternalShellStrDecimalToUint64 (
-- 
2.21.0.windows.1


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* Re: [Patch 4/6] OvmfPkg: Fix spelling mistake for occurred
  2020-08-01  1:04 ` [Patch 4/6] OvmfPkg: " Michael D Kinney
@ 2020-08-01 19:15   ` Laszlo Ersek
  0 siblings, 0 replies; 16+ messages in thread
From: Laszlo Ersek @ 2020-08-01 19:15 UTC (permalink / raw)
  To: Michael D Kinney, devel; +Cc: Jordan Justen, Ard Biesheuvel

On 08/01/20 03:04, Michael D Kinney wrote:
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2361
> 
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c | 2 +-
>  OvmfPkg/Include/Protocol/Legacy8259.h | 2 +-
>  OvmfPkg/SioBusDxe/SioService.c        | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c b/OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c
> index 0760ffb722..672a67fbe1 100644
> --- a/OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c
> +++ b/OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c
> @@ -226,7 +226,7 @@ EmuGopSetMode (
>  
>    @retval EFI_SUCCESS           The Blt operation completed.
>    @retval EFI_INVALID_PARAMETER BltOperation is not valid.
> -  @retval EFI_DEVICE_ERROR      A hardware error occured writting to the video buffer.
> +  @retval EFI_DEVICE_ERROR      A hardware error occurred writting to the video buffer.
>  
>  **/
>  EFI_STATUS
> diff --git a/OvmfPkg/Include/Protocol/Legacy8259.h b/OvmfPkg/Include/Protocol/Legacy8259.h
> index 74bbb674ed..7fde1c8537 100644
> --- a/OvmfPkg/Include/Protocol/Legacy8259.h
> +++ b/OvmfPkg/Include/Protocol/Legacy8259.h
> @@ -58,7 +58,7 @@ typedef enum {
>    @param  SlaveBase             The base vector for the Slave PIC in the 8259 controller.
>  
>    @retval EFI_SUCCESS           The new bases were programmed.
> -  @retval EFI_DEVICE_ERROR      A device error occured programming the vector bases.
> +  @retval EFI_DEVICE_ERROR      A device error occurred programming the vector bases.
>  
>  **/
>  typedef
> diff --git a/OvmfPkg/SioBusDxe/SioService.c b/OvmfPkg/SioBusDxe/SioService.c
> index 407132ddcd..ab8fa7676f 100644
> --- a/OvmfPkg/SioBusDxe/SioService.c
> +++ b/OvmfPkg/SioBusDxe/SioService.c
> @@ -265,7 +265,7 @@ SioModify (
>    @param[in] DeviceIndex       Index of the device supported by this driver.
>  
>    @retval EFI_SUCCESS          The child device has been created successfully.
> -  @retval Others               Error occured during the child device creation.
> +  @retval Others               Error occurred during the child device creation.
>  
>  **/
>  EFI_STATUS
> 

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Thanks!
Laszlo


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [edk2-devel] [Patch 0/6] Fix spelling mistake for occurred
  2020-08-01  1:04 [Patch 0/6] Fix spelling mistake for occurred Michael D Kinney
                   ` (5 preceding siblings ...)
  2020-08-01  1:04 ` [Patch 6/6] ShellPkg: " Michael D Kinney
@ 2020-08-03  0:57 ` Guomin Jiang
  6 siblings, 0 replies; 16+ messages in thread
From: Guomin Jiang @ 2020-08-03  0:57 UTC (permalink / raw)
  To: devel@edk2.groups.io, Kinney, Michael D
  Cc: Ni, Ray, Gao, Zhichao, Justen, Jordan L, Andrew Fish,
	Wang, Jian J, Wu, Hao A, Gao, Liming, Liu, Zhiguang, Laszlo Ersek,
	Ard Biesheuvel, Zhang, Qi1, Kumar, Rahul1

Reviewed-by: Guomin Jiang <guomin.jiang@intel.com> for the patch series

Thanks for your contribution.
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael
> D Kinney
> Sent: Saturday, August 1, 2020 9:05 AM
> To: devel@edk2.groups.io
> Cc: Ni, Ray <ray.ni@intel.com>; Gao, Zhichao <zhichao.gao@intel.com>;
> Justen, Jordan L <jordan.l.justen@intel.com>; Andrew Fish
> <afish@apple.com>; Wang, Jian J <jian.j.wang@intel.com>; Wu, Hao A
> <hao.a.wu@intel.com>; Gao, Liming <liming.gao@intel.com>; Liu, Zhiguang
> <zhiguang.liu@intel.com>; Laszlo Ersek <lersek@redhat.com>; Ard
> Biesheuvel <ard.biesheuvel@arm.com>; Zhang, Qi1 <qi1.zhang@intel.com>;
> Kumar, Rahul1 <rahul1.kumar@intel.com>
> Subject: [edk2-devel] [Patch 0/6] Fix spelling mistake for occurred
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2361
> 
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Andrew Fish <afish@apple.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Zhiguang Liu <zhiguang.liu@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Cc: Qi Zhang <qi1.zhang@intel.com>
> Cc: Rahul Kumar <rahul1.kumar@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> 
> Michael D Kinney (6):
>   EmulatorPkg: Fix spelling mistake for occurred
>   MdeModulePkg: Fix spelling mistake for occurred
>   MdePkg: Fix spelling mistake for occurred
>   OvmfPkg: Fix spelling mistake for occurred
>   SecurityPkg: Fix spelling mistake for occurred
>   ShellPkg: Fix spelling mistake for occurred
> 
>  EmulatorPkg/EmuGopDxe/GopScreen.c             |  2 +-
>  EmulatorPkg/TimerDxe/Timer.c                  |  2 +-
>  MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c      |  4 +-
>  MdeModulePkg/Core/Dxe/FwVol/FwVol.c           |  2 +-
>  .../Include/Protocol/GenericMemoryTest.h      |  4 +-
>  .../Acpi/S3SaveStateDxe/S3SaveState.c         |  2 +-
>  .../Acpi/SmmS3SaveState/SmmS3SaveState.c      |  2 +-
>  .../Console/ConSplitterDxe/ConSplitter.h      |  4 +-
>  .../ConSplitterDxe/ConSplitterGraphics.c      |  4 +-
>  .../Universal/DebugPortDxe/DebugPort.c        |  2 +-
>  .../Universal/DebugPortDxe/DebugPort.h        |  2 +-
>  .../FvSimpleFileSystem.c                      |  2 +-
>  .../Universal/LoadFileOnFv2/LoadFileOnFv2.c   |  2 +-
>  .../GenericMemoryTestDxe/LightMemoryTest.c    |  4 +-
>  .../GenericMemoryTestDxe/LightMemoryTest.h    |  4 +-
>  MdePkg/Include/Protocol/UgaDraw.h             |  2 +-
>  MdePkg/Library/BaseLib/FilePaths.c            |  2 +-
>  OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c         |  2 +-
>  OvmfPkg/Include/Protocol/Legacy8259.h         |  2 +-
>  OvmfPkg/SioBusDxe/SioService.c                |  2 +-
>  .../DxeImageVerificationLib.c                 |  2 +-
>  ShellPkg/Include/Library/ShellLib.h           |  4 +-
>  .../UefiShellBcfgCommandLib.c                 |  4 +-
>  .../Edit/FileBuffer.c                         |  4 +-
>  .../Edit/MainTextEditor.c                     | 34 ++++++-------
>  .../Edit/MainTextEditor.h                     |  6 +--
>  .../HexEdit/BufferImage.c                     |  8 ++--
>  .../HexEdit/BufferImage.h                     |  6 +--
>  .../HexEdit/Clipboard.c                       |  4 +-
>  .../HexEdit/Clipboard.h                       |  4 +-
>  .../HexEdit/DiskImage.c                       |  6 +--
>  .../HexEdit/DiskImage.h                       |  6 +--
>  .../HexEdit/FileImage.c                       |  4 +-
>  .../HexEdit/FileImage.h                       |  4 +-
>  .../HexEdit/MainHexEditor.c                   | 48 +++++++++----------
>  .../HexEdit/MainHexEditor.h                   |  8 ++--
>  .../HexEdit/MemImage.c                        |  6 +--
>  .../HexEdit/MemImage.h                        |  6 +--
>  .../UefiShellDebug1CommandsLib/HexEdit/Misc.c |  8 ++--
> .../UefiShellDebug1CommandsLib/HexEdit/Misc.h |  4 +-
>  .../UefiShellDriver1CommandsLib/Drivers.c     |  2 +-
>  .../Library/UefiShellLevel2CommandsLib/Rm.c   |  2 +-
>  .../UefiShellLevel2CommandsLib.h              |  2 +-
>  ShellPkg/Library/UefiShellLib/UefiShellLib.c  |  6 +--
>  44 files changed, 120 insertions(+), 120 deletions(-)
> 
> --
> 2.21.0.windows.1
> 
> 
> 


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [edk2-devel] [Patch 3/6] MdePkg: Fix spelling mistake for occurred
  2020-08-01  1:04 ` [Patch 3/6] MdePkg: " Michael D Kinney
@ 2020-08-03  2:12   ` Liming Gao
  0 siblings, 0 replies; 16+ messages in thread
From: Liming Gao @ 2020-08-03  2:12 UTC (permalink / raw)
  To: devel@edk2.groups.io, Kinney, Michael D; +Cc: Liu, Zhiguang

Reviewed-by: Liming Gao <liming.gao@intel.com>

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael D Kinney
Sent: 2020年8月1日 9:05
To: devel@edk2.groups.io
Cc: Gao, Liming <liming.gao@intel.com>; Liu, Zhiguang <zhiguang.liu@intel.com>
Subject: [edk2-devel] [Patch 3/6] MdePkg: Fix spelling mistake for occurred

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2361

Cc: Liming Gao <liming.gao@intel.com>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 MdePkg/Include/Protocol/UgaDraw.h  | 2 +-  MdePkg/Library/BaseLib/FilePaths.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MdePkg/Include/Protocol/UgaDraw.h b/MdePkg/Include/Protocol/UgaDraw.h
index 3d423be052..47286bb684 100644
--- a/MdePkg/Include/Protocol/UgaDraw.h
+++ b/MdePkg/Include/Protocol/UgaDraw.h
@@ -127,7 +127,7 @@ typedef enum {
 
     @retval EFI_SUCCESS           - The Blt operation completed.
     @retval EFI_INVALID_PARAMETER - BltOperation is not valid.
-    @retval EFI_DEVICE_ERROR      - A hardware error occured writting to the video buffer.
+    @retval EFI_DEVICE_ERROR      - A hardware error occurred writting to the video buffer.
 
 **/
 typedef
diff --git a/MdePkg/Library/BaseLib/FilePaths.c b/MdePkg/Library/BaseLib/FilePaths.c
index 40e8d773ce..c2c561ac64 100644
--- a/MdePkg/Library/BaseLib/FilePaths.c
+++ b/MdePkg/Library/BaseLib/FilePaths.c
@@ -57,7 +57,7 @@ PathRemoveLastItem(
 
   @param[in] Path       The pointer to the string containing the path.
 
-  @return       Returns Path, otherwise returns NULL to indicate that an error has occured.
+  @return       Returns Path, otherwise returns NULL to indicate that an error has occurred.
 **/
 CHAR16*
 EFIAPI
--
2.21.0.windows.1





^ permalink raw reply related	[flat|nested] 16+ messages in thread

* Re: [edk2-devel] [Patch 1/6] EmulatorPkg: Fix spelling mistake for occurred
  2020-08-01  1:04 ` [Patch 1/6] EmulatorPkg: " Michael D Kinney
@ 2020-08-03  2:19   ` Liming Gao
  2020-08-07  5:38   ` Ni, Ray
  1 sibling, 0 replies; 16+ messages in thread
From: Liming Gao @ 2020-08-03  2:19 UTC (permalink / raw)
  To: devel@edk2.groups.io, Kinney, Michael D
  Cc: Justen, Jordan L, Andrew Fish, Ni, Ray

Reviewed-by: Liming Gao <liming.gao@intel.com>

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael D Kinney
Sent: 2020年8月1日 9:05
To: devel@edk2.groups.io
Cc: Justen, Jordan L <jordan.l.justen@intel.com>; Andrew Fish <afish@apple.com>; Ni, Ray <ray.ni@intel.com>
Subject: [edk2-devel] [Patch 1/6] EmulatorPkg: Fix spelling mistake for occurred

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2361

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Andrew Fish <afish@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 EmulatorPkg/EmuGopDxe/GopScreen.c | 2 +-
 EmulatorPkg/TimerDxe/Timer.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/EmulatorPkg/EmuGopDxe/GopScreen.c b/EmulatorPkg/EmuGopDxe/GopScreen.c
index fbac649f8b..cbbb0db07f 100644
--- a/EmulatorPkg/EmuGopDxe/GopScreen.c
+++ b/EmulatorPkg/EmuGopDxe/GopScreen.c
@@ -177,7 +177,7 @@ EmuGopSetMode (
 
   @retval EFI_SUCCESS           The Blt operation completed.
   @retval EFI_INVALID_PARAMETER BltOperation is not valid.
-  @retval EFI_DEVICE_ERROR      A hardware error occured writting to the video buffer.
+  @retval EFI_DEVICE_ERROR      A hardware error occurred writting to the video buffer.
 
 **/
 EFI_STATUS
diff --git a/EmulatorPkg/TimerDxe/Timer.c b/EmulatorPkg/TimerDxe/Timer.c index dfd92acc8c..8e2baaaa5b 100644
--- a/EmulatorPkg/TimerDxe/Timer.c
+++ b/EmulatorPkg/TimerDxe/Timer.c
@@ -301,7 +301,7 @@ Returns:
 
   EFI_OUT_OF_RESOURCES  - Not enough resources available to initialize driver.
 
-  EFI_DEVICE_ERROR      - A device error occured attempting to initialize the driver.
+  EFI_DEVICE_ERROR      - A device error occurred attempting to initialize the driver.
 
 **/
 {
--
2.21.0.windows.1





^ permalink raw reply related	[flat|nested] 16+ messages in thread

* Re: [edk2-devel] [Patch 6/6] ShellPkg: Fix spelling mistake for occurred
  2020-08-01  1:04 ` [Patch 6/6] ShellPkg: " Michael D Kinney
@ 2020-08-03  4:49   ` Gao, Zhichao
  0 siblings, 0 replies; 16+ messages in thread
From: Gao, Zhichao @ 2020-08-03  4:49 UTC (permalink / raw)
  To: devel@edk2.groups.io, Kinney, Michael D; +Cc: Ni, Ray

Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>

Thanks,
Zhichao

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael D
> Kinney
> Sent: Saturday, August 1, 2020 9:05 AM
> To: devel@edk2.groups.io
> Cc: Ni, Ray <ray.ni@intel.com>; Gao, Zhichao <zhichao.gao@intel.com>
> Subject: [edk2-devel] [Patch 6/6] ShellPkg: Fix spelling mistake for occurred
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2361
> 
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  ShellPkg/Include/Library/ShellLib.h           |  4 +-
>  .../UefiShellBcfgCommandLib.c                 |  4 +-
>  .../Edit/FileBuffer.c                         |  4 +-
>  .../Edit/MainTextEditor.c                     | 34 ++++++-------
>  .../Edit/MainTextEditor.h                     |  6 +--
>  .../HexEdit/BufferImage.c                     |  8 ++--
>  .../HexEdit/BufferImage.h                     |  6 +--
>  .../HexEdit/Clipboard.c                       |  4 +-
>  .../HexEdit/Clipboard.h                       |  4 +-
>  .../HexEdit/DiskImage.c                       |  6 +--
>  .../HexEdit/DiskImage.h                       |  6 +--
>  .../HexEdit/FileImage.c                       |  4 +-
>  .../HexEdit/FileImage.h                       |  4 +-
>  .../HexEdit/MainHexEditor.c                   | 48 +++++++++----------
>  .../HexEdit/MainHexEditor.h                   |  8 ++--
>  .../HexEdit/MemImage.c                        |  6 +--
>  .../HexEdit/MemImage.h                        |  6 +--
>  .../UefiShellDebug1CommandsLib/HexEdit/Misc.c |  8 ++--
>   .../UefiShellDebug1CommandsLib/HexEdit/Misc.h |  4 +-
>  .../UefiShellDriver1CommandsLib/Drivers.c     |  2 +-
>  .../Library/UefiShellLevel2CommandsLib/Rm.c   |  2 +-
>  .../UefiShellLevel2CommandsLib.h              |  2 +-
>  ShellPkg/Library/UefiShellLib/UefiShellLib.c  |  6 +--
>  23 files changed, 93 insertions(+), 93 deletions(-)
> 
> diff --git a/ShellPkg/Include/Library/ShellLib.h
> b/ShellPkg/Include/Library/ShellLib.h
> index 1dc41f2cc1..ed9b8f9105 100644
> --- a/ShellPkg/Include/Library/ShellLib.h
> +++ b/ShellPkg/Include/Library/ShellLib.h
> @@ -1034,7 +1034,7 @@ ShellIsFileInPath(
>    @param[in] String   String representation of a number.
> 
>    @return             The unsigned integer result of the conversion.
> -  @retval (UINTN)(-1) An error occured.
> +  @retval (UINTN)(-1) An error occurred.
>  **/
>  UINTN
>  EFIAPI
> @@ -1051,7 +1051,7 @@ ShellStrToUintn(
>    @param[in] String   String representation of a number.
> 
>    @return             The unsigned integer result of the conversion.
> -  @retval (UINTN)(-1) An error occured.
> +  @retval (UINTN)(-1) An error occurred.
>  **/
>  UINTN
>  EFIAPI
> diff --git
> a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c
> b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c
> index f8bcaebe46..52d90e3c97 100644
> --- a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c
> +++ b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c
> @@ -84,7 +84,7 @@ typedef struct {
>    @param[in]      Target    The target of the operation.
> 
>    @retval EFI_SUCCESS       The data was sucessfully updated.
> -  @retval other             A error occured.
> +  @retval other             A error occurred.
>  **/
>  EFI_STATUS
>  UpdateOptionalData(
> @@ -170,7 +170,7 @@ UpdateOptionalData(
>    @param[in]      BootIndex   The boot option index to CRC.
> 
>    @retval EFI_SUCCESS           The CRC was sucessfully returned.
> -  @retval other                 A error occured.
> +  @retval other                 A error occurred.
>  **/
>  EFI_STATUS
>  GetBootOptionCrc(
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
> index c9814e400c..5659ec9810 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
> @@ -221,7 +221,7 @@ InternalEditorMiscLineRetreat (
>                         >0 : advance
>                         <0 : retreat
> 
> -  @retval NULL An error occured.
> +  @retval NULL An error occurred.
>    @return The line after advance/retreat.
>  **/
>  EFI_EDITOR_LINE *
> @@ -2609,7 +2609,7 @@ RightCurrentScreen (
>                       >0 : advance
>                       <0: retreat
> 
> -  @retval NULL An error occured.
> +  @retval NULL An error occurred.
>    @return The line after advance/retreat.
>  **/
>  EFI_EDITOR_LINE *
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c
> index df530f1119..a9423e0d10 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c
> @@ -40,7 +40,7 @@ EFI_EDITOR_GLOBAL_EDITOR      MainEditor;
>    Load a file from disk to editor
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>    @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
>  **/
>  EFI_STATUS
> @@ -74,7 +74,7 @@ MainCommandGotoLine (
> 
>    @retval EFI_SUCCESS           The file was saved correctly.
>    @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
> -  @retval EFI_LOAD_ERROR          A file access error occured.
> +  @retval EFI_LOAD_ERROR          A file access error occurred.
>  **/
>  EFI_STATUS
>  MainCommandSaveFile (
> @@ -96,7 +96,7 @@ MainCommandDisplayHelp (
> 
>    @retval EFI_SUCCESS             The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  MainCommandExit (
> @@ -108,7 +108,7 @@ MainCommandExit (
> 
>    @retval EFI_SUCCESS             The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  MainCommandSearch (
> @@ -120,7 +120,7 @@ MainCommandSearch (
> 
>    @retval EFI_SUCCESS             The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  MainCommandSearchReplace (
> @@ -132,7 +132,7 @@ MainCommandSearchReplace (
> 
>    @retval EFI_SUCCESS             The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  MainCommandCutLine (
> @@ -144,7 +144,7 @@ MainCommandCutLine (
> 
>    @retval EFI_SUCCESS             The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  MainCommandPasteLine (
> @@ -277,7 +277,7 @@ EDITOR_MENU_ITEM  MainMenuItems[] = {
>    Load a file from disk to editor
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>    @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
>  **/
>  EFI_STATUS
> @@ -465,7 +465,7 @@ MainCommandSwitchFileType (
> 
>    @retval EFI_SUCCESS             The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  MainCommandCutLine (
> @@ -503,7 +503,7 @@ MainCommandCutLine (
> 
>    @retval EFI_SUCCESS             The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  MainCommandPasteLine (
> @@ -535,7 +535,7 @@ MainCommandPasteLine (
> 
>    @retval EFI_SUCCESS             The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  MainCommandSearch (
> @@ -676,7 +676,7 @@ MainCommandSearch (
> 
>    @retval EFI_SUCCESS             The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  MainCommandSearchReplace (
> @@ -979,7 +979,7 @@ MainCommandSearchReplace (
> 
>    @retval EFI_SUCCESS             The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  MainCommandExit (
> @@ -1133,7 +1133,7 @@ MainCommandGotoLine (
> 
>    @retval EFI_SUCCESS           The file was saved correctly.
>    @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
> -  @retval EFI_LOAD_ERROR          A file access error occured.
> +  @retval EFI_LOAD_ERROR          A file access error occurred.
>  **/
>  EFI_STATUS
>  MainCommandSaveFile (
> @@ -1439,7 +1439,7 @@ EFI_EDITOR_GLOBAL_EDITOR      MainEditorConst = {
>    The initialization function for MainEditor.
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  MainEditorInit (
> @@ -1585,7 +1585,7 @@ MainEditorInit (
>    The cleanup function for MainEditor.
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  MainEditorCleanup (
> @@ -1823,7 +1823,7 @@ MainEditorHandleMouseInput (
>    Handle user key input. This routes to other functions for the actions.
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>    @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
>  **/
>  EFI_STATUS
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.h
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.h
> index 766d7bba40..b22b6587bf 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.h
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.h
> @@ -15,7 +15,7 @@
>    The initialization function for MainEditor.
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  MainEditorInit (
> @@ -26,7 +26,7 @@ MainEditorInit (
>    The cleanup function for MainEditor.
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  MainEditorCleanup (
> @@ -45,7 +45,7 @@ MainEditorRefresh (
>    Handle user key input. This routes to other functions for the actions.
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>    @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
>  **/
>  EFI_STATUS
> diff --git
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
> index 5db40eef4e..a730cc105c 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
> @@ -72,7 +72,7 @@ BOOLEAN                           HBufferImageMouseNeedRefresh;
>    Initialization function for HBufferImage
> 
>    @retval EFI_SUCCESS       The operation was successful.
> -  @retval EFI_LOAD_ERROR    A load error occured.
> +  @retval EFI_LOAD_ERROR    A load error occurred.
>  **/
>  EFI_STATUS
>  HBufferImageInit (
> @@ -730,7 +730,7 @@ HBufferImageRestorePosition (
>    Refresh function for HBufferImage.
> 
>    @retval EFI_SUCCESS     The operation was successful.
> -  @retval EFI_LOAD_ERROR  A Load error occured.
> +  @retval EFI_LOAD_ERROR  A Load error occurred.
> 
>  **/
>  EFI_STATUS
> @@ -1314,7 +1314,7 @@ HBufferImageDoBackspace (
>    @param[in] Char               The input char.
> 
>    @retval EFI_SUCCESS           The operation was successful.
> -  @retval EFI_LOAD_ERROR        A load error occured.
> +  @retval EFI_LOAD_ERROR        A load error occurred.
>    @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
>  **/
>  EFI_STATUS
> @@ -2376,7 +2376,7 @@ HBufferImageAdjustMousePosition (
>                          INS
> 
>    @retval EFI_SUCCESS           The operation was successful.
> -  @retval EFI_LOAD_ERROR        A load error occured.
> +  @retval EFI_LOAD_ERROR        A load error occurred.
>    @retval EFI_OUT_OF_RESOURCES  A Memory allocation failed.
>  **/
>  EFI_STATUS
> diff --git
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.h
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.h
> index 3df22306ca..0599f293ec 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.h
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.h
> @@ -16,7 +16,7 @@
>    Initialization function for HBufferImage
> 
>    @retval EFI_SUCCESS       The operation was successful.
> -  @retval EFI_LOAD_ERROR    A load error occured.
> +  @retval EFI_LOAD_ERROR    A load error occurred.
>  **/
>  EFI_STATUS
>  HBufferImageInit (
> @@ -37,7 +37,7 @@ HBufferImageCleanup (
>    Refresh function for HBufferImage.
> 
>    @retval EFI_SUCCESS     The operation was successful.
> -  @retval EFI_LOAD_ERROR  A Load error occured.
> +  @retval EFI_LOAD_ERROR  A Load error occurred.
> 
>  **/
>  EFI_STATUS
> @@ -57,7 +57,7 @@ HBufferImageRefresh (
>                          INS
> 
>    @retval EFI_SUCCESS           The operation was successful.
> -  @retval EFI_LOAD_ERROR        A load error occured.
> +  @retval EFI_LOAD_ERROR        A load error occurred.
>    @retval EFI_OUT_OF_RESOURCES  A Memory allocation failed.
>  **/
>  EFI_STATUS
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Clipboard.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Clipboard.c
> index 6cb42764b6..c2d6c5fa9a 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Clipboard.c
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Clipboard.c
> @@ -27,7 +27,7 @@ HEFI_EDITOR_CLIPBOARD HClipBoardConst = {
>    Initialization function for HDiskImage.
> 
>    @param[in] EFI_SUCCESS      The operation was successful.
> -  @param[in] EFI_LOAD_ERROR   A load error occured.
> +  @param[in] EFI_LOAD_ERROR   A load error occurred.
>  **/
>  EFI_STATUS
>  HClipBoardInit (
> @@ -46,7 +46,7 @@ HClipBoardInit (
>    Initialization function for HDiskImage.
> 
>    @param[in] EFI_SUCCESS      The operation was successful.
> -  @param[in] EFI_LOAD_ERROR   A load error occured.
> +  @param[in] EFI_LOAD_ERROR   A load error occurred.
>  **/
>  EFI_STATUS
>  HClipBoardCleanup (
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Clipboard.h
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Clipboard.h
> index 44399cfbb5..6e1e2d42cc 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Clipboard.h
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Clipboard.h
> @@ -16,7 +16,7 @@
>    Initialization function for HDiskImage
> 
>    @param[in] EFI_SUCCESS      The operation was successful.
> -  @param[in] EFI_LOAD_ERROR   A load error occured.
> +  @param[in] EFI_LOAD_ERROR   A load error occurred.
>  **/
>  EFI_STATUS
>  HClipBoardInit (
> @@ -27,7 +27,7 @@ HClipBoardInit (
>    Initialization function for HDiskImage.
> 
>    @param[in] EFI_SUCCESS      The operation was successful.
> -  @param[in] EFI_LOAD_ERROR   A load error occured.
> +  @param[in] EFI_LOAD_ERROR   A load error occurred.
>  **/
>  EFI_STATUS
>  HClipBoardCleanup (
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c
> index e31b90b867..771a5c6840 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.c
> @@ -35,7 +35,7 @@ HEFI_EDITOR_DISK_IMAGE            HDiskImageConst = {
>    Initialization function for HDiskImage.
> 
>    @retval EFI_SUCCESS     The operation was successful.
> -  @retval EFI_LOAD_ERROR  A load error occured.
> +  @retval EFI_LOAD_ERROR  A load error occurred.
>  **/
>  EFI_STATUS
>  HDiskImageInit (
> @@ -147,7 +147,7 @@ HDiskImageSetDiskNameOffsetSize (
> 
>    @retval EFI_SUCCESS           The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
> -  @retval EFI_LOAD_ERROR        A load error occured.
> +  @retval EFI_LOAD_ERROR        A load error occurred.
>    @retval EFI_INVALID_PARAMETER A parameter was invalid.
>  **/
>  EFI_STATUS
> @@ -319,7 +319,7 @@ HDiskImageRead (
> 
>    @retval EFI_SUCCESS           The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
> -  @retval EFI_LOAD_ERROR        A load error occured.
> +  @retval EFI_LOAD_ERROR        A load error occurred.
>    @retval EFI_INVALID_PARAMETER A parameter was invalid.
>  **/
>  EFI_STATUS
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.h
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.h
> index e5c6f42e15..d0a78e0a12 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.h
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/DiskImage.h
> @@ -16,7 +16,7 @@
>    Initialization function for HDiskImage.
> 
>    @retval EFI_SUCCESS     The operation was successful.
> -  @retval EFI_LOAD_ERROR  A load error occured.
> +  @retval EFI_LOAD_ERROR  A load error occurred.
>  **/
>  EFI_STATUS
>  HDiskImageInit (
> @@ -55,7 +55,7 @@ HDiskImageBackup (
> 
>    @retval EFI_SUCCESS           The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
> -  @retval EFI_LOAD_ERROR        A load error occured.
> +  @retval EFI_LOAD_ERROR        A load error occurred.
>    @retval EFI_INVALID_PARAMETER A parameter was invalid.
>  **/
>  EFI_STATUS
> @@ -76,7 +76,7 @@ HDiskImageRead (
> 
>    @retval EFI_SUCCESS           The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
> -  @retval EFI_LOAD_ERROR        A load error occured.
> +  @retval EFI_LOAD_ERROR        A load error occurred.
>    @retval EFI_INVALID_PARAMETER A parameter was invalid.
>  **/
>  EFI_STATUS
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.c
> index bb324ceafc..4f96cb6cb5 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.c
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.c
> @@ -131,7 +131,7 @@ HFileImageSetFileName (
> 
>    @retval EFI_SUCCESS           The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
> -  @retval EFI_LOAD_ERROR        A load error occured.
> +  @retval EFI_LOAD_ERROR        A load error occurred.
>  **/
>  EFI_STATUS
>  HFileImageRead (
> @@ -244,7 +244,7 @@ HFileImageRead (
> 
>    @retval EFI_SUCCESS           The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
> -  @retval EFI_LOAD_ERROR        A load error occured.
> +  @retval EFI_LOAD_ERROR        A load error occurred.
>  **/
>  EFI_STATUS
>  HFileImageSave (
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.h
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.h
> index 7967144db3..9fb25ac5e9 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.h
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/FileImage.h
> @@ -52,7 +52,7 @@ HFileImageBackup (
> 
>    @retval EFI_SUCCESS           The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
> -  @retval EFI_LOAD_ERROR        A load error occured.
> +  @retval EFI_LOAD_ERROR        A load error occurred.
>  **/
>  EFI_STATUS
>  HFileImageRead (
> @@ -67,7 +67,7 @@ HFileImageRead (
> 
>    @retval EFI_SUCCESS           The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
> -  @retval EFI_LOAD_ERROR        A load error occured.
> +  @retval EFI_LOAD_ERROR        A load error occurred.
>  **/
>  EFI_STATUS
>  HFileImageSave (
> diff --git
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
> index a00df49d38..9f72da1193 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.
> +++ c
> @@ -243,8 +243,8 @@ HMainCommandGoToOffset (
>    save to another file name.
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  HMainCommandSaveBuffer (
> @@ -540,8 +540,8 @@ HMainCommandSaveBuffer (
>    Load a disk buffer editor.
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  HMainCommandSelectStart (
> @@ -578,8 +578,8 @@ HMainCommandSelectStart (
>    Load a disk buffer editor.
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  HMainCommandSelectEnd (
> @@ -616,8 +616,8 @@ HMainCommandSelectEnd (
>    Cut current line to clipboard.
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  HMainCommandCut (
> @@ -688,8 +688,8 @@ HMainCommandCut (
>    Paste line to file buffer.
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  HMainCommandPaste (
> @@ -748,8 +748,8 @@ HMainCommandPaste (
>    Exit editor.
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  HMainCommandExit (
> @@ -841,8 +841,8 @@ HMainCommandExit (
>    Load a file from disk to editor.
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  HMainCommandOpenFile (
> @@ -1074,8 +1074,8 @@ HMainCommandOpenFile (
>    Load a disk buffer editor.
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>    @retval EFI_NOT_FOUND           The disk was not found.
>  **/
>  EFI_STATUS
> @@ -1319,8 +1319,8 @@ HMainCommandOpenDisk (
>    Load memory content to editor
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>    @retval EFI_NOT_FOUND           The disk was not found.
>  **/
>  EFI_STATUS
> @@ -1623,7 +1623,7 @@ CONST EDITOR_MENU_ITEM HexEditorMenuItems[]
> = {
>    Init function for MainEditor
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  HMainEditorInit (
> @@ -1780,7 +1780,7 @@ HMainEditorInit (
>    Cleanup function for MainEditor.
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  HMainEditorCleanup (
> @@ -1932,8 +1932,8 @@ HMainEditorRefresh (
>    @param[out] BeforeLeftButtonDown  helps with selections.
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>    @retval EFI_NOT_FOUND           The disk was not found.
>  **/
>  EFI_STATUS
> @@ -2091,8 +2091,8 @@ HMainEditorHandleMouseInput (
>    Handle user key input. will route it to other components handle function.
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  HMainEditorKeyInput (
> diff --git
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.h
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.h
> index e1a14a4b46..c77685c175 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.h
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.
> +++ h
> @@ -18,7 +18,7 @@
>    Init function for MainEditor
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  HMainEditorInit (
> @@ -29,7 +29,7 @@ HMainEditorInit (
>    Cleanup function for MainEditor.
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  HMainEditorCleanup (
> @@ -50,8 +50,8 @@ HMainEditorRefresh (
>    Handle user key input. will route it to other components handle function.
> 
>    @retval EFI_SUCCESS             The operation was successful.
> -  @retval EFI_OUT_OF_RESOURCES    A memory allocation occured.
> -  @retval EFI_LOAD_ERROR          A load error occured.
> +  @retval EFI_OUT_OF_RESOURCES    A memory allocation occurred.
> +  @retval EFI_LOAD_ERROR          A load error occurred.
>  **/
>  EFI_STATUS
>  HMainEditorKeyInput (
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.c
> index 224fbe7398..5e734f668a 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.c
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.c
> @@ -34,7 +34,7 @@ HEFI_EDITOR_MEM_IMAGE             HMemImageConst = {
>    Initialization function for HDiskImage.
> 
>    @retval EFI_SUCCESS       The operation was successful.
> -  @retval EFI_LOAD_ERROR    A load error occured.
> +  @retval EFI_LOAD_ERROR    A load error occurred.
>  **/
>  EFI_STATUS
>  HMemImageInit (
> @@ -106,7 +106,7 @@ HMemImageSetMemOffsetSize (
>    @param[in] Size     The size.
>    @param[in] Recover  if is for recover, no information print.
> 
> -  @retval EFI_LOAD_ERROR        A load error occured.
> +  @retval EFI_LOAD_ERROR        A load error occurred.
>    @retval EFI_SUCCESS           The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
>  **/
> @@ -217,7 +217,7 @@ HMemImageRead (
>    @param[in] Offset   The offset.
>    @param[in] Size     The size.
> 
> -  @retval EFI_LOAD_ERROR        A load error occured.
> +  @retval EFI_LOAD_ERROR        A load error occurred.
>    @retval EFI_SUCCESS           The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
>  **/
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.h
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.h
> index d17d1ee32c..090a3fc775 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.h
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MemImage.h
> @@ -16,7 +16,7 @@
>    Initialization function for HDiskImage.
> 
>    @retval EFI_SUCCESS       The operation was successful.
> -  @retval EFI_LOAD_ERROR    A load error occured.
> +  @retval EFI_LOAD_ERROR    A load error occurred.
>  **/
>  EFI_STATUS
>  HMemImageInit (
> @@ -56,7 +56,7 @@ HMemImageSetMemOffsetSize (
>    @param[in] Size     The size.
>    @param[in] Recover  if is for recover, no information print.
> 
> -  @retval EFI_LOAD_ERROR        A load error occured.
> +  @retval EFI_LOAD_ERROR        A load error occurred.
>    @retval EFI_SUCCESS           The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
>  **/
> @@ -73,7 +73,7 @@ HMemImageRead (
>    @param[in] Offset   The offset.
>    @param[in] Size     The size.
> 
> -  @retval EFI_LOAD_ERROR        A load error occured.
> +  @retval EFI_LOAD_ERROR        A load error occurred.
>    @retval EFI_SUCCESS           The operation was successful.
>    @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
>  **/
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Misc.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Misc.c
> index cc11f9e87c..10bf15cbfb 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Misc.c
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Misc.c
> @@ -33,7 +33,7 @@ HLineFree (
> 
>    @param[in] Count      The line number to advance.
> 
> -  @retval NULL An error occured.
> +  @retval NULL An error occurred.
>    @return A pointer to the line after advance.
>  **/
>  HEFI_EDITOR_LINE *
> @@ -68,7 +68,7 @@ HLineAdvance (
> 
>    @param[in] Count    The line number to retreat.
> 
> -  @retval NULL An error occured.
> +  @retval NULL An error occurred.
>    @return A pointer to the line after retreat.
>  **/
>  HEFI_EDITOR_LINE *
> @@ -105,7 +105,7 @@ HLineRetreat (
>                              >0 : advance
>                              <0: retreat
> 
> -  @retval NULL An error occured.
> +  @retval NULL An error occurred.
>    @return A pointer to the line after move.
>  **/
>  HEFI_EDITOR_LINE *
> @@ -138,7 +138,7 @@ HMoveLine (
>                            >0 : advance
>                            <0: retreat
> 
> -  @retval NULL An error occured.
> +  @retval NULL An error occurred.
>    @return A pointer to the line after move.
>  **/
>  HEFI_EDITOR_LINE *
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Misc.h
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Misc.h
> index d5137ea139..02df65959c 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Misc.h
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/Misc.h
> @@ -18,7 +18,7 @@
>                              >0 : advance
>                              <0: retreat
> 
> -  @retval NULL An error occured.
> +  @retval NULL An error occurred.
>    @return A pointer to the line after move.
>  **/
>  HEFI_EDITOR_LINE *
> @@ -33,7 +33,7 @@ HMoveLine (
>                            >0 : advance
>                            <0: retreat
> 
> -  @retval NULL An error occured.
> +  @retval NULL An error occurred.
>    @return A pointer to the line after move.
>  **/
>  HEFI_EDITOR_LINE *
> diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
> b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
> index 27cd278cf0..99a7b0c8cd 100644
> --- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
> +++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
> @@ -22,7 +22,7 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
> 
>    @param[in] TheHandle      The handle to get the device path for.
> 
> -  @retval NULL    An error occured.
> +  @retval NULL    An error occurred.
>    @return         A pointer to the driver path as a string.  The callee must
>                    free this memory.
>  **/
> diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
> index 59f7eec376..bc85039588 100644
> --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
> @@ -57,7 +57,7 @@ IsDirectoryEmpty (
>    @retval SHELL_SUCCESS       The operation was successful.
>    @retval SHELL_ACCESS_DENIED A file was read only.
>    @retval SHELL_ABORTED       The abort message was received.
> -  @retval SHELL_DEVICE_ERROR  A device error occured reading this Node.
> +  @retval SHELL_DEVICE_ERROR  A device error occurred reading this Node.
>  **/
>  SHELL_STATUS
>  CascadeDelete(
> diff --git
> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
> b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
> index 77be6f1a12..426b6490f4 100644
> ---
> a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
> +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Command
> +++ sLib.h
> @@ -351,7 +351,7 @@ CopySingleFile(
>    @retval SHELL_SUCCESS       The operation was successful.
>    @retval SHELL_ACCESS_DENIED A file was read only.
>    @retval SHELL_ABORTED       The abort message was received.
> -  @retval SHELL_DEVICE_ERROR  A device error occured reading this Node.
> +  @retval SHELL_DEVICE_ERROR  A device error occurred reading this Node.
>  **/
>  SHELL_STATUS
>  CascadeDelete(
> diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
> b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
> index 9f07a58eb2..c4749941a6 100644
> --- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
> +++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
> @@ -3181,7 +3181,7 @@ ShellIsFileInPath(
>    @param[in] String   String representation of a number.
> 
>    @return             The unsigned integer result of the conversion.
> -  @retval (UINTN)(-1) An error occured.
> +  @retval (UINTN)(-1) An error occurred.
>  **/
>  UINTN
>  EFIAPI
> @@ -3810,7 +3810,7 @@ InternalShellHexCharToUintn (
> 
>    @retval EFI_SUCCESS             The conversion was successful.
>    @retval EFI_INVALID_PARAMETER   A parameter was NULL or invalid.
> -  @retval EFI_DEVICE_ERROR        An overflow occured.
> +  @retval EFI_DEVICE_ERROR        An overflow occurred.
>  **/
>  EFI_STATUS
>  InternalShellStrHexToUint64 (
> @@ -3911,7 +3911,7 @@ InternalShellStrHexToUint64 (
> 
>    @retval EFI_SUCCESS             The conversion was successful.
>    @retval EFI_INVALID_PARAMETER   A parameter was NULL or invalid.
> -  @retval EFI_DEVICE_ERROR        An overflow occured.
> +  @retval EFI_DEVICE_ERROR        An overflow occurred.
>  **/
>  EFI_STATUS
>  InternalShellStrDecimalToUint64 (
> --
> 2.21.0.windows.1
> 
> 
> 


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [edk2-devel] [Patch 5/6] SecurityPkg: Fix spelling mistake for occurred
  2020-08-01  1:04 ` [Patch 5/6] SecurityPkg: " Michael D Kinney
@ 2020-08-04 10:00   ` Maciej Rabeda
  2020-08-18 16:42   ` Wang, Jian J
  1 sibling, 0 replies; 16+ messages in thread
From: Maciej Rabeda @ 2020-08-04 10:00 UTC (permalink / raw)
  To: devel, michael.d.kinney; +Cc: Qi Zhang, Rahul Kumar

Reviewed-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>

On 01-Aug-20 03:04, Michael D Kinney wrote:
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2361
>
> Cc: Qi Zhang <qi1.zhang@intel.com>
> Cc: Rahul Kumar <rahul1.kumar@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>   .../Library/DxeImageVerificationLib/DxeImageVerificationLib.c   | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
> index 36b87e16d5..b08fe24e85 100644
> --- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
> +++ b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
> @@ -1465,7 +1465,7 @@ IsAllowedByDb (
>   
>     //
>     // Fetch 'dbx' content. If 'dbx' doesn't exist, continue to check 'db'.
> -  // If any other errors occured, no need to check 'db' but just return
> +  // If any other errors occurred, no need to check 'db' but just return
>     // not-allowed-by-db (FALSE) to avoid bypass.
>     //
>     DbxDataSize = 0;


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [edk2-devel] [Patch 2/6] MdeModulePkg: Fix spelling mistake for occurred
  2020-08-01  1:04 ` [Patch 2/6] MdeModulePkg: " Michael D Kinney
@ 2020-08-07  3:28   ` Wu, Hao A
  0 siblings, 0 replies; 16+ messages in thread
From: Wu, Hao A @ 2020-08-07  3:28 UTC (permalink / raw)
  To: devel@edk2.groups.io, Kinney, Michael D; +Cc: Wang, Jian J

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael
> D Kinney
> Sent: Saturday, August 1, 2020 9:05 AM
> To: devel@edk2.groups.io
> Cc: Wang, Jian J <jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>
> Subject: [edk2-devel] [Patch 2/6] MdeModulePkg: Fix spelling mistake for
> occurred
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2361
> 
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c                      | 4 ++--
>  MdeModulePkg/Core/Dxe/FwVol/FwVol.c                           | 2 +-
>  MdeModulePkg/Include/Protocol/GenericMemoryTest.h             | 4 ++--
>  MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c      | 2 +-
>  MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c   | 2 +-
>  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h   | 4 ++--
>  .../Universal/Console/ConSplitterDxe/ConSplitterGraphics.c    | 4 ++--
>  MdeModulePkg/Universal/DebugPortDxe/DebugPort.c               | 2 +-
>  MdeModulePkg/Universal/DebugPortDxe/DebugPort.h               | 2 +-
>  .../Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c      | 2 +-
>  MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.c          | 2 +-
>  .../MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c         | 4 ++--
>  .../MemoryTest/GenericMemoryTestDxe/LightMemoryTest.h         | 4 ++--
>  13 files changed, 19 insertions(+), 19 deletions(-)
> 
> diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
> b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
> index 12afbec852..e216418849 100644
> --- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
> +++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
> @@ -513,7 +513,7 @@ UhciCheckTdStatus (
>        // terminate the transfer
>        //
>        if (!IsLow && (TdHw->ShortPacket == 1) && (Len < Td->DataLen)) {
> -        DEBUG ((EFI_D_VERBOSE, "UhciCheckTdStatus: short packet read
> occured\n"));
> +        DEBUG ((DEBUG_VERBOSE, "UhciCheckTdStatus: short packet read
> occurred\n"));
> 
>          Finished = TRUE;
>          goto ON_EXIT;
> @@ -590,7 +590,7 @@ UhciExecuteTransfer (
>      Finished = UhciCheckTdStatus (Uhc, Td, IsLow, QhResult);
> 
>      //
> -    // Transfer is OK or some error occured (TD inactive)
> +    // Transfer is OK or some error occurred (TD inactive)
>      //
>      if (Finished) {
>        break;
> diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
> b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
> index e2f58c4d82..cbf5c1c7b9 100644
> --- a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
> +++ b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
> @@ -572,7 +572,7 @@ Done:
>    EFI_FIRMWARE_VOLUME2_PROTOCOL on the same handle.  This is the
> function where
>    the actual initialization of the EFI_FIRMWARE_VOLUME2_PROTOCOL is
> done.
> 
> -  @param  Event                 The event that occured
> +  @param  Event                 The event that occurred
>    @param  Context               For EFI compatiblity.  Not used.
> 
>  **/
> diff --git a/MdeModulePkg/Include/Protocol/GenericMemoryTest.h
> b/MdeModulePkg/Include/Protocol/GenericMemoryTest.h
> index 61cab8c4ae..08157f35f5 100644
> --- a/MdeModulePkg/Include/Protocol/GenericMemoryTest.h
> +++ b/MdeModulePkg/Include/Protocol/GenericMemoryTest.h
> @@ -54,12 +54,12 @@ EFI_STATUS
>    @param  TestedMemorySize    Return the tested extended memory size.
>    @param  TotalMemorySize     Return the whole system physical memory
> size.
>                                The total memory size does not include memory in a slot
> with a disabled DIMM.
> -  @param  ErrorOut            TRUE if the memory error occured.
> +  @param  ErrorOut            TRUE if the memory error occurred.
>    @param  IfTestAbort         Indicates that the user pressed "ESC" to skip the
> memory test.
> 
>    @retval EFI_SUCCESS         One block of memory passed the test.
>    @retval EFI_NOT_FOUND       All memory blocks have already been tested.
> -  @retval EFI_DEVICE_ERROR    Memory device error occured, and no agent
> can handle it.
> +  @retval EFI_DEVICE_ERROR    Memory device error occurred, and no
> agent can handle it.
> 
>  **/
>  typedef
> diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
> b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
> index cfa8ebbd2f..e342f73485 100644
> --- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
> +++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
> @@ -889,7 +889,7 @@ BootScriptCompare (
> 
>    @retval EFI_OUT_OF_RESOURCES  No enough resource
>    @retval EFI_SUCCESS           Succesfully installed the ScriptSave driver.
> -  @retval other                 Errors occured.
> +  @retval other                 Errors occurred.
> 
>  **/
>  EFI_STATUS
> diff --git
> a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
> b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
> index fc6d29e48b..601c8218db 100644
> --- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
> +++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
> @@ -887,7 +887,7 @@ BootScriptCompare (
> 
>    @retval EFI_OUT_OF_RESOURCES  No enough resource
>    @retval EFI_SUCCESS           Succesfully installed the ScriptSave driver.
> -  @retval other                 Errors occured.
> +  @retval other                 Errors occurred.
> 
>  **/
>  EFI_STATUS
> diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
> b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
> index 419635c3f5..f26d2adb81 100644
> --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
> +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
> @@ -1852,7 +1852,7 @@ ConSplitterGraphicsOutputSetMode (
> 
>    @retval EFI_SUCCESS             The Blt operation completed.
>    @retval EFI_INVALID_PARAMETER   BltOperation is not valid.
> -  @retval EFI_DEVICE_ERROR        A hardware error occured writting to the
> video
> +  @retval EFI_DEVICE_ERROR        A hardware error occurred writting to the
> video
>                                    buffer.
> 
>  **/
> @@ -1966,7 +1966,7 @@ ConSplitterUgaDrawSetMode (
> 
>    @retval EFI_SUCCESS            The Blt operation completed.
>    @retval EFI_INVALID_PARAMETER  BltOperation is not valid.
> -  @retval EFI_DEVICE_ERROR       A hardware error occured writting to the
> video buffer.
> +  @retval EFI_DEVICE_ERROR       A hardware error occurred writting to the
> video buffer.
> 
>  **/
>  EFI_STATUS
> diff --git
> a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
> b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
> index ab1d2ddc4d..9323f31b63 100644
> ---
> a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
> +++
> b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
> @@ -238,7 +238,7 @@ ConSplitterGraphicsOutputSetMode (
> 
>    @retval EFI_SUCCESS             The Blt operation completed.
>    @retval EFI_INVALID_PARAMETER   BltOperation is not valid.
> -  @retval EFI_DEVICE_ERROR        A hardware error occured writting to the
> video
> +  @retval EFI_DEVICE_ERROR        A hardware error occurred writting to the
> video
>                                    buffer.
> 
>  **/
> @@ -513,7 +513,7 @@ ConSplitterUgaDrawSetMode (
> 
>    @retval EFI_SUCCESS            The Blt operation completed.
>    @retval EFI_INVALID_PARAMETER  BltOperation is not valid.
> -  @retval EFI_DEVICE_ERROR       A hardware error occured writting to the
> video buffer.
> +  @retval EFI_DEVICE_ERROR       A hardware error occurred writting to the
> video buffer.
> 
>  **/
>  EFI_STATUS
> diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
> b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
> index c3e7db4c42..172c1cbca3 100644
> --- a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
> +++ b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
> @@ -632,7 +632,7 @@ DebugPortWrite (
>                                the DebugPort interface.
>    @retval EFI_NOT_READY       There are no characters ready to read from
> the
>                                DebugPort interface
> -  @retval EFI_DEVICE_ERROR    A hardware failure occured... (from SerialIo)
> +  @retval EFI_DEVICE_ERROR    A hardware failure occurred... (from SerialIo)
> 
>  **/
>  EFI_STATUS
> diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
> b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
> index 9fa2ae922d..12fca8e273 100644
> --- a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
> +++ b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
> @@ -378,7 +378,7 @@ DebugPortWrite (
>                                the DebugPort interface.
>    @retval EFI_NOT_READY       There are no characters ready to read from
> the
>                                DebugPort interface
> -  @retval EFI_DEVICE_ERROR    A hardware failure occured... (from SerialIo)
> +  @retval EFI_DEVICE_ERROR    A hardware failure occurred... (from SerialIo)
> 
>  **/
>  EFI_STATUS
> diff --git
> a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c
> b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c
> index ac57a6c060..f33f7f7216 100644
> ---
> a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c
> +++
> b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c
> @@ -362,7 +362,7 @@ RemoveLastItemFromPath (
> 
>    @param  Path          The pointer to the string containing the path.
> 
> -  @retval NULL          An error occured.
> +  @retval NULL          An error occurred.
>    @return Path in all other instances.
> 
>  **/
> diff --git a/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.c
> b/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.c
> index 43fa6ce128..58e658ee08 100644
> --- a/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.c
> +++ b/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.c
> @@ -317,7 +317,7 @@ InstallFileLoadProtocol (
>    EFI_FIRMWARE_VOLUME_PROTOCOL on the handle of the FFS. This
> notification function
>    also handles the situation when LZMA decoder driver loaded later than
> FirmwareVolume driver.
> 
> -  @param  Event                 The event that occured
> +  @param  Event                 The event that occurred
>    @param  Context               Context of event. Not used in this nofication
> function.
> 
>  **/
> diff --git
> a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMe
> moryTest.c
> b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMe
> moryTest.c
> index fe24e490d4..7fd383ab72 100644
> ---
> a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMe
> moryTest.c
> +++
> b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMe
> moryTest.c
> @@ -539,12 +539,12 @@ InitializeMemoryTest (
>    @param[out] TestedMemorySize  Return the tested extended memory size.
>    @param[out] TotalMemorySize   Return the whole system physical
> memory size.
>                                  The total memory size does not include memory in a slot
> with a disabled DIMM.
> -  @param[out] ErrorOut          TRUE if the memory error occured.
> +  @param[out] ErrorOut          TRUE if the memory error occurred.
>    @param[in]  IfTestAbort       Indicates that the user pressed "ESC" to skip
> the memory test.
> 
>    @retval EFI_SUCCESS         One block of memory passed the test.
>    @retval EFI_NOT_FOUND       All memory blocks have already been tested.
> -  @retval EFI_DEVICE_ERROR    Memory device error occured, and no agent
> can handle it.
> +  @retval EFI_DEVICE_ERROR    Memory device error occurred, and no
> agent can handle it.
> 
>  **/
>  EFI_STATUS
> diff --git
> a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMe
> moryTest.h
> b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMe
> moryTest.h
> index b9e2eaa1e5..72e58ae4a8 100644
> ---
> a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMe
> moryTest.h
> +++
> b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMe
> moryTest.h
> @@ -280,12 +280,12 @@ InitializeMemoryTest (
>    @param[out] TestedMemorySize  Return the tested extended memory size.
>    @param[out] TotalMemorySize   Return the whole system physical
> memory size.
>                                  The total memory size does not include memory in a slot
> with a disabled DIMM.
> -  @param[out] ErrorOut          TRUE if the memory error occured.
> +  @param[out] ErrorOut          TRUE if the memory error occurred.
>    @param[in]  IfTestAbort       Indicates that the user pressed "ESC" to skip
> the memory test.
> 
>    @retval EFI_SUCCESS         One block of memory passed the test.
>    @retval EFI_NOT_FOUND       All memory blocks have already been tested.
> -  @retval EFI_DEVICE_ERROR    Memory device error occured, and no agent
> can handle it.
> +  @retval EFI_DEVICE_ERROR    Memory device error occurred, and no
> agent can handle it.


Reviewed-by: Hao A Wu <hao.a.wu@intel.com>

Best Regards,
Hao Wu


> 
>  **/
>  EFI_STATUS
> --
> 2.21.0.windows.1
> 
> 
> 


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [edk2-devel] [Patch 1/6] EmulatorPkg: Fix spelling mistake for occurred
  2020-08-01  1:04 ` [Patch 1/6] EmulatorPkg: " Michael D Kinney
  2020-08-03  2:19   ` [edk2-devel] " Liming Gao
@ 2020-08-07  5:38   ` Ni, Ray
  1 sibling, 0 replies; 16+ messages in thread
From: Ni, Ray @ 2020-08-07  5:38 UTC (permalink / raw)
  To: devel@edk2.groups.io, Kinney, Michael D; +Cc: Justen, Jordan L, Andrew Fish

Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael D Kinney
> Sent: Saturday, August 1, 2020 9:05 AM
> To: devel@edk2.groups.io
> Cc: Justen, Jordan L <jordan.l.justen@intel.com>; Andrew Fish <afish@apple.com>; Ni, Ray <ray.ni@intel.com>
> Subject: [edk2-devel] [Patch 1/6] EmulatorPkg: Fix spelling mistake for occurred
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2361
> 
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Andrew Fish <afish@apple.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  EmulatorPkg/EmuGopDxe/GopScreen.c | 2 +-
>  EmulatorPkg/TimerDxe/Timer.c      | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/EmulatorPkg/EmuGopDxe/GopScreen.c b/EmulatorPkg/EmuGopDxe/GopScreen.c
> index fbac649f8b..cbbb0db07f 100644
> --- a/EmulatorPkg/EmuGopDxe/GopScreen.c
> +++ b/EmulatorPkg/EmuGopDxe/GopScreen.c
> @@ -177,7 +177,7 @@ EmuGopSetMode (
> 
>    @retval EFI_SUCCESS           The Blt operation completed.
>    @retval EFI_INVALID_PARAMETER BltOperation is not valid.
> -  @retval EFI_DEVICE_ERROR      A hardware error occured writting to the video buffer.
> +  @retval EFI_DEVICE_ERROR      A hardware error occurred writting to the video buffer.
> 
>  **/
>  EFI_STATUS
> diff --git a/EmulatorPkg/TimerDxe/Timer.c b/EmulatorPkg/TimerDxe/Timer.c
> index dfd92acc8c..8e2baaaa5b 100644
> --- a/EmulatorPkg/TimerDxe/Timer.c
> +++ b/EmulatorPkg/TimerDxe/Timer.c
> @@ -301,7 +301,7 @@ Returns:
> 
>    EFI_OUT_OF_RESOURCES  - Not enough resources available to initialize driver.
> 
> -  EFI_DEVICE_ERROR      - A device error occured attempting to initialize the driver.
> +  EFI_DEVICE_ERROR      - A device error occurred attempting to initialize the driver.
> 
>  **/
>  {
> --
> 2.21.0.windows.1
> 
> 
> 


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [edk2-devel] [Patch 5/6] SecurityPkg: Fix spelling mistake for occurred
  2020-08-01  1:04 ` [Patch 5/6] SecurityPkg: " Michael D Kinney
  2020-08-04 10:00   ` [edk2-devel] " Maciej Rabeda
@ 2020-08-18 16:42   ` Wang, Jian J
  1 sibling, 0 replies; 16+ messages in thread
From: Wang, Jian J @ 2020-08-18 16:42 UTC (permalink / raw)
  To: devel@edk2.groups.io, Kinney, Michael D; +Cc: Zhang, Qi1, Kumar, Rahul1


Reviewed-by: Jian J Wang <jian.j.wang@intel.com>

Regards,
Jian

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael D
> Kinney
> Sent: Saturday, August 01, 2020 9:05 AM
> To: devel@edk2.groups.io
> Cc: Zhang, Qi1 <qi1.zhang@intel.com>; Kumar, Rahul1
> <rahul1.kumar@intel.com>
> Subject: [edk2-devel] [Patch 5/6] SecurityPkg: Fix spelling mistake for occurred
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2361
> 
> Cc: Qi Zhang <qi1.zhang@intel.com>
> Cc: Rahul Kumar <rahul1.kumar@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  .../Library/DxeImageVerificationLib/DxeImageVerificationLib.c   | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git
> a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
> b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
> index 36b87e16d5..b08fe24e85 100644
> --- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
> +++ b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
> @@ -1465,7 +1465,7 @@ IsAllowedByDb (
> 
>    //
>    // Fetch 'dbx' content. If 'dbx' doesn't exist, continue to check 'db'.
> -  // If any other errors occured, no need to check 'db' but just return
> +  // If any other errors occurred, no need to check 'db' but just return
>    // not-allowed-by-db (FALSE) to avoid bypass.
>    //
>    DbxDataSize = 0;
> --
> 2.21.0.windows.1
> 
> 
> 


^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2020-08-18 16:42 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-01  1:04 [Patch 0/6] Fix spelling mistake for occurred Michael D Kinney
2020-08-01  1:04 ` [Patch 1/6] EmulatorPkg: " Michael D Kinney
2020-08-03  2:19   ` [edk2-devel] " Liming Gao
2020-08-07  5:38   ` Ni, Ray
2020-08-01  1:04 ` [Patch 2/6] MdeModulePkg: " Michael D Kinney
2020-08-07  3:28   ` [edk2-devel] " Wu, Hao A
2020-08-01  1:04 ` [Patch 3/6] MdePkg: " Michael D Kinney
2020-08-03  2:12   ` [edk2-devel] " Liming Gao
2020-08-01  1:04 ` [Patch 4/6] OvmfPkg: " Michael D Kinney
2020-08-01 19:15   ` Laszlo Ersek
2020-08-01  1:04 ` [Patch 5/6] SecurityPkg: " Michael D Kinney
2020-08-04 10:00   ` [edk2-devel] " Maciej Rabeda
2020-08-18 16:42   ` Wang, Jian J
2020-08-01  1:04 ` [Patch 6/6] ShellPkg: " Michael D Kinney
2020-08-03  4:49   ` [edk2-devel] " Gao, Zhichao
2020-08-03  0:57 ` [edk2-devel] [Patch 0/6] " Guomin Jiang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox