14.06: remove HTML control codes

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

8 files changed, 80 insertions, 80 deletions

diff --git a/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt b/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt
index bd1f0bf..53b723b 100644
--- a/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt
+++ b/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt
@@ -76,9 +76,9 @@ The following tools and environment are required:
 * Baremetal GNU GCC tools. Can be downloaded from Linaro 
 ** "http://releases.linaro.org/13.11/components/toolchain/binaries/gcc-linaro-aarch64-none-elf-4.8-2013.11_linux.tar.xz":http://releases.linaro.org/13.11/components/toolchain/binaries/gcc-linaro-aarch64-none-elf-4.8-2013.11_linux.tar.xz
 
-* The instructions on this page below assume that the environment variable $JUNO_ROOT_DIR  has been initialised to a working directory.
+* The instructions on this page below assume that the environment variable $JUNO_ROOT_DIR  has been initialised to a working directory.
 
-bc. $ export JUNO&#95;ROOT&#95;DIR=<path-to-working-dir>;/<name-of-working-dir>;
+bc. $ export JUNO_ROOT_DIR=<path-to-working-dir>/<name-of-working-dir>
 
 
 
@@ -106,7 +106,7 @@ h3. Obtaining sources
 
 Clone the ARM Trusted Firmware repository from GitHub:
 
-bc. $ cd $JUNO&#95;ROOT&#95;DIR
+bc. $ cd $JUNO_ROOT_DIR
 $ git clone "$":https://github.com/ARM-software/arm-trusted-firmware.git
 $ cd arm-trusted-firmware
 $ git checkout v0.3-Juno-0.3
@@ -115,13 +115,13 @@ h3. Configuration
 
 Set the compiler path
 
-bc. $ export CROSS&#95;COMPILE=<path-to-aarch64-gcc>;/bin/aarch64-none-elf-
+bc. $ export CROSS_COMPILE=<path-to-aarch64-gcc>/bin/aarch64-none-elf-
 
 h3. Building
 
 1. Change to the trusted firmware directory:
 
-bc. $ cd $JUNO&#95;ROOT&#95;DIR/arm-trusted-firmware
+bc. $ cd $JUNO_ROOT_DIR/arm-trusted-firmware
 
 2. Build the different firmware images:
 
@@ -133,17 +133,17 @@ bc. $ make PLAT=juno DEBUG=1 V=1 all
 
 The build process creates products in a `build` directory tree, building the objects for each boot loader stage in separate sub-directories. The following boot loader binary files are created:
 
-    `build/juno/<build-type>;/bl1.bin`
+    `build/juno/<build-type>/bl1.bin`
 
-    `build/juno/<build-type>;/bl2.bin`
+    `build/juno/<build-type>/bl2.bin`
 
-    `build/juno/<build-type>;/bl31.bin`
+    `build/juno/<build-type>/bl31.bin`
 
-    `build/juno/<build-type>;/bl32.bin`
+    `build/juno/<build-type>/bl32.bin`
 
  
 
-... where `<build-type>;` is either `debug` or `release`.
+... where `<build-type>` is either `debug` or `release`.
 
  
 
@@ -161,7 +161,7 @@ h3. Obtaining sources
 
 Clone the Juno UEFI Github repository:
 
-bc. $ cd $JUNO&#95;ROOT&#95;DIR
+bc. $ cd $JUNO_ROOT_DIR
 $ git clone https://github.com/ARM-software/edk2.git -b juno
 $ cd edk2
 $ git checkout v0.3
@@ -172,11 +172,11 @@ h3. Configuration
 
 1. Define the AArch64 GCC toolchain:
 
-bc. $ export GCC48&#95;AARCH64&#95;PREFIX=<path-to-aarch64-gcc>;/bin/aarch64-none-elf-
+bc. $ export GCC48_AARCH64_PREFIX=<path-to-aarch64-gcc>/bin/aarch64-none-elf-
 
 2. Configure Tianocore environment:
 
-bc. $ cd $JUNO&#95;ROOT&#95;DIR/edk2
+bc. $ cd $JUNO_ROOT_DIR/edk2
 $ . edksetup.sh
 $ make -C BaseTools
 
@@ -184,19 +184,19 @@ h3. Building
 
 1. Change to the EDK2 directory:
 
-bc. $ cd $JUNO&#95;ROOT&#95;DIR/edk2
+bc. $ cd $JUNO_ROOT_DIR/edk2
 
 2. To build DEBUG version of UEFI firmware:
 
 bc. $ make -f ArmPlatformPkg/ArmJunoPkg/Makefile
 
