diff --git a/docs/html/autorec.html b/docs/html/autorec.html index 0d3ab216..7e54504b 100644 --- a/docs/html/autorec.html +++ b/docs/html/autorec.html @@ -1,6 +1,6 @@
The 'Automatic Recorder' is used to create rules that will trig automatic recording of -events. You can use this to record you favourite TV show(s), record all movies on +events. You can use this to record you favorite TV show(s), record all movies on a specific channel, etc.

It's also possible to create a recording based on a query in the EPG. For more information diff --git a/docs/html/config_access.html b/docs/html/config_access.html index 70e98e1b..6a2c0958 100644 --- a/docs/html/config_access.html +++ b/docs/html/config_access.html @@ -1,13 +1,13 @@

-Setting upp access control is an important initial step as the system initially is +Setting up access control is an important initial step as the system initially is wide open.

When Tvheadend verifies access is scan thru all the enabled access control entries. -The permission flags are combined for all matchin access entries. +The permission flags are combined for all matching access entries. An access entry is said to match if the username / password matches and the IP source address of the requesting peer is within the prefix.

@@ -83,9 +83,9 @@ Let's also take a look at an example:

-First line gives clients orignating from 192.168.0.0 - 192.168.0.255 network +First line gives clients originating from 192.168.0.0 - 192.168.0.255 network access to streaming functions. Typically you would use this for your -local media players at home (Allthough Showtime can prompt for username & password +local media players at home (All though Showtime can prompt for username & password in its HTSP client)

The second line adds a user with world wide access who might want to modify diff --git a/docs/html/config_channels.html b/docs/html/config_channels.html index 4d057d82..fae901fc 100644 --- a/docs/html/config_channels.html +++ b/docs/html/config_channels.html @@ -46,7 +46,7 @@ in a Media player.

DVR Pre-Start -
Allows the user to specify an amout of extra time that should +
Allows the user to specify an amount of extra time that should be prepended to a recording scheduled on this channel. In other words, if you type 5 here for a recording that is scheduled for 20:00 will start to record at 19:55. This setting overrides the diff --git a/docs/html/config_cwc.html b/docs/html/config_cwc.html index 6140ffda..3877d541 100644 --- a/docs/html/config_cwc.html +++ b/docs/html/config_cwc.html @@ -21,7 +21,7 @@ 'enable' box and then press 'Save changes' to activate the new entry.
  • To delete one or more entries, select the lines (by clicking once on - them), and press the 'Delete selected' button. A popup + them), and press the 'Delete selected' button. A pop up will ask you to confirm your request. diff --git a/docs/html/config_dvb.html b/docs/html/config_dvb.html index d6032ca9..7162de85 100644 --- a/docs/html/config_dvb.html +++ b/docs/html/config_dvb.html @@ -20,7 +20,7 @@
    Adapter name
    - You can change the displayname for the adapter. + You can change the display name for the adapter.
    Autodetect muxes
    @@ -31,7 +31,7 @@
    Idle scanning
    - When nothing else happens Tvheadend will continously rotate among all + When nothing else happens Tvheadend will continuously rotate among all muxes and tune to them to verify that they are still working. If your adapter have problems with lots of tuning, try to disable this. @@ -99,7 +99,7 @@ have to click once in it.
  • Service can not be deleted since they are directly inherited / - discovered from a mux they will reapper in just a few seconds + discovered from a mux they will reappear in just a few seconds should one delete them. @@ -137,7 +137,7 @@ A word about DVB adapters

    A DVB adapter represents a piece of hardware attached to the system. - DVB receivers with dual tuners will present themself as two adapters + DVB receivers with dual tuners will present themselves as two adapters to the Tvheadend application. Tvheadend support DVB-T, DVB-C and DVB-S adapters.

    @@ -146,7 +146,7 @@ in order to detect it.

    If Tvheadend has configuration for an adapter and the adapter is missing - upon startup the configuration will be left untouched in case the adapter + upon start-up the configuration will be left untouched in case the adapter will be back in the future. There is currently no way to remove configuration for a no longer present adapter.

    @@ -156,7 +156,7 @@

    Warning2: Suspending a system is (from a USB driver perspective) equivalent to a unplug/insert event. Thus, suspending a system running Tvheadend - with USB adapters is not recommented at the moment. + with USB adapters is not recommended at the moment.

    • diff --git a/docs/html/config_dvr.html b/docs/html/config_dvr.html index dfe25648..949820a5 100644 --- a/docs/html/config_dvr.html +++ b/docs/html/config_dvr.html @@ -18,12 +18,12 @@ its internal database. Notice that the actual recorded file will not be deleted when the log entry is deleted. -
    Make subdirectories per day +
    Make sub-directories per day
    If checked, Tvheadend will create a new directory per day in the recording system path. Only days when anything is recorded will be created. The format of the directory will be 'YYYY-MM-DD' (ISO standard) -
    Make subdirectories per channel +
    Make sub-directories per channel
    If checked, Tvheadend will create a directory per channel when storing events. If both this and the 'directory per day' checkbox is enabled. The date-directory will be parent to the per-channel directory. @@ -31,17 +31,17 @@
    Include channel name in title
    If checked, Tvheadend will include the name of the channel in the event title. This applies to both the titled stored in the file - and to the filename itself. + and to the file name itself.
    Include date in title
    If checked, Tvheadend will include the date for the recording in the event title. This applies to both the titled stored in the file - and to the filename itself. + and to the file name itself.
    Include time in title
    If checked, Tvheadend will include the time for the recording in the event title. This applies to both the titled stored in the file - and to the filename itself. + and to the file name itself.
    Post-processor command
    Command to run after finishing a recording. The command will be run in background and is executed even if a recording is aborted @@ -58,8 +58,8 @@ %CWho created this recordinguser %tProgram titleNews %cProgram descriptionNews and stories... - %SStart timestmap of recording, UNIX epoch1224421200 - %EStop timestamp of recording, UNIX epoch1224426600 + %SStart time stamp of recording, UNIX epoch1224421200 + %EStop time stamp of recording, UNIX epoch1224426600
    Example usage: /path/to/ffmpeg -i %f -vcodec libx264 -acodec copy "/path/with white space/%b"
    diff --git a/docs/html/config_tags.html b/docs/html/config_tags.html index 17ba950c..1a7e19df 100644 --- a/docs/html/config_tags.html +++ b/docs/html/config_tags.html @@ -12,7 +12,7 @@ The tag-sets are used for:

    @@ -31,7 +31,7 @@ 'enable' box and then press 'Save changes' to activate the new entry.

  • To delete one or more entries, select the lines (by clicking once on - them), and press the 'Delete selected' button. A popup + them), and press the 'Delete selected' button. A pop up will ask you to confirm your request. @@ -44,11 +44,11 @@ not enabled it is only presented in this grid for the administrator.
    Name -
    Name of the tag. Changing the tag name does not interfer with any +
    Name of the tag. Changing the tag name does not interfere with any automatic recordings, groups, etc.
    Internal -
    Tags are exported via HTSP (to the Showtime Mediaplayer) and used +
    Tags are exported via HTSP (to the Showtime Media player) and used there for grouping of TV channels. If you do not wish to export a tag you can flag it as internal only. diff --git a/docs/html/dvrlog.html b/docs/html/dvrlog.html index d0f0ada5..33e0f65c 100644 --- a/docs/html/dvrlog.html +++ b/docs/html/dvrlog.html @@ -1,17 +1,17 @@
    -The DVR log displayes a paged grid containing all schedulded, current and completed +The DVR log displays a paged grid containing all scheduled, current and completed recordings. The list is sorted based on start time.

    Use the bottom toolbar (not displayed in this manual) to navigate between pages in the grid.

    -To see more details about a recorded event, just click on it and a popup will appear: +To see more details about a recorded event, just click on it and a pop up will appear:

    -In this popup you can cancel a scheduled recording or abort a recording in progress. -To close the popup, just close it with the [X] window button. +In this pop up you can cancel a scheduled recording or abort a recording in progress. +To close the pop up, just close it with the [X] window button.

    Once the recording is completed there will be a clickable link to the recorded matroska file so you can download it directly from the interface. diff --git a/docs/html/epg.html b/docs/html/epg.html index 13f70a24..4bc23a2a 100644 --- a/docs/html/epg.html +++ b/docs/html/epg.html @@ -67,7 +67,7 @@ sorted based on start time.

    Autorecordings
    Should you wish to record all events matching a specific query. (Record - your favourite TV-show, etc) you can press the 'Create Autorec' button + your favorite TV-show, etc) you can press the 'Create Autorec' button in the top toolbar.

    A popup with details about the to-be-created autorecording rule needs to diff --git a/docs/html/features.html b/docs/html/features.html index 41b126b0..dec12a31 100644 --- a/docs/html/features.html +++ b/docs/html/features.html @@ -26,13 +26,13 @@

    Output targets
    -
    HTSP (Home TV Streaming Protocol), supported by Showtime Mediaplayer and XBMC +
    HTSP (Home TV Streaming Protocol), supported by Showtime Media player and XBMC
    Built-in Digital Video Recorder
    Built in modern web user interface
    - Entire application loaded into browser. No page refreshs or slow updates. + Entire application loaded into browser. No page refreshes or slow updates. Based on ExtJS.
    Easy to administrate and configure @@ -40,7 +40,7 @@ All setup and configuration is done from the built in web user interface. Even so, all settings are stored in human readable text files. -
    Fully integrated with HTS Showtime Mediaplayer. +
    Fully integrated with HTS Showtime Media player.
    All channel data and their grouping, EPG and TV streaming is conducted over a single TCP connection. @@ -49,7 +49,7 @@
    Built in video recorder stores recorded programs as Matroska (.mkv) files. - Multiple simultanious recordings are supported. + Multiple simultaneous recordings are supported. All original streams (multiple audio tracks, etc) are recorded. Program meta information (title, description, etc) is also stored. @@ -61,15 +61,15 @@
    Automatic recordings
    - Create rulesets manually or based on EPG queries that will record all future - programs matching the query. Great for recording your favourite TV-show(s). + Create rule-sets manually or based on EPG queries that will record all future + programs matching the query. Great for recording your favorite TV-show(s).
    Easy DVB setup
    Tvheadend includes list of all major DVB-T, DVB-C and DVB-S networks around the globe. Just pick your location from a list. Next, it can scan all services and only map those which can be correctly decoded. Avoids - having lots of unusable channels in your mediaplayer. + having lots of unusable channels in your Media player.
    Multi-user support
    diff --git a/docs/html/install.html b/docs/html/install.html index 9092ad3e..a6fc34af 100644 --- a/docs/html/install.html +++ b/docs/html/install.html @@ -14,14 +14,14 @@ Parts of this documentation is also available in the Tvheadend man page.
    -u username
    - Run as 'username'. Only applicable if daemonizing. Default is to - use the uid of 1 (daemon on most systems). + Run as 'username'. Only applicable if demonizing. Default is to + use the UID of 1 (daemon on most systems).
    -g groupname
    Run as group 'groupname'. Only applicable if daemonizing. Default is to use the 'video' group. - If the 'video' group does not exist, gid 1 (daemon) will be used. + If the 'video' group does not exist, GID 1 (daemon) will be used. @@ -38,7 +38,7 @@ Parts of this documentation is also available in the Tvheadend man page. access to all features / settings in the web user interface. If this is the first time you setup Tvheadend you are most encouraged to enter the web user interface, selected the 'Configuration' + 'Access Control' - tab and make reasonable changes. Futher help / documentationcan be obtained + tab and make reasonable changes. Futher help / documentation can be obtained inside the web interface.
    Settings storage @@ -57,15 +57,15 @@ Parts of this documentation is also available in the Tvheadend man page. In order for Tvheadend to control video adapters on the system it must be granted access to those devices. Most systems have a 'video' group with write access to the video adapter devices. When Tvheadend - is started as a daemon (if Tvheadend is installed from a distibution package + is started as a daemon (if Tvheadend is installed from a distribution package this is most likely the way it is) it will change its primary group to 'video' in order to access these groups. If your system is configured in a different way you can either change the group membership of the - video adapters (/dev/dvb, etc) or reconfigure the Tvheadend startup + video adapters (/dev/dvb, etc) or reconfigure the Tvheadend start up parameters.

    - If Tvheadend is started without the '-f' argument it will not daemonize - nor change its primary userid/groupid. Rather it will run with the permissions + If Tvheadend is started without the '-f' argument it will not demonize + nor change its primary UID/GID. Rather it will run with the permissions granted to the user executing the binary. If that's the case you must make sure the current user is granted with access to the video devices. diff --git a/docs/html/overview.html b/docs/html/overview.html index fb2197d7..dc734b46 100644 --- a/docs/html/overview.html +++ b/docs/html/overview.html @@ -11,6 +11,6 @@ Tvheadend is part of the HTS project hosted at http://www.lonelycoder.com/hts

    -It functions primarily as a TV streaming backend for the Showtime Mediaplayer but +It functions primarily as a TV streaming back end for the Showtime Mediaplayer but can be used standalone for other purposes, such as a Digital Video Recorder.

    • diff --git a/docs/html/sysreq.html b/docs/html/sysreq.html index 48d64abe..0f908e07 100644 --- a/docs/html/sysreq.html +++ b/docs/html/sysreq.html @@ -11,6 +11,6 @@ Tvheadend is part of the HTS project hosted at http://hts.lonelycoder.com/.

    -It functions primarily as a TV backend for the Showtime Mediaplayer but +It functions primarily as a TV backend for the Showtime Media player but can be used standalone for other purposes.