Skip to content

Commit 1fa6210

Browse files
committed
Updates re: master --> main
Closes #1480
1 parent 449391f commit 1fa6210

File tree

11 files changed

+31
-31
lines changed

11 files changed

+31
-31
lines changed

β€ŽR/course.Rβ€Ž

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
#' # download the source of rematch2 package from GitHub, 4 ways
4242
#' use_course("r-lib/rematch2")
4343
#' use_course("https://api.github.com/repos/r-lib/rematch2/zipball/HEAD")
44-
#' use_course("https://api.github.com/repos/r-lib/rematch2/zipball/master")
45-
#' use_course("https://github.com/r-lib/rematch2/archive/master.zip")
44+
#' use_course("https://api.github.com/repos/r-lib/rematch2/zipball/main")
45+
#' use_course("https://github.com/r-lib/rematch2/archive/main.zip")
4646
#' }
4747
NULL
4848

@@ -161,7 +161,7 @@ use_zip <- function(url,
161161
#' Click on the repo's "Clone or download" button, to reveal a "Download ZIP"
162162
#' button. Capture this URL, which will have this form:
163163
#' ```
164-
#' https://github.com/r-lib/usethis/archive/master.zip
164+
#' https://github.com/r-lib/usethis/archive/main.zip
165165
#' ```
166166
#' This download link (or a shortlink that points to it) is suitable as input
167167
#' for `tidy_download()`. After one or more redirections, this link will
@@ -207,7 +207,7 @@ use_zip <- function(url,
207207
#'
208208
#' @examples
209209
#' \dontrun{
210-
#' tidy_download("https://github.com/r-lib/rematch2/archive/master.zip")
210+
#' tidy_download("https://github.com/r-lib/rematch2/archive/main.zip")
211211
#' }
212212
#'
213213
#' @section tidy_unzip():
@@ -239,8 +239,8 @@ use_zip <- function(url,
239239
#'
240240
#' @examples
241241
#' \dontrun{
242-
#' tidy_download("https://github.com/r-lib/rematch2/archive/master.zip")
243-
#' tidy_unzip("rematch2-master.zip")
242+
#' tidy_download("https://github.com/r-lib/rematch2/archive/main.zip")
243+
#' tidy_unzip("rematch2-main.zip")
244244
#' }
245245
NULL
246246

@@ -563,7 +563,7 @@ check_is_zip <- function(ct) {
563563
## https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Disposition
564564
## https://tools.ietf.org/html/rfc6266
565565
## DropBox eg: "attachment; filename=\"foo.zip\"; filename*=UTF-8''foo.zip\"
566-
## GitHub eg: "attachment; filename=foo-master.zip"
566+
## GitHub eg: "attachment; filename=foo-main.zip"
567567
# https://stackoverflow.com/questions/30193569/get-content-disposition-parameters
568568
# http://test.greenbytes.de/tech/tc2231/
569569
parse_content_disposition <- function(cd) {

β€ŽR/create.Rβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ create_project <- function(path,
144144
#' * The source repo, `repo_spec`, is configured as the `upstream` remote,
145145
#' using the indicated `protocol`.
146146
#' * The local `DEFAULT` branch is set to track `upstream/DEFAULT`, where
147-
#' `DEFAULT` is typically `master` or `main`. It is also immediately pulled,
147+
#' `DEFAULT` is typically `main` or `master`. It is also immediately pulled,
148148
#' to cover the case of a pre-existing, out-of-date fork.
149149
#'
150150
#' If `fork = NA` (the default), we check your permissions on `repo_spec`. If

β€ŽR/github.Rβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
#' `use_github()` takes a local project and:
55
#' * Checks that the initial state is good to go:
66
#' - Project is already a Git repo
7-
#' - Current branch is the default branch, e.g. `master` or `main`
7+
#' - Current branch is the default branch, e.g. `main` or `master`
88
#' - No uncommitted changes
99
#' - No pre-existing `origin` remote
1010
#' * Creates an associated repo on GitHub
1111
#' * Adds that GitHub repo to your local repo as the `origin` remote
1212
#' * Makes an initial push to GitHub
1313
#' * Calls [use_github_links()], if the project is an R package
1414
#' * Configures `origin/DEFAULT` to be the upstream branch of the local
15-
#' `DEFAULT` branch, e.g. `master` or `main`
15+
#' `DEFAULT` branch, e.g. `main` or `master`
1616
#'
1717
#' See below for the authentication setup that is necessary for all of this to
1818
#' work.

β€ŽR/utils-git.Rβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ git_pull <- function(remref = NULL, verbose = TRUE) {
241241
verbose = FALSE
242242
)
243243
# this is pretty brittle, because I've hard-wired these messages
244-
# https://github.com/r-lib/gert/blob/master/R/merge.R
244+
# https://github.com/r-lib/gert/blob/main/R/merge.R
245245
# but at time of writing, git_merge() offers no verbosity control
246246
gert_shush(
247247
regexp = c(
@@ -323,7 +323,7 @@ check_current_branch <- function(is = NULL, is_not = NULL,
323323
invisible()
324324
}
325325

326-
# examples of remref: upstream/master, origin/foofy
326+
# examples of remref: upstream/main, origin/foofy
327327
check_branch_up_to_date <- function(direction = c("pull", "push"),
328328
remref = NULL,
329329
use = NULL) {

β€ŽREADME.Rmdβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ knitr::opts_chunk$set(
1717

1818
<!-- badges: start -->
1919
[![R-CMD-check](https://github.com/r-lib/usethis/workflows/R-CMD-check/badge.svg)](https://github.com/r-lib/usethis/actions)
20-
[![Codecov test coverage](https://codecov.io/gh/r-lib/usethis/branch/master/graph/badge.svg)](https://app.codecov.io/gh/r-lib/usethis?branch=master)
20+
[![Codecov test coverage](https://codecov.io/gh/r-lib/usethis/branch/main/graph/badge.svg)](https://app.codecov.io/gh/r-lib/usethis?branch=main)
2121
[![CRAN status](https://www.r-pkg.org/badges/version/usethis)](https://CRAN.R-project.org/package=usethis)
2222
[![Lifecycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html#stable)
2323
<!-- badges: end -->

β€ŽREADME.mdβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
[![R-CMD-check](https://github.com/r-lib/usethis/workflows/R-CMD-check/badge.svg)](https://github.com/r-lib/usethis/actions)
99
[![Codecov test
10-
coverage](https://codecov.io/gh/r-lib/usethis/branch/master/graph/badge.svg)](https://app.codecov.io/gh/r-lib/usethis?branch=master)
10+
coverage](https://codecov.io/gh/r-lib/usethis/branch/main/graph/badge.svg)](https://app.codecov.io/gh/r-lib/usethis?branch=main)
1111
[![CRAN
1212
status](https://www.r-pkg.org/badges/version/usethis)](https://CRAN.R-project.org/package=usethis)
1313
[![Lifecycle:

β€Žman/create_from_github.Rdβ€Ž

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žman/use_course_details.Rdβ€Ž

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žman/use_github.Rdβ€Ž

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žman/zip-utils.Rdβ€Ž

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
Β (0)