Skip to content

Commit 5399b9d

Browse files
committed
Work on spelling stuff
1 parent e27eb5f commit 5399b9d

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

NEWS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ usethis has a more sophisticated understanding of the default branch and gains s
2727
## Other
2828

2929
* `use_github_file()` is a new function related to `use_template()`, which grabs
30-
the contents of an arbitrary file on GitHub, with support for targetting a
30+
the contents of an arbitrary file on GitHub, with support for targeting a
3131
specific branch, tag, or commit and for following symlinks (#1407). It is now
3232
used by `use_github_action()` and friends.
3333

inst/WORDLIST

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Depsy
1515
DockerHub
1616
DropBox
1717
GHA
18+
GHE
1819
Gert
1920
Gert's
2021
Git's
@@ -33,7 +34,6 @@ Lifecycle
3334
LinkingTo
3435
Makefile
3536
ORCID
36-
PAT's
3737
PATs
3838
PRs
3939
README
@@ -57,7 +57,6 @@ Templated
5757
Tidyverse
5858
UI
5959
Ushey's
60-
VM
6160
Xcode
6261
YAML
6362
addin
@@ -90,7 +89,6 @@ discoverable
9089
else's
9190
emacs
9291
eval
93-
favicons
9492
favour
9593
fiascos
9694
filenaming
@@ -122,8 +120,8 @@ labelling
122120
learnr
123121
libgit
124122
lifecycle
125-
linux
126123
macOS
124+
macbook
127125
magrittr
128126
magrittr's
129127
md
@@ -148,7 +146,6 @@ rcmdcheck
148146
rebase
149147
reconfigures
150148
redirections
151-
renviron
152149
repo
153150
repo's
154151
repos
@@ -170,10 +167,12 @@ sitrep
170167
src
171168
styler
172169
symlink
170+
symlinks
173171
templated
174172
templating
175173
testthat
176174
tibble
175+
tidymodels
177176
tidyverse
178177
todo
179178
travis
@@ -184,6 +183,9 @@ unpushed
184183
useR
185184
usethis's
186185
ver
186+
vm
187187
withr
188+
www
189+
xyz
188190
xz
189191
yaml

vignettes/articles/git-credentials.Rmd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ Copy the PAT to the clipboard, anticipating what we'll do next: trigger a prompt
149149

150150
Sidebar about storing your PAT: If you use a password management app, such as 1Password or LastPass (highly recommended!), you might want to add this PAT (and its *Note*) to the entry for GitHub.
151151
Storing your PAT in the Git credential store is a semi-persistent convenience, sort of like a browser cache or "remember me" on a website, but it's quite possible you will need to re-enter your PAT in the future.
152-
You could decide to embrace the impermanance of your PAT and, if it is somehow removed from the store, you'll just re-generate a new PAT and re-enter it.
152+
You could decide to embrace the impermanence of your PAT and, if it is somehow removed from the store, you'll just re-generate a new PAT and re-enter it.
153153
If you accept the default 30-day expiration period, this is a workflow you'll be using often anyway.
154154
But if you create long-lasting tokens or want to play around with the functions for setting or clearing your Git credentials, it can be handy to have your own record of your PAT in a secure place, like 1Password or LastPass.
155155

@@ -289,7 +289,7 @@ Once they retrieve a PAT from the store, they temporarily cache it in an environ
289289
This allows a discovered PAT to be reused, potentially by multiple packages, repeatedly over the course of an R session.
290290

291291
Using `.Renviron` as your primary PAT store is less secure and, if you can, it is safer to keep your PAT in the Git credential store and let packages that need it to discover it there upon first need.
292-
Linux users may still need to use the `.Renviron` method, since they don't have easy access to OS-managed stores like macOS's Keychain or Windows Credential Manager.
292+
Linux users may still need to use the `.Renviron` method, since they don't have easy access to OS-managed stores like the macOS Keychain or Windows Credential Manager.
293293

294294
If you still need to use `.Renviron` method, `usethis::edit_r_environ()` opens that file for editing.
295295

@@ -340,7 +340,7 @@ Do NOT define `GITHUB_PAT` in `.Renviron`.
340340
If you want to keep using remotes, instead of pak, you could just rely on the built-in credential.
341341
This will suffice if rate-limiting is the only concern, but obviously will not provide access to private repositories.
342342

343-
If you really want to use remotes, with your own PAT, you can "tickle" gitcreds, via `gitcreds::gitcreds_get()`, to get it to load your PAT from the store into the `GITHUB_PAT` env var, where remotes will happily find it.
343+
If you really want to use remotes, with your own PAT, you can "tickle" gitcreds, via `gitcreds::gitcreds_get()`, to get it to load your PAT from the store into the `GITHUB_PAT` environment variable, where remotes will happily find it.
344344
This could be done interactively as needed, written into individual scripts, or
345345
even executed in a startup file.
346346
This still avoids defining `GITHUB_PAT` in `.Renviron`.

0 commit comments

Comments
 (0)