From beaf157e0374111d18ae0baddeb92a4a52ed4b01 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sat, 18 Nov 2017 15:52:20 +0100 Subject: [PATCH] add Code of Conduct --- CODE_OF_CONDUCT.md | 73 ++++++++++++++++++++++++++++++++++++++++++++++ NEWS.md | 8 +++++ README.md | 45 ++++++++++++++++------------ 3 files changed, 107 insertions(+), 19 deletions(-) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..830a6087b --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,73 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of experience, +nationality, personal appearance, race, religion, or sexual identity and +orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +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. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +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. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at contact@mkvtoolnix.download. 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 +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + +[homepage]: https://www.contributor-covenant.org diff --git a/NEWS.md b/NEWS.md index 0e4904b9a..aa4026b32 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,11 @@ +# Version ? + +## Important notes + +* The MKVToolNix project now contains a + [Code of Coduct](https://mkvtoolnix.download/doc/CODE_OF_CONDUCT.md). + + # Version 18.0.0 "Apricity" 2017-11-18 ## New features and enhancements diff --git a/README.md b/README.md index d8ee70a11..44e4c0c3d 100644 --- a/README.md +++ b/README.md @@ -15,15 +15,16 @@ MKVToolNix 18.0.0 6. [Unit tests](#26-unit-tests) 3. [Reporting bugs](#3-reporting-bugs) 4. [Test suite and continuous integration tests](#4-test-suite-and-continuous-integration-tests) -5. [Included libraries and their licenses](#5-included-libraries-and-their-licenses) - 1. [avilib](#51-avilib) - 2. [Boost's utf8_codecvt_facet](#52-boosts-utf8_codecvt_facet) - 3. [libEBML](#53-libebml) - 4. [libMatroska](#54-libmatroska) - 5. [librmff](#55-librmff) - 6. [nlohmann's JSON](#56-nlohmanns-json) - 7. [pugixml](#57-pugixml) - 8. [utf8-cpp](#58-utf8-cpp) +5. [Code of Conduct](#5-code-of-conduct) +6. [Included libraries and their licenses](#6-included-libraries-and-their-licenses) + 1. [avilib](#61-avilib) + 2. [Boost's utf8_codecvt_facet](#62-boosts-utf8_codecvt_facet) + 3. [libEBML](#63-libebml) + 4. [libMatroska](#64-libmatroska) + 5. [librmff](#65-librmff) + 6. [nlohmann's JSON](#66-nlohmanns-json) + 7. [pugixml](#67-pugixml) + 8. [utf8-cpp](#68-utf8-cpp) ----------------- @@ -273,11 +274,17 @@ commit made to the git repository. The tests include: * building and running the test file test suite * building with all optional features disabled -# 5. Included third-party components and their licenses +# 5. Code of Conduct + +Please note that this project is released with a +[Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project +you agree to abide by its terms. + +# 6. Included third-party components and their licenses MKVToolNix includes and uses the following libraries & artwork: -## 5.1. avilib +## 6.1. avilib Reading and writing avi files. @@ -287,7 +294,7 @@ of the transcode package. * License: GNU General Public License v2 * URL: http://www.transcoding.org/ -## 5.2. Boost's utf8_codecvt_facet +## 6.2. Boost's utf8_codecvt_facet A class, `utf8_codecvt_facet`, derived from `std::codecvt`, which can be used to convert utf8 data in files into `wchar_t` strings @@ -296,21 +303,21 @@ in the application. * License: Boost Software License - Version 1.0 (see `doc/licenses/Boost-1.0.txt`) * URL: http://www.boost.org -## 5.3. libEBML +## 6.3. libEBML A C++ library to parse EBML files * License: GNU Lesser General Public License v2.1 (see `doc/licenses/LGPL-2.1.txt`) * URL: http://www.matroska.org/ -## 5.4. libMatroska +## 6.4. libMatroska A C++ library to parse Matroska files * License: GNU Lesser General Public License v2.1 (see `doc/licenses/LGPL-2.1.txt`) * URL: http://www.matroska.org/ -## 5.5. librmff +## 6.5. librmff librmff is short for 'RealMedia file format access library'. It aims at providing the programmer an easy way to read and write RealMedia @@ -319,28 +326,28 @@ files. * License: GNU Lesser General Public License v2.1 (see `doc/licenses/LGPL-2.1.txt`) * URL: https://www.bunkus.org/videotools/librmff/index.html -## 5.6. nlohmann's JSON +## 6.6. nlohmann's JSON JSON for Modern C++ * License: MIT (see `doc/licenses/nlohmann-json-MIT.txt`) * URL: https://github.com/nlohmann/json -## 5.7. pugixml +## 6.7. pugixml An XML processing library * License: MIT (see `doc/licenses/pugixml-MIT.txt`) * URL: http://pugixml.org/ -## 5.8. utf8-cpp +## 6.8. utf8-cpp UTF-8 with C++ in a Portable Way * License: custom (see `doc/licenses/utf8-cpp-custom.txt`) * URL: http://utfcpp.sourceforge.net/ -## 5.9. Oxygen icons and sound files +## 6.9. Oxygen icons and sound files Most of the icons included in this package originate from the Oxygen Project. These include all files in the `share/icons` sub-directory