-The build produces the binary $JUNO&#95;ROOT&#95;DIR/edk2/Build/ArmJuno/DEBUG&#95;GCC48/FV/BL32&#95;AP&#95;UEFI.fd that should be used as 'bl33.bin' when generating the Firmware Image Package binary.
+The build produces the binary $JUNO_ROOT_DIR/edk2/Build/ArmJuno/DEBUG_GCC48/FV/BL32_AP_UEFI.fd that should be used as 'bl33.bin' when generating the Firmware Image Package binary.
 
 To build RELEASE version of UEFI firmware:
 
-bc. $ make -f ArmPlatformPkg/ArmJunoPkg/Makefile EDK2&#95;BUILD=RELEASE
+bc. $ make -f ArmPlatformPkg/ArmJunoPkg/Makefile EDK2_BUILD=RELEASE
 
-Use the release binary $JUNO&#95;ROOT&#95;DIR/edk2>;/Build/ArmJuno/RELEASE&#95;GCC48/FV/BL32&#95;AP&#95;UEFI.fd as bl33.bin when generating the Firmware Image Package binary.
+Use the release binary $JUNO_ROOT_DIR/edk2>/Build/ArmJuno/RELEASE_GCC48/FV/BL32_AP_UEFI.fd as bl33.bin when generating the Firmware Image Package binary.
 
 To clean EDK2 source tree:
 
@@ -223,30 +223,30 @@ h3. Building a FIP binary
 
 The steps to create a FIP are as follows:
 
-1. Build the 'fip&#95;create' tool.
+1. Build the 'fip_create' tool.
 
-bc. $ cd $JUNO&#95;ROOT&#95;DIR/arm-trusted-firmware
+bc. $ cd $JUNO_ROOT_DIR/arm-trusted-firmware
 $ make fiptool
 
 2. Define the FIP environment. Specifically, include the FIP tool in the path.
 
-bc. $ export PATH=$JUNO&#95;ROOT&#95;DIR/arm-trusted-firmware/tools/fip&#95;create:$PATH
+bc. $ export PATH=$JUNO_ROOT_DIR/arm-trusted-firmware/tools/fip_create:$PATH
 
 3. Gather the binary files (the following example is for release builds only).
 
-bc. $ cd $JUNO&#95;ROOT&#95;DIR
+bc. $ cd $JUNO_ROOT_DIR
 $ mkdir fip
 $ cd fip
-$ cp <path to prebuilt binary>;/bl30.bin .
-$ cp $JUNO&#95;ROOT&#95;DIR/arm-trusted-firmware/build/juno/release/bl2.bin .
-$ cp $JUNO&#95;ROOT&#95;DIR/arm-trusted-firmware/build/juno/release/bl31.bin .
-$ cp $JUNO&#95;ROOT&#95;DIR/edk2/Build/ArmJuno/RELEASE&#95;GCC48/FV/BL32&#95;AP&#95;UEFI.fd  bl33.bin
+$ cp <path to prebuilt binary>/bl30.bin .
+$ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl2.bin .
+$ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl31.bin .
+$ cp $JUNO_ROOT_DIR/edk2/Build/ArmJuno/RELEASE_GCC48/FV/BL32_AP_UEFI.fd  bl33.bin
 
  
 
 4. Create the FIP file:
 
-bc. $ fip&#95;create --dump          \
+bc. $ fip_create --dump          \
              --bl2 bl2.bin   \
              --bl30 bl30.bin \
              --bl31 bl31.bin \
@@ -271,9 +271,9 @@ bc. Creating &quot;fip.bin&quot;
 
  
 
-5. Optional: the `fip&#95;create` tool can be used in the exact same way to update individual images inside an existing FIP file. For example, to update the SCP Firmware BL3-0 image:
+5. Optional: the `fip_create` tool can be used in the exact same way to update individual images inside an existing FIP file. For example, to update the SCP Firmware BL3-0 image:
 
-bc. $ fip&#95;create --dump --bl30 new&#95;bl30.bin fip.bin
+bc. $ fip_create --dump --bl30 new_bl30.bin fip.bin
 
 The previous command will again display the FIP layout:
 
@@ -283,7 +283,7 @@ bc. Firmware Image Package ToC:
 ---------------------------
 - Trusted Boot Firmware BL2: offset=0xD8, size=0x5268
 - SCP Firmware BL3-0: offset=0x5340, size=0x9C64
