[FFmpeg-cvslog] doc/ffserver: move ACL syntax section before the global option sections

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Nov 28 19:14:38 2013 +0100| [312d075e5de97855ee7e1c8a5aa2eb2abc667772] | committer: Stefano Sabatini

doc/ffserver: move ACL syntax section before the global option sections

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=312d075e5de97855ee7e1c8a5aa2eb2abc667772
---

 doc/ffserver.texi |   60 ++++++++++++++++++++++++++---------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index 007b098..64bc514 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -226,6 +226,36 @@ A line starting with @code{#} is ignored and treated as a comment.
 
 Name of options and sections are case-insensitive.
 
+ at section ACL syntax
+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
+ at itemize
+ at item
+Allow/deny access to @var{address}.
+ at example
+ACL ALLOW <address>
+ACL DENY <address>
+ at end example
+
+ at item
+Allow/deny access to ranges of addresses from @var{first_address} to
+ at var{last_address}.
+ at example
+ACL ALLOW <first_address> <last_address>
+ACL DENY <first_address> <last_address>
+ at end example
+ at end itemize
+
+You can repeat the ACL allow/deny as often as you like. It is on a per
+stream basis. The first match defines the action. If there are no matches,
+then the default is the inverse of the last ACL statement.
+
+Thus 'ACL allow localhost' only allows access from localhost.
+'ACL deny 1.0.0.0 1.255.255.255' would deny the whole of network 1 and
+allow everybody else.
+
 @section Global options
 @table @option
 @item Port @var{port_number}
@@ -277,36 +307,6 @@ Set no-daemon mode. This option is currently ignored since now
 
 @end table
 
- at section ACL syntax
-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
- at itemize
- at item
-Allow/deny access to @var{address}.
- at example
-ACL ALLOW <address>
-ACL DENY <address>
- at end example
-
- at item
-Allow/deny access to ranges of addresses from @var{first_address} to
- at var{last_address}.
- at example
-ACL ALLOW <first_address> <last_address>
-ACL DENY <first_address> <last_address>
- at end example
- at end itemize
-
-You can repeat the ACL allow/deny as often as you like. It is on a per
-stream basis. The first match defines the action. If there are no matches,
-then the default is the inverse of the last ACL statement.
-
-Thus 'ACL allow localhost' only allows access from localhost.
-'ACL deny 1.0.0.0 1.255.255.255' would deny the whole of network 1 and
-allow everybody else.
-
 @section Feed section
 
 A Feed section defines a feed provided to @command{ffserver}.