Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Image render fix for chapters 25, 26, and 32 #222

Merged
merged 5 commits into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions remote-setups-common.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ As a starting point, consider a local Git repo that is not yet connected to GitH

```{r no_github}
#| echo = FALSE, fig.align = "center", out.width = "60%",
#| fig.alt = "Setup described as \"no_github\""
#| fig.alt = "Setup described as 'no_github'"

knitr::include_graphics("img/no-github.jpeg")

```

This is not very exciting, but sets the stage for what's to come.
Expand All @@ -43,7 +45,7 @@ A common next step is to associate a local repo with a copy on GitHub, owned by

```{r ours-you}
#| echo = FALSE, fig.align = "center", out.width = "60%",
#| fig.alt = "Setup described as \"ours\""
#| fig.alt = "Setup described as 'ours'"
knitr::include_graphics("img/ours-you.jpeg")
```

Expand Down Expand Up @@ -87,7 +89,7 @@ Here is a variation on "ours" that is equivalent in practice.

```{r ours-them}
#| echo = FALSE, fig.align = "center", out.width = "60%",
#| fig.alt = "Setup described as \"ours\""
#| fig.alt = "Setup described as 'ours'"
knitr::include_graphics("img/ours-them.jpeg")
```

Expand All @@ -113,7 +115,7 @@ It's not broken *per se*, but it's limiting.

```{r theirs}
#| echo = FALSE, fig.align = "center", out.width = "60%",
#| fig.alt = "Setup described as \"theirs\""
#| fig.alt = "Setup described as 'theirs'"
knitr::include_graphics("img/theirs.jpeg")
```

Expand Down Expand Up @@ -144,7 +146,7 @@ This is an ideal setup if you want to make a pull request and generally follow t

```{r fork-them}
#| echo = FALSE, fig.align = "center", out.width = "60%",
#| fig.alt = "Setup described as \"fork\""
#| fig.alt = "Setup described as 'fork'"
knitr::include_graphics("img/fork-them.jpeg")
```

Expand Down Expand Up @@ -186,7 +188,7 @@ This is a less common variation on the fork setup.

```{r fork-ours}
#| echo = FALSE, fig.align = "center", out.width = "60%",
#| fig.alt = "Setup described as \"fork\""
#| fig.alt = "Setup described as 'fork'"
knitr::include_graphics("img/fork-ours.jpeg")
```

Expand All @@ -208,7 +210,7 @@ Here is one last fork setup that's sub-optimal, but it can be salvaged.

```{r fork-no-upstream}
#| echo = FALSE, fig.align = "center", out.width = "60%",
#| fig.alt = "Setup described as \"fork_upstream_is_not_origin_parent\""
#| fig.alt = "Setup described as 'fork_upstream_is_not_origin_parent'"
knitr::include_graphics("img/fork_upstream_is_not_origin_parent.jpeg")
```

Expand Down
4 changes: 2 additions & 2 deletions remote-setups-equivocal.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ When we detect just one GitHub remote, but we can't verify the info above, useth

```{r maybe_ours_or_theirs}
#| echo = FALSE, fig.align = "center", out.width = "60%",
#| fig.alt = "Setup described as \"maybe_ours_or_theirs\""
#| fig.alt = "Setup described as 'maybe_ours_or_theirs'"
knitr::include_graphics("img/maybe_ours_or_theirs.jpeg")
```

Expand All @@ -45,7 +45,7 @@ When we detect two GitHub remotes, but we can't verify the info above, usethis d

```{r maybe_fork}
#| echo = FALSE, fig.align = "center", out.width = "60%",
#| fig.alt = "Setup described as \"maybe_fork\""
#| fig.alt = "Setup described as 'maybe_fork'"
knitr::include_graphics("img/maybe_fork.jpeg")
```

Expand Down
4 changes: 2 additions & 2 deletions render-r-script-demo.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
R scripts can be rendered!
================
jenny
2022-06-23
jeremyallen
2023-10-14

Here’s some prose in a very special comment. Let’s summarize the
built-in dataset `VADeaths`.
Expand Down
2 changes: 1 addition & 1 deletion workflows-upstream-changes-into-fork.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ We assume your repo has this favorable configuration:

```{r fork-them}
#| echo = FALSE, fig.align = "center", out.width = "60%",
#| fig.alt = "Setup described as \"fork\""
#| fig.alt = "Setup described as 'fork'"
knitr::include_graphics("img/fork-them.jpeg")
```

Expand Down