Skip to content

Commit cd2ada6

Browse files
mcanouilmcanouil
authored
Merge branch 'main' into docs/triaging-guide
2 parents 49d4947 + 7b62fb5 commit cd2ada6

File tree

8 files changed

+92
-74
lines changed

8 files changed

+92
-74
lines changed

‎_quarto.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ website:
483483
href: docs/reference/formats/docx.qmd
484484
- text: Typst
485485
href: docs/reference/formats/typst.qmd
486-
- text: "OpenOffice"
486+
- text: "OpenDocument"
487487
href: docs/reference/formats/odt.qmd
488488
- text: "ePub"
489489
href: docs/reference/formats/epub.qmd

‎_redirects‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
/download/latest/quarto-win.msi https://github.com/quarto-dev/quarto-cli/releases/download/v1.6.40/quarto-1.6.40-win.msi
1111
/download/latest/quarto-win.zip https://github.com/quarto-dev/quarto-cli/releases/download/v1.6.40/quarto-1.6.40-win.zip
1212
/download/latest/quarto-. https://github.com/quarto-dev/quarto-cli/releases/download/v1.6.40/quarto-1.6.40.tar.gz
13-
/download/prerelease/changelog.md-. https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.7/changelog.md
14-
/download/prerelease/quarto-checksums.txt https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.7/quarto-1.7.7-checksums.txt
15-
/download/prerelease/quarto-linux-amd64.deb https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.7/quarto-1.7.7-linux-amd64.deb
16-
/download/prerelease/quarto-linux-amd64.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.7/quarto-1.7.7-linux-amd64.tar.gz
17-
/download/prerelease/quarto-linux-arm64.deb https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.7/quarto-1.7.7-linux-arm64.deb
18-
/download/prerelease/quarto-linux-arm64.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.7/quarto-1.7.7-linux-arm64.tar.gz
19-
/download/prerelease/quarto-linux-rhel7-amd64.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.7/quarto-1.7.7-linux-rhel7-amd64.tar.gz
20-
/download/prerelease/quarto-macos.pkg https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.7/quarto-1.7.7-macos.pkg
21-
/download/prerelease/quarto-macos.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.7/quarto-1.7.7-macos.tar.gz
22-
/download/prerelease/quarto-win.msi https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.7/quarto-1.7.7-win.msi
23-
/download/prerelease/quarto-win.zip https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.7/quarto-1.7.7-win.zip
24-
/download/prerelease/quarto-. https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.7/quarto-1.7.7.tar.gz
13+
/download/prerelease/changelog.md-. https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.10/changelog.md
14+
/download/prerelease/quarto-checksums.txt https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.10/quarto-1.7.10-checksums.txt
15+
/download/prerelease/quarto-linux-amd64.deb https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.10/quarto-1.7.10-linux-amd64.deb
16+
/download/prerelease/quarto-linux-amd64.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.10/quarto-1.7.10-linux-amd64.tar.gz
17+
/download/prerelease/quarto-linux-arm64.deb https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.10/quarto-1.7.10-linux-arm64.deb
18+
/download/prerelease/quarto-linux-arm64.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.10/quarto-1.7.10-linux-arm64.tar.gz
19+
/download/prerelease/quarto-linux-rhel7-amd64.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.10/quarto-1.7.10-linux-rhel7-amd64.tar.gz
20+
/download/prerelease/quarto-macos.pkg https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.10/quarto-1.7.10-macos.pkg
21+
/download/prerelease/quarto-macos.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.10/quarto-1.7.10-macos.tar.gz
22+
/download/prerelease/quarto-win.msi https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.10/quarto-1.7.10-win.msi
23+
/download/prerelease/quarto-win.zip https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.10/quarto-1.7.10-win.zip
24+
/download/prerelease/quarto-. https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.10/quarto-1.7.10.tar.gz

‎docs/advanced/environment-vars.qmd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ You can read about other ways to set environment variables in Quarto Projects in
2222
+------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
2323
| `QUARTO_PYTHON` | Explicit path to the version of `python` to be used by the `jupyter` engine and `quarto run *.py` command. |
2424
+------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
25+
| `QUARTO_JULIA` | Explicit path to the version of `julia` to be used by the `julia` engine. |
26+
+------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
2527
| `QUARTO_VERSION_REQUIREMENT` | A [`semver`](https://semver.org/) string describing the Quarto version requested by the environment. If this check fails, Quarto will not run. |
2628
+------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
2729
| `QUARTO_KNITR_RSCRIPT_ARGS` | Comma separated list of command line argument to pass to `Rscript` started by Quarto when rendering with `knitr` engine, e.g. |

‎docs/computations/ojs.qmd‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ OJS works in any Quarto document (plain markdown as well as Jupyter and Knitr do
1717

1818
We'll start with a simple example based on Allison Horst's [Palmer Penguins](https://allisonhorst.github.io/palmerpenguins/) dataset. Here we look at how penguin body mass varies across both sex and species (use the provided inputs to filter the dataset by bill length and island):
1919

20+
```{ojs}
21+
data = FileAttachment("palmer-penguins.csv").csv({ typed: true })
22+
```
23+
2024
```{ojs}
2125
filtered = data.filter(function(penguin) {
2226
return bill_length_min < penguin.bill_length_mm &&
@@ -57,9 +61,9 @@ Plot.rectY(filtered,
5761
)
5862
```
5963

60-
Let's take a look at the source code for this example. First we create an `{ojs}` cell that reads in some data from a CSV file using a [FileAttachment](https://observablehq.com/@observablehq/file-attachments):
64+
Let's take a look at the source code for this example. First we create an `{ojs}` cell that reads in some data from a CSV file (*e.g.*, [`palmer-penguins.csv`](palmer-penguins.csv){target="_blank" download="palmer-penguins.csv"}) using a [FileAttachment](https://observablehq.com/@observablehq/file-attachments):
6165

62-
```{ojs}
66+
```{{ojs}}
6367
data = FileAttachment("palmer-penguins.csv").csv({ typed: true })
6468
```
6569

0 commit comments

Comments
 (0)