Skip to content

Commit 0895c3c

Browse files
authored
Merge pull request #173 from k4rtik/spelling
Spelling fixes
2 parents b8dbece + 91dd89c commit 0895c3c

10 files changed

+17
-17
lines changed

notes/opam-depext.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Depext and opam versions
22

33
From opam 2.1.0 on, depext is integrated into opam.
4-
Depext depedencies are treated in the same way as any other dependency.
4+
Depext dependencies are treated in the same way as any other dependency.
55

66
The Coq Platforms scripts define a shell variable COQ_PLATFORM_OPAM_DEPEXT_COMMAND,
77
which is 'depext' for opam < 2.1.0 and 'install --confirm-level=unsafe-yes --depext-only'

shell_scripts/ask_packagelist.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ packages, but also older versions or development versions of Coq. You can
2121
install several versions of Coq in parallel, which simplifies porting of
2222
developments. You can use "opam switch" to switch between Coq versions.
2323
24-
The follwoing versions / package lists are supported:
24+
The following versions / package lists are supported:
2525
EOH
2626

2727
packagefile_list="$( (for file in versions/packages-*.sh; do echo "$(grep "COQ_PLATFORM_VERSION_SORTORDER=" $file) $file"; done) | tr '=' ' ' | sed 's/ */ /g' | sort -n | cut -d ' ' -f 3)"
@@ -41,12 +41,12 @@ cat <<EOH
4141
Pleas select a version by entering the number shown at the begin of a line.
4242
========================= SELECT PACKAGELIST VERSION ==========================
4343
EOH
44-
ask_user_mumber "Select package list" 1 "${packageindex}"
44+
ask_user_number "Select package list" 1 "${packageindex}"
4545
packageindex=0
4646
for packagefile in ${packagefile_list}
4747
do
4848
packageindex=$((${packageindex} + 1))
49-
if [ "${packageindex}" -eq "${ANSWER}" ]
49+
if [ "${packageindex}" -eq "${ANSWER}" ]
5050
then
5151
COQ_PLATFORM_PACKAGELIST="${packagefile}"
5252
fi

shell_scripts/ask_parallel_build.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ The Coq Platform opam build has two levels of parallelism:
2323
2424
Since a single coqc call can take more than 1 GB of RAM and since the two
2525
above kinds of parallelism multiply, the total amount of memory can be large.
26-
But it is not as bad as one might expect: test show that a full parallel
26+
But it is not as bad as one might expect: tests show that a full parallel
2727
build takes less than 14GB of RAM with 15 parallel make jobs.
2828
29-
With 32 GB or RAM a parallel package build with 16 make jobs is recommended.
29+
With 32 GB of RAM a parallel package build with 16 make jobs is recommended.
3030
With 16 GB of RAM a parallel package build with 4 make jobs is recommended.
3131
With 8 GB of RAM a sequential package build with 4 make jobs is recommended.
3232
With 4 GB+1GB swap a sequential package build with 2 make jobs is recommended.
@@ -39,6 +39,6 @@ https://github.com/coq/platform/issues
3939
EOH
4040
ask_user_opt2_cancel "Build opam packages parallel (p) or sequential (s)?" pP "parallel" sS "sequential"
4141
COQ_PLATFORM_PARALLEL=$ANSWER
42-
ask_user_mumber "Number of parallel make jobs" 1 16
42+
ask_user_number "Number of parallel make jobs" 1 16
4343
COQ_PLATFORM_JOBS=$ANSWER
4444
fi

shell_scripts/closing_remarks.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ After switching you can list the installed packages with:
2727
2828
opam list
2929
30-
You can install additionalpackages with:
30+
You can install additional packages with:
3131
3232
opam install <package>
3333

shell_scripts/get_names_from_switch.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
# Creative Commons CC0 1.0 Universal License
99
# See https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt
1010

11-
###################### Get plaform name info from an opam switch #####################
11+
###################### Get platform name info from an opam switch #####################
1212

13-
# First get COQ_PLATFORM_SWITCH_NAME with the COQ_PLATFORM_PACKAGELIST_NAME part beeing empty
13+
# First get COQ_PLATFORM_SWITCH_NAME with the COQ_PLATFORM_PACKAGELIST_NAME part being empty
1414
COQ_PLATFORM_PACKAGELIST_NAME=''
1515
source versions/coq_platform_version.sh
1616
source versions/coq_platform_switch_name.sh

shell_scripts/init_cygwin_fixes.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Creative Commons CC0 1.0 Universal License
99
# See https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt
1010

11-
###################### Select a python interperter #####################
11+
###################### Select a python interpreter #####################
1212

1313
# Cygwin stopped to have a /usr/bin/python symlink, but some build scripts
1414
# expect that there is *a* python.

shell_scripts/init_utilities.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ function ask_user_opt4_cancel {
157157
# $3 upper
158158
# ------------------------------------------------------------------------------
159159

160-
function ask_user_mumber {
160+
function ask_user_number {
161161
while true; do
162162
read -p "$1 (number in $2..$3, c=cancel) " answer
163163
case "$answer" in
@@ -255,4 +255,4 @@ function check_value_file_exists {
255255
return 1
256256
fi
257257

258-
}
258+
}

shell_scripts/install_opam.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ version 0.2.1, or you can run opam without sandbox.
123123
EOH
124124
if [[ "${COQREGTESTING:-n}" == n ]]
125125
then
126-
ask_user_opt1_cancel "Disable sandbox (d) or cancel (c)?" dD "dsiable sandbox"
126+
ask_user_opt1_cancel "Disable sandbox (d) or cancel (c)?" dD "disable sandbox"
127127
fi
128128
COQ_PLATFORM_OPAM_INIT_EXTRA=--disable-sandboxing
129129
fi

shell_scripts/sanitize_environment.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
###################### Clear unwanted environment variables #####################
1212

13-
# Site setings for configure are likely never what we want since opam installs in
13+
# Site settings for configure are likely never what we want since opam installs in
1414
# its own folders. See discussion at
1515
# https://coq.zulipchat.com/#narrow/stream/237977-Coq-users/topic/flocq.20installation.20error
1616
# This is an issue e.g. on OpenSuse 15.2 Leap

windows/configure_profile.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
###################### CONFIGURE CYGWIN USER PROFILE FOR BUILDING COQ ######################
1212

1313
rcfile=~/.bash_profile
14-
donefile=~/.bash_profile.upated
14+
donefile=~/.bash_profile.updated
1515

1616
if [ ! -f $donefile ] ; then
1717
# to learn about `exec >> $file`, see https://www.tldp.org/LDP/abs/html/x17974.html
@@ -36,7 +36,7 @@ if [ ! -f $donefile ] ; then
3636
# Other installations of OCaml will mess up things
3737
echo unset OCAMLLIB
3838

39-
# Set a marker that this is a cygwin inteded for Coq Platform compilation
39+
# Set a marker that this is a cygwin intended for Coq Platform compilation
4040
echo export COQ_PLATFORM_CYGWIN_OK=Y
4141

4242
exec 1>&6 6>&- # Restore stdout from file descriptor 6 and close file descriptor #6

0 commit comments

Comments
 (0)