diff options
| -rw-r--r-- | doc/src/guide/deps.asciidoc | 2 | ||||
| -rw-r--r-- | doc/src/guide/installation.asciidoc | 2 | ||||
| -rw-r--r-- | doc/src/guide/ports.asciidoc | 2 | ||||
| -rw-r--r-- | doc/src/guide/releases.asciidoc | 2 | ||||
| -rw-r--r-- | index/chronos.mk | 2 | ||||
| -rwxr-xr-x | pkg_add.sh | 2 | ||||
| -rw-r--r-- | test/core_apps.mk | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/doc/src/guide/deps.asciidoc b/doc/src/guide/deps.asciidoc index 3f0f77c..e5dda80 100644 --- a/doc/src/guide/deps.asciidoc +++ b/doc/src/guide/deps.asciidoc @@ -154,7 +154,7 @@ DEPS = cowboy dep_cowboy_commit = 2.0.0-pre.2 Erlang.mk will use the package index to get all information -about Cowboy, except the commit number which will be overriden. +about Cowboy, except the commit number which will be overridden. If you need to set the fetch method or repository information too, for example because you want to use your own fork, or diff --git a/doc/src/guide/installation.asciidoc b/doc/src/guide/installation.asciidoc index 0c21fb0..1f7e178 100644 --- a/doc/src/guide/installation.asciidoc +++ b/doc/src/guide/installation.asciidoc @@ -134,7 +134,7 @@ C:\> C:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syu" ==== Installing the required MSYS2 packages After following these instructions, you can install GNU Make, -Git and any other required softwares. From an MSYS2 shell, +Git and any other required software. From an MSYS2 shell, you can call `pacman` directly: [source,bash] diff --git a/doc/src/guide/ports.asciidoc b/doc/src/guide/ports.asciidoc index 907ee36..3be5bf2 100644 --- a/doc/src/guide/ports.asciidoc +++ b/doc/src/guide/ports.asciidoc @@ -81,7 +81,7 @@ nothing. Erlang.mk sets appropriate compile and linker flags by default. These flags vary depending on the platform, and can of course -be overriden. +be overridden. `CC`:: The compiler to be used. diff --git a/doc/src/guide/releases.asciidoc b/doc/src/guide/releases.asciidoc index 68174b3..892e341 100644 --- a/doc/src/guide/releases.asciidoc +++ b/doc/src/guide/releases.asciidoc @@ -33,7 +33,7 @@ Relx does not need to be installed. Erlang.mk will download and build it automatically. The Relx executable will be saved in the '$(RELX)' file. This -location defaults to '$(CURDIR)/relx' and can be overriden. +location defaults to '$(CURDIR)/relx' and can be overridden. // @todo You can use a custom location by ??? diff --git a/index/chronos.mk b/index/chronos.mk index b538f1c..5c536fe 100644 --- a/index/chronos.mk +++ b/index/chronos.mk @@ -1,6 +1,6 @@ PACKAGES += chronos pkg_chronos_name = chronos -pkg_chronos_description = Timer module for Erlang that makes it easy to abstact time out of the tests. +pkg_chronos_description = Timer module for Erlang that makes it easy to abstract time out of the tests. pkg_chronos_homepage = https://github.com/lehoff/chronos pkg_chronos_fetch = git pkg_chronos_repo = https://github.com/lehoff/chronos @@ -9,7 +9,7 @@ fi T=`echo "$1" | grep "\." | wc -l ` if [ "$T" -eq "1" ] then - echo "Invalid dot character in name. Considere replace by an underscore." 1>&2 + echo "Invalid dot character in name. Consider replacing with an underscore." 1>&2 exit 1 fi diff --git a/test/core_apps.mk b/test/core_apps.mk index 878bb10..72466b2 100644 --- a/test/core_apps.mk +++ b/test/core_apps.mk @@ -477,7 +477,7 @@ core-apps-local-deps: init $i "Distclean the application" $t $(MAKE) -C $(APP) distclean $v - $i "Test after swapping my_app_1 and my_app_2 to make sure lexical ordering didnt incidentally build the correct app first" + $i "Test after swapping my_app_1 and my_app_2 to make sure lexical ordering didn't incidentally build the correct app first" $i "Add my_app_2 to the list of local dependencies of my_app_1, don't add lager, but add the lager parse_transform (this will fail unless my_app_2 was indeed built first)" $t mv $(APP)/apps/my_app_1/Makefile.bak $(APP)/apps/my_app_1/Makefile |