Merge branch 'master' of github.com:lme4/lme4

lme4 · Feb 3, 2017 · 17ca62f · 17ca62f
2 parents 4c6b7f6 + a9d8655
commit 17ca62f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/man/glmer.Rd b/man/glmer.Rd
@@ -14,7 +14,7 @@ glmer(formula, data = NULL, family = gaussian, control = glmerControl(),
 }
 \arguments{
   \item{formula}{a two-sided linear formula object describing both the
-    fixed-effects and fixed-effects part of the model, with the response
+    fixed-effects and random-effects part of the model, with the response
     on the left of a \code{~} operator and the terms, separated by
     \code{+} operators, on the right.  Random-effects terms are
     distinguished by vertical bars (\code{"|"}) separating expressions