X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=doc%2Fvlm.txt;h=e8375e8a8e703a7af8f811696ae2ec3c4202553c;hb=f0923351ff8072ce100a4b2a6292513c89a793ed;hp=51b22a33e845b45cf8752053c93e067b17033641;hpb=4a1949b93288b734115a92167fafa2043422c25d;p=vlc

diff --git a/doc/vlm.txt b/doc/vlm.txt
index 51b22a33e8..e8375e8a8e 100644
--- a/doc/vlm.txt
+++ b/doc/vlm.txt
@@ -61,8 +61,10 @@ Note: an element is a media or a schedule.
         "del all" destroys all elements.
         "del media" destroys all medias.
         "del schedule" destroys all schedules.
-    control (name) (command)
-        Changes the state of the (name) media.
+    control (name) [instance_name] (command)
+        Changes the state of the (instance_name) instance of (name) media.
+        If (instance_name) is not specified, the control command affects the
+        default instance.
         See Commands section for more information.
     save (config_file)
         Saves all media and schedule configurations in the (config_file)
@@ -81,6 +83,10 @@ Note: an element is a media or a schedule.
     Media Properties Syntax:
         input (input_name)
             Adds (input_name) at the end of the media input list.
+        inputdel (input_name)|all
+            Deletes (input_name) or all items from the media input list.
+        inputdeln (input_number)
+            Deletes the item #(input_number) from the media input list.
         output (output_name)
             Defines the output of the media.
             The syntax is equivalent to the ":sout=..." option , but you
@@ -100,6 +106,12 @@ Note: an element is a media or a schedule.
             If a media with "loop" option receives the "play" command
             and finally finishes to play the last input of the list, it
             will automatically restart to play the input list.
+        mux (mux_name)
+            Used for vod only.
+            Only needs to be specified if you want the elementary streams
+            to be sent encapsulated instead of raw. The (mux_name) should be
+            a fourcc describing the encapsulation type (eg. mp2t for MPEG TS,
+            or mp2t for MPEG PS).
 
     Schedule Properties Syntax:
         enabled|disabled
@@ -155,4 +167,5 @@ IV - The configuration file
   will crash (at least).
   The load command converts the medias and schedules configurations into
   command lines, and writes them into a file.
-  Note: commentary system has not been implement yet.
+  Any line where the first non white space character is a '#' is considered
+  as a comment.