From 3447bd60c61706f890fffcc754cd5a546ba41c18 Mon Sep 17 00:00:00 2001
From: Kevin Heis <heiskr@users.noreply.github.com>
Date: Wed, 23 Nov 2022 05:05:25 -0800
Subject: [PATCH 1/2] Change footer column sizes depending on which appear
 (#32759)

Co-authored-by: Peter Bengtsson <peterbe@github.com>
---
 components/page-footer/SupportSection.tsx | 33 +++++++++++++++++------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/components/page-footer/SupportSection.tsx b/components/page-footer/SupportSection.tsx
index c3a6d0e1bd..edd4dab603 100644
--- a/components/page-footer/SupportSection.tsx
+++ b/components/page-footer/SupportSection.tsx
@@ -21,30 +21,47 @@ export const SupportSection = () => {
 
   const showSurvey = !isDeprecated && !isSitePolicyDocs
   const showContribution = !isDeprecated && !isEarlyAccess && isEnglish
+  const showSupport = true
+  const totalCols = Number(showSurvey) + Number(showContribution) + Number(showSupport)
 
   return (
     <section className="container-xl mt-lg-8 mt-6 px-3 px-md-6 no-print mx-auto">
       <div className="container-xl mx-auto py-6 py-lg-6 clearfix border-top border-color-secondary">
         {showSurvey && (
-          <div className="col-12 col-lg-6 col-xl-3 mb-6 mb-xl-0 float-left pr-4">
+          <div
+            className={cx(
+              'float-left pr-4 mb-6 mb-xl-0 col-12',
+              totalCols > 1 && 'col-lg-6',
+              totalCols > 2 && 'col-xl-3'
+            )}
+          >
             <Survey />
           </div>
         )}
         {showContribution && (
           <div
             className={cx(
-              'col-12 col-lg-6 col-xl-4 mb-6 mb-xl-0 float-left pr-4',
-              showSurvey && 'offset-xl-1'
+              'float-left pr-4 mb-6 mb-xl-0 col-12',
+              totalCols > 1 && 'col-lg-6',
+              totalCols > 2 && 'col-xl-4',
+              totalCols > 2 && showSurvey && 'offset-xl-1'
             )}
           >
             <Contribution />
           </div>
         )}
-        <div
-          className={cx('col-12 col-lg-12 col-xl-3 float-left pr-4', showSurvey && 'offset-xl-1')}
-        >
-          <Support />
-        </div>
+        {showSupport && (
+          <div
+            className={cx(
+              'float-left pr-4 mb-6 mb-xl-0 col-12',
+              totalCols > 1 && 'col-lg-6',
+              totalCols > 2 && 'col-xl-3',
+              totalCols > 2 && (showSurvey || showContribution) && 'offset-xl-1'
+            )}
+          >
+            <Support />
+          </div>
+        )}
       </div>
     </section>
   )

From a83787aff0aaecd97536204ab9ce169d36f39018 Mon Sep 17 00:00:00 2001
From: Evan Bonsignori <ebonsignori@github.com>
Date: Wed, 23 Nov 2022 05:06:44 -0800
Subject: [PATCH 2/2] use docs-bot to find existing report issues in link
 checker (#32883)

---
 .github/actions/rendered-content-link-checker.js | 2 +-
 .github/workflows/link-check-daily.yml           | 2 +-
 script/rendered-content-link-checker.js          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/actions/rendered-content-link-checker.js b/.github/actions/rendered-content-link-checker.js
index 49e1f9f21a..215b30e1cd 100755
--- a/.github/actions/rendered-content-link-checker.js
+++ b/.github/actions/rendered-content-link-checker.js
@@ -305,7 +305,7 @@ async function createReportIssue(core, octokit, flaws, opts) {
 async function linkReports(core, octokit, newReport, opts) {
   const {
     reportRepository = 'github/docs-content',
-    reportAuthor = 'docubot',
+    reportAuthor = 'docs-bot',
     reportLabel = 'broken link report',
   } = opts
 
diff --git a/.github/workflows/link-check-daily.yml b/.github/workflows/link-check-daily.yml
index 7a55af00d5..fa60932dfe 100644
--- a/.github/workflows/link-check-daily.yml
+++ b/.github/workflows/link-check-daily.yml
@@ -67,7 +67,7 @@ jobs:
           # ACTIONS_RUNNER_DEBUG = true
           ACTION_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           GITHUB_TOKEN: ${{ secrets.DOCS_BOT_FR }}
-          REPORT_AUTHOR: docubot
+          REPORT_AUTHOR: docs-bot
           REPORT_LABEL: broken link report
           REPORT_REPOSITORY: github/docs-content
           CREATE_REPORT: true
diff --git a/script/rendered-content-link-checker.js b/script/rendered-content-link-checker.js
index 7f76384cb8..49c60e766d 100755
--- a/script/rendered-content-link-checker.js
+++ b/script/rendered-content-link-checker.js
@@ -49,7 +49,7 @@ program
   )
   .option(
     '--report-author <AUTHOR>',
-    'Previous author of report PR for linking. (default: "docubot")'
+    'Previous author of report PR for linking. (default: "docs-bot")'
   )
   .option(
     '--report-label <LABEL>',