Skip to content

Commit

Permalink
remove unnecessary conditionals from content files
Browse files Browse the repository at this point in the history
  • Loading branch information
hectorsector committed May 13, 2022
1 parent 6cbe4d1 commit 08ca047
Show file tree
Hide file tree
Showing 48 changed files with 61 additions and 148 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,7 @@ The contribution activity section includes a detailed timeline of your work, inc

![Contribution activity time filter](/assets/images/help/profile/contributions_activity_time_filter.png)

{% ifversion fpt or ghes or ghae or ghec %}

## Viewing contributions from {% data variables.product.prodname_enterprise %} on {% data variables.product.prodname_dotcom_the_website %}

If you use {% ifversion fpt or ghec %}{% data variables.product.prodname_ghe_server %}{% ifversion ghae %} or {% data variables.product.prodname_ghe_managed %}{% endif %}{% else %}{% data variables.product.product_name %}{% endif %} and your enterprise owner enables {% data variables.product.prodname_unified_contributions %}, you can send enterprise contribution counts from to your {% data variables.product.prodname_dotcom_the_website %} profile. For more information, see "[Sending enterprise contributions to your {% data variables.product.prodname_dotcom_the_website %} profile](/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/sending-enterprise-contributions-to-your-githubcom-profile)."

{% endif %}
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,11 @@ The security log lists all actions performed within the last 90 days.
![Security log tab](/assets/images/help/settings/audit-log-tab.png)
{% endif %}

{% ifversion fpt or ghae or ghes or ghec %}
## Searching your security log

{% data reusables.audit_log.audit-log-search %}

### Search based on the action performed
{% else %}
## Understanding events in your security log
{% endif %}

The events listed in your security log are triggered by your actions. Actions are grouped into the following categories:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ Using the template builder, you can specify a title and description for each tem
With issue forms, you can create templates that have web form fields using the {% data variables.product.prodname_dotcom %} form schema. When a contributor opens an issue using an issue form, the form inputs are converted to a standard markdown issue comment. You can specify different input types and set inputs as required to help contributors open actionable issues in your repository. For more information, see "[Configuring issue templates for your repository](/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository#creating-issue-forms)" and "[Syntax for issue forms](/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-issue-forms)."
{% endif %}

{% ifversion fpt or ghae or ghes or ghec %}
{% data reusables.repositories.issue-template-config %} For more information, see "[Configuring issue templates for your repository](/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository#configuring-the-template-chooser)."
{% endif %}

Issue templates are stored on the repository's default branch, in a hidden `.github/ISSUE_TEMPLATE` directory. If you create a template in another branch, it will not be available for collaborators to use. Issue template filenames are not case sensitive, and need a *.md* extension.{% ifversion fpt or ghec %} Issue templates created with issue forms need a *.yml* extension.{% endif %} {% data reusables.repositories.valid-community-issues %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,8 @@ shortTitle: Configure

{% endif %}

{% ifversion fpt or ghae or ghes or ghec %}

## Creating issue templates

{% endif %}

