Skip to content

Commit eb04600

Browse files
committed
minor fixses made in announcements and intro section
1 parent 9eb0c0e commit eb04600

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

index.html.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
<li><i class="mega-octicon fa-3x octicon-issue-opened"></i>
178178
Take a look to see if the issue has already been raised on the feedstock's issue tracker.
179179
Otherwise, create a new issue, providing appropriate information, such as your operating system,
180-
package versions and an reproducible example of the problem. Even better, if you can automate the test in the conda recipe,
180+
package versions and, a reproducible example of the problem. Even better, if you can automate the test in the conda recipe,
181181
it might be worth <a href="#update_recipe">submitting a PR containing the test</a>.
182182
</li>
183183
<li><i class="mega-octicon fa-3x octicon-question"></i>
@@ -205,7 +205,7 @@
205205
</li>
206206
<li><i class="mega-octicon fa-3x octicon-git-pull-request"></i>
207207
Propose the change as a pull request.
208-
Your recipe will automatically be built on Windows, Linux and OSX to test that it works,
208+
Your recipe will automatically be built on Windows, Linux, and OSX to test that it works,
209209
but the new distribution will not yet be available on the conda-forge channel.
210210
</li>
211211
<li><i class="mega-octicon fa-3x octicon-git-merge"></i>
@@ -230,7 +230,7 @@
230230
</li>
231231
<li><i class="mega-octicon fa-3x octicon-git-pull-request"></i>
232232
Propose the change as a pull request.
233-
Your recipe will automatically be built on Windows, Linux and OSX to test that it works,
233+
Your recipe will automatically be built on Windows, Linux, and OSX to test that it works,
234234
but the distribution will not yet be available on the conda-forge channel.
235235
</li>
236236
<li><i class="mega-octicon fa-3x octicon-git-merge"></i>

src/user/announcements.rst

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ Our announcements are published to an RSS feed `here <https://conda-forge.org/do
2727

2828
In an effort to better secure ``conda-forge``, we are developing a process to
2929
validate artifacts before they are uploaded to ``anaconda.org``. This validation
30-
will look for various security related items, such as artifacts which overwrite
30+
will look for various security-related items, such as artifacts that overwrite
3131
key pieces of certain packages. While this process is in development, we will not
3232
be rejecting uploads. However, we will start scanning our current artifacts and
3333
working with the maintainers of those artifacts to mark broken any which we deem
3434
a security risk. We will also be running validation on new artifacts being upload
35-
and will report any issues back to feedstocks. At a future date, artifacts which
35+
and will report any issues back to feedstocks. At a future date, artifacts that
3636
do not pass validation will not be uploaded.
3737

3838
:2020-10-08: Compiler Upgrade to ``GCC`` ``9.3.0``
@@ -51,7 +51,7 @@ Our announcements are published to an RSS feed `here <https://conda-forge.org/do
5151
to anaconda.org. Direct uploads to the ``conda-forge`` channel will no
5252
longer work. If you are having trouble with package uploads, please
5353
rerender your feedstock with the latest version of ``conda-smithy``.
54-
As always, if you need help, bump us on gitter or GitHub!
54+
As always, if you need help, bump us on Gitter or GitHub!
5555

5656
:2020-08-06: Fixed Maintenance Process for Feedstock Teams
5757

@@ -85,10 +85,10 @@ Our announcements are published to an RSS feed `here <https://conda-forge.org/do
8585
channels. Users can disable this by setting ``channel_priority: flexible`` in their
8686
``conda-forge.yml``.
8787

88-
:2020-07-23: NumPy 1.16 as the minimal NumPy version on all platforms.
88+
:2020-07-23: NumPy 1.16 is the minimal NumPy version on all platforms.
8989

9090
In accordance with `NEP-29 <https://numpy.org/neps/nep-0029-deprecation_policy.html>`_,
91-
we have switched to have ``numpy 1.16`` as the minimal supported version on all
91+
we have switched to have ``numpy 1.16`` as the minimum supported version on all
9292
platforms.
9393

9494
:2020-07-17: Conda-forge is building openblas with both pthreads and openmp on Linux
@@ -192,7 +192,7 @@ Our announcements are published to an RSS feed `here <https://conda-forge.org/do
192192

193193
Despite our extensive testing, we do not expect this change to be completely smooth,
194194
so please bear with us. As always, if you have any questions, concerns, or trouble, you
195-
can find us on gitter or bump us directly on github!
195+
can find us on Gitter or bump us directly on Github!
196196

197197
:2020-03-24: ``vs2015`` to ``vs2017`` Transition
198198

@@ -231,7 +231,7 @@ Our announcements are published to an RSS feed `here <https://conda-forge.org/do
231231
no ongoing support for Python 2.7 builds and any existing builds are provided on an "as-is" basis.
232232
- A ``cf202003`` label has been applied to the ``conda-forge`` channel for those
233233
who need a reference to the package index with Python 2.7.
234-
- We are removing support for ``vs2008`` on Windows conjunction with the deprecation
234+
- We are removing support for ``vs2008`` on Windows in conjunction with the deprecation
235235
of Python 2.7, as it was only supported to build this version of Python.
236236
- We will provide an admin command that will add back Python 2.7 to any feedstock.
237237
Note that as stated above, we cannot provide support for any Python 2.7 builds
@@ -243,7 +243,7 @@ Our announcements are published to an RSS feed `here <https://conda-forge.org/do
243243

244244
:2019-09-30: Clang 9.0.0 and gfortran 7.3.0 as default compilers in OSX.
245245

246-
- If you maintain a feedstock which require a C/C++ compiler, no changes necessary. A rerender
246+
- If you maintain a feedstock that requires a C/C++ compiler, no changes necessary. A rerender
247247
should be done next time the feedstock is updated to use the new compiler.
248248
- If you maintain a feedstock with a Fortran compiler, a PR to upgrade to gfortran 7.3.0 was
249249
already issued. If that PR was merged, there's nothing to do. If not, contact core if you
@@ -266,17 +266,17 @@ Our announcements are published to an RSS feed `here <https://conda-forge.org/do
266266
2018
267267
----
268268

269-
:2018-10-12: The rebuild is moving along nicely with almost a third of packages completed.
269+
:2018-10-12: The rebuild is moving along nicely with almost a third of the packages completed.
270270

271-
Recently completed are numpy and openblas which should open up much of the python numeric stack.
271+
Recently completed are NumPy and Openblas which should open up much of the python numeric stack.
272272
We're only about 5 feedstocks away from opening up all of R as well.
273273

274274
:2018-09-24: A minimal python 3.7 build is now available across all platforms and both compilers!
275275

276276
:2018-09-24: Deprecation notice for Python 3.5
277277

278-
As we start building out more of the python 3.7 stack, we will no longer be building
279-
python 3.5 packages.
278+
As we start building out more of the Python 3.7 stack, we will no longer be building
279+
Python 3.5 packages.
280280

281281
No new python 3.5 packages will be built after 2018-10-01.
282282

0 commit comments

Comments
 (0)