Merge branch 'maint'

* maint:
  Update preloaded module
  typos

Conflicts:
	erts/preloaded/ebin/prim_file.beam

4 files changed, 3 insertions, 3 deletions

diff --git a/HOWTO/INSTALL.md b/HOWTO/INSTALL.md
index 0b78f4ca56..a823d5abbc 100644
--- a/HOWTO/INSTALL.md
+++ b/HOWTO/INSTALL.md
@@ -381,7 +381,7 @@ Some of the available `configure` options are:
     if different than specified by `--with-ssl=PATH`
 *   `--with-ssl-rpath=yes|no|PATHS` - Runtime library path for OpenSSL.
     Default is `yes`, which equates to a number of standard locations. If
-    `no`, then no runtime library paths wil be used. Anything else should be
+    `no`, then no runtime library paths will be used. Anything else should be
     a comma separated list of paths.
 *   `--with-libatomic_ops=PATH` - Use the `libatomic_ops` library for atomic
     memory accesses. If `configure` should inform you about no native atomic
diff --git a/configure.in b/configure.in
index 51728a847e..89486590b8 100644
--- a/configure.in
+++ b/configure.in
@@ -267,7 +267,7 @@ AC_ARG_WITH(ssl-rpath,
 AS_HELP_STRING([--with-ssl-rpath=yes|no|PATHS],
                [runtime library path for OpenSSL. Default is 'yes', which equates to a
 	       number of standard locations. If 'no', then no runtime
-	       library paths wil be used. Anything else should be a
+	       library paths will be used. Anything else should be a
 	       comma separated list of paths.]))
 
 AC_ARG_ENABLE(dynamic-ssl-lib,
diff --git a/erts/configure.in b/erts/configure.in
index d84651f4f9..ba735fe921 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -4071,7 +4071,7 @@ AC_ARG_WITH(ssl-rpath,
 AS_HELP_STRING([--with-ssl-rpath=yes|no|PATHS],
                [runtime library path for OpenSSL. Default is "yes", which equates to a
 	       number of standard locations. If "no", then no runtime
-	       library paths wil be used. Anything else should be a
+	       library paths will be used. Anything else should be a
 	       comma separated list of paths.]),
 [
 case X$with_ssl in
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
index a386613eef..426e764127 100644
--- a/erts/preloaded/ebin/prim_file.beam
+++ b/erts/preloaded/ebin/prim_file.beam