Skip to content

Commit b75ffd1

Browse files
h-vetinaribeckermr
andauthored
Apply suggestions from code review
Co-authored-by: Matthew R. Becker <[email protected]>
1 parent 37c4001 commit b75ffd1

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/maintainer/infrastructure.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ principles.
300300
* We upgrade them in an ad-hoc manner on a periodic basis as we have the time and energy to do so.
301301
Note that because of the way we enforce runtime constraints, these compiler upgrades will not break
302302
existing packages. However, if you are using the compilers outside of ``conda``, then you may find issues.
303-
* We will provide notice in the form of an announcement when an ABI-incompatible compiler change is going to be happen.
303+
* We usually provide notice in the form of an announcement when an ABI-incompatible compiler change is going to happen.
304304
Note that these changes take a bit of time to complete, so you will generally have time
305305
to prepare should you need to.
306306
* Some of the criteria we think about when considering a compiler migration include
@@ -328,7 +328,7 @@ working also outside of conda-forge, and even provide an easy way to install the
328328
(through the `compilers <https://github.com/conda-forge/compilers-feedstock>`_ feedstock).
329329

330330
In more detail, our default compiler stack is made up very differently on each platform.
331-
More specifically, each compiler needs an _activation_ that makes the difference
331+
More specifically, each compiler uses an _activation_ package that makes the difference
332332
between it being merely present in a build environment, and it being used by default.
333333
These will be installed when using ``{{ compiler('xyz') }}`` in ``meta.yaml``, where
334334
``'xyz'`` is one of ``'c', 'cxx', 'fortran', 'cuda', 'rust', 'go-cgo', 'go-nocgo'``.
@@ -361,11 +361,11 @@ Windows (MSVC):
361361
* [Fortran] Activation & Implementation: https://github.com/conda-forge/flang-feedstock
362362

363363
There exists an alternative, MinGW-based, compiler stack on windows, which is available
364-
with a ``m2w64_`` prefix (e.g. ``{{ compiler('m2w64_c') }}``), which is however falling out
364+
with a ``m2w64_`` prefix (e.g. ``{{ compiler('m2w64_c') }}``). However, it is falling out
365365
of use now that most projects will natively support compilation also with MSVC, in addition
366366
to several complications arising from mixing compiler stacks.
367367

368-
Additionally, there is a possibility to use clang as a compiler also on Linux & Windows:
368+
Additionally, there is a possibility to use clang as a compiler on Linux & Windows:
369369

370370
* Activation (Linux): https://github.com/conda-forge/clang-compiler-activation-feedstock/
371371
* Activation (Windows): https://github.com/conda-forge/clang-win-activation-feedstock/

0 commit comments

Comments
 (0)