From 5df107ed37755e1beffdfab86b3b72f3be5e6703 Mon Sep 17 00:00:00 2001 From: Edwin Khoo Date: Sun, 4 Jun 2017 20:00:25 -0400 Subject: [PATCH 1/6] Fix typos --- src/options.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/options.json b/src/options.json index d207c82..b0de809 100644 --- a/src/options.json +++ b/src/options.json @@ -1072,7 +1072,7 @@ "no_lead_zero": { "type": "boolean", "default": false, - "description": "If in CSS values leading 0s immediately preceeding a decimal should be removed or prevented. (Supported by Pretty Diff)", + "description": "If in CSS values leading 0s immediately preceding a decimal should be removed or prevented. (Supported by Pretty Diff)", "title": "No lead zero", "beautifiers": [ "Pretty Diff" @@ -1087,7 +1087,7 @@ "title": "comb custom config file", "type": "string", "default": "", - "description": "Path to custom CSScomb config file, used in absense of a `.csscomb.json` or `.csscomb.cson` at the root of your project. (Supported by CSScomb)", + "description": "Path to custom CSScomb config file, used in absence of a `.csscomb.json` or `.csscomb.cson` at the root of your project. (Supported by CSScomb)", "beautifiers": [ "CSScomb" ], @@ -4239,7 +4239,7 @@ "indent_preamble": { "type": "boolean", "default": false, - "description": "Indent the preable (Supported by Latex Beautify)", + "description": "Indent the preamble (Supported by Latex Beautify)", "title": "Indent preamble", "beautifiers": [ "Latex Beautify" @@ -4300,7 +4300,7 @@ "bmatrix", "pmatrix" ], - "decription": "Aligns columns by the alignment tabs for environments specified", + "description": "Aligns columns by the alignment tabs for environments specified", "title": "Align columns in environments", "beautifiers": [ "Latex Beautify" @@ -4490,7 +4490,7 @@ "no_lead_zero": { "type": "boolean", "default": false, - "description": "If in CSS values leading 0s immediately preceeding a decimal should be removed or prevented. (Supported by Pretty Diff)", + "description": "If in CSS values leading 0s immediately preceding a decimal should be removed or prevented. (Supported by Pretty Diff)", "title": "No lead zero", "beautifiers": [ "Pretty Diff" @@ -4505,7 +4505,7 @@ "title": "comb custom config file", "type": "string", "default": "", - "description": "Path to custom CSScomb config file, used in absense of a `.csscomb.json` or `.csscomb.cson` at the root of your project. (Supported by CSScomb)", + "description": "Path to custom CSScomb config file, used in absence of a `.csscomb.json` or `.csscomb.cson` at the root of your project. (Supported by CSScomb)", "beautifiers": [ "CSScomb" ], @@ -5439,7 +5439,7 @@ "title": "Don't join curly brackets", "type": "boolean", "default": true, - "descriotion": "", + "description": "", "beautifiers": [ "Nginx Beautify" ], @@ -6707,7 +6707,7 @@ "no_lead_zero": { "type": "boolean", "default": false, - "description": "If in CSS values leading 0s immediately preceeding a decimal should be removed or prevented. (Supported by Pretty Diff)", + "description": "If in CSS values leading 0s immediately preceding a decimal should be removed or prevented. (Supported by Pretty Diff)", "title": "No lead zero", "beautifiers": [ "Pretty Diff" @@ -6722,7 +6722,7 @@ "title": "comb custom config file", "type": "string", "default": "", - "description": "Path to custom CSScomb config file, used in absense of a `.csscomb.json` or `.csscomb.cson` at the root of your project. (Supported by CSScomb)", + "description": "Path to custom CSScomb config file, used in absence of a `.csscomb.json` or `.csscomb.cson` at the root of your project. (Supported by CSScomb)", "beautifiers": [ "CSScomb" ], @@ -7323,7 +7323,7 @@ "no_lead_zero": { "type": "boolean", "default": false, - "description": "If in CSS values leading 0s immediately preceeding a decimal should be removed or prevented. (Supported by Pretty Diff)", + "description": "If in CSS values leading 0s immediately preceding a decimal should be removed or prevented. (Supported by Pretty Diff)", "title": "No lead zero", "beautifiers": [ "Pretty Diff" @@ -9123,4 +9123,4 @@ } } } -} \ No newline at end of file +} From 663583b5697d2476fd6a4d823ced7180916d9a67 Mon Sep 17 00:00:00 2001 From: Edwin Khoo Date: Mon, 5 Jun 2017 00:42:33 -0400 Subject: [PATCH 2/6] Fix typos in language files --- src/languages/css.coffee | 4 ++-- src/languages/latex.coffee | 4 ++-- src/languages/nginx.coffee | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/languages/css.coffee b/src/languages/css.coffee index dada0c7..40fd1a7 100644 --- a/src/languages/css.coffee +++ b/src/languages/css.coffee @@ -78,13 +78,13 @@ module.exports = { no_lead_zero: type: 'boolean' default: false - description: "If in CSS values leading 0s immediately preceeding \ + description: "If in CSS values leading 0s immediately preceding \ a decimal should be removed or prevented." configPath: title: "comb custom config file" type: 'string' default: "" - description: "Path to custom CSScomb config file, used in absense of a \ + description: "Path to custom CSScomb config file, used in absence of a \ `.csscomb.json` or `.csscomb.cson` at the root of your project." predefinedConfig: title: "comb predefined config" diff --git a/src/languages/latex.coffee b/src/languages/latex.coffee index 8cf625a..70331bb 100644 --- a/src/languages/latex.coffee +++ b/src/languages/latex.coffee @@ -44,7 +44,7 @@ module.exports = { indent_preamble: type: 'boolean' default: false - description: "Indent the preable" + description: "Indent the preamble" always_look_for_split_braces: type: 'boolean' default: true @@ -60,5 +60,5 @@ module.exports = { align_columns_in_environments: type: 'array' default:["tabular", "matrix", "bmatrix", "pmatrix"] - decription: "Aligns columns by the alignment tabs for environments specified" + description: "Aligns columns by the alignment tabs for environments specified" } diff --git a/src/languages/nginx.coffee b/src/languages/nginx.coffee index 9e5419c..1f116a6 100644 --- a/src/languages/nginx.coffee +++ b/src/languages/nginx.coffee @@ -38,5 +38,5 @@ module.exports = { title: "Don't join curly brackets" type: "boolean" default: true - descriotion: "" + description: "" } From 5bd9d693d3cb312ac0fa89b63af5af5e9bec6533 Mon Sep 17 00:00:00 2001 From: Edwin Khoo Date: Mon, 5 Jun 2017 01:04:15 -0400 Subject: [PATCH 3/6] Regenerate docs --- docs/options.md | 26 +++++++++++++------------- src/options.json | 12 +++++------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/docs/options.md b/docs/options.md index 84d5fba..03a5370 100644 --- a/docs/options.md +++ b/docs/options.md @@ -1718,7 +1718,7 @@ If lists of assignments or properties should be vertically aligned for faster an **Description**: -Path to custom CSScomb config file, used in absense of a `.csscomb.json` or `.csscomb.cson` at the root of your project. (Supported by CSScomb) +Path to custom CSScomb config file, used in absence of a `.csscomb.json` or `.csscomb.cson` at the root of your project. (Supported by CSScomb) **Example `.jsbeautifyrc` Configuration** @@ -1922,7 +1922,7 @@ Add a newline between CSS rules (Supported by JS Beautify, Pretty Diff) **Description**: -If in CSS values leading 0s immediately preceeding a decimal should be removed or prevented. (Supported by Pretty Diff) +If in CSS values leading 0s immediately preceding a decimal should be removed or prevented. (Supported by Pretty Diff) **Example `.jsbeautifyrc` Configuration** @@ -7074,7 +7074,7 @@ Automatically beautify LaTeX files on save **Description**: - (Supported by Latex Beautify) +Aligns columns by the alignment tabs for environments specified (Supported by Latex Beautify) **Example `.jsbeautifyrc` Configuration** @@ -7179,7 +7179,7 @@ Indentation character (Supported by Latex Beautify) **Description**: -Indent the preable (Supported by Latex Beautify) +Indent the preamble (Supported by Latex Beautify) **Example `.jsbeautifyrc` Configuration** @@ -7356,7 +7356,7 @@ If lists of assignments or properties should be vertically aligned for faster an **Description**: -Path to custom CSScomb config file, used in absense of a `.csscomb.json` or `.csscomb.cson` at the root of your project. (Supported by CSScomb) +Path to custom CSScomb config file, used in absence of a `.csscomb.json` or `.csscomb.cson` at the root of your project. (Supported by CSScomb) **Example `.jsbeautifyrc` Configuration** @@ -7536,7 +7536,7 @@ Add a newline between CSS rules (Supported by Pretty Diff) **Description**: -If in CSS values leading 0s immediately preceeding a decimal should be removed or prevented. (Supported by Pretty Diff) +If in CSS values leading 0s immediately preceding a decimal should be removed or prevented. (Supported by Pretty Diff) **Example `.jsbeautifyrc` Configuration** @@ -10957,7 +10957,7 @@ If lists of assignments or properties should be vertically aligned for faster an **Description**: -Path to custom CSScomb config file, used in absense of a `.csscomb.json` or `.csscomb.cson` at the root of your project. (Supported by CSScomb) +Path to custom CSScomb config file, used in absence of a `.csscomb.json` or `.csscomb.cson` at the root of your project. (Supported by CSScomb) **Example `.jsbeautifyrc` Configuration** @@ -11137,7 +11137,7 @@ Add a newline between CSS rules (Supported by Pretty Diff) **Description**: -If in CSS values leading 0s immediately preceeding a decimal should be removed or prevented. (Supported by Pretty Diff) +If in CSS values leading 0s immediately preceding a decimal should be removed or prevented. (Supported by Pretty Diff) **Example `.jsbeautifyrc` Configuration** @@ -12181,7 +12181,7 @@ Add a newline between CSS rules (Supported by Pretty Diff) **Description**: -If in CSS values leading 0s immediately preceeding a decimal should be removed or prevented. (Supported by Pretty Diff) +If in CSS values leading 0s immediately preceding a decimal should be removed or prevented. (Supported by Pretty Diff) **Example `.jsbeautifyrc` Configuration** @@ -15191,7 +15191,7 @@ Supported options for each beautifier. **Description**: -Path to custom CSScomb config file, used in absense of a `.csscomb.json` or `.csscomb.cson` at the root of your project. (Supported by CSScomb) +Path to custom CSScomb config file, used in absence of a `.csscomb.json` or `.csscomb.cson` at the root of your project. (Supported by CSScomb) **Example `.jsbeautifyrc` Configuration** @@ -16742,7 +16742,7 @@ Indentation uses tabs, overrides `Indent Size` and `Indent Char` (Supported by L **Description**: -Indent the preable (Supported by Latex Beautify) +Indent the preamble (Supported by Latex Beautify) **Example `.jsbeautifyrc` Configuration** @@ -16842,7 +16842,7 @@ Remove trailing whitespace (Supported by Latex Beautify) **Description**: - (Supported by Latex Beautify) +Aligns columns by the alignment tabs for environments specified (Supported by Latex Beautify) **Example `.jsbeautifyrc` Configuration** @@ -17973,7 +17973,7 @@ If lists of assignments or properties should be vertically aligned for faster an **Description**: -If in CSS values leading 0s immediately preceeding a decimal should be removed or prevented. (Supported by Pretty Diff) +If in CSS values leading 0s immediately preceding a decimal should be removed or prevented. (Supported by Pretty Diff) **Example `.jsbeautifyrc` Configuration** diff --git a/src/options.json b/src/options.json index b0de809..1b199d8 100644 --- a/src/options.json +++ b/src/options.json @@ -4300,7 +4300,7 @@ "bmatrix", "pmatrix" ], - "description": "Aligns columns by the alignment tabs for environments specified", + "description": "Aligns columns by the alignment tabs for environments specified (Supported by Latex Beautify)", "title": "Align columns in environments", "beautifiers": [ "Latex Beautify" @@ -4309,8 +4309,7 @@ "language": { "name": "LaTeX", "namespace": "latex" - }, - "description": " (Supported by Latex Beautify)" + } }, "disabled": { "title": "Disable Beautifying Language", @@ -5439,7 +5438,7 @@ "title": "Don't join curly brackets", "type": "boolean", "default": true, - "description": "", + "description": " (Supported by Nginx Beautify)", "beautifiers": [ "Nginx Beautify" ], @@ -5447,8 +5446,7 @@ "language": { "name": "Nginx", "namespace": "nginx" - }, - "description": " (Supported by Nginx Beautify)" + } }, "disabled": { "title": "Disable Beautifying Language", @@ -9123,4 +9121,4 @@ } } } -} +} \ No newline at end of file From 340076fa610aa9812f945145535658c7143d1c31 Mon Sep 17 00:00:00 2001 From: Edwin Khoo Date: Mon, 5 Jun 2017 11:37:00 -0400 Subject: [PATCH 4/6] Fix typo in description for Python --- src/languages/python.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/python.coffee b/src/languages/python.coffee index 3331f2e..b8d8f4d 100644 --- a/src/languages/python.coffee +++ b/src/languages/python.coffee @@ -38,7 +38,7 @@ module.exports = { type: 'string' default: 'autopep8' enum: ['autopep8', 'yapf'] - description: "formater used by pybeautifier" + description: "formatter used by pybeautifier" style_config: type: 'string' default: 'pep8' From a4c978fbe3c345e41f4a5440b4c3642b9acea625 Mon Sep 17 00:00:00 2001 From: Edwin Khoo Date: Mon, 5 Jun 2017 11:38:52 -0400 Subject: [PATCH 5/6] Regenerate docs --- docs/options.md | 6 +++--- src/options.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/options.md b/docs/options.md index 03a5370..d677417 100644 --- a/docs/options.md +++ b/docs/options.md @@ -10084,7 +10084,7 @@ Automatically beautify Python files on save **Description**: -formater used by pybeautifier (Supported by autopep8, pybeautifier) +formatter used by pybeautifier (Supported by autopep8, pybeautifier) **Example `.jsbeautifyrc` Configuration** @@ -19737,7 +19737,7 @@ do not fix these errors/warnings (Supported by autopep8, pybeautifier) **Description**: -formater used by pybeautifier (Supported by autopep8, pybeautifier) +formatter used by pybeautifier (Supported by autopep8, pybeautifier) **Example `.jsbeautifyrc` Configuration** @@ -20090,7 +20090,7 @@ do not fix these errors/warnings (Supported by autopep8, pybeautifier) **Description**: -formater used by pybeautifier (Supported by autopep8, pybeautifier) +formatter used by pybeautifier (Supported by autopep8, pybeautifier) **Example `.jsbeautifyrc` Configuration** diff --git a/src/options.json b/src/options.json index 1b199d8..b55a4a2 100644 --- a/src/options.json +++ b/src/options.json @@ -6108,7 +6108,7 @@ "autopep8", "yapf" ], - "description": "formater used by pybeautifier (Supported by autopep8, pybeautifier)", + "description": "formatter used by pybeautifier (Supported by autopep8, pybeautifier)", "title": "Formater", "beautifiers": [ "autopep8", From 88fbdaa2b063ab5ca4cba3c47448b1a70263d76b Mon Sep 17 00:00:00 2001 From: Glavin Wiechert Date: Thu, 15 Jun 2017 17:30:25 -0300 Subject: [PATCH 6/6] Create CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..996e609 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,46 @@ +# 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 glavin.wiechert@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems 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 [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/