summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-08-29 18:46:32 (EDT)
committer Francis Rowe <info@gluglug.org.uk>2015-08-29 18:46:32 (EDT)
commit661faa994be69bfff51d34d32ba9d408db291c5d (patch)
treee4f055a4281b6345e2cfad6fb76cac1a0b8e611d
parentcfe7f633cfb610d8a1105f377434e448b433dcd0 (diff)
downloadlibreboot-661faa994be69bfff51d34d32ba9d408db291c5d.zip
libreboot-661faa994be69bfff51d34d32ba9d408db291c5d.tar.gz
libreboot-661faa994be69bfff51d34d32ba9d408db291c5d.tar.bz2
Don't say programme. That's actually wrong.
-rw-r--r--docs/archive_old.html2
-rw-r--r--docs/index.html2
-rw-r--r--docs/install/bbb_setup.html4
-rw-r--r--docs/install/index.html2
-rw-r--r--docs/install/r400_external.html2
-rw-r--r--docs/install/t400_external.html2
-rw-r--r--docs/install/t500_external.html2
-rw-r--r--docs/tasks.html2
-rwxr-xr-xdownload28
9 files changed, 23 insertions, 23 deletions
diff --git a/docs/archive_old.html b/docs/archive_old.html
index e689add..6f7d7d8 100644
--- a/docs/archive_old.html
+++ b/docs/archive_old.html
@@ -289,7 +289,7 @@
</li>
<li>
Replace <i>getall</i> with <i>download</i>, which takes as input an argument
- specifying which programme the user wants to download.
+ specifying which program the user wants to download.
</li>
<li>Moved the get scripts to resources/scripts/helpers/download/</li>
<li>build-release: Remove the powertop entries</li>
diff --git a/docs/index.html b/docs/index.html
index 88b480d..4cbb125 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -189,7 +189,7 @@
which libreboot includes, from a ROM image that you either dumped or haven't flashed yet.
In GNU/Linux, run cbfstool on your ROM image (<i>libreboot.rom</i>, in this example):<br/>
$ <b>./cbfstool libreboot.rom extract -n lbversion -f lbversion</b><br/>
- You will now have a file, named <i>lbversion</i>, which you can read in whatever programme
+ You will now have a file, named <i>lbversion</i>, which you can read in whatever program
it is that you use for reading/writing text files.
</p>
diff --git a/docs/install/bbb_setup.html b/docs/install/bbb_setup.html
index d05dd1d..c7279b2 100644
--- a/docs/install/bbb_setup.html
+++ b/docs/install/bbb_setup.html
@@ -8,13 +8,13 @@
@import url('../css/main.css');
</style>
- <title>How to programme an SPI flash chip with the BeagleBone Black</title>
+ <title>How to program an SPI flash chip with the BeagleBone Black</title>
</head>
<body>
<div class="section">
- <h1 id="pagetop">How to programme an SPI flash chip with the BeagleBone Black</h1>
+ <h1 id="pagetop">How to program an SPI flash chip with the BeagleBone Black</h1>
<p>
This document exists as a guide for reading from or writing to an SPI flash chip with the BeagleBone Black,
using the <a href="http://flashrom.org/Flashrom">flashrom</a> software.
diff --git a/docs/install/index.html b/docs/install/index.html
index 9394537..5655745 100644
--- a/docs/install/index.html
+++ b/docs/install/index.html
@@ -38,7 +38,7 @@
<h2>Hardware methods</h2>
<ul>
- <li><a href="bbb_setup.html">How to programme an SPI flash chip with the BeagleBone Black</a></li>
+ <li><a href="bbb_setup.html">How to program an SPI flash chip with the BeagleBone Black</a></li>
<li><a href="bbb_ehci.html">How to configure EHCI debugging on the BeagleBone Black</a></li>
<li><a href="x60_unbrick.html">ThinkPad X60: Recovery guide</a></li>
<li><a href="x60tablet_unbrick.html">ThinkPad X60 Tablet: Recovery guide</a></li>
diff --git a/docs/install/r400_external.html b/docs/install/r400_external.html
index 450e6d2..74a47f7 100644
--- a/docs/install/r400_external.html
+++ b/docs/install/r400_external.html
@@ -84,7 +84,7 @@
<p>
Some models have an Intel GPU, while others have both an ATI and an Intel GPU; this
- is referred to as &quot;switchable graphics&quot;. In the <i>BIOS setup</i> programme
+ is referred to as &quot;switchable graphics&quot;. In the <i>BIOS setup</i> program
for lenovobios, you can specify that the system will use one or the other (but not both).
</p>
diff --git a/docs/install/t400_external.html b/docs/install/t400_external.html
index 1a360e5..d042c59 100644
--- a/docs/install/t400_external.html
+++ b/docs/install/t400_external.html
@@ -78,7 +78,7 @@
<p>
Some models have an Intel GPU, while others have both an ATI and an Intel GPU; this
- is referred to as &quot;switchable graphics&quot;. In the <i>BIOS setup</i> programme
+ is referred to as &quot;switchable graphics&quot;. In the <i>BIOS setup</i> program
for lenovobios, you can specify that the system will use one or the other (but not both).
</p>
diff --git a/docs/install/t500_external.html b/docs/install/t500_external.html
index f2948e9..fd5277e 100644
--- a/docs/install/t500_external.html
+++ b/docs/install/t500_external.html
@@ -79,7 +79,7 @@
<p>
Some models have an Intel GPU, while others have both an ATI and an Intel GPU; this
- is referred to as &quot;switchable graphics&quot;. In the <i>BIOS setup</i> programme
+ is referred to as &quot;switchable graphics&quot;. In the <i>BIOS setup</i> program
for lenovobios, you can specify that the system will use one or the other (but not both).
</p>
diff --git a/docs/tasks.html b/docs/tasks.html
index 63e1954..e2e1949 100644
--- a/docs/tasks.html
+++ b/docs/tasks.html
@@ -496,7 +496,7 @@
have EC in the main chip, some don't use SPI flash at all but have the firmware inside the EC chip itself.
If the EC has integrated flash then you need to be able to get to the pins on the chip or be able to program them over LPC or SPI (if they have that feature).
The lenovo laptops currently supported in libreboot all use H8 EC chips (contains flash inside the chip).
- Read the datasheets on how to externally programme the EC. Chromebooks seem to have free EC
+ Read the datasheets on how to externally flash the EC. Chromebooks seem to have free EC
(<a href="https://chromium.googlesource.com/chromiumos/platform/ec/+/master/chip/">https://chromium.googlesource.com/chromiumos/platform/ec/+/master/chip/</a>).
- see
<a href="http://blogs.coreboot.org/blog/2015/05/28/progress-gsoc-week-1/">http://blogs.coreboot.org/blog/2015/05/28/progress-gsoc-week-1/</a> (H8S EC, applies to thinkpads)
diff --git a/download b/download
index 8eb7d53..5af864a 100755
--- a/download
+++ b/download
@@ -1,6 +1,6 @@
#!/bin/bash
-# download script: Download the programmes used in libreboot, that
+# download script: Download the programs used in libreboot, that
# aren't distributed in the git repository.
#
# Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk>
@@ -24,12 +24,12 @@
set -u -e
download="resources/scripts/helpers/download"
-programmes="$(ls ${download}/)"
+programs="$(ls ${download}/)"
noconfirm="0"
help () {
- printf "%s\n\n" "./download programme(s) # programmes are space separated, if specifing multiple programmes"
- printf "possible values for 'programmes':\nall:\n%s\n\n" "${programmes}"
+ printf "%s\n\n" "./download program(s) # programs are space separated, if specifing multiple programs"
+ printf "possible values for 'programs':\nall:\n%s\n\n" "${programs}"
printf "Example (download everything): ./download all\n"
printf "Example (download flashrom): ./download flashrom\n"
printf "Example (download coreboot): ./download coreboot\n"
@@ -52,7 +52,7 @@ case "${1}" in
all)
;;
list)
- printf "possible values for 'programmes':\nall\n%s\n\n" "${programmes}"
+ printf "possible values for 'programs':\nall\n%s\n\n" "${programs}"
exit
;;
help)
@@ -60,28 +60,28 @@ case "${1}" in
exit
;;
*)
- for programme in "${@}"; do
- printf "%s" "${programmes}\n" | grep -wq "${programme}" || (printf "ERROR: Invalid programme '%s'. See ./download help.\n" "${programme}"; exit 1)
+ for program in "${@}"; do
+ printf "%s" "${programs}\n" | grep -wq "${program}" || (printf "ERROR: Invalid program '%s'. See ./download help.\n" "${program}"; exit 1)
done
- programmes="${*}"
+ programs="${*}"
;;
esac
-for programme in ${programmes}; do
+for program in ${programs}; do
if [ "${noconfirm}" = "0" ]; then
printf "Use \"./download --noconfirm\" or \"./download -y\" if you want to be rid of these confirmation dialogues.\n\n"
- if [ -d "${programme}/" ]; then
- printf "A %s/ directory already exists, delete it? [yN]: " "${programme}"
+ if [ -d "${program}/" ]; then
+ printf "A %s/ directory already exists, delete it? [yN]: " "${program}"
read -r answer
if [ "${answer}" = "y" ]; then
- rm -Rf "${programme:?}" && printf "Old %s directory deleted.\n\n" "${programme}"
+ rm -Rf "${program:?}" && printf "Old %s directory deleted.\n\n" "${program}"
else
- printf "%s directory not deleted, and therefore not replaced.\n" "${programme}"
+ printf "%s directory not deleted, and therefore not replaced.\n" "${program}"
continue
fi
fi
fi
- "${download}/${programme}"
+ "${download}/${program}"
done