Skip to content

Commit 64f95a5

Browse files
committed
Merge branch 'main' into focardozom-add-create-quarto-project
2 parents 9dfc1bd + 9cfa993 commit 64f95a5

File tree

5 files changed

+40
-21
lines changed

5 files changed

+40
-21
lines changed

R/create.R

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#' more advanced usage.
1212
#'
1313
#' These functions work best when creating a project *de novo*, but
14-
#' `create_package()` and `create_project()` can be called in an existing
14+
#' `create_package()` and `create_project()` can be called on an existing
1515
#' project; you will be asked before any existing files are changed.
1616
#'
1717
#' @inheritParams use_description
@@ -31,11 +31,11 @@
3131
#' `.here` file is placed to mark the project root.
3232
#' @param open If `TRUE`, [activates][proj_activate()] the new project:
3333
#'
34-
#' * If using RStudio desktop, the project is opened in a new session.
35-
#' * If using Positron, the project is opened in a new window.
36-
#' * If on RStudio server, the current RStudio project is activated.
37-
#' * Otherwise, the working directory and active project is changed in the
38-
#' current R session.
34+
#' * If using RStudio or Positron, the new project is opened in a new session,
35+
#' window, or browser tab, depending on the product (RStudio or Positron)
36+
#' and context (desktop or server).
37+
#' * Otherwise, the working directory and active project of the current R
38+
#' session are changed to the new project.
3939
#' @param type The type of Quarto project to create. See
4040
#' `?quarto::quarto_create_project` for the most up-to-date list, but
4141
#' `"website"`, `"blog"`, `"book"`, and `"manuscript"` are common choices.

R/proj.R

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,17 @@ project_name <- function(base_path = proj_get()) {
278278

279279
#' Activate a project
280280
#'
281-
#' Activates a project in usethis, R session, and (if relevant) RStudio senses.
282-
#' If you are in RStudio, this will open a new RStudio session. If not, it will
281+
#' Activates a project in the usethis, R session, and (if relevant) RStudio
282+
#' senses. If you are in RStudio, this will open a new RStudio session. If not, it will
283283
#' change the working directory and [active project][proj_set()].
284284
#'
285+
#' * If using RStudio desktop, the project is opened in a new session.
286+
#' * If using Positron, the project is opened in a new window.
287+
#' * If using RStudio or Positron on a server, the project is opened in a new
288+
#' browser tab.
289+
#' * Otherwise, the working directory and active project is changed in the
290+
#' current R session.
291+
#'
285292
#' @param path Project directory
286293
#' @return Single logical value indicating if current session is modified.
287294
#' @export

man/create_from_github.Rd

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

man/create_package.Rd

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

man/proj_activate.Rd

Lines changed: 14 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)