diff options
| -rw-r--r-- | .flake8_packages | 2 | ||||
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | lib/spack/docs/basic_usage.rst | 2 | ||||
| -rw-r--r-- | lib/spack/docs/build_systems/intelpackage.rst | 6 | ||||
| -rw-r--r-- | lib/spack/docs/containers.rst | 6 | ||||
| -rw-r--r-- | lib/spack/docs/getting_started.rst | 2 | ||||
| -rw-r--r-- | lib/spack/docs/packaging_guide.rst | 2 | ||||
| -rw-r--r-- | lib/spack/docs/pipelines.rst | 2 | ||||
| -rw-r--r-- | lib/spack/docs/workflows.rst | 6 |
9 files changed, 17 insertions, 17 deletions
diff --git a/.flake8_packages b/.flake8_packages index d17a34951d..fc2dbf98af 100644 --- a/.flake8_packages +++ b/.flake8_packages @@ -9,7 +9,7 @@ # # Note that we also add *per-line* exemptions for certain patterns in the # `spack flake8` command. This is where F403 for `from spack import *` -# is added (beause we *only* allow that wildcard). +# is added (because we *only* allow that wildcard). # # See .flake8 for regular exceptions. # diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fea052884..092959aff9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,7 @@ This is a bugfix release on top of `v0.14.0`. Specific fixes include: 2. **Build pipelines.** You can also build in parallel through Gitlab CI. Simply create a Spack environment and push it to Gitlab to build - on Gitlab runners. Pipeline support is now integreated into a single + on Gitlab runners. Pipeline support is now integrated into a single `spack ci` command, so setting it up is easier than ever. See the [Pipelines section](https://spack.readthedocs.io/en/v0.14.0/pipelines.html) in the docs. @@ -125,8 +125,8 @@ RHEL8. * mirror bugfixes: symlinks, duplicate patches, and exception handling (#13789) * don't try to fetch `BundlePackages` (#13908) * avoid re-fetching patches already added to a mirror (#13908) -* avoid re-fetching alread added patches (#13908) -* avoid re-fetching alread added patches (#13908) +* avoid re-fetching already added patches (#13908) +* avoid re-fetching already added patches (#13908) * allow repeated invocations of `spack mirror create` on the same dir (#13908) * bugfix for RHEL8 when `python` is unavailable (#14252) * improve concretization performance in environments (#14190) diff --git a/lib/spack/docs/basic_usage.rst b/lib/spack/docs/basic_usage.rst index d63dec8827..2f047c0785 100644 --- a/lib/spack/docs/basic_usage.rst +++ b/lib/spack/docs/basic_usage.rst @@ -925,7 +925,7 @@ contains any spaces. Any of ``cppflags=-O3``, ``cppflags="-O3"``, ``cppflags='-O3'``, and ``cppflags="-O3 -fPIC"`` are acceptable, but ``cppflags=-O3 -fPIC`` is not. Additionally, if the value of the compiler flags is not the last thing on the line, it must be followed -by a space. The commmand ``spack install libelf cppflags="-O3"%intel`` +by a space. The command ``spack install libelf cppflags="-O3"%intel`` will be interpreted as an attempt to set ``cppflags="-O3%intel"``. The six compiler flags are injected in the order of implicit make commands diff --git a/lib/spack/docs/build_systems/intelpackage.rst b/lib/spack/docs/build_systems/intelpackage.rst index c14fc34f51..153b41bdc7 100644 --- a/lib/spack/docs/build_systems/intelpackage.rst +++ b/lib/spack/docs/build_systems/intelpackage.rst @@ -553,7 +553,7 @@ follow `the next section <intel-install-libs_>`_ instead. f77: stub fc: stub - Replace ``18.0.3`` with the version that you determined in the preceeding + Replace ``18.0.3`` with the version that you determined in the preceding step. The contents under ``paths:`` do not matter yet. You are right to ask: "Why on earth is that necessary?" [fn8]_. @@ -696,7 +696,7 @@ follow `the next section <intel-install-libs_>`_ instead. - /home/$user/spack-stage Do not duplicate the ``config:`` line if it already is present. - Adapt the location, which here is the same as in the preceeding example. + Adapt the location, which here is the same as in the preceding example. 3. Retry installing the large package. @@ -965,7 +965,7 @@ a *virtual* ``mkl`` package is declared in Spack. Likewise, in a :ref:`MakefilePackage <makefilepackage>` - or similiar package that does not use AutoTools you may need to provide include + or similar package that does not use AutoTools you may need to provide include and link options for use on command lines or in environment variables. For example, to generate an option string of the form ``-I<dir>``, use: diff --git a/lib/spack/docs/containers.rst b/lib/spack/docs/containers.rst index 18500ff764..2ca25b7207 100644 --- a/lib/spack/docs/containers.rst +++ b/lib/spack/docs/containers.rst @@ -44,7 +44,7 @@ Environments: && echo " install_tree: /opt/software" \ && echo " view: /opt/view") > /opt/spack-environment/spack.yaml - # Install the software, remove unecessary deps + # Install the software, remove unnecessary deps RUN cd /opt/spack-environment && spack install && spack gc -y # Strip all the binaries @@ -266,7 +266,7 @@ following ``Dockerfile``: && echo " install_tree: /opt/software" \ && echo " view: /opt/view") > /opt/spack-environment/spack.yaml - # Install the software, remove unecessary deps + # Install the software, remove unnecessary deps RUN cd /opt/spack-environment && spack install && spack gc -y # Strip all the binaries @@ -304,4 +304,4 @@ following ``Dockerfile``: .. note:: Spack can also produce Singularity definition files to build the image. The minimum version of Singularity required to build a SIF (Singularity Image Format) - from them is ``3.5.3``.
\ No newline at end of file + from them is ``3.5.3``. diff --git a/lib/spack/docs/getting_started.rst b/lib/spack/docs/getting_started.rst index 3a9b2d42b2..8de9d27662 100644 --- a/lib/spack/docs/getting_started.rst +++ b/lib/spack/docs/getting_started.rst @@ -851,7 +851,7 @@ from websites and from git. .. warning:: - This workaround should be used ONLY as a last resort! Wihout SSL + This workaround should be used ONLY as a last resort! Without SSL certificate verification, spack and git will download from sites you wouldn't normally trust. The code you download and run may then be compromised! While this is not a major issue for archives that will diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst index 3c588c240b..88b7814838 100644 --- a/lib/spack/docs/packaging_guide.rst +++ b/lib/spack/docs/packaging_guide.rst @@ -3607,7 +3607,7 @@ the command line. For most compilers, ``$rpath_flag`` is ``-Wl,-rpath,``. However, NAG passes its flags to GCC instead of passing them directly to the linker. Therefore, its ``$rpath_flag`` is doubly wrapped: ``-Wl,-Wl,,-rpath,``. - ``$rpath_flag`` can be overriden on a compiler specific basis in + ``$rpath_flag`` can be overridden on a compiler specific basis in ``lib/spack/spack/compilers/$compiler.py``. The compiler wrappers also pass the compiler flags specified by the user from diff --git a/lib/spack/docs/pipelines.rst b/lib/spack/docs/pipelines.rst index f70b39a16d..a8f8198852 100644 --- a/lib/spack/docs/pipelines.rst +++ b/lib/spack/docs/pipelines.rst @@ -132,7 +132,7 @@ A pipeline-enabled spack environment ------------------------------------ Here's an example of a spack environment file that has been enhanced with -sections desribing a build pipeline: +sections describing a build pipeline: .. code-block:: yaml diff --git a/lib/spack/docs/workflows.rst b/lib/spack/docs/workflows.rst index b329a0205c..89d17e98b2 100644 --- a/lib/spack/docs/workflows.rst +++ b/lib/spack/docs/workflows.rst @@ -444,7 +444,7 @@ environment. A single-prefix filesystem view is a single directory tree that is the union of the directory hierarchies of a number of installed packages; -it is similar to the directory hiearchy that might exist under +it is similar to the directory hierarchy that might exist under ``/usr/local``. The files of the view's installed packages are brought into the view by symbolic or hard links, referencing the original Spack installation. @@ -1237,7 +1237,7 @@ you can also manually set them in your ``.bashrc``. 2. Other package managers like Homebrew will try to install things to the same directory. If you plan on using Homebrew in conjunction with Spack, don't symlink things to ``/usr/local``. - 3. If you are on a shared workstation, or don't have sudo priveleges, you + 3. If you are on a shared workstation, or don't have sudo privileges, you can't do this. If you still want to do this anyway, there are several ways around SIP. @@ -1467,7 +1467,7 @@ In order to build and run the image, execute: SPACK_ROOT=/usr/local \ FORCE_UNSAFE_CONFIGURE=1 - # install minimal spack depedencies + # install minimal spack dependencies RUN apt-get update \ && apt-get install -y --no-install-recommends \ autoconf \ |