Merge branch 'master' into density_fv

Author: florisvdh

content/articles/inbo_software/index.Rmd

@@ -28,21 +28,21 @@ website**, if available. When there is no documentation website, often
 one or more **vignettes** are available within the package, describing
 the package’s purpose and demonstrating its use.
 
-The following table gives a **quick
-overview**:
-
-| Research stage                | Related INBO packages                                                                                                                                                                                      |
-| :---------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Study design                  | [grts](https://github.com/ThierryO/grts)                                                                                                                                                                   |
-| Retrieve data: environmental  | [wateRinfo](https://ropensci.github.io/wateRinfo/), [pydov](https://pydov.readthedocs.io/), [watina](https://inbo.github.io/watina)                                                                        |
-| Retrieve data: biological     | [pyinaturalist](https://github.com/inbo/pyinaturalist), [uvabits](https://inbo.github.io/uvabits/), [etn](https://inbo.github.io/etn/), [n2khab](https://inbo.github.io/n2khab)                            |
-| Store data                    | [git2rdata](https://inbo.github.io/git2rdata/)                                                                                                                                                             |
-| Validate data                 | [pywhip](https://inbo.github.io/pywhip/)                                                                                                                                                |
-| Analyze data: graphs          | [inboggvegan](https://github.com/inbo/inboggvegan)                                                                                                                                                         |
-| Analyze data: models          | [inlatools](https://inlatools.netlify.com/), [multimput](https://github.com/inbo/multimput), [effectclass](https://effectclass.netlify.com), [niche\_vlaanderen](https://inbo.github.io/niche_vlaanderen/), [gwloggeR](https://dov-vlaanderen.github.io/groundwater-logger-validation/gwloggeR/docs/articles/gwloggeR.html)                    |
-| Analyze data: indices         | [LSVI](https://inbo.github.io/LSVI)                                                                                                                                                                       |
-| Publish                       | [INBOmd](https://inbomd.netlify.com/articles/introduction.html), [INBOtheme](https://inbo.github.io/INBOtheme/)                                                                                            |
-| Miscellaneous (mixed content) | [inborutils](https://inbo.github.io/inborutils/)                                                                                                                                                           |
+The following table gives a **quick overview**:
+
+| Research stage | Related INBO packages |
+| :------------- | :-------------------- |
+| Study design | [grts](https://github.com/ThierryO/grts)  |
+| Retrieve data: general | [inbodb](https://inbo.github.io/inbodb) |
+| Retrieve data: environmental | [wateRinfo](https://ropensci.github.io/wateRinfo/), [pydov](https://pydov.readthedocs.io/), [watina](https://inbo.github.io/watina) |
+| Retrieve data: biological | [pyinaturalist](https://github.com/inbo/pyinaturalist), [uvabits](https://inbo.github.io/uvabits/), [etn](https://inbo.github.io/etn/), [n2khab](https://inbo.github.io/n2khab), [forrescalc](https://inbo.github.io/forrescalc/) |
+| Store data | [git2rdata](https://inbo.github.io/git2rdata/) |
+| Validate data | [pywhip](https://inbo.github.io/pywhip/) |
+| Analyze data: graphs | [inboggvegan](https://github.com/inbo/inboggvegan) |
+| Analyze data: models | [inlatools](https://inlatools.netlify.com/), [multimput](https://github.com/inbo/multimput), [effectclass](https://effectclass.netlify.com), [niche\_vlaanderen](https://inbo.github.io/niche_vlaanderen/), [gwloggeR](https://dov-vlaanderen.github.io/groundwater-logger-validation/gwloggeR/docs/articles/gwloggeR.html) |
+| Analyze data: indices | [LSVI](https://inbo.github.io/LSVI) |
+| Publish | [INBOmd](https://inbomd.netlify.com/articles/introduction.html), [INBOtheme](https://inbo.github.io/INBOtheme/) |
+| Miscellaneous (mixed content) | [inborutils](https://inbo.github.io/inborutils/) |
 
 ## Study design
 
@@ -52,6 +52,12 @@ overview**:
 
 ## Retrieve data
 
+### General
+
+  - **R package [inbodb](https://inbo.github.io/inbodb)**: connect
+    to and retrieve data from databases on the INBO server, with
+    dedicated functions to query some of these databases.
+
 ### Environmental data
 
   - **R package [wateRinfo](https://ropensci.github.io/wateRinfo/)**:
@@ -100,6 +106,11 @@ overview**:
     GRTSmaster\_habitats)* and preprocessing functions, supporting
     reproducible and transparent analyses on Flemish Natura 2000 (*n2k*)
     habitats (*hab*) and regionally important biotopes (RIBs).
+  - **R package [forrescalc](https://inbo.github.io/forrescalc/)**:
+    provides aggregated values on dendrometry, regeneration and
+    vegetation of the Flemish forest reserve monitoring network, and
+    functions to derive these data starting from individual tree
+    measurements in Fieldmap.
 
 ## Store data
 

content/articles/inbo_software/index.md

@@ -0,0 +1,7 @@
+[user]
+	name = Voornaam Achternaam
+	email = voornaam.achternaam@inbo.be
+[core]
+	autocrlf = true
+[fetch]
+	prune = true

content/installation/administrator/admin_install_git/.gitconfig

@@ -1,7 +1,6 @@
 ---
 title: "Git installation"
 description: "Installation instructions for Git (in Dutch). Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency."
-date: 2017-10-18T00:29:14+02:00
 categories: ["installation"]
 tags: ["git", "version control", "installation"]
 ---
@@ -10,20 +9,31 @@ tags: ["git", "version control", "installation"]
 
 De installatiebestanden zijn beschikbaar via http://git-scm.com/downloads
 
-1. Voer het installatiebestand uit
-1. Welkom bij de installatie: klik op _Next_
-1. Aanvaard de licentievoorwaarden door _Next_ te klikken
-1. Installeer git in de voorgesteld standaard directory.
-1. Gebruik de standaard componenten door _Next_ te klikken
-1. Kies `use Git from the Windows Command Prompt` en klik _Next_
+1. Installeer eerst `notepad++`.
+1. Voer het installatiebestand uit en klik _Ja_.
+1. Welkom bij de installatie: klik op _Next_.
+1. Aanvaard de licentievoorwaarden door _Next_ te klikken.
+1. Installeer git in de voorgestelde standaard directory.
+1. Gebruik de standaard componenten door _Next_ te klikken.
+1. Klik _Next_ om de menu map in te stellen.
+1. Kies `Notepad++` als editor.
+1. Kies `use Git from the command line` en klik _Next_.
+1. `Use OpenSSL library` en klik _Next_.
 1. Kies `Checkout Windows-style, commit Unix-style line endings` en klik _Next_
 1. Kies `use Windows' default console window` en klik _Next_
-1. Klik op _Finish_
+1. Kies `Default` en klik _Next_.
+1. Gebruik de standaard door _Next_ te klikken.
+1. Gebruik de standaard door _Install_ te klikken.
+1. Vink alles uit en klik op _Next_.
+1. Download [.gitconfig](.gitconfig).
+Open het bestand met een editor en pas de `name` en `email` aan.
+Bewaar het bestand in `c:/users/username`.
 
 ### Afwijkingen t.o.v. default installatie
 
-- `use Git from the Windows Command Prompt`
+- `Notepad++` als editor
 - `use Windows' default console window`
+- `.gitconfig` download, aanpassen en bewaren in de map van de gebruiker
 
 ## Ubuntu
 

content/installation/administrator/admin_install_git/index.md

@@ -3,7 +3,6 @@ options(
   tab.width = 2,
   width = 80,
   help_type = "html",
-  stringsAsFactors = TRUE,
   keep.source.pkgs = TRUE,
   xpinch = 300,
   ypinch = 300,
@@ -36,6 +35,3 @@ if (interactive()) {
     }
   )
 }
-
-# required for RStan and brms
-Sys.setenv(BINPREF = "C:/Rtools/mingw_$(WIN)/bin/")