diff --git a/docs/docresources/configdvbmux.png b/docs/docresources/configdvbmux.png new file mode 100644 index 00000000..a8d936b5 Binary files /dev/null and b/docs/docresources/configdvbmux.png differ diff --git a/docs/docresources/configdvbnetwork.png b/docs/docresources/configdvbnetwork.png new file mode 100644 index 00000000..1b889640 Binary files /dev/null and b/docs/docresources/configdvbnetwork.png differ diff --git a/docs/docresources/configdvbservices.png b/docs/docresources/configdvbservices.png new file mode 100644 index 00000000..f0c80807 Binary files /dev/null and b/docs/docresources/configdvbservices.png differ diff --git a/docs/html/config_muxes.html b/docs/html/config_muxes.html index ef9be119..e59a500a 100644 --- a/docs/html/config_muxes.html +++ b/docs/html/config_muxes.html @@ -1,40 +1,58 @@

- Muxes are data streams coming from networks + Muxes are locations at which services can be found. On traditional networks (DVB-C, -T and -S), these are carrier signals on which the individual channels are multiplexed, hence the name. However, Tvheadend also uses the term 'mux' to describe a source for multiple IP streams - so an IP address, in effect.

- +

The columns have the following functions:
+ +
Play +
Downloads a playlist file (M3U or XSPF, depending on your startup options) so you can tune to the mux from an external application. +
Enabled -
If selected, mux is enabled. - If unselected, mux is disabled. +
Whether or not the mux is enabled and thus available.
EPG -
Retrieve EPG informations from mux. +
Whether or not to retrieve EPG information from the mux. + +
Network +
The name of the network to which the mux belongs. Networks are defined in Configuration -> DVB Inputs -> Networks - DVB-S or ATSC, for example. + +
Original Network ID +
The ONID is a code which uniquely identifies a network. + +
Transport Stream ID +
The TSID is a code which identifies the network origination source or transmitter. + +
CRID Authority +
The group responsible for the Content Reference Identifier for this mux. This is effectively a URL/URI to an authoritative source for programme data (e.g. series link).
Scan Status -
Mux scan status. +
Whether the mux is being scanned (ACTIVE), is planned to be scanned (PEND) or has reverted to idle scan (IDLE). + +
Scan Result +
Whether there were any problems with the last scan of this mux.
URL
Mux URL. -
Interface -
- -
ATSC -
- -
Service Name -
Mux name +
# Services +
The number of services found on this mux.
Character Set -
+
The character encoding for this mux (e.g. UTF-8). + +
Interface +
IPTV : the network interface/card on which the IPTV source can be found. + +
ATSC +
whether or not this is an ATSC IPTV source. + -
diff --git a/docs/html/config_networks.html b/docs/html/config_networks.html index a277d028..1b77f71d 100644 --- a/docs/html/config_networks.html +++ b/docs/html/config_networks.html @@ -1,23 +1,30 @@

- Networks + A network is the type of carrier for your television signals. Tvheadend supports several different types of network, notably: + +

DVB-C : Cable TV, delivered via a cable to your house +
DVB-S : Satellite (includes S2), so any signal coming in via a dish +
DVB-T : Terrestrial, so over-the-air broadcasts received through a traditional television aerial +
ATSC : Over-the-air terrestrial, common in north and central America and parts of south Asia +
IPTV : IP, so over the Internet +

- +

The columns have the following functions:
Network Name -
Name of the network. +
The name of the network. This can be set automatically or you can give it a name that means something to you (e.g. if you have multiple OTA networks).
Network Discovery -
+
Whether automatic discovery is enabled for this network, i.e. whether Tvheadend looks for muxes or simply stays with the list of muxes as defined initially.
Skip initial Scan -
+
Don't scan this network for muxes at Tvheadend start.
Idle Scan Muxes
@@ -35,7 +42,8 @@
Character Set -
+
The character encoding for this network (e.g. UTF-8). + diff --git a/docs/html/config_services.html b/docs/html/config_services.html index 8352b325..7975687e 100644 --- a/docs/html/config_services.html +++ b/docs/html/config_services.html @@ -3,51 +3,56 @@ Services are automatically pulled from muxes and can be mapped to Channels.

- +

The columns have the following functions:
-
Enabled -
If selected, mux is enabled. - If unselected, mux is disabled. +
Play +
Opens a playlist (M3U of XSPF, depending on your startup options) to allow you to stream this service to another application, e.g. to watch a channel in VLC. -
Service Name -
+
Details +
Display details on this service, e.g. PID, streams, audio/video CODECs, languages, etc. + +
Enabled +
Whether or not this service is available for use
Channel -
Channel mapped to this service. +
The channel to which the service is mapped + +
Service Name +
The name of the service, detected when the service was discovered
Encrypted -
Service encryption status. +
Whether or not the service is scrambled
Network -
Network the service is running on. +
The network on which this service resides (i.e. whether it's a cable channel or a terrestrial one)
Mux -
Mux the service is served from. +
The mux which carries this service. This is typically the frequency of the carrier signal in kHz, with polarisation (H or V) as applicable.
Service ID -
+
A unique identifier for this service within this mux/transport stream.
Local Channel Number -
+
Channel number as assigned by the broadcaster.
Provider -
+
Any supplied provider string, e.g. where multiple broadcasters share a platform, such as for free-to-air and pay TV.
CRID Authority -
+
The group responsible for the Content Reference Identifier for this service. This is effectively a URL/URI to an authoritative source for programme data (e.g. series link).
Service Type -
+
The service type flag as defined by the DVB specifications (e.g. 0x02 = radio, 0x11 = MPEG2 HD TV, 0x19 = H.264 HD TV)
Pref. CA PID -
+
The Preferred Conditional Access Packet Identifier. Used for decrypting scrambled streams.
Character Set -
+
The character encoding for this service (e.g. UTF-8).