more

docs/about/handbook/community.md

@@ -2,6 +2,20 @@
 title: Community Basics
 ---
 
+Everything within our community must adhere to our conduct policies. This document deals with some trickier moderation decisions you may be wondering about.
+
+[:material-book: Read our Code of Conduct](../../CODE_OF_CONDUCT.md){ .md-button .md-button--primary }
+
+## Keep a Light Touch
+
+In many situations, our community can be trusted to self-moderate. If you have been granted moderation privileges, you are empowered to make any moderation decisions you deem necessary.
+
+However, it is better in many situations to enter a conversation and "cool down" the discussion taking place, or steer it towards a more constructive topic.
+
+This is better than ending conversations, deleting posts, or locking threads in many situations. People can feel very passionate about some of the issues we discuss in our community, and this can lead to heated discussions, but in the end many such people only want to be a vocal advocate for their position, and can be guided to do so in a constructive manner.
+
+Of course, conversations that devolve into harassment or other violations of our strict code of conduct should be ended immediately and reported.
+
 ## Identifying "Bad Faith" Comments
 
 We should always strive to enter discussions in good faith. Likewise, we expect participants in our communities to engage in good faith as well. When reading comments in our community, comments which meet the following definition of "bad faith" should be removed:

docs/about/handbook/guidelines.md

@@ -6,13 +6,15 @@ We are committed to ensuring that Privacy Guides is and always will be a welcomi
 
 The Privacy Guides Community is first and foremost a place for learning. Volunteers and community members who give advice or join conversations in bad faith, purposefully misinform others, or otherwise engage in poor conduct according to these guidelines run the risk of being permanently removed from our community.
 
