From 70c88f2ba22ba57b751a850566d4874cc96c519a Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Thu, 21 Mar 2024 13:51:08 +0300 Subject: [PATCH] Pull request 2181: imp-docs Squashed commit of the following: commit 1f7be03896a6eaf0a292e4c7e9a7ef7c712ed734 Author: Ainar Garipov Date: Thu Mar 21 13:35:37 2024 +0300 all: use standard md style in some docs --- CONTRIBUTING.md | 80 +++++++++++++++---------------------------------- HACKING.md | 53 ++++++++++++++------------------ SECURITY.md | 19 +++++------- 3 files changed, 53 insertions(+), 99 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ffcda28393e..29f28f78df9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,89 +1,57 @@ - # Contributing to AdGuard Home +# Contributing to AdGuard Home -If you want to contribute to AdGuard Home by filing or commenting on an issue or -opening a pull request, please follow the instructions below. +If you want to contribute to AdGuard Home by filing or commenting on an issue or opening a pull request, please follow the instructions below. +## General recommendations +Please don’t: -## General recommendations +- post comments like “+1” or “this”. Use the :+1: reaction on the issue instead, as this allows us to actually see the level of support for issues. -Please don't: +- file issues about localization errors or send localization updates as PRs. We’re using [CrowdIn] to manage our translations and we generally update them before each Beta and Release build. You can learn more about translating AdGuard products [in our Knowledge Base][kb-trans]. - * post comments like “+1” or “this”. Use the :+1: reaction on the issue - instead, as this allows us to actually see the level of support for issues. +- file issues about a particular filtering-rule list misbehaving. These are tracked through the [separate form for filtering issues][form]. - * file issues about localization errors or send localization updates as PRs. - We're using [CrowdIn] to manage our translations and we generally update - them before each Beta and Release build. You can learn more about - translating AdGuard products [in our Knowledge Base][kb-trans]. - - * file issues about a particular filtering-rule list misbehaving. These are - tracked through the [separate form for filtering issues][form]. - - * send updates to filtering-rule lists, such as the ones for the Blocked - Services feature or the list of approved filtering-rule lists. We update - them once before each Beta and Release build. +- send or request updates to filtering-rule lists, such as the ones for the Blocked Services feature or the list of approved filtering-rule lists. We update them from the [separate repository][hostlist] once before each Beta and Release build. Please do: - * follow the template instructions and provide data for reproducing issues. +- follow the template instructions and provide data for reproducing issues. - * write the title of your issue or pull request in English. Any language is - fine in the body, but it is important to keep the title in English to make - it easier for people and bots to look up duplicated issues. +- write the title of your issue or pull request in English. Any language is fine in the body, but it is important to keep the title in English to make it easier for people and bots to look up duplicated issues. [CrowdIn]: https://crowdin.com/project/adguard-applications/en#/adguard-home [form]: https://link.adtidy.org/forward.html?action=report&app=home&from=github +[hostlist]: https://github.com/AdguardTeam/HostlistsRegistry [kb-trans]: https://kb.adguard.com/en/general/adguard-translations +## Issues +### Search first -## Issues - - ### Search first - -Please make sure that the issue is not a duplicate or a question. If it's a -duplicate, please react to the original issue with a thumbs up. If it's a -question, please look through our [Wiki] and, if you haven't found the answer, -post it to the GitHub [Discussions] page. +Please make sure that the issue is not a duplicate or a question. If it’s a duplicate, please react to the original issue with a thumbs up. If it’s a question, please look through our [Wiki] and, if you haven’t found the answer, post it to the GitHub [Discussions] page. [Discussions]: https://github.com/AdguardTeam/AdGuardHome/discussions/categories/q-a [Wiki]: https://github.com/AdguardTeam/AdGuardHome/wiki +### Follow the issue template +Developers need to be able to reproduce the faulty behavior in order to fix an issue, so please make sure that you follow the instructions in the issue template carefully. - ### Follow the issue template - -Developers need to be able to reproduce the faulty behavior in order to fix an -issue, so please make sure that you follow the instructions in the issue -template carefully. - +## Pull requests +### Discuss your changes first -## Pull requests +Please discuss your changes by opening an issue. The maintainers should evaluate your proposal, and it’s generally better if that’s done before any code is written. - ### Discuss your changes first +### Review your changes for style -Please discuss your changes by opening an issue. The maintainers should -evaluate your proposal, and it's generally better if that's done before any code -is written. - - - - ### Review your changes for style - -We have a set of [code guidelines][hacking] that we expect the code to follow. -Please make sure you follow it. +We have a set of [code guidelines][hacking] that we expect the code to follow. Please make sure you follow it. [hacking]: https://github.com/AdguardTeam/CodeGuidelines/blob/master/Go/Go.md +### Test your changes +Make sure that it passes linters and tests by running the corresponding Make targets. For backend changes, it’s `make go-check`. For frontend, run `make js-lint`. - ### Test your changes - -Make sure that it passes linters and tests by running the corresponding Make -targets. For backend changes, it's `make go-check`. For frontend, run -`make js-lint`. - -Additionally, a manual test is often required. While we're constantly working -on improving our test suites, they're still not as good as we'd like them to be. +Additionally, a manual test is often required. While we’re constantly working on improving our test suites, they’re still not as good as we’d like them to be. diff --git a/HACKING.md b/HACKING.md index c5e3ca8abce..0436e661679 100644 --- a/HACKING.md +++ b/HACKING.md @@ -1,65 +1,56 @@ - # AdGuard Home Developer Guidelines +# AdGuard Home developer guidelines -This document was moved to the [AdGuard Code Guidelines repository][repo]. All -sections with IDs now only have links to the corresponding files and sections in -that repository. +This document was moved to the [AdGuard Code Guidelines repository][repo]. All sections with IDs now only have links to the corresponding files and sections in that repository. -## Git +## Git This section was moved to [its own document][git]. -## Go +## Go This section was moved to [its own document][go]. - ### Code +### Code -This subsection was moved to the [corresponding section][code] of the Go -guidelines document. +This subsection was moved to the [corresponding section][code] of the Go guidelines document. - ### Commenting +### Commenting -This subsection was moved to the [corresponding section][cmnt] of the Go -guidelines document. +This subsection was moved to the [corresponding section][cmnt] of the Go guidelines document. - ### Formatting +### Formatting -This subsection was moved to the [corresponding section][fmt] of the Go -guidelines document. +This subsection was moved to the [corresponding section][fmt] of the Go guidelines document. - ### Naming +### Naming -This subsection was moved to the [corresponding section][name] of the Go -guidelines document. +This subsection was moved to the [corresponding section][name] of the Go guidelines document. - ### Testing +### Testing -This subsection was moved to the [corresponding section][test] of the Go -guidelines document. +This subsection was moved to the [corresponding section][test] of the Go guidelines document. - ### Recommended Reading +### Recommended Reading -This subsection was moved to the [corresponding section][read] of the Go -guidelines document. +This subsection was moved to the [corresponding section][read] of the Go guidelines document. -## Markdown +## Markdown This section was moved to [its own document][md]. -## Shell Scripting +## Shell Scripting This section was moved to [its own document][sh]. - ### Shell Conditionals +### Shell Conditionals -This subsection was moved to the [corresponding section][cond] of the Shell -guidelines document. +This subsection was moved to the [corresponding section][cond] of the Shell guidelines document. -## Text, Including Comments +## Text, Including Comments This section was moved to [its own document][txt]. -## YAML +## YAML This section was moved to [its own document][yaml]. diff --git a/SECURITY.md b/SECURITY.md index 2fa3a67b2f4..a9985fd471c 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,18 +1,13 @@ - # Security Policy +# Security Policy -## Reporting a Vulnerability +## Reporting vulnerabilities -Please send your vulnerability reports to . To make sure -that your report reaches us, please: +Please send your vulnerability reports to . To make sure that your report reaches us, please: -1. Include the words “AdGuard Home” and “vulnerability” to the subject line as - well as a short description of the vulnerability. For example: +1. Include the words “AdGuard Home” and “vulnerability” to the subject line as well as a short description of the vulnerability. For example: - > AdGuard Home API vulnerability: possible XSS attack + > AdGuard Home API vulnerability: possible XSS attack -2. Make sure that the message body contains a clear description of the - vulnerability. +2. Make sure that the message body contains a clear description of the vulnerability. -If you have not received a reply to your email within 7 days, please make sure -to follow up with us again at . Once again, make sure -that the word “vulnerability” is in the subject line. +If you have not received a reply to your email within 7 days, please make sure to follow up with us again at . Once again, make sure that the word “vulnerability” is in the subject line.