Change many windows references to unix.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2186 6f19259b-4bc3-4df7-8a09-765794883524

29 files changed, 62 insertions, 62 deletions

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/BlockIo/UnixBlockIo.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/BlockIo/UnixBlockIo.c
index ca4a5f2ff8..81dd20661b 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/BlockIo/UnixBlockIo.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/BlockIo/UnixBlockIo.c
@@ -15,8 +15,8 @@ Module Name:
 

 Abstract:

 

-  Produce block IO abstractions for real devices on your PC using Win32 APIs.

-  The configuration of what devices to mount or emulate comes from NT 

+  Produce block IO abstractions for real devices on your PC using Posix APIs.

+  The configuration of what devices to mount or emulate comes from UNIX 

   environment variables. The variables must be visible to the Microsoft* 

   Developer Studio for them to work.

 

@@ -27,7 +27,7 @@ Abstract:
   <block count> - Decimal number of blocks a device supports.

   <block size>  - Decimal number of bytes per block.

 

-  NT envirnonment variable contents. '<' and '>' are not part of the variable, 

+  UNIX envirnonment variable contents. '<' and '>' are not part of the variable, 

   they are just used to make this help more readable. There should be no 

   spaces between the ';'. Extra spaces will break the variable. A '!' is 

   used to seperate multiple devices in a variable.

@@ -47,7 +47,7 @@ Abstract:
     A 1.44MB emulated floppy with a block size of 1024 would look like:

     EFI_UNIX_VIRTUAL_DISKS=RW;1440;1024

 

-  Physical Disks: These devices use NT to open a real device in your system

+  Physical Disks: These devices use UNIX to open a real device in your system

 

     Thus a 120 MB floppy would look like:

     EFI_UNIX_PHYSICAL_DISKS=B:RW;245760;512

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/BlockIo/UnixBlockIo.h b/EdkUnixPkg/Dxe/UnixThunk/Bus/BlockIo/UnixBlockIo.h
index 70d8571c3c..8cdc9a97d5 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/BlockIo/UnixBlockIo.h
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/BlockIo/UnixBlockIo.h
@@ -15,8 +15,8 @@ Module Name:
 

 Abstract:

 

-  Produce block IO abstractions for real devices on your PC using Win32 APIs.

-  The configuration of what devices to mount or emulate comes from NT 

+  Produce block IO abstractions for real devices on your PC using Posix APIs.

+  The configuration of what devices to mount or emulate comes from UNIX 

   environment variables. The variables must be visible to the Microsoft* 

   Developer Studio for them to work.

 

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/Console.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/Console.c
index cd4870d502..79558a88d9 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/Console.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/Console.c
@@ -15,7 +15,7 @@ Module Name:
 

 Abstract:

 

-  Console based on Win32 APIs. 

+  Console based on Posix APIs. 

 

 --*/

 

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/Console.h b/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/Console.h
index 3f0b4eb6c8..a59c934a54 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/Console.h
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/Console.h
@@ -15,7 +15,7 @@ Module Name:
 

 Abstract:

 

-  Console based on Win32 APIs.

+  Console based on Posix APIs.

 

   This file attaches a SimpleTextIn protocol to a previously open window.

   

