Skip to content

Commit b7e8e72

Browse files
authored
Merge pull request #43054 from github/repo-sync
Repo sync
2 parents 088a567 + a222736 commit b7e8e72

File tree

21 files changed

+725
-252
lines changed

21 files changed

+725
-252
lines changed
Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
---
2+
applyTo: "content/**,data/**,**/*.md"
3+
---
4+
5+
# Concise style guide for docs.github.com
6+
7+
**When to use**: Any content editing, documentation writing, or Markdown file changes. This is a condensed version of the full style guide at `/content/contributing/style-guide-and-content-model/style-guide.md`. Use these rules for routine work. Only consult the full style guide if you encounter a style question not covered here.
8+
9+
For Liquid variable usage, reusables, linking conventions, bullet-list formatting, and parenthetical dashes, see `content.instructions.md` (loaded automatically alongside this file).
10+
11+
## Core principles
12+
13+
1. **Simplicity**: Keep guidelines and content easy to apply. Short paragraphs (1–3 sentences), tables for structured data, bullet lists for sets of items.
14+
2. **User-first**: Style decisions are based on what's best for the reader, not on grammar rules or stylistic preferences.
15+
3. **Clarity first**: Prioritize meaning and readability over rigid grammatical rules.
16+
4. **Use judgment**: When the style guide doesn't cover a case, consider the surrounding content and what the reader needs at that point, then make a decision that fits.
17+
18+
## Voice and tone
19+
20+
* Use clear, simple language approachable for a wide range of readers.
21+
* Use active voice whenever possible. Passive voice is acceptable when emphasizing the object of an action.
22+
* Avoid idioms, slang, and region-specific phrases.
23+
* Avoid ambiguous modal verbs ("may", "might", "should", "could") when an action is required. Use definitive verbs instead.
24+
* Refer to people as "people" or "users", not "customers."
25+
26+
## Headers
27+
28+
* Use sentence casing for all headers.
29+
* Headers must start at H2 (`##`). Do not skip header levels (for example, H2 to H4).
30+
* There must be text content between a header and its first subheader.
31+
* Each header at the same level on a page must be unique.
32+
33+
## Procedural steps
34+
35+
* Always use numbered lists for procedures.
36+
* Each step must include an instruction.
37+
* Give readers all prerequisites before the procedure, not within steps.
38+
39+
## Code blocks
40+
41+
* Keep lines to about 60 characters to avoid horizontal scrolling.
42+
* Specify the language after the opening code fence (for example, ` ```shell `, ` ```yaml `).
43+
* Use ALL CAPS for placeholder values that readers must replace (for example, `YOUR-REPOSITORY`). Explain what to replace placeholders with.
44+
* Do not use command prompts like `$` before commands.
45+
* If showing command output, comment it out so the command can be copied and run without modification.
46+
47+
## Alerts
48+
49+
* Use alerts sparingly—no consecutive alerts, no more than one per section.
50+
* Keep alerts concise (a couple of sentences max).
51+
* Use Markdown syntax: `> [!NOTE]`, `> [!TIP]`, `> [!WARNING]`, `> [!CAUTION]`, `> [!IMPORTANT]`.
52+
53+
## Links
54+
55+
* Use `[AUTOTITLE](/path/to/article)` for all internal links. Never hardcode article titles in link text.
56+
* Introduce links with "For more information, see" or "See" when context is clear.
57+
* Do not use inline links where words within a sentence are hyperlinked without additional context.
58+
* Do not include punctuation inside a hyperlink.
59+
* Do not repeat the same link more than once in the same article.
60+
61+
## Lists
62+
63+
* Use `*` (asterisks) for unordered lists, never `-` (hyphens).
64+
* Capitalize the first letter of each list item.
65+
* Use periods only if the item is a complete sentence.
66+
* Introduce lists with a descriptive sentence, not vague phrases like "the following" in isolation.
67+
68+
## Tables
69+
70+
* Use tables for tabular data (comparisons, options with multiple attributes). Do not use tables for simple lists.
71+
* Every cell must contain a value—use "None" or "Not applicable" for empty cells, not "N/A".
72+
* Left-align text columns. Center-align columns containing only icons.
73+
74+
## Emphasis
75+
76+
* Use **bold** for UI elements that can be interacted with, and for emphasis (sparingly, no more than five contiguous words).
77+
* Do not bold text that already has other formatting (for example, all-caps placeholders).
78+
79+
## Keyboard shortcuts
80+
81+
* Use `<kbd>` tags for each individual key: `<kbd>Ctrl</kbd>+<kbd>C</kbd>`.
82+
* Use `+` between key combinations with no spaces.
83+
* Use full words for Apple modifier keys (`Command`, `Option`, `Control`), not symbols.
84+
* Capitalize letter keys.
85+
86+
## Product names and variables
87+
88+
* Always use Liquid variables for product names—never hardcode them. Check `data/variables/product.yml` and `data/variables/copilot.yml`.
89+
* Product names are always singular (for example, "GitHub Actions helps" not "help").
90+
91+
## Word choice
92+
93+
| Use | Avoid |
94+
|---|---|
95+
| terminal | shell |
96+
| sign in | log in, login |
97+
| sign up | signup |
98+
| email | e-mail |
99+
| press (a key) | hit, tap |
100+
| type (in the UI) | enter (in the UI) |
101+
| enter (in the command line) | type (in the command line) |
102+
| repository | repo |
103+
| administrator | admin |

