--- multiplexer/iso13818ts.1	2001/08/01 08:23:18	1.9
+++ multiplexer/iso13818ts.1	2001/08/02 14:51:22	1.10
@@ -166,6 +166,81 @@ with the \fB\-\-si\fR command, which in
 data to arise in the target stream without listing it
 in the PMT.
 .TP
+\fB\-\-descr\fR \fItarget_program\fR [\fIdescr_tag\fR [\fIdescr_length\fR \fIdata\fR...]]
+Add, inhibit or delete in the PMT section a descriptor,
+that does \fBnot\fR belong to a specific stream.
+To add a descriptor, all parameters must be given,
+\fIdescr_tag\fR (range 0x00..0xFF),
+\fIdescr_length\fR (range 1..255),
+and the appropriate amount of bytes given as \fIdata\fR (range 0x00..0xFF).
+To inhibit any descriptor with a given \fIdescr_tag\fR,
+\fIdescr_length\fR is set to \fB0\fR and no \fIdata\fR is given.
+This causes matching descriptors from input streams to
+be discarded instead of being copied to the target stream.
+To delete the manual setting of a descriptor,
+\fIdescr_length\fR is omitted. This causes descriptors
+with matching \fIdescr_tag\fR to be passed from input to
+the target stream.
+To delete all manual settings for a \fItarget_program\fR,
+that do \fBnot\fR belong to a specific stream,
+the \fIdescr_tag\fR is omitted, too.
+Note, that \fB\-\-descr\fR never modifies descriptors,
+that belong to a specific stream.
+To modify these, use the command \fB\-\-sdescr\fR or \fB\-\-pdescr\fR.
+.TP
+\fB\-\-sdescr\fR [\fItarget_program\fR [\fIstream_id\fR [\fIdescr_tag\fR [\fIdescr_length\fR \fIdata\fR...]]]]
+Add, inhibit or delete in the PMT section a descriptor,
+that does belong to a specific stream.
+To add a descriptor, all parameters must be given,
+\fIstream_id\fR (recommended range 0xBD..0xFE),
+\fIdescr_tag\fR (range 0x00..0xFF),
+\fIdescr_length\fR (range 1..255),
+and the appropriate amount of bytes given as \fIdata\fR (range 0x00..0xFF).
+To inhibit any descriptor with a given \fIdescr_tag\fR,
+\fIdescr_length\fR is set to \fB0\fR and no \fIdata\fR is given.
+This causes matching descriptors from the corresponding input streams to
+be discarded instead of being copied to the target stream.
+To delete the manual setting of a descriptor,
+\fIdescr_length\fR is omitted. This causes descriptors
+with matching \fIdescr_tag\fR to be passed from input to
+the target stream.
+To delete all manual settings for a \fIstream_id\fR in
+the \fItarget_program\fR,
+the \fIdescr_tag\fR is omitted, too.
+To delete all manual settings for all streams \fBand\fR those
+that do not belong to a specific stream,
+the \fIstream_id\fR is omitted, too.
+Finally, to delete all manual settings in all programs,
+all parameters are omitted.
+.TP
+\fB\-\-pdescr\fR [\fItarget_program\fR [\fIpid\fR [\fIdescr_tag\fR [\fIdescr_length\fR \fIdata\fR...]]]]
+Add, inhibit or delete in the PMT section a descriptor,
+that does belong to a specific stream.
+To add a descriptor, all parameters must be given,
+\fIpid\fR (range 0x0001..0x1FFE),
+\fIdescr_tag\fR (range 0x00..0xFF),
+\fIdescr_length\fR (range 1..255),
+and the appropriate amount of bytes given as \fIdata\fR (range 0x00..0xFF).
+To inhibit any descriptor with a given \fIdescr_tag\fR,
+\fIdescr_length\fR is set to \fB0\fR and no \fIdata\fR is given.
+This causes matching descriptors from the corresponding input streams to
+be discarded instead of being copied to the target stream.
+To delete the manual setting of a descriptor,
+\fIdescr_length\fR is omitted. This causes descriptors
+with matching \fIdescr_tag\fR to be passed from input to
+the target stream.
+To delete all manual settings for a \fIpid\fR in
+the \fItarget_program\fR,
+the \fIdescr_tag\fR is omitted, too.
+To delete all manual settings for all streams \fBand\fR those
+that do not belong to a specific stream,
+the \fIpid\fR is omitted, too.
+Finally, to delete all manual settings in all programs,
+all parameters are omitted.
+Note, that, in contrast to \fB\-\-descr\fR and \fB\-\-sdescr\fR,
+with \fB\-\-pdescr\fR it is possible to set
+descriptors for PMT entries, that have been added using \fB\-\-sipid\fR.
+.TP
 \fB\-I\fR, \fB\-\-ident\fR \fItransport_stream_id\fR
 Set the output \fItransport_stream_id\fR (range 0x0000..0xFFFF).
 .TP
@@ -214,10 +289,12 @@ of a certain buffer fullness.
 \fB\-C\fR, \fB\-\-config\fR \fInum\fR
 Order output configuration of target stream with \fInum\fR=1,
 switch off with \fInum\fR=0.
+Set \fInum\fR=2, to get information about descriptors, too.
 When switched on, the configuration is printed each time it changes.
 First, the number of programs is printed,
 then for each program one line of description and
 for each stream within that program another line is printed.
+When \fInum\fR=2, then for each descriptor there is printed one more line.
 The following values are compiled:
 .RS
 .TP
@@ -259,6 +336,15 @@ Source file reference number (-1 if none
 .TP
 \fIname\fR
 Source file name.
+.TP
+\fIdescr\fR
+Descriptor tag.
+.TP
+\fIlen\fR
+Descriptor length, number of data bytes in the descriptor.
+.TP
+\fIdata\fR
+Descriptor data, bytewise.
 .RE
 .TP
 \fB\-S\fR, \fB\-\-statistics\fR \fItime\fR
@@ -479,12 +565,12 @@ again multiplexed in some way. Results w
 when this remultiplexing takes place entirely within the
 multiplexer, because that way timing information won't get lost.
 .SH BUGS
-Non-ISO_13818-1 descriptors (private descriptors) in
-ISO_13818-1 PSI sections are not promoted.
-.P
 End of action sometimes is not detected correctly, which
 causes the multiplexer to hang.
 Nevertheless, it then can be stopped by the \fBquit\fR command.
+.P
+Changing configuration is not printed if the change
+is solely a descriptor coming from a source file.
 .SH "SEE ALSO"
 .BR repeatts (1),
 .BR iso13818ps (1),