From 0217cfcf88e4dbf6869e8189f8f86b5069a3b5c5 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Tue, 20 Dec 2016 16:28:12 +0000 Subject: Revert "Bug 1321592 - Update Bugzilla Etiquette and add Abuse Policy" This reverts commit 50fe01e3ee89cd9395dc21a739b8bc74b5c54272. --- .../template/en/default/account/create.html.tmpl | 113 +++++++--------- .../template/en/default/pages/anti-abuse.html.tmpl | 58 --------- .../template/en/default/pages/etiquette.html.tmpl | 143 +++++++++++++-------- template/en/default/index.html.tmpl | 3 - 4 files changed, 131 insertions(+), 186 deletions(-) delete mode 100644 extensions/BMO/template/en/default/pages/anti-abuse.html.tmpl diff --git a/extensions/BMO/template/en/default/account/create.html.tmpl b/extensions/BMO/template/en/default/account/create.html.tmpl index 42070fe02..3a4dd8a70 100644 --- a/extensions/BMO/template/en/default/account/create.html.tmpl +++ b/extensions/BMO/template/en/default/account/create.html.tmpl @@ -17,12 +17,11 @@ # # Contributor(s): Gervase Markham # Byron Jones - # Emma Humphries #%] [%# INTERFACE # none - # + # # Param("maintainer") is used to display the maintainer's email. # Param("emailsuffix") is used to pre-fill the email field. #%] @@ -41,12 +40,11 @@ @@ -119,69 +110,52 @@ function onSubmit() {

I want to help

-

- Great! There are five things to know and do: -

-
    -
  1. - Please read our - [% terms.bug %]-writing guidelines. -
    2. -
  2. - [% terms.Bugzilla %] is a public place. Your comments and other activities - on [% terms.bugs %] will generally be publicly visible, and your email address will be - accessible through public APIs and will be visible to all logged-in users - of [% terms.Bugzilla %]. Some people use an - alternative email address for this reason. - See Mozilla's Websites, Communications & Cookies Privacy Notice for - more information on our privacy policies. -
    3. -
  3. - When using [% terms.Bugzilla %] to submit patches, comments, code, and any other content, - you agree to our policies on open source licensing and content submission. See Mozilla’s - Websites - and Communications Terms of Use for more information. -
    4. -
  4. - Your understand that your conduct on this site is subject to both [% terms.Bugzilla %] etiquette, - and Mozilla's participation guidelines, - and in turn are governed by our anti-abuse policy. By creating an account, - you agree to abide by them. -
    5. -
  5. - Please give us an email address you want to use. Once we confirm that it works, - you'll be asked to set a password and then you can start filing [% terms.bugs %] and helping fix them. -
    6. -
+

+ Great! There are three things to know and do: +

+
    +
  1. + Please consider reading our + [% terms.bug %]-writing guidelines. +
    2. +
  2. + [% terms.Bugzilla %] is a public place. Your comments and other activities + on [% terms.bugs %] will generally be publicly visible, and your email address will be + accessible through public APIs and will be visible to all logged-in users + of [% terms.Bugzilla %]. Some people use an + alternative email address for this reason. + See Mozilla's Websites, Communications & Cookies Privacy Notice for + more information on our privacy policies. +
    3. +
  3. + When using [% terms.Bugzilla %] to submit patches, comments, code, and any other content, + you agree to our policies on open source licensing and content submission. See Mozilla’s + Websites + and Communications Terms of Use for more information. +
    4. +
  4. + Please give us an email address you want to use. Once we confirm that it works, + you'll be asked to set a password and then you can start filing [% terms.bugs %] and helping fix them. +
    5. +

Create an account