content/code-security/concepts/vulnerability-reporting-and-management/about-repository-security-advisories.md

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ topics:
2929

3030
With repository security advisories, you can:
3131

32-
1. Create a draft security advisory, and use the draft to privately discuss the impact of the vulnerability on your project. For more information, see [AUTOTITLE](/code-security/security-advisories/working-with-repository-security-advisories/creating-a-repository-security-advisory).
32+
1. Create a draft security advisory, and use the draft to privately discuss the impact of the vulnerability on your project.
3333
1. Privately collaborate to fix the vulnerability in a temporary private fork.
34-
1. Publish the security advisory to alert your community of the vulnerability once a patch is released. For more information, see [AUTOTITLE](/code-security/security-advisories/working-with-repository-security-advisories/publishing-a-repository-security-advisory).
34+
1. Publish the security advisory to alert your community of the vulnerability once a patch is released.
3535

3636
{% data reusables.repositories.security-advisories-republishing %}
3737

@@ -58,8 +58,30 @@ If a security advisory is specifically for npm, we also publish the advisory to
5858
When you create a security advisory for a public repository on {% data variables.product.prodname_dotcom %}, you have the option of providing an existing CVE identification number for the security vulnerability. {% data reusables.repositories.request-security-advisory-cve-id %}
5959

6060
Once you've published the security advisory and {% data variables.product.prodname_dotcom %} has assigned a CVE identification number to the vulnerability, {% data variables.product.prodname_dotcom %} publishes the CVE to the MITRE database.
61-
For more information, see [AUTOTITLE](/code-security/security-advisories/working-with-repository-security-advisories/publishing-a-repository-security-advisory).
6261

63-
## {% data variables.product.prodname_dependabot_alerts %} for published security advisories
62+
## Publication of security advisories
6463

65-
{% data reusables.repositories.github-reviews-security-advisories %}
64+
Publishing a security advisory notifies your community about the vulnerability it addresses, making it easier for them to update package dependencies and research the impact of the vulnerability.
65+
66+
When you publish a draft advisory from a public repository, visibility levels vary as follows:
67+
68+
* **Anyone** can see the current version of the advisory data, as well as any advisory credits that the credited users have accepted.
69+
* **Collaborators** can view the conversation history of the advisory.
70+
71+
The URL of a security advisory does not change after publication.
72+
73+
If you need to update or correct information in a security advisory that you've published, you can edit the security advisory. See [AUTOTITLE](/code-security/security-advisories/working-with-repository-security-advisories/editing-a-repository-security-advisory).
74+
75+
### {% data variables.product.prodname_dependabot_alerts %} for published security advisories
76+
77+
{% data variables.product.prodname_dotcom %} will review each published security advisory, add it to the {% data variables.product.prodname_advisory_database %}, and may use the security advisory to send {% data variables.product.prodname_dependabot_alerts %} to affected repositories. If the security advisory comes from a fork, we'll only send an alert if the fork owns a package, published under a unique name, on a public package registry. This process can take up to 72 hours and {% data variables.product.prodname_dotcom %} may contact you for more information.
78+
79+
### Importance of fix versions
80+
81+
Whenever possible, you should **add a fix version to a security advisory prior to publishing the advisory**. If you don't, the advisory will be published without a fixed version, and {% data variables.product.prodname_dependabot %} will alert your users about the issue, without offering any safe version to update to.
82+
83+
Depending on the vulnerability, you may need to adjust your approach. If a fix version is:
84+
85+
* **Imminently available**, and you are able to, wait to disclose the issue when the fix is ready.
86+
* **In development but not yet available**, mention this in the advisory, and edit the advisory later, after publication.
87+
* **Not planned**, be clear about it in the advisory so that your users don't contact you to ask when a fix will be made. In this case, it is helpful to include steps users can take to mitigate the issue.

0 commit comments

Comments
 (0)