{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
3. In the "Features" section, under "Issues," click **Set up templates**.
Expand Down Expand Up @@ -71,7 +67,6 @@ Here is the rendered version of the issue form.

{% endif %}

{% ifversion fpt or ghae or ghes or ghec %}
## Configuring the template chooser

{% data reusables.repositories.issue-template-config %}
Expand Down Expand Up @@ -110,7 +105,6 @@ Your configuration file will customize the template chooser when the file is mer
{% data reusables.files.write_commit_message %}
{% data reusables.files.choose_commit_branch %}
{% data reusables.files.propose_new_file %}
{% endif %}

## Further reading

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ While most of your API interaction should occur using your server-to-server inst

* [List deployments](/rest/reference/deployments#list-deployments)
* [Create a deployment](/rest/reference/deployments#create-a-deployment)
* [Get a deployment](/rest/reference/deployments#get-a-deployment){% ifversion fpt or ghes or ghae or ghec %}
* [Delete a deployment](/rest/reference/deployments#delete-a-deployment){% endif %}
* [Get a deployment](/rest/reference/deployments#get-a-deployment)
* [Delete a deployment](/rest/reference/deployments#delete-a-deployment)

#### Events

Expand Down Expand Up @@ -421,14 +421,12 @@ While most of your API interaction should occur using your server-to-server inst
* [Remove pre-receive hook enforcement for an organization](/enterprise/user/rest/reference/enterprise-admin#remove-pre-receive-hook-enforcement-for-an-organization)
{% endif %}

{% ifversion fpt or ghes or ghae or ghec %}
#### Organization Team Projects

* [List team projects](/rest/reference/teams#list-team-projects)
* [Check team permissions for a project](/rest/reference/teams#check-team-permissions-for-a-project)
* [Add or update team project permissions](/rest/reference/teams#add-or-update-team-project-permissions)
* [Remove a project from a team](/rest/reference/teams#remove-a-project-from-a-team)
{% endif %}

#### Organization Team Repositories

Expand Down Expand Up @@ -574,7 +572,7 @@ While most of your API interaction should occur using your server-to-server inst

#### Reactions

{% ifversion fpt or ghes or ghae or ghec %}* [Delete a reaction](/rest/reference/reactions#delete-a-reaction-legacy){% else %}* [Delete a reaction](/rest/reference/reactions#delete-a-reaction){% endif %}
* [Delete a reaction](/rest/reference/reactions#delete-a-reaction-legacy)
* [List reactions for a commit comment](/rest/reference/reactions#list-reactions-for-a-commit-comment)
* [Create reaction for a commit comment](/rest/reference/reactions#create-reaction-for-a-commit-comment)
* [List reactions for an issue](/rest/reference/reactions#list-reactions-for-an-issue)
Expand All @@ -586,13 +584,13 @@ While most of your API interaction should occur using your server-to-server inst
* [List reactions for a team discussion comment](/rest/reference/reactions#list-reactions-for-a-team-discussion-comment)
* [Create reaction for a team discussion comment](/rest/reference/reactions#create-reaction-for-a-team-discussion-comment)
* [List reactions for a team discussion](/rest/reference/reactions#list-reactions-for-a-team-discussion)
* [Create reaction for a team discussion](/rest/reference/reactions#create-reaction-for-a-team-discussion){% ifversion fpt or ghes or ghae or ghec %}
* [Create reaction for a team discussion](/rest/reference/reactions#create-reaction-for-a-team-discussion)
* [Delete a commit comment reaction](/rest/reference/reactions#delete-a-commit-comment-reaction)
* [Delete an issue reaction](/rest/reference/reactions#delete-an-issue-reaction)
* [Delete a reaction to a commit comment](/rest/reference/reactions#delete-an-issue-comment-reaction)
* [Delete a pull request comment reaction](/rest/reference/reactions#delete-a-pull-request-comment-reaction)
* [Delete team discussion reaction](/rest/reference/reactions#delete-team-discussion-reaction)
* [Delete team discussion comment reaction](/rest/reference/reactions#delete-team-discussion-comment-reaction){% endif %}
* [Delete team discussion comment reaction](/rest/reference/reactions#delete-team-discussion-comment-reaction)

#### Repositories

Expand Down Expand Up @@ -706,11 +704,9 @@ While most of your API interaction should occur using your server-to-server inst
* [Get a repository README](/rest/reference/repos#get-a-repository-readme)
* [Get the license for a repository](/rest/reference/licenses#get-the-license-for-a-repository)

{% ifversion fpt or ghes or ghae or ghec %}
#### Repository Event Dispatches

* [Create a repository dispatch event](/rest/reference/repos#create-a-repository-dispatch-event)
{% endif %}

#### Repository Hooks

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -353,8 +353,8 @@ Webhook events are triggered based on the specificity of the domain you register
### Webhook payload object
Key | Type | Description
----|------|-------------{% ifversion fpt or ghes or ghae or ghec %}
`action` |`string` | The action performed. Can be `created`.{% endif %}
----|------|-------------
`action` |`string` | The action performed. Can be `created`.
`deployment` |`object` | The [deployment](/rest/reference/deployments#list-deployments).
{% data reusables.webhooks.repo_desc %}
{% data reusables.webhooks.org_desc %}
Expand All @@ -378,8 +378,8 @@ Key | Type | Description
### Webhook payload object
Key | Type | Description
----|------|-------------{% ifversion fpt or ghes or ghae or ghec %}
`action` |`string` | The action performed. Can be `created`.{% endif %}
----|------|-------------
`action` |`string` | The action performed. Can be `created`.
`deployment_status` |`object` | The [deployment status](/rest/reference/deployments#list-deployment-statuses).
`deployment_status["state"]` |`string` | The new state. Can be `pending`, `success`, `failure`, or `error`.
`deployment_status["target_url"]` |`string` | The optional link added to the status.
Expand Down Expand Up @@ -1152,7 +1152,6 @@ Key | Type | Description
{{ webhookPayloadsForCurrentVersion.release.published }}
{% ifversion fpt or ghes or ghae or ghec %}
## repository_dispatch
This event occurs when a {% data variables.product.prodname_github_app %} sends a `POST` request to the "[Create a repository dispatch event](/rest/reference/repos#create-a-repository-dispatch-event)" endpoint.
Expand All @@ -1164,7 +1163,6 @@ This event occurs when a {% data variables.product.prodname_github_app %} sends
### Webhook payload example
{{ webhookPayloadsForCurrentVersion.repository_dispatch }}
{% endif %}
## repository
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,10 @@ When you `git clone`, `git fetch`, `git pull`, or `git push` to a remote reposit

{% endtip %}

{% ifversion fpt or ghes or ghae or ghec %}

## Cloning with {% data variables.product.prodname_cli %}

You can also install {% data variables.product.prodname_cli %} to use {% data variables.product.product_name %} workflows in your terminal. For more information, see "[About {% data variables.product.prodname_cli %}](/github-cli/github-cli/about-github-cli)."

{% endif %}

{% ifversion not ghae %}
## Cloning with Subversion

Expand Down
3 changes: 0 additions & 3 deletions content/get-started/quickstart/communicating-on-github.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ This example shows the {% data variables.product.prodname_discussions %} welcome
This community maintainer started a discussion to welcome the community, and to ask members to introduce themselves. This post fosters an inviting atmosphere for visitors and contributors. The post also clarifies that the team's happy to help with contributions to the repository.

{% endif %}
{% ifversion fpt or ghes or ghae or ghec %}
### Scenarios for team discussions

- I have a question that's not necessarily related to specific files in the repository.
Expand All @@ -139,8 +138,6 @@ The `octocat` team member posted a team discussion, informing the team of variou
- There is a blog post describing how the teams use {% data variables.product.prodname_actions %} to produce their docs.
- Material about the April All Hands is now available for all team members to view.

{% endif %}

## Next steps

These examples showed you how to decide which is the best tool for your conversations on {% data variables.product.product_name %}. But this is only the beginning; there is so much more you can do to tailor these tools to your needs.
Expand Down
15 changes: 3 additions & 12 deletions content/get-started/using-github/keyboard-shortcuts.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ The {% data variables.product.prodname_command_palette %} also gives you quick a
| Keyboard shortcut | Description
|-----------|------------
|<kbd>S</kbd> or <kbd>/</kbd> | Focus the search bar. For more information, see "[About searching on {% data variables.product.company_short %}](/search-github/getting-started-with-searching-on-github/about-searching-on-github)."
|<kbd>G</kbd> <kbd>N</kbd> | Go to your notifications. For more information, see {% ifversion fpt or ghes or ghae or ghec %}"[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[About notifications](/github/receiving-notifications-about-activity-on-github/about-notifications){% endif %}."
|<kbd>G</kbd> <kbd>N</kbd> | Go to your notifications. For more information, see "[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications)."
|<kbd>Esc</kbd> | When focused on a user, issue, or pull request hovercard, closes the hovercard and refocuses on the element the hovercard is in
{% if command-palette %}|<kbd>Command</kbd>+<kbd>K</kbd> (Mac) or </br> <kbd>Ctrl</kbd>+<kbd>K</kbd> (Windows/Linux) | Opens the {% data variables.product.prodname_command_palette %}. If you are editing Markdown text, open the command palette with <kbd>Command</kbd>+<kbd>Option</kbd>+<kbd>K</kbd> or <kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>K</kbd>. For more information, see "[{% data variables.product.prodname_command_palette %}](/get-started/using-github/github-command-palette)."{% endif %}

Expand Down Expand Up @@ -101,7 +101,6 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr
|<kbd>Command</kbd>+<kbd>G</kbd> (Mac) or </br> <kbd>Ctrl</kbd>+<kbd>G</kbd> (Windows/Linux) | Insert a suggestion. For more information, see "[Reviewing proposed changes in a pull request](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request)." |{% endif %}
|<kbd>R</kbd> | Quote the selected text in your reply. For more information, see "[Basic writing and formatting syntax](/articles/basic-writing-and-formatting-syntax#quoting-text)." |


## Issue and pull request lists

| Keyboard shortcut | Description
Expand Down Expand Up @@ -137,8 +136,8 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr
|<kbd>J</kbd> | Move selection down in the list
|<kbd>K</kbd> | Move selection up in the list
|<kbd>Command</kbd>+<kbd>Shift</kbd>+<kbd>Enter</kbd> | Add a single comment on a pull request diff |
|<kbd>Alt</kbd> and click | Toggle between collapsing and expanding all outdated review comments in a pull request by holding down <kbd>Alt</kbd> and clicking **Show outdated** or **Hide outdated**.|{% ifversion fpt or ghes or ghae or ghec %}
|Click, then <kbd>Shift</kbd> and click | Comment on multiple lines of a pull request by clicking a line number, holding <kbd>Shift</kbd>, then clicking another line number. For more information, see "[Commenting on a pull request](/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request#adding-line-comments-to-a-pull-request)."|{% endif %}
|<kbd>Alt</kbd> and click | Toggle between collapsing and expanding all outdated review comments in a pull request by holding down <kbd>Alt</kbd> and clicking **Show outdated** or **Hide outdated**.|
|Click, then <kbd>Shift</kbd> and click | Comment on multiple lines of a pull request by clicking a line number, holding <kbd>Shift</kbd>, then clicking another line number. For more information, see "[Commenting on a pull request](/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request#adding-line-comments-to-a-pull-request)."|

## Project boards

Expand Down Expand Up @@ -195,21 +194,13 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr

## Notifications

{% ifversion fpt or ghes or ghae or ghec %}
| Keyboard shortcut | Description
|-----------|------------
|<kbd>E</kbd> | Mark as done
|<kbd>Shift</kbd>+<kbd>U</kbd>| Mark as unread
|<kbd>Shift</kbd>+<kbd>I</kbd>| Mark as read
|<kbd>Shift</kbd>+<kbd>M</kbd> | Unsubscribe

{% else %}

| Keyboard shortcut | Description
|-----------|------------
|<kbd>E</kbd> or <kbd>I</kbd> or <kbd>Y</kbd> | Mark as read
|<kbd>Shift</kbd>+<kbd>M</kbd> | Mute thread
{% endif %}

## Network graph

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,13 @@ Gist supports mapping GeoJSON files. These maps are displayed in embedded gists,

Follow the steps below to create a gist.

{% ifversion fpt or ghes or ghae or ghec %}
{% note %}

You can also create a gist using the {% data variables.product.prodname_cli %}. For more information, see "[`gh gist create`](https://cli.github.com/manual/gh_gist_create)" in the {% data variables.product.prodname_cli %} documentation.

Alternatively, you can drag and drop a text file from your desktop directly into the editor.

{% endnote %}
{% endif %}

1. Sign in to {% data variables.product.product_name %}.
2. Navigate to your {% data variables.gists.gist_homepage %}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ When you use two or more headings, GitHub automatically generates a table of con

![Screenshot highlighting the table of contents icon](/assets/images/help/repository/headings_toc.png)


## Styling text

You can indicate emphasis with bold, italic, or strikethrough text in comment fields and `.md` files.
Expand Down Expand Up @@ -234,7 +233,7 @@ For more information, see "[About task lists](/articles/about-task-lists)."

## Mentioning people and teams

You can mention a person or [team](/articles/setting-up-teams/) on {% data variables.product.product_name %} by typing <kbd>@</kbd> plus their username or team name. This will trigger a notification and bring their attention to the conversation. People will also receive a notification if you edit a comment to mention their username or team name. For more information about notifications, see {% ifversion fpt or ghes or ghae or ghec %}"[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[About notifications](/github/receiving-notifications-about-activity-on-github/about-notifications){% endif %}."
You can mention a person or [team](/articles/setting-up-teams/) on {% data variables.product.product_name %} by typing <kbd>@</kbd> plus their username or team name. This will trigger a notification and bring their attention to the conversation. People will also receive a notification if you edit a comment to mention their username or team name. For more information about notifications, see "[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications)."

{% note %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ topics:

## Linking a pull request to an issue

To link a pull request to an issue to{% ifversion fpt or ghes or ghae or ghec %} show that a fix is in progress and to{% endif %} automatically close the issue when someone merges the pull request, type one of the following keywords followed by a reference to the issue. For example, `Closes #10` or `Fixes octo-org/octo-repo#100`.
To link a pull request to an issue to show that a fix is in progress and to automatically close the issue when someone merges the pull request, type one of the following keywords followed by a reference to the issue. For example, `Closes #10` or `Fixes octo-org/octo-repo#100`.

* close
* closes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ You can also use the "Filter cards" search bar at the top of each project board
- Filter by check status using `status:pending`, `status:success`, or `status:failure`
- Filter cards by type using `type:issue`, `type:pr`, or `type:note`
- Filter cards by state and type using `is:open`, `is:closed`, or `is:merged`; and `is:issue`, `is:pr`, or `is:note`
- Filter cards by issues that are linked to a pull request by a closing reference using `linked:pr`{% ifversion fpt or ghes or ghae or ghec %}
- Filter cards by repository in an organization-wide project board using `repo:ORGANIZATION/REPOSITORY`{% endif %}
- Filter cards by issues that are linked to a pull request by a closing reference using `linked:pr`
- Filter cards by repository in an organization-wide project board using `repo:ORGANIZATION/REPOSITORY`

1. Navigate to the project board that contains the cards you want to filter.
2. Above the project card columns, click into the "Filter cards" search bar and type a search query to filter the cards.
Expand Down
Loading

0 comments on commit 08ca047

Please sign in to comment.