+If you notice anyone not following these guidelines, you may have a private and respectful discussion with them about it, or you may notify the project director of the situation. You should not publicly accuse any of your fellow volunteers of misbehavior. This does not mean to keep violations "under wraps," you may always involve the project director or executive committee in any situation, and very serious violations such as a violation of our [harassment](#anti-racism-harassment-and-bullying) policy will be dealt with immediately.
+
 ## Basics
 
 1. Foster constructive discussions: You should **never** use your status as a trusted volunteer team member to shut down discussions or assert "superiority" over other community members in our spaces. Our role is to act as stewards of discussion and knowledge-sharing, not to impose our own ideals or opinions.
 
 2. Do not speak on behalf of Privacy Guides, or present your opinions as the opinions of Privacy Guides. The only opinions of Privacy Guides are those expressed on this website, which have been subject to our [review process](reviews.md) and community consensus. Postings by team members on our forum or other spaces are the opinions of that individual team member, and should always be expressed as such.
 
-3. Do not use your status (GitHub org membership, forum flair, etc.) or resources (email account, etc.) at Privacy Guides to request complimentary goods or services from companies. If you require any software/hardware/materials for a review, please inform the executive committee.
+3. Do not use your status (GitHub org membership, forum flair, etc.) or resources (email account, etc.) at Privacy Guides to request complimentary goods or services from companies. If you require any software/hardware/materials for a review, please [request resources](resources.md) from the executive committee.
 
 4. Always identify yourself as an individual working with Privacy Guides. You could begin an email similarly to: "Hello, my name is [name] and I am a [writer/volunteer/journalist/contributor] with Privacy Guides."
 
@@ -38,23 +40,77 @@ If you witness these behaviors, you are required to notify Jonah Aragon (Project
 
 During the course of their duties, volunteers will likely have access to, deal with, or become aware of confidential information and circumstances surrounding those we work with or serve. This information must be kept strictly confidential. Any breach of confidentiality will result in disciplinary action up to and including the termination of volunteer services.
 
-## Resources for Contributors
+## Conflicts of Interest
 
-Privacy Guides can provide access to various resources on an **as needed** basis. These could include:
+It is likely a conflict of interest when a contribution you are making involves yourself, family, friends, clients, employers, or your financial and other relationships. **Any** external relationship can trigger a conflict of interest.
 
-1. Email accounts/forwarding/aliases
-2. Reimbursement for purchases
-3. SSH access to various machines
-4. Secure VPN tunnels
-5. Much more...
+Having a conflict of interest is a description of a situation, not a judgment about that person's opinions or integrity. Conflict of interest is not the same as bias, and can still exist in the absence of bias. Likewise, there are many situations where one may be biased without a conflict of interest. Contributions which are merely biased by personal beliefs or desires are discouraged, but not subject to this specific conflict of interest policy.
 
-Please [post a request](https://discuss.privacyguides.net/c/meta/team/12) internally for anything you need.
+Making contributions where you have a conflict of interest is highly discouraged. This undermines trust in Privacy Guides, and risks eventually causing embarrassment to yourself and the companies, tools, or individuals being promoted. If you have a conflict of interest, you are not able to judge how much that conflict of interest has influenced your editing.
+
+**Anyone** with a conflict of interest **must** disclose this status whenever you seek to change content which affects that interest, or provide advice to users within our communities.
+
+### Tool Developers
+
+Occasionally the developers or authors of a tool will create a Pull Request to add their own work. This is discouraged, but technically acceptable because they will not be involved with the review process. We treat these submissions as we do [self-submissions](https://discuss.privacyguides.net/t/about-the-project-showcase-category/114) on our forum.
+
+In virtually all cases, the entire Pull Request will be entirely re-written by our writing and review team. This leads to the Pull Request being left open for much longer than our standard proposals, and creates duplicate work for all involved.
+
+We strongly encourage developers to use our forum to highlight their own work instead.
+
+### Website Reviewers
+
+==If you have a conflict of interest, you should not mark Pull Requests related to that interest as *Approved*.==
+
+You may leave comments if needed, but ideally you should have no involvement with the Pull Request at all. If you leave a comment or request changes, you must disclose your conflict of interest as usual. Please respect other reviewers by keeping your comments concise.
+
+### Paid Contributions
+
+Paid work of great concern to the community involves attempting to use Privacy Guides for public relations or marketing purposes.
+
+If you receive or expect to receive any form of compensation for your contributions to Privacy Guides, you must disclose who is paying you and any other relevant affiliations.
+
+People who are paid by Privacy Guides directly for work approved by the executive committee are exempt from this rule.
+
+## Behavior
+
+1. **Mistakes are allowed.** We do not expect perfection from our volunteers and community members, and generally if you have the power to do something you should feel empowered to do it without worrying about consequences or criticism.
+
+    - Mistakes may not be acceptable if: They are purposeful (therefore they aren't mistakes), or they continue to reoccur after one has been warned that similar actions were mistakes.
+    - Mistakes will be met with counsel from the project director or another team member, so that we can learn from them.
+
+2. **Questions are allowed,** and not only that, but they are strongly encouraged and considered productive.
+
+    - If you have a question about *anything at all*, you should always ask the project director, an executive committee member, or another team member for advice. We are all here to help each other.
+    - Asking questions indicates that you're acting in good faith, you're eager to collaborate, and you're concerned with improving Privacy Guides as a whole.
+
+3. **Bias is allowed.** In fact, all contributors *will* have bias, as is usually the case when people volunteer to help something they're passionate about.
+
+    - Bias becomes a problem when you see your own biases as neutral, or when you assume that resistance to approve your contributions is founded in bias to an opposing point of view.
+    - Always allow for the possibility that you are wrong, and never attribute motive to the actions of other contributors.
+    - *Repeatedly pushing* for biased edits is unwelcome and may see you removed from trusted positions or from making contributions in certain topic areas.
+
+## Consensus & Disputes
+
+Our administrative process is geared towards protecting the stability and trust of Privacy Guides. It is not a democracy, and it's not geared towards "justice" or "definitively proving who's in the right." It is designed around the principle that the needs of the many—our team and our overall readership as a whole—outweigh the desires of the one.
+
+Our expectation when it comes to disputes is that they are quickly resolved with a result that's acceptable to the consensus of our team and community, so that we can get back to the work that actually matters.
+
+We've learned valuable lessons over the past 5 years that have shaped this policy. You may be warned for acting disagreeable, nit-picking, finger-pointing, clearly just trying to "win" arguments at all costs, dragging out conflicts, being excessively individualistic, or stubbornly "not getting it."
+
+Every once in a while this behavior has led some contributors to dramatically leave the project in the hopes of attracting "please don't go" messages and support for their high-maintenance demands, and to use their past contributions to establish some reputational capital for whatever new project they're working on. We wish them well, and are okay with seeing these contributors be replaced with new contributors who don't have a constant need for self-promotion and personal validation.
+
+While we expect disputes to resolve collaboratively, if a dispute cannot be resolved quickly, it will be decided by the project director (staff). If the dispute continues further, action will be taken by the executive committee.
+
+Enforcement by the executive committee will virtually never favor *arguments ad nauseum* to defy the general community's consensus, regardless of whether the arguer is "technically correct," because the very act is highly disruptive in and of itself. If you are temperamental and uncollaborative you will likely be asked to leave the team.
+
+If this might be you, walking away from Privacy Guides for a little while is an option that's available to you, and it's probably not a bad one.
 
 ## Other Communities
 
 Generally, we prefer to be "blind" to other privacy communities, rather than endorsing or criticizing others. As a rule of thumb, if a community isn't notable enough to have a Wikipedia page, we should not engage with them.
 
-These rules are **critical** to follow if you are trusted with a forum flair, mod/admin label, or email account.
+These rules are **critical** to follow if you are trusted with a forum flair, mod/admin label, or email account. These statuses intertwine your behavior with the reputation of our project, and should be handled with the utmost respect.
 
 1. Do not share negative personal opinions of other communities, content creators, or companies in our official spaces. Avoid criticism of others in the privacy space in general, unless you are refuting a specific point being made, and are providing evidence to back up your correction. If you see these discussions occurring, gently try to steer the topic towards something more constructive.
 
@@ -66,8 +122,7 @@ These rules are **critical** to follow if you are trusted with a forum flair, mo
 
     - Of course, the work they are sharing must follow our [community guidelines](community.md). If it's something that wouldn't be appropriate to post on our forum on its own, then a link to it isn't acceptable either.
 
-3. **Never** engage with [these entities](https://discuss.privacyguides.org/#).
+3. **Never** engage with [these entities](https://discuss.privacyguides.net/t/blacklisted-communities/19915).
 
     - If you are a staff member, team member, volunteer, moderator, or otherwise are officially associated with these entities in any capacity, you are ineligible to make contributions to Privacy Guides. You may still participate in our communities in good faith.
-
     - Unfortunately, some entities are responsible for inordinate amounts of abuse, harassment, and other negative behavior. Such is life on the internet! To avoid unnecessary drama, this list of blacklisted communities is only viewable by the current volunteer team.

docs/about/handbook/resources.md

@@ -0,0 +1,13 @@
+---
+title: Request Resources
+---
+
+Privacy Guides can provide access to various resources on an **as needed** basis. These could include:
+
+1. Email accounts/forwarding/aliases
+2. Reimbursement for purchases
+3. SSH access to various machines
+4. Secure VPN tunnels
+5. Much more...
+
+Please [post a request](https://discuss.privacyguides.net/c/meta/team/12) internally with justification for anything you need.

docs/about/handbook/reviews.md

@@ -2,7 +2,11 @@
 title: Git Reviews
 ---
 
-All changes to *privacyguides.org* are required to be reviewed and approved by **2** trusted team members.
+Anyone who is interested in helping us out is encouraged to leave reviews on GitHub, even if you are not a trusted reviewer yet. We primarily invite new reviewers based on a history of constructive *Requests for Changes* and appropriate *Approvals*.
+
+[:material-github: How to Review a Pull Request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request){ .md-button .md-button--primary }
+
+All changes to *privacyguides.org* are required to be reviewed and approved by **2** trusted reviewers, which is anyone granted write access to the repository.
 
 ## Basic Principles
 

docs/about/volunteer.md

@@ -0,0 +1,55 @@
+---
+title: Volunteer Positions
+---
+
+Thank you for choosing to help improve Privacy Guides. We are in need of volunteers in many different areas! Positions which ask for an application are handled on a **quarterly** basis, so you are committing to 3 months of volunteer work when you apply.
+
+<div class="grid cards" markdown>
+
+- :material-check-all:{ .lg .middle } **Review Team**
+
+    ---
+
+    One of our most critical tasks is reviewing and approving proposed changes to this website. We are always in need of reviewers/editors, especially those with English experience.
+
+    [:octicons-arrow-right-24: Get Started](handbook/reviews.md)
+
+- :material-pencil-box:{ .lg .middle } **Blog Writer**
+
+    ---
+
+    We are looking for insightful and experienced writers who can share stories, advice, and news about privacy and security on our [blog](https://blog.privacyguides.org).
+
+    Estimated commitment: ~2 hours / week
+
+    [:octicons-arrow-right-24: Apply](#)
+
+- :material-newspaper:{ .lg .middle } **Press Team**
+
+    ---
+
+    We want to build relationships with press organizations, if you have any public relations or press experience, this would be an excellent area to help out in.
+
+    Estimated commitment: ~2 hours / week
+
+    [:octicons-arrow-right-24: Apply](#)
+
+- :material-post:{ .lg .middle } **Social Media Director**
+
+    ---
+
+    We are looking for an excellent communicator experienced in social media strategy and trends to review posts and help develop our social media strategy.
+
+    Estimated commitment: ~4 hours / week
+
+    [:octicons-arrow-right-24: Apply](#)
+
+- :material-help-circle:{ .lg .middle } **Advisory Team**
+
+    ---
+
+    If you are a subject matter expert in a specific field of privacy or technology, you can join our list of contacts we can reach out to when we are in need of expert advice to write an article or post a recommendation.
+
+    [:octicons-arrow-right-24: Join](#)
+
+</div>

mkdocs.yml

@@ -445,11 +445,13 @@ nav:
       - "about/criteria.md"
       - "about/notices.md"
       - "about/privacy-policy.md"
+      - "about/volunteer.md"
       - !ENV [NAV_HANDBOOK, "Handbook"]:
           - "about/handbook/intro.md"
           - "about/handbook/guidelines.md"
           - "about/handbook/community.md"
           - "about/handbook/reviews.md"
+          - "about/handbook/resources.md"
       - !ENV [NAV_COMMUNITY, "Community"]:
           - !ENV [NAV_ONLINE_SERVICES, "Online Services"]: "about/services.md"
           - !ENV [NAV_CODE_OF_CONDUCT, "Code of Conduct"]: "CODE_OF_CONDUCT.md"