diff --git a/assets/images/help/marketplace/marketplace-add-payment-method-org.png b/assets/images/help/marketplace/marketplace-add-payment-method-org.png deleted file mode 100644 index 4a1339ebaf..0000000000 Binary files a/assets/images/help/marketplace/marketplace-add-payment-method-org.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-add-payment-method-personal.png b/assets/images/help/marketplace/marketplace-add-payment-method-personal.png deleted file mode 100644 index 5755d5b008..0000000000 Binary files a/assets/images/help/marketplace/marketplace-add-payment-method-personal.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-buy-with-github-button.png b/assets/images/help/marketplace/marketplace-buy-with-github-button.png deleted file mode 100644 index d2f38ac7bf..0000000000 Binary files a/assets/images/help/marketplace/marketplace-buy-with-github-button.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-choose-new-plan.png b/assets/images/help/marketplace/marketplace-choose-new-plan.png deleted file mode 100644 index 02c87f10d1..0000000000 Binary files a/assets/images/help/marketplace/marketplace-choose-new-plan.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-choose-plan.png b/assets/images/help/marketplace/marketplace-choose-plan.png deleted file mode 100644 index bf11cac236..0000000000 Binary files a/assets/images/help/marketplace/marketplace-choose-plan.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-choose-repo-install-option.png b/assets/images/help/marketplace/marketplace-choose-repo-install-option.png deleted file mode 100644 index dbadc41aa0..0000000000 Binary files a/assets/images/help/marketplace/marketplace-choose-repo-install-option.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-complete-order-begin-installation-button.png b/assets/images/help/marketplace/marketplace-complete-order-begin-installation-button.png deleted file mode 100644 index a76b07ff70..0000000000 Binary files a/assets/images/help/marketplace/marketplace-complete-order-begin-installation-button.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-confirm-org-no-org-details.png b/assets/images/help/marketplace/marketplace-confirm-org-no-org-details.png new file mode 100644 index 0000000000..bba3d27346 Binary files /dev/null and b/assets/images/help/marketplace/marketplace-confirm-org-no-org-details.png differ diff --git a/assets/images/help/marketplace/marketplace-confirm-org.png b/assets/images/help/marketplace/marketplace-confirm-org.png index 3dec038701..e7baa9651a 100644 Binary files a/assets/images/help/marketplace/marketplace-confirm-org.png and b/assets/images/help/marketplace/marketplace-confirm-org.png differ diff --git a/assets/images/help/marketplace/marketplace-confirm-personal-account.png b/assets/images/help/marketplace/marketplace-confirm-personal-account.png deleted file mode 100644 index ed85582f6c..0000000000 Binary files a/assets/images/help/marketplace/marketplace-confirm-personal-account.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-edit-app-billing-settings.png b/assets/images/help/marketplace/marketplace-edit-app-billing-settings.png deleted file mode 100644 index 57ede84aa3..0000000000 Binary files a/assets/images/help/marketplace/marketplace-edit-app-billing-settings.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-edit-payment-method-org.png b/assets/images/help/marketplace/marketplace-edit-payment-method-org.png deleted file mode 100644 index 0cc69c6fe4..0000000000 Binary files a/assets/images/help/marketplace/marketplace-edit-payment-method-org.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-edit-payment-method-personal.png b/assets/images/help/marketplace/marketplace-edit-payment-method-personal.png deleted file mode 100644 index b9a214eaea..0000000000 Binary files a/assets/images/help/marketplace/marketplace-edit-payment-method-personal.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-issue-plan-changes.png b/assets/images/help/marketplace/marketplace-issue-plan-changes.png deleted file mode 100644 index c50266bb22..0000000000 Binary files a/assets/images/help/marketplace/marketplace-issue-plan-changes.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-link-global-navigation.png b/assets/images/help/marketplace/marketplace-link-global-navigation.png index d43bf6553b..f19634901f 100644 Binary files a/assets/images/help/marketplace/marketplace-link-global-navigation.png and b/assets/images/help/marketplace/marketplace-link-global-navigation.png differ diff --git a/assets/images/help/marketplace/marketplace-new-quantity.png b/assets/images/help/marketplace/marketplace-new-quantity.png deleted file mode 100644 index c6b3f84738..0000000000 Binary files a/assets/images/help/marketplace/marketplace-new-quantity.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-report-app.png b/assets/images/help/marketplace/marketplace-report-app.png index 25b6c9b0f5..fe5fdb1871 100644 Binary files a/assets/images/help/marketplace/marketplace-report-app.png and b/assets/images/help/marketplace/marketplace-report-app.png differ diff --git a/assets/images/help/marketplace/marketplace-select-repo-field.png b/assets/images/help/marketplace/marketplace-select-repo-field.png deleted file mode 100644 index 2d984d8cda..0000000000 Binary files a/assets/images/help/marketplace/marketplace-select-repo-field.png and /dev/null differ diff --git a/content/apps/using-github-apps/installing-an-app-in-your-organization.md b/content/apps/using-github-apps/installing-an-app-in-your-organization.md index db81c287b1..ef515c51bd 100644 --- a/content/apps/using-github-apps/installing-an-app-in-your-organization.md +++ b/content/apps/using-github-apps/installing-an-app-in-your-organization.md @@ -28,8 +28,7 @@ If you choose a paid plan, you'll pay for your app subscription on your organiza {% data reusables.marketplace.confirm-install-account-org %} {% data reusables.marketplace.add-payment-method-org %} {% data reusables.marketplace.complete-order-begin-installation %} -8. If the app requires access to repositories, decide whether to give the app access to all of your repositories or to certain repositories, then select **All repositories** or **Only select repositories**. - ![Radio buttons with options to install an app on all of your repositories or certain repositories](/assets/images/help/marketplace/marketplace-choose-repo-install-option.png) +1. If the app requires access to repositories, select **All repositories** or **Only select repositories**. {% data reusables.marketplace.select-installation-repos %} {% data reusables.marketplace.review-app-perms-install %} diff --git a/content/apps/using-github-apps/installing-an-app-in-your-personal-account.md b/content/apps/using-github-apps/installing-an-app-in-your-personal-account.md index ab66c84e76..2b71440fdc 100644 --- a/content/apps/using-github-apps/installing-an-app-in-your-personal-account.md +++ b/content/apps/using-github-apps/installing-an-app-in-your-personal-account.md @@ -27,7 +27,6 @@ If you choose a paid plan, you'll pay for your app subscription on your personal {% data reusables.marketplace.add-payment-method-personal %} {% data reusables.marketplace.complete-order-begin-installation %} 8. Decide whether to give the app access to all of your repositories, or to certain repositories, then select **All repositories** or **Only select repositories**. - ![Radio buttons with options to install an app on all of your repositories or certain repositories](/assets/images/help/marketplace/marketplace-choose-repo-install-option.png) {% data reusables.marketplace.select-installation-repos %} {% data reusables.marketplace.review-app-perms-install %} diff --git a/content/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam.md b/content/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam.md index 447a2066d6..2f6df72cae 100644 --- a/content/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam.md +++ b/content/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam.md @@ -32,32 +32,33 @@ Users in India can contact GitHub's Grievance Officer for India [here](https://s ## Reporting an issue or pull request 1. Navigate to the issue or pull request you'd like to report. -2. In the upper-right corner of the issue or pull request, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab octicon" %}, then click **Report content**. +1. In the upper-right corner of the issue or pull request, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab octicon" %}, then click **Report content**. ![Button to report a comment](/assets/images/help/repository/menu-report-issue-or-pr.png) {% data reusables.community.report-content %} ## Reporting a comment 1. Navigate to the comment you'd like to report. -2. In the upper-right corner of the comment, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab octicon" %}, then click **Report content**. +1. In the upper-right corner of the comment, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab octicon" %}, then click **Report content**. ![Kebab menu with option to report a comment](/assets/images/help/repository/menu-report-comment.png) {% data reusables.community.report-content %} ## Reporting an app in {% data variables.product.prodname_marketplace %} {% data reusables.marketplace.visit-marketplace %} -2. Browse to the app you'd like to report. -3. In the left sidebar, under the "Developer links" section, click {% octicon "report" aria-label="The report symbol" %} **Report abuse**. - ![Button to report an app in {% data variables.product.prodname_marketplace %}](/assets/images/help/marketplace/marketplace-report-app.png) -4. Complete the contact form to tell {% data variables.contact.contact_support %} about the app's behavior, then click **Send request**. +1. Browse to the app you'd like to report. +1. In the left sidebar, under the "Developer links" section, click **Report abuse**. + + ![Screenshot of the sidebar of a {% data variables.product.prodname_marketplace %} app. A link, labeled "Report abuse", is outlined in dark orange.](/assets/images/help/marketplace/marketplace-report-app.png) +1. Complete the contact form to tell {% data variables.contact.contact_support %} about the app's behavior, then click **Send request**. ## Reporting contact link abuse in the template chooser 1. Navigate to the repository that contains the contact link you'd like to report. -2. Under the repository name, click {% octicon "issue-opened" aria-label="The issues icon" %} **Issues**. -3. In the lower-right corner of the template chooser, click **Report abuse**. +1. Under the repository name, click {% octicon "issue-opened" aria-label="The issues icon" %} **Issues**. +1. In the lower-right corner of the template chooser, click **Report abuse**. ![Link to report an abuse](/assets/images/help/repository/template-chooser-report-abuse.png) -4. Complete the contact form to tell {% data variables.contact.contact_support %} about the contact link's behavior, then click **Send request**. +1. Complete the contact form to tell {% data variables.contact.contact_support %} about the contact link's behavior, then click **Send request**. ## Further reading diff --git a/data/reusables/marketplace/add-payment-method-org.md b/data/reusables/marketplace/add-payment-method-org.md index 2333ce3f96..c17e60e543 100644 --- a/data/reusables/marketplace/add-payment-method-org.md +++ b/data/reusables/marketplace/add-payment-method-org.md @@ -1,5 +1,3 @@ 1. If you chose a paid plan, review your payment method. - - To change the existing payment method on file for the organization, click **Edit...**, then complete the form to add a new payment method. After you successfully add a new payment method, you will automatically return to the order page. - ![Link to add a payment method to your organization](/assets/images/help/marketplace/marketplace-edit-payment-method-org.png) + - To change the existing payment method on file for the organization, click **Edit**, then complete the form to add a new payment method. - If there isn't a payment method on file for the organization, click **Add a Payment Method**, then complete the form to add a credit card or PayPal account. - ![Link to add a payment method to your organization](/assets/images/help/marketplace/marketplace-add-payment-method-org.png) diff --git a/data/reusables/marketplace/add-payment-method-personal.md b/data/reusables/marketplace/add-payment-method-personal.md index 06de54b358..981998d4d6 100644 --- a/data/reusables/marketplace/add-payment-method-personal.md +++ b/data/reusables/marketplace/add-payment-method-personal.md @@ -1,5 +1,3 @@ -1. If you chose a paid plan, review your payment method. - - To change the existing payment method on file for your personal account, click **Edit...**, then complete the form to add a new payment method. After you successfully add a new payment method, you will automatically return to the order page. - ![Link to add a payment method to your personal account](/assets/images/help/marketplace/marketplace-edit-payment-method-personal.png) - - If there isn't a payment method on file for your personal account, click **Add a Payment Method**, then complete the form to add a credit card or PayPal account. - ![Link to add a payment method to your personal account](/assets/images/help/marketplace/marketplace-add-payment-method-personal.png) +1. If you chose a paid plan, in the "Payment Method" section, review your payment method. + - To change the existing payment method on file for your personal account, click **Edit**, then complete the form to add a new payment method. + - If there isn't a payment method on file for your personal account, complete the form to add a credit card or PayPal account. diff --git a/data/reusables/marketplace/cancel-app-billing-settings.md b/data/reusables/marketplace/cancel-app-billing-settings.md index 4f3df262f2..0dedde4d94 100644 --- a/data/reusables/marketplace/cancel-app-billing-settings.md +++ b/data/reusables/marketplace/cancel-app-billing-settings.md @@ -1,2 +1 @@ -1. Next to the app you want to cancel, use the **Edit** drop-down and click **Cancel plan**. - ![Cancel link in the Marketplace Purchases section of your personal account's billing settings](/assets/images/help/marketplace/marketplace-edit-app-billing-settings.png) +1. Next to the app you want to cancel, select the **Edit** {% octicon "triangle-down" aria-label="" %} dropdown menu, then click **Cancel plan**. diff --git a/data/reusables/marketplace/choose-new-plan.md b/data/reusables/marketplace/choose-new-plan.md index 6871a7dbe5..2682ad5f41 100644 --- a/data/reusables/marketplace/choose-new-plan.md +++ b/data/reusables/marketplace/choose-new-plan.md @@ -1,2 +1 @@ -1. Under "Edit your plan," use the drop-down menu, and click on a new plan. - ![Drop-down menu listing all of the app's available plans](/assets/images/help/marketplace/marketplace-choose-new-plan.png) +1. Under "Edit your plan," select the dropdown menu, then click a new plan. diff --git a/data/reusables/marketplace/choose-new-quantity.md b/data/reusables/marketplace/choose-new-quantity.md index 8384c6b84f..6905ab9c77 100644 --- a/data/reusables/marketplace/choose-new-quantity.md +++ b/data/reusables/marketplace/choose-new-quantity.md @@ -1,2 +1 @@ 1. If you chose a unit plan, type a new quantity. - ![Field to enter a new quantity for a unit plan](/assets/images/help/marketplace/marketplace-new-quantity.png) diff --git a/data/reusables/marketplace/choose-plan.md b/data/reusables/marketplace/choose-plan.md index f5e02aff10..ae3cc3dbce 100644 --- a/data/reusables/marketplace/choose-plan.md +++ b/data/reusables/marketplace/choose-plan.md @@ -1,2 +1 @@ -1. On the app's page, under "Pricing and setup," click on the pricing plan you'd like to use. - ![List of the app's available pricing plans](/assets/images/help/marketplace/marketplace-choose-plan.png) +1. On the app's page, under "Pricing and setup," click the pricing plan you'd like to use. diff --git a/data/reusables/marketplace/complete-order-begin-installation.md b/data/reusables/marketplace/complete-order-begin-installation.md index a1e78a6a20..80c1aa5f4e 100644 --- a/data/reusables/marketplace/complete-order-begin-installation.md +++ b/data/reusables/marketplace/complete-order-begin-installation.md @@ -1,2 +1 @@ 1. Click **Complete order and begin installation**. - ![Complete order and begin installation button](/assets/images/help/marketplace/marketplace-complete-order-begin-installation-button.png) diff --git a/data/reusables/marketplace/confirm-install-account-org.md b/data/reusables/marketplace/confirm-install-account-org.md index 0b260c8b48..47d93cdda4 100644 --- a/data/reusables/marketplace/confirm-install-account-org.md +++ b/data/reusables/marketplace/confirm-install-account-org.md @@ -1,2 +1,9 @@ -1. Under "Billing information," use the Switch billing account drop-down menu, and choose the organization in which you'd like to install the app. - ![Drop-down menu to switch the billing account, and your chosen organization's name and avatar](/assets/images/help/marketplace/marketplace-confirm-org.png) +1. Choose an installation organization for the app. Depending on your organization's terms of service, this process will be slightly different. + + - If you have given {% data variables.product.prodname_dotcom %} permission to collect name and address information for your organization, in the "Billing information" section, select the **Switch billing account** {% octicon "triangle-down" aria-label="The downwards-facing triangle icon" %} dropdown menu, then click the organization in which you'd like to install the app. + + ![Screenshot of the {% data variables.product.prodname_marketplace %} app purchase screen. A collapsed blue dropdown menu labeled "Switch billing account" is outlined in dark orange.](/assets/images/help/marketplace/marketplace-confirm-org.png) + + - Otherwise, under "Review your order," select the **Account** dropdown menu, then click the organization in which you'd like to install the app. + + ![Screenshot of the {% data variables.product.prodname_marketplace %} app purchase screen. A collapsed gray dropdown menu labeled "Account" is outlined in dark orange.](/assets/images/help/marketplace/marketplace-confirm-org-no-org-details.png) diff --git a/data/reusables/marketplace/confirm-install-account-personal.md b/data/reusables/marketplace/confirm-install-account-personal.md index 3f365dd152..13e82a5eec 100644 --- a/data/reusables/marketplace/confirm-install-account-personal.md +++ b/data/reusables/marketplace/confirm-install-account-personal.md @@ -1,2 +1 @@ -1. Under "Billing information," confirm that you're installing the app for your personal account. - ![Your name, your avatar, the text "Personal account," and a drop-down menu to switch the billing account](/assets/images/help/marketplace/marketplace-confirm-personal-account.png) +1. Under "Review your order," in the **Account** dropdown menu, confirm that you're installing the app for your personal account. diff --git a/data/reusables/marketplace/downgrade-app-billing-settings.md b/data/reusables/marketplace/downgrade-app-billing-settings.md index 7aac24b6c0..88c0e0da3a 100644 --- a/data/reusables/marketplace/downgrade-app-billing-settings.md +++ b/data/reusables/marketplace/downgrade-app-billing-settings.md @@ -1,2 +1 @@ -1. Next to the app you'd like to downgrade, use the **Edit** drop-down and click **Change plan** or **Cancel plan**. - ![Edit link in the Marketplace Purchases section of your personal account's billing settings](/assets/images/help/marketplace/marketplace-edit-app-billing-settings.png) +1. Next to the app you'd like to downgrade, select the **Edit** {% octicon "triangle-down" aria-label="" %} dropdown menu, then click **Change plan** or **Cancel plan**. diff --git a/data/reusables/marketplace/install-buy.md b/data/reusables/marketplace/install-buy.md index 3fb9a930e9..9596c68b11 100644 --- a/data/reusables/marketplace/install-buy.md +++ b/data/reusables/marketplace/install-buy.md @@ -1,2 +1 @@ 1. Click **Install it for free**, **Buy with {% data variables.product.prodname_dotcom %}**, or **Try free for 14 days**. - ![Buy with {% data variables.product.prodname_dotcom %} button](/assets/images/help/marketplace/marketplace-buy-with-github-button.png) diff --git a/data/reusables/marketplace/issue-plan-changes.md b/data/reusables/marketplace/issue-plan-changes.md index 2dfc03b3ac..bca3334f73 100644 --- a/data/reusables/marketplace/issue-plan-changes.md +++ b/data/reusables/marketplace/issue-plan-changes.md @@ -1,2 +1 @@ 1. Review the information about your new plan and billing information, then click **Issue plan changes**. - ![Summary of your old plan, new plan, and billing information, and Issue plan changes button](/assets/images/help/marketplace/marketplace-issue-plan-changes.png) diff --git a/data/reusables/marketplace/select-installation-repos.md b/data/reusables/marketplace/select-installation-repos.md index a0673d48eb..5991f9d286 100644 --- a/data/reusables/marketplace/select-installation-repos.md +++ b/data/reusables/marketplace/select-installation-repos.md @@ -1,2 +1 @@ 1. If you chose to give the app access to limited repositories instead of all of your repositories, type the name of each repository you'd like to give the app access to, then click on the repository name to select it. - ![Field to select repositories you'd like to give to app access to](/assets/images/help/marketplace/marketplace-select-repo-field.png) diff --git a/data/reusables/marketplace/upgrade-app-billing-settings.md b/data/reusables/marketplace/upgrade-app-billing-settings.md index b6f6b04c03..2a9f337d13 100644 --- a/data/reusables/marketplace/upgrade-app-billing-settings.md +++ b/data/reusables/marketplace/upgrade-app-billing-settings.md @@ -1,2 +1 @@ -1. Next to the app you want to upgrade, use the **Edit** drop-down and click **Change plan**. - ![Edit drop-down in the Marketplace Purchases section of your personal account's billing settings](/assets/images/help/marketplace/marketplace-edit-app-billing-settings.png) +1. Next to the app you want to upgrade, select the **Edit** {% octicon "triangle-down" aria-label="" %} dropdown menu, then click **Change plan**. diff --git a/data/reusables/marketplace/visit-marketplace.md b/data/reusables/marketplace/visit-marketplace.md index 01acf2f8ce..43812a650c 100644 --- a/data/reusables/marketplace/visit-marketplace.md +++ b/data/reusables/marketplace/visit-marketplace.md @@ -1,2 +1,3 @@ -1. At the top of any page, click **Marketplace**. - ![Marketplace link in the global navigation menu at the top of every page](/assets/images/help/marketplace/marketplace-link-global-navigation.png) +1. In the navigation bar, at the top of any page, click **Marketplace**. + + ![Screenshot of the {% data variables.product.prodname_dotcom %} navigation bar. A link to {% data variables.product.prodname_marketplace %} is outlined in dark orange.](/assets/images/help/marketplace/marketplace-link-global-navigation.png)