Skip to content

Commit

Permalink
Merge pull request #2042 from olivroy/b-fix-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
krlmlr authored Oct 16, 2023
2 parents 72e7feb + 147c169 commit 64fc575
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion R/dm.R
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@ as.list.dm_zoomed <- function(x, ...) {
#' keys, etc.) of all tables included in the `dm` object. It will additionally
#' print details about outgoing foreign keys for the child table.
#'
#' `glimpse()` is provided by the pillar package, and re-exported by {dm}.
#' `glimpse()` is provided by the pillar package, and re-exported by \pkg{dm}.
#' See [pillar::glimpse()] for more details.
#'
#' @examples
Expand Down
2 changes: 1 addition & 1 deletion R/nycflights13.R
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#' @param table_description Boolean, if `TRUE`, a description will be added for each table that will be displayed
#' when drawing the table with [dm_draw()].
#'
#' @return A `dm` object consisting of {nycflights13} tables, complete with primary and foreign keys and optionally colored.
#' @return A `dm` object consisting of \pkg{nycflights13} tables, complete with primary and foreign keys and optionally colored.
#'
#' @export
#' @seealso `vignette("howto-dm-df")`
Expand Down
2 changes: 1 addition & 1 deletion R/pixarfilms.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#' `pixar_films` contains missing values so cannot be made a proper primary key.
#' Set to `TRUE` to remove those records.
#'
#' @return A `dm` object consisting of {pixarfilms} tables, complete with
#' @return A `dm` object consisting of \pkg{pixarfilms} tables, complete with
#' primary and foreign keys and optionally colored.
#'
#' @export
Expand Down
4 changes: 2 additions & 2 deletions R/zoom.R
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
#' Calling [filter()] on a zoomed `dm` is different from calling [dm_filter()]:
#' only with the latter, the filter expression is added to the list of table filters stored in the dm.
#'
#' Furthermore, different `join()`-variants from {dplyr} are also supported,
#' Furthermore, different `join()`-variants from \pkg{dplyr} are also supported,
#' e.g. [left_join()] and [semi_join()].
#' (Support for [nest_join()] is planned.)
#' The join-methods for `dm_zoomed` infer the columns to join by from the primary and foreign keys,
#' and have an extra argument `select` that allows choosing the columns of the RHS table.
#'
#' And -- last but not least -- also the {tidyr}-functions [unite()] and [separate()] are supported for `dm_zoomed`.
#' And -- last but not least -- also the \pkg{tidyr}-functions [unite()] and [separate()] are supported for `dm_zoomed`.
#'
#' @rdname dm_zoom_to
#' @aliases zoomed_df
Expand Down
2 changes: 1 addition & 1 deletion man/dm_nycflights13.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/dm_pixarfilms.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/dm_zoom_to.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/glimpse.dm.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 64fc575

Please sign in to comment.