-file: 'new&#95;bl30.bin'
+file: 'new_bl30.bin'
 - EL3 Runtime Firmware BL3-1: offset=0xEFA4, size=0x82A0
 - Non-Trusted Firmware BL3-3: offset=0x17244, size=0xF0000
 ---------------------------
@@ -292,9 +292,9 @@ bc. Updating &quot;fip.bin&quot;
 
  
 
-For more details and options about the `fip&#95;create` tool:
+For more details and options about the `fip_create` tool:
 
-bc. $ fip&#95;create --help
+bc. $ fip_create --help
 
  
 
diff --git a/android/images/armv8-android-juno-lsk/HOWTO_gettingstarted.txt b/android/images/armv8-android-juno-lsk/HOWTO_gettingstarted.txt
index 844917e..ebc0a93 100644
--- a/android/images/armv8-android-juno-lsk/HOWTO_gettingstarted.txt
+++ b/android/images/armv8-android-juno-lsk/HOWTO_gettingstarted.txt
@@ -157,11 +157,11 @@ The Mali GPU in Juno is able to use a variety of texture compression formats, ma
 
 3.      Connect the 12 volt power supply to the board.
 
-The serial terminal will show the command prompt Cmd>;
+The serial terminal will show the command prompt Cmd>
 
-4.      At the Cmd>; prompt on the serial terminal, issue the command usb&#95;on
+4.      At the Cmd> prompt on the serial terminal, issue the command usb_on
 
-bc. Cmd>; usb&#95;on
+bc. Cmd> usb_on
 
 The configuration flash memory should now be visible on the host computer as a mass storage device.
 
@@ -171,7 +171,7 @@ The configuration flash memory should now be visible on the host computer as a m
 
 7.      In the [SCC REGISTERS] section, below the “TOTALSCCS” line, insert the following line:
 
-SCC: 0x05C <value from step 6 above>;           ;Optional comment to explain which texture you have enabled
+SCC: 0x05C <value from step 6 above>           ;Optional comment to explain which texture you have enabled
 
 8.      Update the TOTALSCCS count (increment it by one) so that it now reflects the total number of SCC registers that are programmed.
 
diff --git a/android/images/armv8-android-juno-lsk/HOWTO_install.txt b/android/images/armv8-android-juno-lsk/HOWTO_install.txt
index 298397e..89106c8 100644
--- a/android/images/armv8-android-juno-lsk/HOWTO_install.txt
+++ b/android/images/armv8-android-juno-lsk/HOWTO_install.txt
@@ -148,11 +148,11 @@ To carry out a system recovery or update the MCC firmware, follow these steps:
 
 3.      Connect the 12 volt power supply to the board.
 
-The serial terminal will show the command prompt Cmd>;
+The serial terminal will show the command prompt Cmd>
 
-4.      At the Cmd>; prompt on the serial terminal, issue the command usb&#95;on
+4.      At the Cmd> prompt on the serial terminal, issue the command usb_on
 
-bc. Cmd>; usb&#95;on
+bc. Cmd> usb_on
 
 The configuration flash memory should now be visible on the host computer as a mass storage device.
 
diff --git a/android/images/armv8-android-juno-lsk/HOWTO_releasenotes.txt b/android/images/armv8-android-juno-lsk/HOWTO_releasenotes.txt
index f5e137f..64001c1 100644
--- a/android/images/armv8-android-juno-lsk/HOWTO_releasenotes.txt
+++ b/android/images/armv8-android-juno-lsk/HOWTO_releasenotes.txt
@@ -29,7 +29,7 @@ The Linaro Android releases for Juno appear monthly. Sources are also made avail
 
 h2. Support
 
-Please send any support enquiries to "juno-support&#64;arm.com":mailto:juno-support@arm.com?subject=Juno%20support%20request
+Please send any support enquiries to "juno-support_arm.com":mailto:juno-support@arm.com?subject=Juno%20support%20request
 
  
 
@@ -89,7 +89,7 @@ h4. SCP Firmware
 h4. AP Trusted Firmware
 
 * Does not support changing the primary core using SCC General Purpose Register 1.
-* Does not support bringing up secondary cores using PSCI CPU&#95;ON when they have been enabled at boot time by SCP using SCC General Purpose Register 1.
+* Does not support bringing up secondary cores using PSCI CPU_ON when they have been enabled at boot time by SCP using SCC General Purpose Register 1.
 * Does not support Secure-EL1 Payload (i.e. BL3-2)
 * Does not support CPU suspend
 
