Skip to content

Commit 31d2104

Browse files
authored
Merge pull request #73 from ropensci/merge-prs
2 parents b884c93 + 57eef44 commit 31d2104

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

DESCRIPTION

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Suggests:
2929
rmarkdown,
3030
testthat,
3131
withr
32-
RoxygenNote: 7.1.2
32+
RoxygenNote: 7.2.3
3333
Roxygen: list(markdown = TRUE)
3434
VignetteBuilder: knitr
3535
Encoding: UTF-8

R/validate.R

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
##' `jsonvalidate.no_note_imjv` to `FALSE` will print the message
2424
##' even noninteractively.
2525
##'
26-
##' Updating the engine should be simply a case of adding `{engine
26+
##' Updating the engine should be simply a case of adding `engine
2727
##' = "ajv"` to your `json_validator` or `json_validate`
2828
##' calls, but you may see some issues when doing so.
2929
##'
@@ -67,11 +67,11 @@
6767
##'
6868
##' @section Using multiple files:
6969
##'
70-
##' Multiple files are supported. You can have a schema that
71-
##' references a file `child.json` using `{"$ref": "child.json"}` -
72-
##' in this case if `child.json` includes an `id` or `$id` element
73-
##' it will be silently dropped and the filename used to reference
74-
##' the schema will be used as the schema id.
70+
##' Multiple files are supported. You can have a schema that references
71+
##' a file `child.json` using `{"$ref": "child.json"}`---in this case if
72+
##' `child.json` includes an `id` or `$id` element it will be silently
73+
##' dropped and the filename used to reference the schema will be used
74+
##' as the schema id.
7575
##'
7676
##' The support is currently quite limited - it will not (yet) read
7777
##' sub-child schemas relative to child schema `$id` url, and

man/json_schema.Rd

+9-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/json_validator.Rd

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)