@@ -44,7 +44,7 @@ typedef struct {
   EFI_UNIX_THUNK_PROTOCOL     *UnixThunk;

 

   //

-  // SimpleTextOut Private Data including Win32 types.

+  // SimpleTextOut Private Data including Posix types.

   //

   //  HANDLE                        NtOutHandle;

   //  HANDLE                        NtInHandle;

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/ConsoleIn.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/ConsoleIn.c
index ff70a5fd8e..0a7503fe6e 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/ConsoleIn.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/ConsoleIn.c
@@ -15,7 +15,7 @@ Module Name:
 

 Abstract:

 

-  Console based on Win32 APIs. 

+  Console based on Posix APIs. 

 

   This file attaches a SimpleTextIn protocol to a previously open window.

   

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/ConsoleOut.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/ConsoleOut.c
index bd9d4e29fe..5fbc77e51d 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/ConsoleOut.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/ConsoleOut.c
@@ -15,9 +15,9 @@ Module Name:
 

 Abstract:

 

-  Console based on Win32 APIs. 

+  Console based on Posix APIs. 

 

-  This file creates an Win32 window and attaches a SimpleTextOut protocol.

+  This file creates an Posix window and attaches a SimpleTextOut protocol.

 

 --*/

 

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/UnixSimpleFileSystem.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/UnixSimpleFileSystem.c
index a1b5b32010..2a745cbdd2 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/UnixSimpleFileSystem.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/UnixSimpleFileSystem.c
@@ -15,8 +15,8 @@ Module Name:
 

 Abstract:

 

-  Produce Simple File System abstractions for directories on your PC using Win32 APIs.

-  The configuration of what devices to mount or emulate comes from NT 

+  Produce Simple File System abstractions for directories on your PC using Posix APIs.

+  The configuration of what devices to mount or emulate comes from UNIX 

   environment variables. The variables must be visible to the Microsoft* 

   Developer Studio for them to work.

 

@@ -1398,7 +1398,7 @@ Returns:
   return EFI_SUCCESS;
 

   //

-  // bugbug: need to access windows error reporting

+  // bugbug: need to access unix error reporting

   //

 }

 

@@ -2100,7 +2100,7 @@ Returns:
   return PrivateFile->UnixThunk->FSync (PrivateFile->fd) == 0 ? EFI_SUCCESS : EFI_DEVICE_ERROR;

 

   //

-  // bugbug: - Use Windows error reporting.

+  // bugbug: - Use Unix error reporting.

   //

 }

 

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/Uga/UnixUga.h b/EdkUnixPkg/Dxe/UnixThunk/Bus/Uga/UnixUga.h
index c34768d5c6..0ea88e5d02 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/Uga/UnixUga.h
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/Uga/UnixUga.h
@@ -136,7 +136,7 @@ Returns:
 ;

 

 //

-// EFI 1.1 driver model prototypes for Win NT UGA

+// EFI 1.1 driver model prototypes for Win UNIX UGA

 //

 

 EFI_STATUS

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.c
index 038c71a074..5346774ae2 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.c
@@ -15,9 +15,9 @@ Module Name:
 

 Abstract:

 

-This following section documents the envirnoment variables for the Win NT 

+This following section documents the envirnoment variables for the Win UNIX 

 build.  These variables are used to define the (virtual) hardware 

-configuration of the NT environment

+configuration of the UNIX environment

 

 A ! can be used to seperate multiple instances in a variable. Each 

 instance represents a seperate hardware device. 

@@ -35,7 +35,7 @@ EFI_UNIX_UGA            - Builds UGA Windows of Width and Height
  <block count> - Decimal number of blocks a device supports.

  <block size>  - Decimal number of bytes per block.

 

- NT envirnonment variable contents. '<' and '>' are not part of the variable, 

+ UNIX envirnonment variable contents. '<' and '>' are not part of the variable, 

  they are just used to make this help more readable. There should be no 

  spaces between the ';'. Extra spaces will break the variable. A '!' is  

  used to seperate multiple devices in a variable.

@@ -55,7 +55,7 @@ EFI_UNIX_UGA            - Builds UGA Windows of Width and Height
    A 1.44MB emulated floppy with a block size of 1024 would look like:

    EFI_UNIX_VIRTUAL_DISKS=RW;1440;1024

 

- Physical Disks: These devices use NT to open a real device in your system

+ Physical Disks: These devices use UNIX to open a real device in your system

 

    Thus a 120 MB floppy would look like:

    EFI_UNIX_PHYSICAL_DISKS=B:RW;245760;512

