Merge branch 'master' of ssh://jrwb.de/mkin into pkgdown

Conflicts:
	.Rbuildignore

1 files changed, 5 insertions, 5 deletions

diff --git a/vignettes/FOCUS_L.Rmd b/vignettes/FOCUS_L.Rmd
index 72a5ba34..b500243b 100644
--- a/vignettes/FOCUS_L.Rmd
+++ b/vignettes/FOCUS_L.Rmd
@@ -17,16 +17,16 @@ references:
     given: Johannes

   type: report

   year: 2014

-  number: Umweltbundesamt Projektnummer 27452

+  number: "Umweltbundesamt Projektnummer 27452"

 vignette: >

   %\VignetteIndexEntry{Example evaluation of FOCUS Laboratory Data L1 to L3}

   %\VignetteEngine{knitr::rmarkdown}

-  \usepackage[utf8]{inputenc}

+  %\VignetteEncoding{UTF-8}

 ---

 

 ```{r, include = FALSE}

 library(knitr)

-opts_chunk$set(tidy = FALSE, cache = TRUE)

+opts_chunk$set(tidy = FALSE, cache = FALSE)

 ```

 

 # Laboratory Data L1

@@ -189,7 +189,7 @@ FOCUS_2006_L3 = data.frame(
 FOCUS_2006_L3_mkin <- mkin_wide_to_long(FOCUS_2006_L3)

 ```

 

-## Use mmkin to fit multiple models

+## Fit multiple models

 

 As of mkin version 0.9-39 (June 2015), we can fit several models to 

 one or more datasets in one call to the function `mmkin`. The datasets

@@ -209,7 +209,7 @@ error level at which the $\chi^2$ test passes of 7%.  Fitting the four
 parameter DFOP model further reduces the $\chi^2$ error level

 considerably.

 

-## Accessing elements of mmkin objects

+## Accessing mmkin objects

 

 The objects returned by mmkin are arranged like a matrix, with 

 models as a row index and datasets as a column index.