diff --git a/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt b/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt
index 63b55e8..0b80017 100644
--- a/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt
+++ b/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt
@@ -76,9 +76,9 @@ The following tools and environment are required:
 * Baremetal GNU GCC tools. Can be downloaded from Linaro 
 ** "http://releases.linaro.org/13.11/components/toolchain/binaries/gcc-linaro-aarch64-none-elf-4.8-2013.11_linux.tar.xz":http://releases.linaro.org/13.11/components/toolchain/binaries/gcc-linaro-aarch64-none-elf-4.8-2013.11_linux.tar.xz
 
-* The instructions on this page below assume that the environment variable $JUNO&#95;ROOT&#95;DIR  has been initialised to a working directory.
+* The instructions on this page below assume that the environment variable $JUNO_ROOT_DIR  has been initialised to a working directory.
 
-bc. $ export JUNO&#95;ROOT&#95;DIR=<path-to-working-dir>;/<name-of-working-dir>;
+bc. $ export JUNO_ROOT_DIR=<path-to-working-dir>/<name-of-working-dir>
 
 
 
@@ -106,7 +106,7 @@ h3. Obtaining sources
 
 Clone the ARM Trusted Firmware repository from GitHub:
 
-bc. $ cd $JUNO&#95;ROOT&#95;DIR
+bc. $ cd $JUNO_ROOT_DIR
 $ git clone "$":https://github.com/ARM-software/arm-trusted-firmware.git
 $ cd arm-trusted-firmware
 $ git checkout v0.3-Juno-0.3
@@ -115,13 +115,13 @@ h3. Configuration
 
 Set the compiler path
 
-bc. $ export CROSS&#95;COMPILE=<path-to-aarch64-gcc>;/bin/aarch64-none-elf-
+bc. $ export CROSS_COMPILE=<path-to-aarch64-gcc>/bin/aarch64-none-elf-
 
 h3. Building
 
 1. Change to the trusted firmware directory:
 
-bc. $ cd $JUNO&#95;ROOT&#95;DIR/arm-trusted-firmware
+bc. $ cd $JUNO_ROOT_DIR/arm-trusted-firmware
 
 2. Build the different firmware images:
 
@@ -133,17 +133,17 @@ bc. $ make PLAT=juno DEBUG=1 V=1 all
 
 The build process creates products in a `build` directory tree, building the objects for each boot loader stage in separate sub-directories. The following boot loader binary files are created:
 
-    `build/juno/<build-type>;/bl1.bin`
+    `build/juno/<build-type>/bl1.bin`
 
-    `build/juno/<build-type>;/bl2.bin`
+    `build/juno/<build-type>/bl2.bin`
 
-    `build/juno/<build-type>;/bl31.bin`
+    `build/juno/<build-type>/bl31.bin`
 
-    `build/juno/<build-type>;/bl32.bin`
+    `build/juno/<build-type>/bl32.bin`
 
  
 
-... where `<build-type>;` is either `debug` or `release`.
+... where `<build-type>` is either `debug` or `release`.
 
  
 
@@ -161,7 +161,7 @@ h3. Obtaining sources
 
 Clone the Juno UEFI Github repository:
 
-bc. $ cd $JUNO&#95;ROOT&#95;DIR
+bc. $ cd $JUNO_ROOT_DIR
 $ git clone https://github.com/ARM-software/edk2.git -b juno
 $ cd edk2
 $ git checkout v0.3
@@ -172,11 +172,11 @@ h3. Configuration
 
 1. Define the AArch64 GCC toolchain:
 
-bc. $ export GCC48&#95;AARCH64&#95;PREFIX=<path-to-aarch64-gcc>;/bin/aarch64-none-elf-
+bc. $ export GCC48_AARCH64_PREFIX=<path-to-aarch64-gcc>/bin/aarch64-none-elf-
 
 2. Configure Tianocore environment:
 
-bc. $ cd $JUNO&#95;ROOT&#95;DIR/edk2
+bc. $ cd $JUNO_ROOT_DIR/edk2
 $ . edksetup.sh
 $ make -C BaseTools
 
@@ -184,19 +184,19 @@ h3. Building
 
 1. Change to the EDK2 directory:
 
-bc. $ cd $JUNO&#95;ROOT&#95;DIR/edk2
+bc. $ cd $JUNO_ROOT_DIR/edk2
 
 2. To build DEBUG version of UEFI firmware:
 
 bc. $ make -f ArmPlatformPkg/ArmJunoPkg/Makefile
 