@@ -115,7 +115,7 @@ EFI_DRIVER_BINDING_PROTOCOL           gUnixBusDriverBinding = {
 #define UNIX_PCD_ARRAY_SIZE (sizeof(mPcdEnvironment)/sizeof(UNIX_PCD_ENTRY))

 

 //

-// Table to map NT Environment variable to the GUID that should be in

+// Table to map UNIX Environment variable to the GUID that should be in

 // device path.

 //

 static UNIX_PCD_ENTRY  mPcdEnvironment[] = {

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.h b/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.h
index 4d8530bc8f..da9a9ac690 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.h
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.h
@@ -37,7 +37,7 @@ EFI_UNIX_PASS_THRU      - associates a device with our PCI support
  <block count> - Decimal number of blocks a device supports.

  <block size>  - Decimal number of bytes per block.

 

- NT envirnonment variable contents. '<' and '>' are not part of the variable, 

+ UNIX envirnonment variable contents. '<' and '>' are not part of the variable, 

  they are just used to make this help more readable. There should be no 

  spaces between the ';'. Extra spaces will break the variable. A '!' is  

  used to seperate multiple devices in a variable.

@@ -57,7 +57,7 @@ EFI_UNIX_PASS_THRU      - associates a device with our PCI support
    A 1.44MB emulated floppy with a block size of 1024 would look like:

    EFI_UNIX_VIRTUAL_DISKS=RW;1440;1024

 

- Physical Disks: These devices use NT to open a real device in your system

+ Physical Disks: These devices use UNIX to open a real device in your system

 

    Thus a 120 MB floppy would look like:

    EFI_UNIX_PHYSICAL_DISKS=B:RW;245760;512

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.msa b/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.msa
index 2ca466c2c5..b64a8216de 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.msa
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.msa
@@ -132,7 +132,7 @@
     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdUnixFileSystem</C_Name>

       <TokenSpaceGuidCName>gEfiEdkUnixPkgTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>This PCD defines the windows directory who will be mounted as

+      <HelpText>This PCD defines the unix directory who will be mounted as

         harddisk in simulator.

         The item type of this PCD can only be "DYNAMIC".</HelpText>

     </PcdEntry>

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Chipset/Metronome/Metronome.c b/EdkUnixPkg/Dxe/UnixThunk/Chipset/Metronome/Metronome.c
index be5d87d846..ee2aad0f66 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Chipset/Metronome/Metronome.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Chipset/Metronome/Metronome.c
@@ -15,7 +15,7 @@ Module Name:
 

 Abstract:

 

-  NT Emulation Metronome Architectural Protocol Driver as defined in DXE CIS

+  UNIX Emulation Metronome Architectural Protocol Driver as defined in DXE CIS

 

 --*/

 

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Chipset/Metronome/Metronome.h b/EdkUnixPkg/Dxe/UnixThunk/Chipset/Metronome/Metronome.h
index d82c825c6c..10e6dc9b8a 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Chipset/Metronome/Metronome.h
+++ b/EdkUnixPkg/Dxe/UnixThunk/Chipset/Metronome/Metronome.h
@@ -15,7 +15,7 @@ Module Name:
 

 Abstract:

 

-  NT Emulation Metronome Architectural Protocol Driver as defined in DXE CIS

+  UNIX Emulation Metronome Architectural Protocol Driver as defined in DXE CIS

 

 --*/

 

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Chipset/RealTimeClock/RealTimeClock.c b/EdkUnixPkg/Dxe/UnixThunk/Chipset/RealTimeClock/RealTimeClock.c
index 8cf60ebf99..12cbcc8ecc 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Chipset/RealTimeClock/RealTimeClock.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Chipset/RealTimeClock/RealTimeClock.c
@@ -15,7 +15,7 @@ Module Name:
 

 Abstract:

 

-  NT Emulation Architectural Protocol Driver as defined in Tiano

+  UNIX Emulation Architectural Protocol Driver as defined in Tiano

 

 --*/

 

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Chipset/Reset/Reset.c b/EdkUnixPkg/Dxe/UnixThunk/Chipset/Reset/Reset.c
index 8739d6cd1a..72c196bfd8 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Chipset/Reset/Reset.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Chipset/Reset/Reset.c
@@ -15,7 +15,7 @@ Module Name:
 

 Abstract:

 

-  Reset Architectural Protocol as defined in Tiano under NT Emulation

+  Reset Architectural Protocol as defined in Tiano under UNIX Emulation

 

 --*/

 

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.c b/EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.c
index 19fd911764..8001138b94 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.c
@@ -15,9 +15,9 @@ Module Name:
 

 Abstract:

 

-  NT Emulation Timer Architectural Protocol Driver as defined in DXE CIS

+  UNIX Emulation Timer Architectural Protocol Driver as defined in DXE CIS

 

-  This Timer module uses an NT Thread to simulate the timer-tick driven

+  This Timer module uses an UNIX Thread to simulate the timer-tick driven

   timer service.  In the future, the Thread creation should possibly be 

   abstracted by the CPU architectural protocol

 

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.h b/EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.h
index 98d1999b5b..37ff8b26b3 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.h
+++ b/EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.h
@@ -15,8 +15,8 @@ Module Name:
 

 Abstract:

 

-  NT Emulation Architectural Protocol Driver as defined in Tiano.

-  This Timer module uses an NT Thread to simulate the timer-tick driven

+  UNIX Emulation Architectural Protocol Driver as defined in Tiano.

+  This Timer module uses an UNIX Thread to simulate the timer-tick driven

   timer service.

 

 --*/

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Cpu/Cpu.c b/EdkUnixPkg/Dxe/UnixThunk/Cpu/Cpu.c
index 9149639abc..9166a8a0a2 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Cpu/Cpu.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Cpu/Cpu.c
@@ -70,7 +70,7 @@ UnixFlushCpuDataCache (
 Routine Description:

 

   This routine would provide support for flushing the CPU data cache.

-  In the case of NT emulation environment, this flushing is not necessary and

+  In the case of UNIX emulation environment, this flushing is not necessary and

   is thus not implemented.

 

 Arguments:

@@ -92,13 +92,13 @@ Returns:
 {

   if (FlushType == EfiCpuFlushTypeWriteBackInvalidate) {

     //

-    // Only WB flush is supported. We actually need do nothing on NT emulator

+    // Only WB flush is supported. We actually need do nothing on UNIX emulator

     // environment. Classify this to follow EFI spec

     //

     return EFI_SUCCESS;

   }

   //

-  // Other flush types are not supported by NT emulator

+  // Other flush types are not supported by UNIX emulator

   //

   return EFI_UNSUPPORTED;

 }

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Cpu/CpuDriver.h b/EdkUnixPkg/Dxe/UnixThunk/Cpu/CpuDriver.h
index 3a838a0c7f..d7254203d5 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Cpu/CpuDriver.h
+++ b/EdkUnixPkg/Dxe/UnixThunk/Cpu/CpuDriver.h
@@ -15,7 +15,7 @@ Module Name:
 

 Abstract:

 

-  NT Emulation Architectural Protocol Driver as defined in Tiano.

+  UNIX Emulation Architectural Protocol Driver as defined in Tiano.

 

 --*/

 

diff --git a/EdkUnixPkg/EdkUnixPkg.spd b/EdkUnixPkg/EdkUnixPkg.spd
index f43a44bfb6..982bb07f15 100644
--- a/EdkUnixPkg/EdkUnixPkg.spd
+++ b/EdkUnixPkg/EdkUnixPkg.spd
@@ -261,7 +261,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <DatumType>VOID*</DatumType>

       <ValidUsage>DYNAMIC</ValidUsage>

       <DefaultValue>L".!..\\..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>

-      <HelpText>This PCD defines the windows directory who will be mounted as 

+      <HelpText>This PCD defines the host directory who will be mounted as 

         harddisk in simulator.

         The item type of this PCD can only be "DYNAMIC".</HelpText>

     </PcdEntry>

@@ -273,7 +273,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ValidUsage>DYNAMIC</ValidUsage>

       <DefaultValue>L"64!64"</DefaultValue>

       <HelpText>This PCD defines the memory size of simulated machine. Simulator will allocate

-        the size of PcdUnixMemorySize in windows platform.

+        the size of PcdUnixMemorySize in host platform.

         The item type of this PCD can only be "DYNAMIC".</HelpText>

     </PcdEntry>

     <PcdEntry>

@@ -324,7 +324,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <DatumType>VOID*</DatumType>

       <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>

       <DefaultValue>L"..\\Fv\\Fv_Recovery.fd"</DefaultValue>

-      <HelpText>This PCD defines the FD file windows path string. Simulator will load the FD file and execute.</HelpText>

+      <HelpText>This PCD defines the FD file path string. Simulator will load the FD file and execute.</HelpText>

     </PcdEntry>

     <PcdEntry>

       <C_Name>PcdUnixConsole</C_Name>

@@ -354,7 +354,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>

       <DefaultValue>L"64!64"</DefaultValue>

       <HelpText>This PCD defines the memory size of simulated machine. Simulator will allocate

-        the size of PcdUnixMemorySizeForSecMain in windows platform.</HelpText>

+        the size of PcdUnixMemorySizeForSecMain in host platform.</HelpText>

     </PcdEntry>

   </PcdDeclarations>

 </PackageSurfaceArea>
diff --git a/EdkUnixPkg/Include/Ppi/UnixAutoScan.h b/EdkUnixPkg/Include/Ppi/UnixAutoScan.h
index 17a4c02b8f..0c04d8202e 100644
--- a/EdkUnixPkg/Include/Ppi/UnixAutoScan.h
+++ b/EdkUnixPkg/Include/Ppi/UnixAutoScan.h
@@ -43,7 +43,7 @@ Routine Description:
   This service is called from Index == 0 until it returns EFI_UNSUPPORTED.

   It allows discontiguous memory regions to be supported by the emulator.

   It uses gSystemMemory[] and gSystemMemoryCount that were created by

-  parsing the Windows environment variable EFI_MEMORY_SIZE.

+  parsing the host environment variable EFI_MEMORY_SIZE.

   The size comes from the varaible and the address comes from the call to

   WinNtOpenFile. 

 

diff --git a/EdkUnixPkg/Include/Ppi/UnixFwh.h b/EdkUnixPkg/Include/Ppi/UnixFwh.h
index 869f4c968f..a9885a57bf 100644
--- a/EdkUnixPkg/Include/Ppi/UnixFwh.h
+++ b/EdkUnixPkg/Include/Ppi/UnixFwh.h
@@ -41,7 +41,7 @@ EFI_STATUS
 

 Routine Description:

   Return the FD Size and base address. Since the FD is loaded from a 

-  file into Windows memory only the SEC will know it's address.

+  file into host memory only the SEC will know it's address.

 

 Arguments:

   Index  - Which FD, starts at zero.

diff --git a/EdkUnixPkg/Include/Protocol/UnixIo.h b/EdkUnixPkg/Include/Protocol/UnixIo.h
index 6b83c99fe4..2d8e9fab7d 100644
--- a/EdkUnixPkg/Include/Protocol/UnixIo.h
+++ b/EdkUnixPkg/Include/Protocol/UnixIo.h
@@ -36,7 +36,7 @@ extern EFI_GUID gEfiUnixIoProtocolGuid;
 

 //

 // The following GUIDs are used in EFI_UNIX_IO_PROTOCOL_GUID

-// Device paths. They map 1:1 with NT envirnment variables. The variables

+// Device paths. They map 1:1 with UNIX envirnment variables. The variables

 // define what virtual hardware the emulator/UnixBusDriver will produce.

 //

 //

diff --git a/EdkUnixPkg/Pei/AutoScan/UnixAutoScan.c b/EdkUnixPkg/Pei/AutoScan/UnixAutoScan.c
index 35c61affda..6fd4a97dcf 100644
--- a/EdkUnixPkg/Pei/AutoScan/UnixAutoScan.c
+++ b/EdkUnixPkg/Pei/AutoScan/UnixAutoScan.c
@@ -53,7 +53,7 @@ Returns:
   DEBUG ((EFI_D_ERROR, "Unix Autoscan PEIM Loaded\n"));

 

   //

-  // Get the PEI NT Autoscan PPI

+  // Get the PEI UNIX Autoscan PPI

   //

   Status = (**PeiServices).LocatePpi (

                             PeiServices,

diff --git a/EdkUnixPkg/Pei/BootMode/BootMode.c b/EdkUnixPkg/Pei/BootMode/BootMode.c
index b368dc1f39..b18d1519d7 100644
--- a/EdkUnixPkg/Pei/BootMode/BootMode.c
+++ b/EdkUnixPkg/Pei/BootMode/BootMode.c
@@ -15,7 +15,7 @@ Module Name:
    

 Abstract:

 

-  Tiano PEIM to provide the platform support functionality within Windows

+  Tiano PEIM to provide the platform support functionality within unix

 

 --*/

 

diff --git a/EdkUnixPkg/Pei/UnixStuff/UnixStuff.msa b/EdkUnixPkg/Pei/UnixStuff/UnixStuff.msa
index d7760bc82a..889d98d8ec 100644
--- a/EdkUnixPkg/Pei/UnixStuff/UnixStuff.msa
+++ b/EdkUnixPkg/Pei/UnixStuff/UnixStuff.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>Stuff driver</Abstract>

     <Description>

-      Tiano PEIM to abstract construction of firmware volume in a Windows NT environment.

+      Tiano PEIM to abstract construction of firmware volume in a Unix environment.

     </Description>

     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>

     <License>All rights reserved. This program and the accompanying materials

diff --git a/EdkUnixPkg/Sec/SecMain.c b/EdkUnixPkg/Sec/SecMain.c
index 32793f7c64..b1394a2c02 100644
--- a/EdkUnixPkg/Sec/SecMain.c
+++ b/EdkUnixPkg/Sec/SecMain.c
@@ -14,10 +14,10 @@ Module Name:
   SecMain.c

 

 Abstract:

-  WinNt emulator of SEC phase. It's really a Win32 application, but this is

-  Ok since all the other modules for NT32 are NOT Win32 applications.

+  WinNt emulator of SEC phase. It's really a Posix application, but this is

+  Ok since all the other modules for NT32 are NOT Posix applications.

 

-  This program processes Windows environment variables and figures out

+  This program processes host environment variables and figures out

   what the memory layout will be, how may FD's will be loaded and also

   what the boot mode is.

 

@@ -25,9 +25,9 @@ Abstract:
   is a list of PPI's produced by the SEC that are availble for usage in PEI.

 

   This code produces 128 K of temporary memory for the PEI stack by opening a

-  Windows file and mapping it directly to memory addresses.

+  host file and mapping it directly to memory addresses.

 

-  The system.cmd script is used to set windows environment variables that drive

+  The system.cmd script is used to set host environment variables that drive

   the configuration opitons of the SEC.

 

 --*/

@@ -103,7 +103,7 @@ EFI_PEI_PPI_DESCRIPTOR  gPrivateDispatchTable[] = {
 //

 // Default information about where the FD is located.

 //  This array gets filled in with information from EFI_FIRMWARE_VOLUMES

-//  EFI_FIRMWARE_VOLUMES is a Windows environment variable set by system.cmd.

+//  EFI_FIRMWARE_VOLUMES is a host environment variable set by system.cmd.

 //  The number of array elements is allocated base on parsing

 //  EFI_FIRMWARE_VOLUMES and the memory is never freed.

 //

@@ -147,7 +147,7 @@ main (
 /*++

 

 Routine Description:

-  Main entry point to SEC for WinNt. This is a Windows program

+  Main entry point to SEC for WinNt. This is a unix program

 

 Arguments:

   Argc - Number of command line arguments

@@ -176,7 +176,7 @@ Returns:
   MemorySizeStr      = (CHAR16 *)PcdGetPtr (PcdUnixMemorySizeForSecMain);

   FirmwareVolumesStr = (CHAR16 *)PcdGetPtr (PcdUnixFirmwareVolume);

 

-  printf ("\nEDK SEC Main NT Emulation Environment from www.TianoCore.org\n");

+  printf ("\nEDK SEC Main UNIX Emulation Environment from www.TianoCore.org\n");

 

   //

   // Allocate space for gSystemMemory Array

@@ -485,7 +485,7 @@ Routine Description:
   This routine produces the ReportStatusCode PEI service. It's passed

   up to the PEI Core via a PPI. T

 

-  This code currently uses the NT clib printf. This does not work the same way

+  This code currently uses the UNIX clib printf. This does not work the same way

   as the EFI Print (), as %t, %g, %s as Unicode are not supported.

 

 Arguments:

@@ -647,7 +647,7 @@ Routine Description:
   This service is called from Index == 0 until it returns EFI_UNSUPPORTED.

   It allows discontiguous memory regions to be supported by the emulator.

   It uses gSystemMemory[] and gSystemMemoryCount that were created by

-  parsing the Windows environment variable EFI_MEMORY_SIZE.

+  parsing the host environment variable EFI_MEMORY_SIZE.

   The size comes from the varaible and the address comes from the call to

   WinNtOpenFile.

 

@@ -689,7 +689,7 @@ SecWinNtWinNtThunkAddress (
 /*++

 

 Routine Description:

-  Since the SEC is the only Windows program in stack it must export

+  Since the SEC is the only Unix program in stack it must export

   an interface to do Win API calls. That's what the WinNtThunk address

   is for. gWinNt is initailized in WinNtThunk.c.

 

@@ -744,7 +744,7 @@ Returns:
     return Status;

   }

   //

-  // Allocate space in NT (not emulator) memory. Extra space is for alignment

+  // Allocate space in UNIX (not emulator) memory. Extra space is for alignment

   //

   ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS) (UINTN) malloc ((UINTN) (ImageContext.ImageSize + (ImageContext.SectionAlignment * 2)));

   if (ImageContext.ImageAddress == 0) {

@@ -789,7 +789,7 @@ SecWinNtFdAddress (
 

 Routine Description:

   Return the FD Size and base address. Since the FD is loaded from a

-  file into Windows memory only the SEC will know it's address.

+  file into host memory only the SEC will know it's address.

 

 Arguments:

   Index  - Which FD, starts at zero.

diff --git a/EdkUnixPkg/Sec/SecMain.h b/EdkUnixPkg/Sec/SecMain.h
index 815dc79b45..4c24207661 100644
--- a/EdkUnixPkg/Sec/SecMain.h
+++ b/EdkUnixPkg/Sec/SecMain.h
@@ -14,7 +14,7 @@ Module Name:
   SecMain.h

 

 Abstract:

-  Include file for Windows API based SEC

+  Include file for host API based SEC

 

 --*/

 

diff --git a/EdkUnixPkg/Sec/SecMain.msa b/EdkUnixPkg/Sec/SecMain.msa
index 335cc5fad0..8e0af9a7ce 100644
--- a/EdkUnixPkg/Sec/SecMain.msa
+++ b/EdkUnixPkg/Sec/SecMain.msa
@@ -85,7 +85,7 @@
       <C_Name>PcdUnixMemorySizeForSecMain</C_Name>

       <TokenSpaceGuidCName>gEfiEdkUnixPkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>This PCD defines the memory size of simulated machine. Simulator will allocate

-        the size of PcdUnixMemorySizeForSecMain in windows platform.</HelpText>

+        the size of PcdUnixMemorySizeForSecMain in host platform.</HelpText>

     </PcdEntry>

     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdUnixFirmwareVolume</C_Name>