Merge branch 'master' into saemix

1 files changed, 3 insertions, 2 deletions

diff --git a/man/mmkin.Rd b/man/mmkin.Rd
index 170ce8df..309761dd 100644
--- a/man/mmkin.Rd
+++ b/man/mmkin.Rd
@@ -9,7 +9,7 @@ more datasets}
 mmkin(
   models = c("SFO", "FOMC", "DFOP"),
   datasets,
-  cores = parallel::detectCores(),
+  cores = if (Sys.info()["sysname"] == "Windows") 1 else parallel::detectCores(),
   cluster = NULL,
   ...
 )
@@ -28,7 +28,8 @@ data for \code{\link{mkinfit}}.}
 is only used when the \code{cluster} argument is \code{NULL}. On Windows
 machines, cores > 1 is not supported, you need to use the \code{cluster}
 argument to use multiple logical processors. Per default, all cores
-detected by \code{\link[parallel:detectCores]{parallel::detectCores()}} are used.}
+detected by \code{\link[parallel:detectCores]{parallel::detectCores()}} are used, except on Windows where
+the default is 1.}
 
 \item{cluster}{A cluster as returned by \code{\link{makeCluster}} to be used
 for parallel execution.}