summaryrefslogtreecommitdiff
path: root/doc/ffserver.texi
diff options
context:
space:
mode:
Diffstat (limited to 'doc/ffserver.texi')
-rw-r--r--doc/ffserver.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index ad48f47a8f..b3e1f1d7ef 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -327,7 +327,7 @@ Name of options and sections are case-insensitive.
An ACL (Access Control List) specifies the address which are allowed
to access a given stream, or to write a given feed.
-It accepts the folling forms
+It accepts the following forms
@itemize
@item
Allow/deny access to @var{address}.
@@ -416,7 +416,7 @@ deprecated.
@item NoDefaults
Control whether default codec options are used for the all streams or not.
Each stream may overwrite this setting for its own. Default is @var{UseDefaults}.
-The lastest occurrence overrides previous if multiple definitions.
+The last occurrence overrides the previous if multiple definitions exist.
@end table
@section Feed section