Skip to content

Commit

Permalink
Merge pull request #127 from molgenis/fix/english
Browse files Browse the repository at this point in the history
docs: updated English
  • Loading branch information
timcadman authored Jun 3, 2024
2 parents 5d4b52a + 9b908e3 commit 6534439
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- run:
name: Install R deps takes 15min, but no worries we skipinstalled from cache when this PR has installed them before
command: |
install2.r --skipinstalled --repo https://cloud.r-project.org pkgdown markdown rmarkdown mockery webmockr httr urltools xml2 arrow MolgenisAuth DSMolgenisArmadillo git2r ellipsis vctrs covr desc rlist httr2 devtools
install2.r --skipinstalled --repo https://cloud.r-project.org utils pkgdown markdown rmarkdown mockery webmockr httr urltools xml2 arrow MolgenisAuth DSMolgenisArmadillo git2r ellipsis vctrs covr desc rlist httr2 devtools
install2.r --repo https://cloud.r-project.org testthat
Rscript -e "git2r::config(user.email = '[email protected]', user.name = 'MOLGENIS Jenkins')"
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ When fixing bugs or adding features we need you to state what it is in one of yo

- bug: fixing out of memory
> This will increment the bug number (third) from the version number 1.2.3 to 1.2.4
- feat: adding new function
- feat: adding new functionality
> This will increment the minor number (second) from the version number 1.2.3 to 1.3.3
- breaking: comply to new upstream version of X
> This will increment the major number (first) from the version number 1.2.3 to 1.3.3
Expand Down
6 changes: 1 addition & 5 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ Client to share data in a [MOLGENIS Armadillo DataSHIELD Service](https://github
## Purpose
This library can be used by data managers to share datasets on a
MOLGENIS Armadillo server.
Researchers can then analyse these datasets and datasets shared on other servers
using DataSHIELD.
Researchers will only be able to access aggregate information and cannot see
individual rows.

## Overview
The datasets are stored in shared folders on a MinIO file store. The MOLGENIS
Expand Down Expand Up @@ -56,7 +52,7 @@ Listing the tables.
armadillo.list_tables("project")
```

Removing the data from the storage. First you need to remove the content of a project before you can throw away the project.
Removing the data from the storage. First you need to remove the content of a project before you can delete the project.
``` R
armadillo.delete_table("project", "folder", "iris")
armadillo.delete_project("project")
Expand Down

0 comments on commit 6534439

Please sign in to comment.