Master => main

schneems · schneems · commit cdd313f619fa · 2020-09-03T14:39:57.000-05:00
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ JDBC_DATABASE_URL=jdbc:postgresql://localhost:5432/java_database_name
 
 ```sh
 $ heroku create
-$ git push heroku master
+$ git push heroku main
 $ heroku open
 ```
 
diff --git a/docs/deploying-spring-boot-apps.md b/docs/deploying-spring-boot-apps.md
@@ -9,7 +9,7 @@ end
 ```
 <!--
   rundoc src:
-  https://github.com/heroku/java-getting-started/blob/master/deploying-spring-boot-apps.md
+  https://github.com/heroku/java-getting-started/blob/main/deploying-spring-boot-apps.md
 
   Command:
   $ rundoc build --path deploying-spring-boot-apps.md
@@ -112,7 +112,7 @@ for your app. You can rename it later with the `heroku apps:rename` command.
 Now deploy your code:
 
 ```term
-:::>- $ git push heroku master
+:::>- $ git push heroku main || git push heroku master
 :::-> | (head -6; echo "..."; tail -18)
 ```
 
@@ -220,7 +220,7 @@ public class DatabaseConfig {
 ```
 :::-- $ git add .
 :::-- $ git commit -m "database"
-:::-- $ git push heroku master
+:::-- $ git push heroku main || git push heroku master
 :::-- $ cd ..
 :::-- $ mv demo deploying-spring-boot-apps
 ```
diff --git a/docs/java-getting-started.md b/docs/java-getting-started.md
@@ -9,7 +9,7 @@ end
 ```
 <!--
   rundoc src:
-  https://github.com/heroku/java-getting-started/blob/master/java-getting-started.md
+  https://github.com/heroku/java-getting-started/blob/main/java-getting-started.md
 
   Command:
   $ rundoc build --path java-getting-started.md
@@ -112,7 +112,7 @@ To create a local copy of a sample app that you can deploy to Heroku, execute th
 :::>- $ git clone https://github.com/heroku/java-getting-started
 :::>- $ cd java-getting-started
 :::-- $ git fetch
-:::-- $ git merge origin/master
+:::-- $ git merge origin/main
 ```
 
 You now have a functioning Git repository that contains a simple Java application. The application includes a `pom.xml` file, which is used by Java's dependency manager, Maven.
@@ -134,7 +134,7 @@ By default, Heroku generates a random name for your app. You can pass a paramete
 Now deploy your code:
 
 ```term
-:::>- $ git push heroku master
+:::>- $ git push heroku main
 :::-> | (head -6; echo "..."; tail -18)
 ```
 
@@ -218,7 +218,7 @@ To prevent abuse, scaling a non-free application to more than one dyno requires
 
 Heroku automatically identifies an app as a Java app if it contains a `pom.xml` file in the root directory. You can create a `pom.xml` file for your own apps with the `mvn archetype:create` command.
 
-The demo app you deployed already has a `pom.xml` ([see it here](https://github.com/heroku/java-getting-started/blob/master/pom.xml)). Here's an excerpt:
+The demo app you deployed already has a `pom.xml` ([see it here](https://github.com/heroku/java-getting-started/blob/main/pom.xml)). Here's an excerpt:
 
 ```xml
 :::-> $ sed -n '27,35p' pom.xml
@@ -359,7 +359,7 @@ Next, commit the changes to the repository:
 Now deploy, just as you did previously:
 
 ```term
-:::>- $ git push heroku master
+:::>- $ git push heroku main
 ```
 
 Finally, check that your updated code is successfully deployed:
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
@@ -25,7 +25,7 @@ <h3><span class="glyphicon glyphicon-info-sign"></span> How this sample app work
       <ul>
         <li>This app was deployed to Heroku, either using Git or by using <a href="https://github.com/heroku/java-getting-started">Heroku Button</a> on the repository.</li>
 
-        <li>When Heroku received the source code, it fetched all the dependencies in the <a href="https://github.com/heroku/java-getting-started/blob/master/pom.xml">pom.xml</a>, creating a slug.</li>
+        <li>When Heroku received the source code, it fetched all the dependencies in the <a href="https://github.com/heroku/java-getting-started/blob/main/pom.xml">pom.xml</a>, creating a slug.</li>
         <li>The platform then spins up a dyno, a lightweight container that provides an isolated environment in which the slug can be mounted and executed.</li>
         <li>You can scale your app, manage it, and deploy over <a href="https://addons.heroku.com/">150 add-on services</a>, from the Dashboard or CLI.</li>
       </ul>