- - - - - -
Email Address: - [% Param('emailsuffix') FILTER html %] -
- - - - - -
- I have read [% terms.Bugzilla %] etiquette - and Mozilla's participation guidelines - and agree to abide by them, and - I acknowledge, and have read the anti-abuse policy. -
-
- - + + + + + + +
Email Address: + [% Param('emailsuffix') FILTER html %] + + +
[% Hook.process('additional_methods') %] @@ -212,3 +186,4 @@ function onSubmit() { [% END %] + diff --git a/extensions/BMO/template/en/default/pages/anti-abuse.html.tmpl b/extensions/BMO/template/en/default/pages/anti-abuse.html.tmpl deleted file mode 100644 index 7d3bcad4b..000000000 --- a/extensions/BMO/template/en/default/pages/anti-abuse.html.tmpl +++ /dev/null @@ -1,58 +0,0 @@ - -[%# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - # - # This Source Code Form is "Incompatible With Secondary Licenses", as - # defined by the Mozilla Public License, v. 2.0. - #%] - -[% PROCESS global/header.html.tmpl - title = "Bugzilla Anti-Abuse Policy" - style = "li { margin: 5px } .heading { font-weight: bold }" %] - -

Anti-Abuse Policy

- -

- It is our intention that [% terms.Bugzilla %] remains a useful tool for reporting - and commenting on [% terms.bugs %], feature-requests and tasks for the Mozilla community. -

- -

- In order to keep [% terms.Bugzilla %] a useful, inclusive place for this work, we have - guidelines - for using this site which, by using this site, you agree to follow. -

- -
    -
  • - If you find a [% terms.Bugzilla %] user violating or guidelines - or Mozilla's participation guidelines - in comments on [% terms.bugs %], please tag the comments - in question so that an administrator can review them. -
    • -
  • - If a comment is abusive or threatening use the tag admin. An admin will - receive a notification shortly and be able to follow up. [% terms.Bugs %] with comments marked 'spam', - and 'advocacy' will also be reviewed. -
    • -
  • - If a [% terms.bug %]'s short-description or whiteboard tags violate our guidelines, - please describe the issue in a comment and tag it admin. -
    • -
  • - If another [% terms.Bugzilla %] user asks you to stop a behavior, stop doing it. - If an administrator asks you to stop engaging in a behavior, do it. Administrators - have the discretion to limit or suspend your account, and take further actions - if necessary if you violate our guidelines. -
    • -
- -

- Questions about this policy should be addressed to - bugzilla-admin@mozilla.org. - If you need to contact a [% terms.Bugzilla %] community administrator immediately, - please contact an administrator in the #bmo channel on irc.mozilla.org. -

- -[% INCLUDE global/footer.html.tmpl %] diff --git a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl index 282c0c2ed..ad913bd9e 100644 --- a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl +++ b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl @@ -18,98 +18,129 @@ # # Contributor(s): Stefan Seifert # Gervase Markham - # Emma Humphries #%] [% PROCESS global/header.html.tmpl title = "Bugzilla Etiquette" style = "li { margin: 5px } .heading { font-weight: bold }" %] -

Bugzilla Etiquette

+

+ There's a number of faux pas you can commit when using + [%+ terms.Bugzilla %]. At the very + least, these will make Mozilla contributors upset at you; if committed enough + times they will cause those contributors to demand the disabling of your + [%+ terms.Bugzilla %] account. So, ignore this advice at your peril. +

- It is our intention that [% terms.Bugzilla %] remains a useful tool for reporting - and commenting on [% terms.bugs %], feature-requests, and tasks for the Mozilla community. - In order to keep [%+ terms.Bugzilla %] a useful, inclusive place for this work, we have - guidelines for using this site which, by using this site, you agree to follow. - In addition, your participation on this site is also subject to - Mozilla's participation guidelines. - Violations of [% terms.Bugzilla %] etiquette or Mozilla's participation guidelines will be considered - as grounds for suspending your privileges on this site, or suspend your account altogether. + + Please also read the Mozilla Community Participation Guidelines

-

Commenting

+

+ That said, Mozilla developers are generally a friendly bunch, and will be + friendly towards you as long as you follow these guidelines. +

-
    -
  1. - No abusing people. - Constant and intense critique is one of the reasons we build great products. - It's harder to fall into group-think if there is always a healthy amount of - dissent. We want to encourage vibrant debate inside of the Mozilla - community, we want you to disagree with us, and we want you to effectively - argue your case. However, we require that in the process, you criticize - things, not people. Examples of things include: interfaces, - algorithms, and schedules. Examples of people include: developers, - designers and users. Attacking or encouraging attacks on a person - may result in you being banned from [% terms.Bugzilla %]. -
    2. +

    1. Commenting

    + +

    + This is the most important section. +

    +
    1. - No obligation. - "Open Source" is not the same as "the developers must do my bidding." - Everyone here wants to help, but no one else has any obligation to fix - the [% terms.bugs %] you want fixed. Therefore, you should not act as if you - expect someone to fix a [% terms.bug %] by a particular date or release. - Aggressive or repeated demands will not be received well and will almost - certainly diminish the impact and interest in your suggestions. + No pointless comments. + Unless you have something constructive and helpful to say, do not add a + comment to a [% terms.bug %]. In [% terms.bugs %] where there is a heated debate going on, you + should be even more + inclined not to add a comment. Unless you have something new to contribute, + then the [% terms.bug %] owner is aware of all the issues, and will make a judgement + as to what to do. If you agree the [% terms.bug %] should be fixed, vote for it. + Additional "I see this too" or "It works for me" comments are unnecessary + unless they are on a different platform or a significantly different build. + Constructive and helpful thoughts unrelated to the topic of the [% terms.bug %] + should go in the appropriate + newsgroup.
    2. - No spam. - Posting comment spam will lead to the supsension of your account. + No obligation. + "Open Source" is not the same as "the developers must do my bidding." + Everyone here wants to help, but no one else has any obligation to fix + the [% terms.bugs %] you want fixed. Therefore, you should not act as if you + expect someone to fix a [% terms.bug %] by a particular date or release. + Aggressive or repeated demands will not be received well and will almost + certainly diminish the impact and interest in your suggestions.
    3. - No pointless comments. - Limit comments on a [% terms.bug %] to information which will help with - resolving it. Unless requested, additional "I see this too" or "It works for me" - comments are unnecessary unless they are on a different platform or a significantly - different build. + No abusing people. + Constant and intense critique is one of the reasons we build great products. + It's harder to fall into group-think if there is always a healthy amount of + dissent. We want to encourage vibrant debate inside of the Mozilla + community, we want you to disagree with us, and we want you to effectively + argue your case. However, we require that in the process, you attack + things, not people. Examples of things include: interfaces, + algorithms, and schedules. Examples of people include: developers, + designers and users. Attacking a person may result in you being banned + from [% terms.Bugzilla %].
    4. - No private email. - Do not send comments to [% terms.bugs %] by private email; no-one else can read - them if you do that, and they'll be missed and/or ignored. If an attachment - is too big for [% terms.Bugzilla %], add a comment giving the file size and contents - and ask what to do. + No private email. + Unless the [% terms.bug %] owner or another respected project contributor has asked you + to email them with specific information, please place all information + relating to [% terms.bugs %] + in the [% terms.bug %] itself. Do not send them by private email; no-one else can read + them if you do that, and they'll probably just get ignored. If a file + is too big for [% terms.Bugzilla %], add a comment giving the file size and contents + and ask what to do.
    -

    Changing Fields

    +

    2. Changing Fields

    1. - No messing with other people's [% terms.bugs %]. - Unless you are the [% terms.bug %] assignee, or have some say over the use of their - time, never change the Priority or Target Milestone fields. If in doubt, - do not change the fields of [% terms.bugs %] you do not own - add a comment - instead, suggesting the change. + No messing with other people's [% terms.bugs %]. + Unless you are the [% terms.bug %] assignee, or have some say over the use of their + time, never change the Priority or Target Milestone fields. If in doubt, + do not change the fields of [% terms.bugs %] you do not own - add a comment + instead, suggesting the change.
    2. - No whining about decisions. - If another project contributor has marked a [% terms.bug %] as INVALID, then it is - invalid. Filing another duplicate of it does not change this. Unless - you have further evidence to support this, do not post a comment arguing that an - INVALID or WONTFIX [% terms.bug %] should be reopened. + No whining about decisions. + If a respected project contributor has marked a [% terms.bug %] as INVALID, then it is + invalid. Someone filing another duplicate of it does not change this. Unless + you have further important evidence, do not post a comment arguing that an + INVALID or WONTFIX [% terms.bug %] should be reopened.
    +

    3. Applicability

    + +
      +
    1. + Some of these rules may not apply to you. If they do not, you will know + exactly which ones do not, and why they do not apply. If you are not + sure, then they definitely all apply to you. +
      2. +
    + +

    + If you see someone not following these rules, the first step is, as an exception + to guideline 1.4, to make them aware of this document by private mail. + Flaming people publically in [% terms.bugs %] violates guidelines 1.1 and 1.3. In the case of + persistent offending you should ping an administrator on Mozilla IRC in channel #bmo and ask them + to look into it. +

    +

    - If you observe, or are the subject of behavior in violation of these guidelines, please tag - the [% terms.bug %] or comment following our anti-abuse policy. + This entire document can be summed up in one sentence: + do unto others as you would have them do unto you.

    diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index c4436b53f..f99287d49 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -85,9 +85,6 @@ function checkQuicksearch( form ) {

  2. [%- terms.Bugzilla %] Etiquette
    3. -
  3. - | Anti-Abuse Policy -
  4. | [%- terms.Bug %] Writing Guidelines
    5. -- cgit v1.2.3-24-g4f1b