-The build produces the binary $JUNO&#95;ROOT&#95;DIR/edk2/Build/ArmJuno/DEBUG&#95;GCC48/FV/BL32&#95;AP&#95;UEFI.fd that should be used as 'bl33.bin' when generating the Firmware Image Package binary.
+The build produces the binary $JUNO_ROOT_DIR/edk2/Build/ArmJuno/DEBUG_GCC48/FV/BL32_AP_UEFI.fd that should be used as 'bl33.bin' when generating the Firmware Image Package binary.
 
 To build RELEASE version of UEFI firmware:
 
-bc. $ make -f ArmPlatformPkg/ArmJunoPkg/Makefile EDK2&#95;BUILD=RELEASE
+bc. $ make -f ArmPlatformPkg/ArmJunoPkg/Makefile EDK2_BUILD=RELEASE
 
-Use the release binary $JUNO&#95;ROOT&#95;DIR/edk2>;/Build/ArmJuno/RELEASE&#95;GCC48/FV/BL32&#95;AP&#95;UEFI.fd as bl33.bin when generating the Firmware Image Package binary.
+Use the release binary $JUNO_ROOT_DIR/edk2>/Build/ArmJuno/RELEASE_GCC48/FV/BL32_AP_UEFI.fd as bl33.bin when generating the Firmware Image Package binary.
 
 To clean EDK2 source tree:
 
@@ -223,30 +223,30 @@ h3. Building a FIP binary
 
 The steps to create a FIP are as follows:
 
-1. Build the 'fip&#95;create' tool.
+1. Build the 'fip_create' tool.
 
-bc. $ cd $JUNO&#95;ROOT&#95;DIR/arm-trusted-firmware
+bc. $ cd $JUNO_ROOT_DIR/arm-trusted-firmware
 $ make fiptool
 
 2. Define the FIP environment. Specifically, include the FIP tool in the path.
 
-bc. $ export PATH=$JUNO&#95;ROOT&#95;DIR/arm-trusted-firmware/tools/fip&#95;create:$PATH
+bc. $ export PATH=$JUNO_ROOT_DIR/arm-trusted-firmware/tools/fip_create:$PATH
 
 3. Gather the binary files (the following example is for release builds only).
 
-bc. $ cd $JUNO&#95;ROOT&#95;DIR
+bc. $ cd $JUNO_ROOT_DIR
 $ mkdir fip
 $ cd fip
-$ cp <path to prebuilt binary>;/bl30.bin .
-$ cp $JUNO&#95;ROOT&#95;DIR/arm-trusted-firmware/build/juno/release/bl2.bin .
-$ cp $JUNO&#95;ROOT&#95;DIR/arm-trusted-firmware/build/juno/release/bl31.bin .
-$ cp $JUNO&#95;ROOT&#95;DIR/edk2/Build/ArmJuno/RELEASE&#95;GCC48/FV/BL32&#95;AP&#95;UEFI.fd  bl33.bin
+$ cp <path to prebuilt binary>/bl30.bin .
+$ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl2.bin .
+$ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl31.bin .
+$ cp $JUNO_ROOT_DIR/edk2/Build/ArmJuno/RELEASE_GCC48/FV/BL32_AP_UEFI.fd  bl33.bin
 
  
 
 4. Create the FIP file:
 
-bc. $ fip&#95;create --dump          \
+bc. $ fip_create --dump          \
              --bl2 bl2.bin   \
              --bl30 bl30.bin \
              --bl31 bl31.bin \
@@ -271,9 +271,9 @@ bc. Creating &quot;fip.bin&quot;
 
  
 
-5. Optional: the `fip&#95;create` tool can be used in the exact same way to update individual images inside an existing FIP file. For example, to update the SCP Firmware BL3-0 image:
+5. Optional: the `fip_create` tool can be used in the exact same way to update individual images inside an existing FIP file. For example, to update the SCP Firmware BL3-0 image:
 
-bc. $ fip&#95;create --dump --bl30 new&#95;bl30.bin fip.bin
+bc. $ fip_create --dump --bl30 new_bl30.bin fip.bin
 
 The previous command will again display the FIP layout:
 
@@ -283,7 +283,7 @@ bc. Firmware Image Package ToC:
 ---------------------------
 - Trusted Boot Firmware BL2: offset=0xD8, size=0x5268
 - SCP Firmware BL3-0: offset=0x5340, size=0x9C64
