Merge branch 'main' into dev

Start new development version

7 files changed, 11 insertions, 11 deletions

diff --git a/docs/reference/D24_2014.html b/docs/reference/D24_2014.html
index fcc3cec3..1e35e864 100644
--- a/docs/reference/D24_2014.html
+++ b/docs/reference/D24_2014.html
@@ -22,7 +22,7 @@ constrained by data protection regulations."><!-- mathjax --><script src="https:
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">mkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.2.4</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.2.5</span>
       </span>
     </div>
 
diff --git a/docs/reference/Rplot001.png b/docs/reference/Rplot001.png
index 5de2bdc7..fa2316b9 100644
--- a/docs/reference/Rplot001.png
+++ b/docs/reference/Rplot001.png
diff --git a/docs/reference/Rplot002.png b/docs/reference/Rplot002.png
index 556ca0a7..fa2316b9 100644
--- a/docs/reference/Rplot002.png
+++ b/docs/reference/Rplot002.png
diff --git a/docs/reference/Rplot003.png b/docs/reference/Rplot003.png
index 30cf38f3..fa2316b9 100644
--- a/docs/reference/Rplot003.png
+++ b/docs/reference/Rplot003.png
diff --git a/docs/reference/dimethenamid_2018.html b/docs/reference/dimethenamid_2018.html
index a1c800e8..961b28d2 100644
--- a/docs/reference/dimethenamid_2018.html
+++ b/docs/reference/dimethenamid_2018.html
@@ -22,7 +22,7 @@ constrained by data protection regulations."><!-- mathjax --><script src="https:
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">mkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.2.4</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.2.5</span>
       </span>
     </div>
 
@@ -222,10 +222,10 @@ specific pieces of information in the comments.</p>
 <span class="r-in"><span><span class="co">#saemix::plot(f_dmta_saem_tc$so, plot.type = "convergence")</span></span></span>
 <span class="r-in"><span><span class="fu"><a href="https://rdrr.io/r/base/summary.html" class="external-link">summary</a></span><span class="op">(</span><span class="va">f_dmta_saem_tc</span><span class="op">)</span></span></span>
 <span class="r-out co"><span class="r-pr">#&gt;</span> saemix version used for fitting:      3.2 </span>
-<span class="r-out co"><span class="r-pr">#&gt;</span> mkin version used for pre-fitting:  1.2.4 </span>
-<span class="r-out co"><span class="r-pr">#&gt;</span> R version used for fitting:         4.3.0 </span>
-<span class="r-out co"><span class="r-pr">#&gt;</span> Date of fit:     Fri May 19 09:15:21 2023 </span>
-<span class="r-out co"><span class="r-pr">#&gt;</span> Date of summary: Fri May 19 09:15:21 2023 </span>
+<span class="r-out co"><span class="r-pr">#&gt;</span> mkin version used for pre-fitting:  1.2.5 </span>
+<span class="r-out co"><span class="r-pr">#&gt;</span> R version used for fitting:         4.3.1 </span>
+<span class="r-out co"><span class="r-pr">#&gt;</span> Date of fit:     Wed Aug  9 17:55:36 2023 </span>
+<span class="r-out co"><span class="r-pr">#&gt;</span> Date of summary: Wed Aug  9 17:55:36 2023 </span>
 <span class="r-out co"><span class="r-pr">#&gt;</span> </span>
 <span class="r-out co"><span class="r-pr">#&gt;</span> Equations:</span>
 <span class="r-out co"><span class="r-pr">#&gt;</span> d_DMTA/dt = - k_DMTA * DMTA</span>
@@ -238,7 +238,7 @@ specific pieces of information in the comments.</p>
 <span class="r-out co"><span class="r-pr">#&gt;</span> </span>
 <span class="r-out co"><span class="r-pr">#&gt;</span> Model predictions using solution type deSolve </span>
 <span class="r-out co"><span class="r-pr">#&gt;</span> </span>
-<span class="r-out co"><span class="r-pr">#&gt;</span> Fitted in 282.941 s</span>
+<span class="r-out co"><span class="r-pr">#&gt;</span> Fitted in 796.123 s</span>
 <span class="r-out co"><span class="r-pr">#&gt;</span> Using 300, 100 iterations and 9 chains</span>
 <span class="r-out co"><span class="r-pr">#&gt;</span> </span>
 <span class="r-out co"><span class="r-pr">#&gt;</span> Variance model: Two-component variance function </span>
diff --git a/docs/reference/index.html b/docs/reference/index.html
index 4d59b3ab..a0d9e12b 100644
--- a/docs/reference/index.html
+++ b/docs/reference/index.html
@@ -17,7 +17,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">mkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.2.4</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.2.5</span>
       </span>
     </div>
 
diff --git a/docs/reference/read_spreadsheet.html b/docs/reference/read_spreadsheet.html
index 4d1aa706..7603cee2 100644
--- a/docs/reference/read_spreadsheet.html
+++ b/docs/reference/read_spreadsheet.html
@@ -22,7 +22,7 @@ factors can be given in columns named 'Temperature' and 'Moisture'."><!-- mathja
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">mkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.2.4</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.2.5</span>
       </span>
     </div>
 
@@ -154,7 +154,7 @@ and moisture normalisation factors in the sheet 'Datasets'?</p></dd>
 The first row read after the header read in from this sheet is assumed
 to contain name and acronym of the parent compound.</p>
 <p>The dataset sheets should be named using the dataset numbers read in from
-the 'Datasets' sheet, i.e. '1', '2', ... . In each dataset sheet, name
+the 'Datasets' sheet, i.e. '1', '2', ... . In each dataset sheet, the name
 of the observed variable (e.g. the acronym of the parent compound or
 one of its transformation products) should be in the first column,
 the time values should be in the second colum, and the observed value
@@ -166,7 +166,7 @@ column and the column must have the same name as the second column in
 'Datasets'. Covariates will be read in from columns four and higher.
 Their names should preferably not contain special characters like spaces,
 so they can be easily used for specifying covariate models.</p>
-<p>An similar data structure is defined as the R6 class <a href="mkindsg.html">mkindsg</a>, but
+<p>A similar data structure is defined as the R6 class <a href="mkindsg.html">mkindsg</a>, but
 is probably more complicated to use.</p>
     </div>