diff options
30 files changed, 147 insertions, 90 deletions
diff --git a/CodeOfConduct.mdwn b/CodeOfConduct.mdwn index 7e05cc0a..7b6eba43 100644 --- a/CodeOfConduct.mdwn +++ b/CodeOfConduct.mdwn @@ -43,6 +43,9 @@ that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. +Please see our [[Guidelines for Project Maintainer|CodeOfConduct/guidlines]] for +suggestions and other helpful resources. + ## Scope This Code of Conduct applies both within project spaces and in public spaces @@ -52,60 +55,6 @@ address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. -## Guidelines for Project Maintainer moderation - -Remember these aren't rules, there's simply suggestions project maintainers are -free to use when moderating projects on Freedesktop - especially when using -Gitlab. - -### Dealing with Spam - -If possible or unless told otherwise, don't report spam through Gitlab's -reporting system. Because of how much spam we get, we've setup a spam bot -that project maintainers can use instead to prevent the pipes from getting -clogged up - and get a much faster response. When you see spam: - -* If it's an issue or a merge requeest, add the "spam" label to it on Gitlab. - This will hide the comment immediately -* If it's a comment, react with the do not litter emoji 🚯 and the bot will - do its civic duty - -Note that the bot isn't setup by default, but can be setup for any project -on freedesktop's gitlab. See -https://gitlab.freedesktop.org/freedesktop/damspam for information on how -to do this - -### Documenting incidences - -Document things first and foremost, such as with screenshots - -The biggest reason for this: Gitlab *does not* keep an edit history for -comments, nor does it keep track of deleted comments. Once something has -been removed or edited it's gone. Taking record of incidents can help the -CoC team act on those when/if you reach out to them - as it makes it much -easier to spot repeated patterns of behavior. - -### Inappropriate comments - -If you come across a comment that feels inappropriate or hinders a healthy discussion, consider one of the following actions: - -* Editing the comment with a canned response such as: - * "This comment has been removed as discussion about Foo is off-topic, - and should be discussed in its own issue" - * "This comment has been hidden due to inflammatory language, please - assume good faith when participating in discussions." -* You can also delete the comment -* You can also add a spoiler tag when editing the comment, to keep the body - of the comment intact - but collapse it by default. - -### Limit engagement with problematic comments to moderating them - -Trying to argue with someone or accuse them of wrongdoing will many times -make a situation worse, and can also complicate things from the perspective -of the CoC team. When problematic behavior occurs, it's recommended to keep -responses brief and to the point - and to reach out to the code of conduct -team if moderating the discussion fails. - ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be @@ -115,6 +64,8 @@ or to any of the members of that list: * Lyude Paul <lyude@redhat.com> * Karol Herbst <kherbst@redhat.com> * Simon Ser <contact@emersion.fr> +* Daniel Stone <daniel@fooishbar.org> +* Daniel Vetter <sima@ffwll.ch> All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is diff --git a/CodeOfConduct/Guidlines.mdwn b/CodeOfConduct/Guidlines.mdwn new file mode 100644 index 00000000..d65c028a --- /dev/null +++ b/CodeOfConduct/Guidlines.mdwn @@ -0,0 +1,96 @@ +# Guidelines for Project Maintainer moderation + +Remember these aren't rules, there's simply suggestions project maintainers are +free to use when moderating projects on Freedesktop - especially when using +Gitlab. + +## Dealing with Spam + +If possible or unless told otherwise, don't report spam through Gitlab's +reporting system. Because of how much spam we get, we've setup a spam bot +that project maintainers can use instead to prevent the pipes from getting +clogged up - and get a much faster response. When you see spam: + +* If it's an issue or a merge requeest, add the "spam" label to it on Gitlab. + This will hide the comment immediately +* If it's a comment, react with the do not litter emoji 🚯 and the bot will + do its civic duty + +Note that the bot isn't setup by default, but can be setup for any project +on freedesktop's gitlab. See +[gitlab.freedesktop.org/freedesktop/damspam](https://gitlab.freedesktop.org/freedesktop/damspam) for information on how +to do this + +## Documenting incidences + +Document things first and foremost, such as with screenshots + +The biggest reason for this: Gitlab *does not* keep an edit history for +comments, nor does it keep track of deleted comments. Once something has +been removed or edited it's gone. Taking record of incidents can help the +CoC team act on those when/if you reach out to them - as it makes it much +easier to spot repeated patterns of behavior. + +## Inappropriate comments + +If you come across a comment that feels inappropriate or hinders a healthy discussion, consider one of the following actions: + +* Editing the comment with a canned response such as: + * "This comment has been removed as discussion about Foo is off-topic, + and should be discussed in its own issue" + * "This comment has been hidden due to inflammatory language, please + assume good faith when participating in discussions." +* You can also delete the comment +* You can also add a spoiler tag when editing the comment, to keep the body + of the comment intact - but collapse it by default. + +Be aware that no notification will be generated for editing or comments, +unless you explicitly mention somebody not mentioned before. + +## Limit engagement with problematic comments to moderating them + +Trying to argue with someone or accuse them of wrongdoing will many times +make a situation worse, and can also complicate things from the perspective +of the CoC team. When problematic behavior occurs, it's recommended to keep +responses brief and to the point - and to reach out to the code of conduct +team if moderating the discussion fails. + +## Escalating issues within your project + +If a contributor is causing issues within your project, as a project maintainer you may choose to exclude them from your project's spaces. If the behavior is completely egregious, please immediately escalate to the Code of Conduct committee who can take appropriate action. In most cases, we suggest first issuing a firm warning to them about their behavior, with a ban to be placed if they do not heed this warning. + +You may take this decision independently as a maintainer, however if you need any assistance or would like to discuss anything, please feel free to get in touch with the committee. + +### Suggested template to issue warning + + To: $contributor + Cc: conduct@lists.freedesktop.org + Subject: Your behavior in $project + + Dear $contributor, + Your behavior on $project has been [derailing|disrespectful|disruptive|inconsiderate]. As the maintainer of $project, I urge you to read the freedesktop.org Code of Conduct you agreed to when signing up at https://www.freedesktop.org/wiki/CodeOfConduct. + + Please read this, consider your actions, and refrain from such behavior in future. + + If there is no improvement in your behavior after this warning, we will consider either a temporary ban from all our project's spaces (issues, merge requests, mailing lists and other discussion forums, conferences, etc) or escalating to the freedesktop.org Code of Conduct committee who can take more extensive action. + + $yourname + Maintainer, $project + +### Suggested template to issue ban + + To: $contributor + Cc: conduct@lists.freedesktop.org + Subject: Your behavior in $project + + Dear $contributor, + Your behavior on $project has continued to be [derailing|disrespectful|disruptive|inconsiderate] despite my earlier warning. + + As the maintainer of $project, I am hereby banning you from any interaction with the project. This includes, but is not limited to: issues, merge requests, mailing lists and other discussion forums, and conferences. + + You can ask me to lift the ban after $time. + + If you contravene this ban and continue to interact with the project, we will escalate this to the freedesktop.org Code of Conduct committee who are likely to issue an immediate ban across all of freedesktop.org. + + $yourname + Maintainer, $project diff --git a/Software/PulseAudio/Documentation/Maintainer.mdwn b/Software/PulseAudio/Documentation/Maintainer.mdwn index e5d7a2b1..bbb01b03 100644 --- a/Software/PulseAudio/Documentation/Maintainer.mdwn +++ b/Software/PulseAudio/Documentation/Maintainer.mdwn @@ -48,6 +48,8 @@ Library changes can be found easily by viewing only changes that affect files un --- ## (final release only) Update NEWS or README +For pavucontrol, update the metainfo file with release notes. + In case of pavucontrol and paprefs, there's no NEWS file, but you should add a news item to doc/README.html.in. Git shortlog can be used to generate the contributor list that we add to the entries in NEWS: @@ -74,18 +76,12 @@ The clean command is needed, because otherwise the tarball will have wrong versi --- ## Generate the tarball -### pulseaudio & paprefs +### pulseaudio, pavucontrol & paprefs meson dist -C build --formats=gztar,xztar That will create a .tar.gz file and a .tar.xz file and corresponding checksum files in build/meson-dist. -### pavucontrol - - make distcheck - -That will create a .tar.gz file and a .tar.xz file as well as .sha256sum files with the corresponding checksums. - --- ## Check that all new files are included in the tarball diff --git a/Software/systemd/APIFileSystems.mdwn b/Software/systemd/APIFileSystems.mdwn index f1f36ba4..9ca0c322 100644 --- a/Software/systemd/APIFileSystems.mdwn +++ b/Software/systemd/APIFileSystems.mdwn @@ -7,7 +7,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/userdocs/API_FILE_SYSTEMS.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/API_FILE_SYSTEMS]].** --- diff --git a/Software/systemd/Backports.mdwn b/Software/systemd/Backports.mdwn index dff3709a..8b5e453b 100644 --- a/Software/systemd/Backports.mdwn +++ b/Software/systemd/Backports.mdwn @@ -6,7 +6,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/devdocs/BACKPORTS.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/BACKPORTS]].** --- diff --git a/Software/systemd/ControlGroupInterface.mdwn b/Software/systemd/ControlGroupInterface.mdwn index faf91f69..e3ee3f79 100644 --- a/Software/systemd/ControlGroupInterface.mdwn +++ b/Software/systemd/ControlGroupInterface.mdwn @@ -1,11 +1,10 @@ - --- --- --- -**This page has been obsoleted and replaced: [[https://systemd.io/devdocs/CONTROL_GROUP_INTERFACE.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/CONTROL_GROUP_INTERFACE]].** --- diff --git a/Software/systemd/DaemonSocketActivation.mdwn b/Software/systemd/DaemonSocketActivation.mdwn index a52ad8db..d6380ae4 100644 --- a/Software/systemd/DaemonSocketActivation.mdwn +++ b/Software/systemd/DaemonSocketActivation.mdwn @@ -1,12 +1,11 @@ - --- --- --- -**This page has been obsoleted and replaced: [[https://systemd.io/userdocs/DAEMON_SOCKET_ACTIVATION.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/DAEMON_SOCKET_ACTIVATION]].** --- diff --git a/Software/systemd/Debugging.mdwn b/Software/systemd/Debugging.mdwn index beb5dc30..05e3edc9 100644 --- a/Software/systemd/Debugging.mdwn +++ b/Software/systemd/Debugging.mdwn @@ -14,7 +14,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/userdocs/DEBUGGING.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/DEBUGGING]].** --- diff --git a/Software/systemd/FileHierarchy.mdwn b/Software/systemd/FileHierarchy.mdwn index a04329d3..60ae8d8c 100644 --- a/Software/systemd/FileHierarchy.mdwn +++ b/Software/systemd/FileHierarchy.mdwn @@ -1,11 +1,10 @@ - --- --- --- -**This page has been obsoleted and replaced: [[https://systemd.io/devdocs/SYSTEMD_FILE_HIERARCHY_REQUIREMENTS.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/SYSTEMD_FILE_HIERARCHY_REQUIREMENTS]].** --- diff --git a/Software/systemd/FrequentlyAskedQuestions.mdwn b/Software/systemd/FrequentlyAskedQuestions.mdwn index c10df391..6cc46f3e 100644 --- a/Software/systemd/FrequentlyAskedQuestions.mdwn +++ b/Software/systemd/FrequentlyAskedQuestions.mdwn @@ -8,7 +8,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/userdocs/FAQ.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/FAQ]].** --- diff --git a/Software/systemd/Incompatibilities.mdwn b/Software/systemd/Incompatibilities.mdwn index 87b45364..0143c54e 100644 --- a/Software/systemd/Incompatibilities.mdwn +++ b/Software/systemd/Incompatibilities.mdwn @@ -7,7 +7,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/userdocs/INCOMPATIBILITIES.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/INCOMPATIBILITIES]].** --- diff --git a/Software/systemd/MinimalBuilds.mdwn b/Software/systemd/MinimalBuilds.mdwn index cfe24435..4971c17f 100644 --- a/Software/systemd/MinimalBuilds.mdwn +++ b/Software/systemd/MinimalBuilds.mdwn @@ -7,7 +7,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/devdocs/MINIMAL_BUILDS.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/MINIMAL_BUILDS]].** --- diff --git a/Software/systemd/MyServiceCantGetRealtime.mdwn b/Software/systemd/MyServiceCantGetRealtime.mdwn index 203923bf..bd884165 100644 --- a/Software/systemd/MyServiceCantGetRealtime.mdwn +++ b/Software/systemd/MyServiceCantGetRealtime.mdwn @@ -7,7 +7,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/userdocs/MY_SERVICE_CANT_GET_REATLIME.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/MY_SERVICE_CANT_GET_REATLIME]].** --- diff --git a/Software/systemd/NetworkTarget.mdwn b/Software/systemd/NetworkTarget.mdwn index 59a7a3af..ae21dcf4 100644 --- a/Software/systemd/NetworkTarget.mdwn +++ b/Software/systemd/NetworkTarget.mdwn @@ -6,7 +6,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/networking/NETWORK_ONLINE]].** +**This page has been obsoleted and replaced: [[https://systemd.io/NETWORK_ONLINE]].** --- diff --git a/Software/systemd/Optimizations.mdwn b/Software/systemd/Optimizations.mdwn index 143d8e84..90370ebb 100644 --- a/Software/systemd/Optimizations.mdwn +++ b/Software/systemd/Optimizations.mdwn @@ -7,7 +7,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/devdocs/OPTIMIZATIONS.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/OPTIMIZATIONS]].** --- diff --git a/Software/systemd/PredictableNetworkInterfaceNames.mdwn b/Software/systemd/PredictableNetworkInterfaceNames.mdwn index 58766703..2eb3a392 100644 --- a/Software/systemd/PredictableNetworkInterfaceNames.mdwn +++ b/Software/systemd/PredictableNetworkInterfaceNames.mdwn @@ -1,7 +1,24 @@ [[Back to systemd|http://www.freedesktop.org/wiki/Software/systemd/]] + + +--- + +--- + +--- + + **This page has been obsoleted and replaced by a man page: [[systemd.net-naming-scheme(7)|http://www.freedesktop.org/software/systemd/man/systemd.net-naming-scheme.html]].** + +--- + +--- + +--- + + # Generators # Predictable Network Interface Names diff --git a/Software/systemd/Preset.mdwn b/Software/systemd/Preset.mdwn index 0bd0182b..94fda521 100644 --- a/Software/systemd/Preset.mdwn +++ b/Software/systemd/Preset.mdwn @@ -7,7 +7,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/devdocs/PRESET.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/PRESET]].** --- diff --git a/Software/systemd/TheCaseForTheUsrMerge.mdwn b/Software/systemd/TheCaseForTheUsrMerge.mdwn index cf9566f9..7eaf822b 100644 --- a/Software/systemd/TheCaseForTheUsrMerge.mdwn +++ b/Software/systemd/TheCaseForTheUsrMerge.mdwn @@ -8,7 +8,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/devdocs/THE_CASE_FOR_THE_USR_MERGE.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/THE_CASE_FOR_THE_USR_MERGE]].** --- diff --git a/Software/systemd/TipsAndTricks.mdwn b/Software/systemd/TipsAndTricks.mdwn index 1b5bba4a..a5dfbf98 100644 --- a/Software/systemd/TipsAndTricks.mdwn +++ b/Software/systemd/TipsAndTricks.mdwn @@ -6,7 +6,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/userdocs/TIPS_AND_TRICKS.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/TIPS_AND_TRICKS]].** --- diff --git a/Software/systemd/VirtualizedTesting.mdwn b/Software/systemd/VirtualizedTesting.mdwn index 15ae1179..028de221 100644 --- a/Software/systemd/VirtualizedTesting.mdwn +++ b/Software/systemd/VirtualizedTesting.mdwn @@ -8,7 +8,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/devdocs/VIRTUALIZED_TESTING.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/VIRTUALIZED_TESTING]].** --- diff --git a/Software/systemd/catalog.mdwn b/Software/systemd/catalog.mdwn index 138571af..4e38c6e6 100644 --- a/Software/systemd/catalog.mdwn +++ b/Software/systemd/catalog.mdwn @@ -6,7 +6,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/devdocs/CATALOG.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/CATALOG]].** --- diff --git a/Software/systemd/inhibit.mdwn b/Software/systemd/inhibit.mdwn index 0aab6935..f744b72c 100644 --- a/Software/systemd/inhibit.mdwn +++ b/Software/systemd/inhibit.mdwn @@ -6,7 +6,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/devdocs/INHIBITOR_LOCKS.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/INHIBITOR_LOCKS]].** --- diff --git a/Software/systemd/separate-usr-is-broken.mdwn b/Software/systemd/separate-usr-is-broken.mdwn index f5a5fb6d..35cb7da9 100644 --- a/Software/systemd/separate-usr-is-broken.mdwn +++ b/Software/systemd/separate-usr-is-broken.mdwn @@ -8,7 +8,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/userdocs/SEPARATE_USR_IS_BROKEN.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/SEPARATE_USR_IS_BROKEN]].** --- diff --git a/Software/systemd/syslog.mdwn b/Software/systemd/syslog.mdwn index 929ca708..262ca7db 100644 --- a/Software/systemd/syslog.mdwn +++ b/Software/systemd/syslog.mdwn @@ -7,7 +7,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/devdocs/SYSLOG.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/SYSLOG]].** --- diff --git a/Software/systemd/systemd-boot.mdwn b/Software/systemd/systemd-boot.mdwn index ffc7a740..4569795f 100644 --- a/Software/systemd/systemd-boot.mdwn +++ b/Software/systemd/systemd-boot.mdwn @@ -4,7 +4,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/devdocs/BOOT.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/BOOT]].** --- diff --git a/Software/systemd/writing-desktop-environments.mdwn b/Software/systemd/writing-desktop-environments.mdwn index 5bbbe5b1..9d57c23f 100644 --- a/Software/systemd/writing-desktop-environments.mdwn +++ b/Software/systemd/writing-desktop-environments.mdwn @@ -7,7 +7,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/devdocs/WRITING_DESKTOP_ENVIRONMENTS.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/WRITING_DESKTOP_ENVIRONMENTS]].** --- diff --git a/Software/systemd/writing-display-managers.mdwn b/Software/systemd/writing-display-managers.mdwn index b2bd2d32..a8ce837d 100644 --- a/Software/systemd/writing-display-managers.mdwn +++ b/Software/systemd/writing-display-managers.mdwn @@ -7,7 +7,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/devdocs/WRITING_DISPLAY_MANAGERS.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/WRITING_DISPLAY_MANAGERS]].** --- diff --git a/Software/systemd/writing-network-configuration-managers.mdwn b/Software/systemd/writing-network-configuration-managers.mdwn index dd1986cd..50789a39 100644 --- a/Software/systemd/writing-network-configuration-managers.mdwn +++ b/Software/systemd/writing-network-configuration-managers.mdwn @@ -7,7 +7,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/devdocs/WRITING_NETWORK_CONFIGURATION_MANAGERS.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/WRITING_NETWORK_CONFIGURATION_MANAGERS]].** --- diff --git a/Software/systemd/writing-resolver-clients.mdwn b/Software/systemd/writing-resolver-clients.mdwn index 81a0e8ec..53a67627 100644 --- a/Software/systemd/writing-resolver-clients.mdwn +++ b/Software/systemd/writing-resolver-clients.mdwn @@ -7,7 +7,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/devdocs/WRITING_RESOLVER_CLIENTS.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/WRITING_RESOLVER_CLIENTS]].** --- diff --git a/Software/systemd/writing-vm-managers.mdwn b/Software/systemd/writing-vm-managers.mdwn index 51361625..1e838f6e 100644 --- a/Software/systemd/writing-vm-managers.mdwn +++ b/Software/systemd/writing-vm-managers.mdwn @@ -7,7 +7,7 @@ --- -**This page has been obsoleted and replaced: [[https://systemd.io/devdocs/WRITING_VM_AND_CONTAINER_MANAGERS.html]].** +**This page has been obsoleted and replaced: [[https://systemd.io/WRITING_VM_AND_CONTAINER_MANAGERS]].** --- |