Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions content/about/code_of_conduct/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title = "Code of Conduct"

# NUMFOCUS CODE OF CONDUCT

You can find the whole document here https://numfocus.org/code-of-conduct.
You can find the whole document [here][NumFOCUS Code of Conduct].

## THE SHORT VERSION

Expand All @@ -22,15 +22,17 @@ Thank you for helping make this a welcoming, friendly community for all.

## LONG VERSION

You can find the long version of the Code of Conduct on the NumFOCUS website https://numfocus.org/code-of-conduct
You can find the long version of the Code of Conduct on the [NumFOCUS Code of Conduct][] page.

## HOW TO REPORT

If you feel that the Code of Conduct has been violated, feel free to submit a report, by using the form: NumFOCUS Code of Conduct Reporting Form
If you feel that the Code of Conduct has been violated, feel free to submit a report, by using the [NumFOCUS Code of Conduct Reporting Form](https://numfocus.typeform.com/to/ynjGdT).

## WHO WILL RECEIVE YOUR REPORT

Your report will be received and handled by NumFOCUS Code of Conduct Working Group; trained, and experienced contributors with diverse backgrounds.
The group is making decisions independently from the project, PyData, NumFOCUS or any other organization.
The group is making decisions independently from the project, PyData, NumFOCUS or any other organization.

You can learn more about the current group members, as well as the reporting procedure [HERE](https://numfocus.org/code-of-conduct).
You can learn more about the current group members, as well as the reporting procedure on the [NumFOCUS Code of Conduct][] page.

[NumFOCUS Code of Conduct](https://numfocus.org/code-of-conduct)
4 changes: 2 additions & 2 deletions content/about/roles/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ This includes who gets commit rights to their projects.

The core team are community members who have demonstrated continued commitment to the project through ongoing contributions.
They have shown they can be trusted to maintain scverse with care.
Team members appear as organization members on the scverse [GitHub organization](https://github.com/orgs/scverse/people) and are on our [@scverse/core](https://github.com/orgs/scverse/teams/core) GitHub team.
Team members appear as organization members on the scverse [GitHub organization](https://github.com/orgs/scverse/people) and are on our [@scverse/core](https://github.com/orgs/scverse/teams/core) GitHub team, but can also be reached by e-mail at [core@scverse.org](core@scverse.org).

There are sub-roles within the core team depending on the kinds covering different kinds of contributions and responsibilities.

Expand Down Expand Up @@ -93,7 +93,7 @@ Nominees should have demonstrated long-term, continued commitment to the project
A nomination will result in discussion that cannot take more than a month and then admission to the SC by consensus.
During that time deadlocked votes of the SC will be postponed until the new member has joined and another vote can be held.

The `scverse` steering council may be contacted at `steering-council@scverse.org`, or via the [@scverse/steering-council](https://github.com/orgs/scverse/teams/steering-council) GitHub team.
The `scverse` steering council may be contacted at [steering-council@scverse.org](mailto:steering-council@scverse.org).

### Management Committee

Expand Down
8 changes: 6 additions & 2 deletions content/join/_index.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Join scverse"

email_stmt = "You can also reach the steering council at: [steering-council@scverse.org](steering-council@scverse.org)"

[[resources]]
id = "github"
title = "GitHub"
Expand Down Expand Up @@ -39,3 +37,9 @@ email_stmt = "You can also reach the steering council at: [steering-council@scve
text = "Subscribe to our YouTube channel"
link = "https://www.youtube.com/channel/UCpsvsIAW3R5OdftJKKuLNMA"
+++

You can also reach us by e-mail for certain matters:

- [core@scverse.org](core@scverse.org): [core team](/about/roles#core-team)
- [conference@scverse.org](conference@scverse.org): for matters regarding the [next conference](/conference2025)
- [steering-council@scverse.org](steering-council@scverse.org): [steering council](/about/roles#steering-council) (e.g. for questions about sponsorships)
2 changes: 1 addition & 1 deletion layouts/join/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h5 class="card-title">
</div>
<div>
<p>
{{ .Params.email_stmt | markdownify }}
{{ .Content }}
</p>
</div>
</div>
Expand Down
4 changes: 4 additions & 0 deletions layouts/partials/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@
<li>
<a class="dropdown-item" href="/about/code_of_conduct">Code of Conduct</a>
</li>
<li>
<!-- This is just a second link to the /join page, but makes it more discoverable for people who think “I don’t want to join, just contact” -->
<a class="dropdown-item" href="/join">Contact</a>
</li>
</ul>
</li>
<li class="nav-item">
Expand Down