From 08f8bc86e5ad512985646eb2da1f04171bb74383 Mon Sep 17 00:00:00 2001
From: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 17:06:09 +0000
Subject: [PATCH 1/2] chore(python): rename default branch to main

Source-Link: https://github.com/googleapis/synthtool/commit/5c0fa62eea9c33ebe61e582424b659eb264e1ba4
Post-Processor: gcr.io/repo-automation-bots/owlbot-python:latest@sha256:0ffe3bdd6c7159692df5f7744da74e5ef19966288a6bf76023e8e04e0c424d7d
---
 .github/.OwlBot.lock.yaml |  2 +-
 CONTRIBUTING.rst          |  6 +++---
 docs/conf.py              | 10 +++++-----
 renovate.json             |  1 +
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index b75186cf1b..c07f148f0b 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
 docker:
   image: gcr.io/repo-automation-bots/owlbot-python:latest
-  digest: sha256:d6761eec279244e57fe9d21f8343381a01d3632c034811a72f68b83119e58c69
+  digest: sha256:0ffe3bdd6c7159692df5f7744da74e5ef19966288a6bf76023e8e04e0c424d7d
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 4b526d4fb6..8e1f307db0 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -113,9 +113,9 @@ Coding Style
    export GOOGLE_CLOUD_TESTING_BRANCH="main"
 
   By doing this, you are specifying the location of the most up-to-date
-  version of ``python-spanner``. The the suggested remote name ``upstream``
-  should point to the official ``googleapis`` checkout and the
-  the branch should be the main branch on that remote (``main``).
+  version of ``python-spanner``. The
+  remote name ``upstream`` should point to the official ``googleapis``
+  checkout and the branch should be the default branch on that remote (``main``).
 
 - This repository contains configuration for the
   `pre-commit <https://pre-commit.com/>`__ tool, which automates checking
diff --git a/docs/conf.py b/docs/conf.py
index c66f03f7b5..6410a1a2ad 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -76,8 +76,8 @@
 # The encoding of source files.
 # source_encoding = 'utf-8-sig'
 
-# The master toctree document.
-master_doc = "index"
+# The root toctree document.
+root_doc = "index"
 
 # General information about the project.
 project = "google-cloud-spanner"
@@ -280,7 +280,7 @@
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     (
-        master_doc,
+        root_doc,
         "google-cloud-spanner.tex",
         "google-cloud-spanner Documentation",
         author,
@@ -315,7 +315,7 @@
 # (source start file, name, description, authors, manual section).
 man_pages = [
     (
-        master_doc,
+        root_doc,
         "google-cloud-spanner",
         "google-cloud-spanner Documentation",
         [author],
@@ -334,7 +334,7 @@
 #  dir menu entry, description, category)
 texinfo_documents = [
     (
-        master_doc,
+        root_doc,
         "google-cloud-spanner",
         "google-cloud-spanner Documentation",
         author,
diff --git a/renovate.json b/renovate.json
index 9fa8816fe8..c21036d385 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,6 +1,7 @@
 {
   "extends": [
     "config:base",
+    "group:all",
     ":preserveSemverRanges",
     ":disableDependencyDashboard"
   ],

From 2c0bc002da5ed26c5ff488e03e28a30c07548fb1 Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Wed, 1 Sep 2021 19:23:28 +0000
Subject: [PATCH 2/2] chore: remove obsolete replacements in owlbot.py

---
 owlbot.py | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/owlbot.py b/owlbot.py
index c4dc298b11..2e9183922c 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -249,32 +249,3 @@ def place_before(path, text, *before_text, escape=None):
 )
 
 s.shell.run(["nox", "-s", "blacken"], hide_output=False)
-
-# ----------------------------------------------------------------------------
-# Main Branch migration
-# ----------------------------------------------------------------------------
-
-s.replace(
-  "*.rst",
-  "master",
-  "main"
-)
-
-s.replace(
-  "*.rst",
-  "google-cloud-python/blob/main",
-  "google-cloud-python/blob/master"
-)
-
-s.replace(
-  "CONTRIBUTING.rst",
-  "kubernetes/community/blob/main",
-  "kubernetes/community/blob/master"
-)
-
-s.replace(
-  ".kokoro/*",
-  "master",
-  "main"
-)
-