-file: 'new&#95;bl30.bin'
+file: 'new_bl30.bin'
 - EL3 Runtime Firmware BL3-1: offset=0xEFA4, size=0x82A0
 - Non-Trusted Firmware BL3-3: offset=0x17244, size=0xF0000
 ---------------------------
@@ -292,9 +292,9 @@ bc. Updating &quot;fip.bin&quot;
 
  
 
-For more details and options about the `fip&#95;create` tool:
+For more details and options about the `fip_create` tool:
 
-bc. $ fip&#95;create --help
+bc. $ fip_create --help
 
  
 
diff --git a/android/images/armv8-juice-juno-lsk/HOWTO_gettingstarted.txt b/android/images/armv8-juice-juno-lsk/HOWTO_gettingstarted.txt
index 1dabb1e..cf4ab10 100644
--- a/android/images/armv8-juice-juno-lsk/HOWTO_gettingstarted.txt
+++ b/android/images/armv8-juice-juno-lsk/HOWTO_gettingstarted.txt
@@ -157,11 +157,11 @@ The Mali GPU in Juno is able to use a variety of texture compression formats, ma
 
 3.      Connect the 12 volt power supply to the board.
 
-The serial terminal will show the command prompt Cmd>;
+The serial terminal will show the command prompt Cmd>
 
-4.      At the Cmd>; prompt on the serial terminal, issue the command usb&#95;on
+4.      At the Cmd> prompt on the serial terminal, issue the command usb_on
 
-bc. Cmd>; usb&#95;on
+bc. Cmd> usb_on
 
 The configuration flash memory should now be visible on the host computer as a mass storage device.
 
@@ -171,7 +171,7 @@ The configuration flash memory should now be visible on the host computer as a m
 
 7.      In the [SCC REGISTERS] section, below the “TOTALSCCS” line, insert the following line:
 
-SCC: 0x05C <value from step 6 above>;           ;Optional comment to explain which texture you have enabled
+SCC: 0x05C <value from step 6 above>           ;Optional comment to explain which texture you have enabled
 
 8.      Update the TOTALSCCS count (increment it by one) so that it now reflects the total number of SCC registers that are programmed.
 
diff --git a/android/images/armv8-juice-juno-lsk/HOWTO_install.txt b/android/images/armv8-juice-juno-lsk/HOWTO_install.txt
index 4110cd6..90fad88 100644
--- a/android/images/armv8-juice-juno-lsk/HOWTO_install.txt
+++ b/android/images/armv8-juice-juno-lsk/HOWTO_install.txt
@@ -148,11 +148,11 @@ To carry out a system recovery or update the MCC firmware, follow these steps:
 
 3.      Connect the 12 volt power supply to the board.
 
-The serial terminal will show the command prompt Cmd>;
+The serial terminal will show the command prompt Cmd>
 
-4.      At the Cmd>; prompt on the serial terminal, issue the command usb&#95;on
+4.      At the Cmd> prompt on the serial terminal, issue the command usb_on
 
-bc. Cmd>; usb&#95;on
+bc. Cmd> usb_on
 
 The configuration flash memory should now be visible on the host computer as a mass storage device.
 
diff --git a/android/images/armv8-juice-juno-lsk/HOWTO_releasenotes.txt b/android/images/armv8-juice-juno-lsk/HOWTO_releasenotes.txt
index 6785e06..0184504 100644
--- a/android/images/armv8-juice-juno-lsk/HOWTO_releasenotes.txt
+++ b/android/images/armv8-juice-juno-lsk/HOWTO_releasenotes.txt
@@ -29,7 +29,7 @@ The Linaro Android releases for Juno appear monthly. Sources are also made avail
 
 h2. Support
 
-Please send any support enquiries to "juno-support&#64;arm.com":mailto:juno-support@arm.com?subject=Juno%20support%20request
+Please send any support enquiries to "juno-support_arm.com":mailto:juno-support@arm.com?subject=Juno%20support%20request
 
  
 
@@ -89,7 +89,7 @@ h4. SCP Firmware
 h4. AP Trusted Firmware
 
 * Does not support changing the primary core using SCC General Purpose Register 1.
-* Does not support bringing up secondary cores using PSCI CPU&#95;ON when they have been enabled at boot time by SCP using SCC General Purpose Register 1.
+* Does not support bringing up secondary cores using PSCI CPU_ON when they have been enabled at boot time by SCP using SCC General Purpose Register 1.
 * Does not support Secure-EL1 Payload (i.e. BL3-2)
 * Does not support CPU suspend