Skip to content

Commit ccf8d47

Browse files
committed
updating according to review
1 parent 2e5cc68 commit ccf8d47

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

newsfeed/demo/announcements.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Announcements
3232
to anaconda.org. Direct uploads to the ``conda-forge`` channel will no
3333
longer work. If you are having trouble with package uploads, please
3434
rerender your feedstock with the latest version of ``conda-smithy``.
35-
As always, if you need help, bump us on element chatroom or GitHub!
35+
As always, if you need help, bump us on gitter or GitHub!
3636

3737
:2020-08-06: Fixed Maintenance Process for Feedstock Teams
3838

@@ -173,7 +173,7 @@ Announcements
173173

174174
Despite our extensive testing, we do not expect this change to be completely smooth,
175175
so please bear with us. As always, if you have any questions, concerns, or trouble, you
176-
can find us on Element chatroom or bump us directly on github!
176+
can find us on gitter or bump us directly on github!
177177

178178
:2020-03-24: ``vs2015`` to ``vs2017`` Transition
179179

src/maintainer/maintainer_faq.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ FAQ
146146
:ref:`(Q) <mfaq_contact_core>` **How can I contact conda-forge/core?**
147147

148148
When in an issue or PR, you can contact `conda-forge/core <https://conda-forge.org/docs/orga/governance.html#teams-roles>`__ by simply mentioning ``@conda-forge/core`` in a comment.
149-
If you don't receive an an answer after a couple of days, feel free to reach out to us via the public `element <https://app.element.io/#/room/#conda-forge:matrix.org>`__ chatroom.
149+
If you don't receive an an answer after a couple of days, feel free to reach out to us via the public `Element <https://app.element.io/#/room/#conda-forge:matrix.org>`__ chatroom.
150150

151151
.. note::
152152

src/maintainer/updating_pkgs.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ We need to re-render when there are changes in the following parts of the feedst
168168
- ``yum_requirements.txt`` or ``conda-forge.yml``.
169169
- Updates in the build matrix due to new versions of Python, NumPy, PERL, R, etc.
170170
- Updates in conda-forge pinning that affect the feedstock.
171-
- Build issues that a feedstock configuration update will fix (follow us on `element <https://app.element.io/#/room/#conda-forge:matrix.org>`_ to know about those).
171+
- Build issues that a feedstock configuration update will fix (follow us on `Element <https://app.element.io/#/room/#conda-forge:matrix.org>`_ to know about those).
172172

173173
Updating for newly released Python version
174174
==========================================
@@ -286,7 +286,7 @@ an issue in the feedstock repository with the following title:
286286

287287
where ``username`` is the username of the new maintainer to be added.
288288
A PR will be automatically created and a maintainer or a member of the ``core`` team, in case no maintainer is active anymore, can then merge this PR to add the user.
289-
To contact core, ping them by mentioning @conda-forge/core in a comment or, if you haven't heard back in a while or are new to conda-forge, contact them through the community `element <https://app.element.io/#/room/#conda-forge:matrix.org>`__.
289+
To contact core, ping them by mentioning @conda-forge/core in a comment or, if you haven't heard back in a while or are new to conda-forge, contact them through the community `Element <https://app.element.io/#/room/#conda-forge:matrix.org>`__.
290290

291291
.. note::
292292

src/orga/joining-the-team.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ for officially interfacing with external communities, organizations, non-profits
1919
and companies. They are also responsible for maintaining conda-forge's infrastructure.
2020

2121
If you are interested in joining the core team, please get in touch with us on our
22-
`Element Chatroom <https://app.element.io/#/room/#conda-forge:matrix.org>`__.
22+
`Element chatroom <https://app.element.io/#/room/#conda-forge:matrix.org>`__.
2323
Core members are added via a vote amongst the current core team. The core team
2424
member who is running your vote will ask you to provide sufficient justification
2525
as to why you should be nominated to core. Prior service to the community, including
@@ -46,7 +46,7 @@ Generally speaking, your role is as follows:
4646
4. Helping recipe maintainers who bump the ``conda-forge/help-*`` teams.
4747

4848
To join the staged-recipes team, please ask one of the core members on our
49-
`Element Chatroom <https://app.element.io/#/room/#conda-forge:matrix.org>`__.
49+
`Element chatroom <https://app.element.io/#/room/#conda-forge:matrix.org>`__.
5050
We will then reach consensus in private and let you know our decision.
5151
Our decision will likely be "yes" but it could be "please get more involved
5252
with the review process on staged recipes first" if we have not seen you

src/user/announcements.rst

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

1414
We have made the ``conda-forge`` Google Group read-only. Please use the new
1515
``conda-forge`` `discourse forum <https://conda.discourse.group/c/pkg-building/conda-forge/25>`_,
16-
our `Element Chatroom <https://app.element.io/#/room/#conda-forge:matrix.org>`_, or it's `Matrix/Element
16+
our `Gitter room <https://gitter.im/conda-forge/conda-forge.github.io>`_, , or it's `Matrix/Element
1717
counterpart <https://app.element.io/#/room/#conda-forge-space:matrix.org>`_ instead.
1818

1919

@@ -313,7 +313,7 @@ We have now completed rolling out the new staging process for uploads
313313
to anaconda.org. Direct uploads to the ``conda-forge`` channel will no
314314
longer work. If you are having trouble with package uploads, please
315315
rerender your feedstock with the latest version of ``conda-smithy``.
316-
As always, if you need help, bump us on Element chatroom or GitHub!
316+
As always, if you need help, bump us on gitter or GitHub!
317317

318318

319319
2020-08-06: Fixed Maintenance Process for Feedstock Teams
@@ -476,7 +476,7 @@ What will you see as a feedstock maintainer?
476476

477477
Despite our extensive testing, we do not expect this change to be completely smooth,
478478
so please bear with us. As always, if you have any questions, concerns, or trouble, you
479-
can find us on Element chatroom or bump us directly on Github!
479+
can find us on gitter or bump us directly on Github!
480480

481481

482482
2020-03-24: ``vs2015`` to ``vs2017`` Transition

0 commit comments

Comments
 (0)