Skip to content

Commit

Permalink
pre-commit: Fix linter issues in markdown documents
Browse files Browse the repository at this point in the history
  • Loading branch information
Holzhaus committed Aug 18, 2021
1 parent 7d91afe commit db22e63
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 37 deletions.
50 changes: 26 additions & 24 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ communication initiated in the context of these spaces.

Simply put, community discussions should be

* respectful and kind;
* about Mixxx;
* about features and code, not the individuals involved.
* respectful and kind;
* about Mixxx;
* about features and code, not the individuals involved.

## Be respectful and constructive.
## Be respectful and constructive

Treat everyone with respect. Build on each other's ideas. Each of us has the
right to enjoy our experience and participate without fear of harassment,
Expand All @@ -23,7 +23,7 @@ communicating with someone in their primary language. We all get frustrated
when working on hard problems, but we cannot allow that frustration to turn
into personal attacks.

## Speak up if you see or hear something.
## Speak up if you see or hear something

You are empowered to politely engage when you feel that you or others are
disrespected. The person making you feel uncomfortable may not be aware of what
Expand All @@ -42,32 +42,34 @@ While all reports will be taken seriously, the Mixxx community managers may
not act on complaints that they feel are not violations of this code of
conduct.

## We will not tolerate harassment of any kind, including but not limited to:
## No Tolerance for Harassment

* Harassing comments
* Intimidation
* Encouraging a person to engage in self-harm.
* Sustained disruption or derailing of threads, channels, lists, etc.
* Offensive or violent comments, jokes or otherwise
* Inappropriate sexual content
* Unwelcome sexual or otherwise aggressive attention
* Continued one-on-one communication after requests to cease
* Distribution or threat of distribution of people's personally identifying
information, AKA “doxing”
We will not tolerate harassment of any kind, including but not limited to:

* Harassing comments
* Intimidation
* Encouraging a person to engage in self-harm.
* Sustained disruption or derailing of threads, channels, lists, etc.
* Offensive or violent comments, jokes or otherwise
* Inappropriate sexual content
* Unwelcome sexual or otherwise aggressive attention
* Continued one-on-one communication after requests to cease
* Distribution or threat of distribution of people's personally identifying
information, AKA “doxing”

## Consequences for failing to comply with this policy

Consequences for failing to comply with this policy may include, at the sole
discretion of the Mixxx community managers:

* a request for an apology;
* a private or public warning or reprimand;
* a temporary ban from the mailing list, blog, Mixxx repository or
organization, or other Mixxx-supported communication group, including
loss of committer status;
* a permanent ban from any of the above, or from all current and future
Mixxx-supported communities, including loss of
committer status.
* a request for an apology;
* a private or public warning or reprimand;
* a temporary ban from the mailing list, blog, Mixxx repository or
organization, or other Mixxx-supported communication group, including
loss of committer status;
* a permanent ban from any of the above, or from all current and future
Mixxx-supported communities, including loss of
committer status.

Participants warned to stop any harassing behavior are expected to comply
immediately; failure to do so will result in an escalation of consequences.
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Mixxx

[![GitHub latest tag](https://img.shields.io/github/tag/mixxxdj/mixxx.svg)](https://mixxx.org/download)
[![Packaging status](https://repology.org/badge/tiny-repos/mixxx.svg)](https://repology.org/metapackage/mixxx/versions)
[![Zulip chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://mixxx.zulipchat.com)
Expand Down
11 changes: 3 additions & 8 deletions packaging/certificates/README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@

# Key Rotation

# downloads-hostgator.mixxx.org
## downloads-hostgator.mixxx.org

SSH access is granted via an RSA key stored in `build/certificates/downloads-hostgator.mixxx.org.key`.

To rotate this key, generate a new RSA key with a strong password (e.g. 32 character randomly generated).

```
ssh-keygen -t rsa -b 4096 -f downloads-hostgator.mixxx.org.key
```
ssh-keygen -t rsa -b 4096 -f downloads-hostgator.mixxx.org.key

Copy the **public** key to `$HOME/.ssh/authorized_keys`, replacing the old file to remove access for the current key.

Encrypt the password using `travis encrypt` and update `.travis.yml`.

```
travis encrypt DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD=hunter2 -r mixxxdj/mixxx
```
travis encrypt DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD=hunter2 -r mixxxdj/mixxx
7 changes: 2 additions & 5 deletions res/controllers/mixco/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@

Mixco Scripts
=============
# Mixco Scripts

Some of the scripts in the parent folder are the compile output of
**Mixco**, a tool that can generate the `.xml` and `.js` files from a
Expand All @@ -10,9 +8,8 @@ original sources for such scripts.
If you modify these scripts, you need to use the `mixco` command to
compile the `.xml` and `.js` files that Mixxx can read. To install
it, you need [NPM](https://www.npmjs.org/) and then:
```sh

$ npm install -g mixco
```

You can find more information on how to install and use this
tool [in the official Mixco website](https://sinusoid.es/mixco/).

0 comments on commit db22e63

Please sign in to comment.