Rename files

CREAFFuture · Jun 16, 2020 · fb9d66d · fb9d66d
1 parent 374cff0
commit fb9d66d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/_bookdown.yml b/_bookdown.yml
@@ -40,9 +40,9 @@ rmd_files: [
   "git-branches.Rmd",
   "git-remotes.Rmd",
 
-  "remote-scenarios-intro.Rmd",
-  "remote-scenarios-supported.Rmd",
-  "remote-scenarios-unsupported.Rmd",
+  "remote-setups-intro.Rmd",
+  "remote-setups-common.Rmd",
+  "remote-setups-peculiar.Rmd",
 
   "workflows-intro.Rmd",
   "workflows-repeated-amend.Rmd",

diff --git a/remote-scenarios-unsupported.Rmd b/remote-scenarios-unsupported.Rmd
diff --git a/remote-scenarios-supported.Rmd → remote-setups-common.Rmd b/remote-scenarios-supported.Rmd → remote-setups-common.Rmd
@@ -1,4 +1,4 @@
-# Supported remote setups {#supported}
+# Common remote setups {#common-remote-setups}
 
 We only consider a very constrained set of remotes here:
 
@@ -98,7 +98,7 @@ This is a less common variation on the fork setup.
 knitr::include_graphics("img/fork-ours.png")
 ```
 
-In this case, you have permission to push to the primary repo, but you elect to create a personal fork anyway. Certain projects favor this approach and it offers maximum development flexibility for advanced users. However, most users are better-served by the simpler "ours" setup in this case.
+In this case, you have permission to push to the primary repo, but you elect to create a personal fork anyway. Certain projects favor this approach and it offers maximum development flexibility for advanced users. However, most users are better served by the simpler "ours" setup in this case.
 
 `usethis::create_from_github("OWNER/REPO", fork = TRUE)` can create this setup, as long as you have configured a `GITHUB_PAT`. usethis describes this setup as "fork".
 

diff --git a/remote-scenarios-intro.Rmd → remote-setups-intro.Rmd b/remote-scenarios-intro.Rmd → remote-setups-intro.Rmd
@@ -1,4 +1,4 @@
-# (PART) Remote scenarios {-} 
+# (PART) Remote setups {-} 
 
 # Git remote setups {#remote-scenarios-intro .unnumbered}
 

diff --git a/remote-setups-peculiar.Rmd b/remote-setups-peculiar.Rmd
@@ -0,0 +1,10 @@
+# Peculiar remote setups {#unsupported}
+
+Just like the previous section about the most common setups, we only consider a very constrained set of remotes:
+
+* The remote is on GitHub.
+* The remote is named `origin` or `upstream`.
+
+This section exists as counterpoint to the previous. Here we provide more details on remote setups that are more unusual and, usually, not very functional. In general, these are setups usethis cannot work with. We try to suggest a better alterntive in each case. *2020-06 note: this currently refers to features in a development version of usethis. These features are not in v1.6.1 = the current CRAN version.*
+
+*section coming soon*