Update docs

diff --git a/docs/html/autorec.html b/docs/html/autorec.html
index 7e54504b3d278695063bd0a831e8ad253063e9cb..bb0d28452ddd0889faacf1c4ffb5777c7fa61eb9 100644 (file)
--- a/docs/html/autorec.html
+++ b/docs/html/autorec.html
@@ -1,10 +1,10 @@
 <div class="hts-doc-text">
-The 'Automatic Recorder' is used to create rules that will trig automatic recording of 
-events. You can use this to record you favorite TV show(s), record all movies on
-a specific channel, etc.
+The 'Automatic Recorder' is used to create rules that will trig
+automatic recording of events. You can use this to record you favorite
+TV show(s), record all movies on a specific channel, etc.
 <p>
-It's also possible to create a recording based on a query in the EPG. For more information
-about that, please read the EPG chapter.
+It's also possible to create a recording based on a query in the
+EPG. For more information about that, please read the EPG chapter.
 <p>
 <img src="docresources/autorec.png">
 <p>
@@ -12,18 +12,19 @@ about that, please read the EPG chapter.
 
  <ul>
   <li>To edit a cell, double click on it. After a cell is changed it
-      will flags one of its corner to red to indicated that it has been
-      changed. To commit these changes back to Tvheadend press the 
-      'Save changes' button. In order to change a Checkbox cell you only
-      have to click once in it.
+      will flags one of its corner to red to indicated that it has
+      been changed. To commit these changes back to Tvheadend press
+      the 'Save changes' button. In order to change a Checkbox cell
+      you only have to click once in it.
 
-  <li>To add a new entry, press the 'Add entry' button. The new (empty) entry
-      will be created on the server but will not be in its enabled state.
-      You can now change all the cells to the desired values, check the
-      'enable' box and then press 'Save changes' to activate the new entry.
+  <li>To add a new entry, press the 'Add entry' button. The new
+      (empty) entry will be created on the server but will not be in
+      its enabled state.  You can now change all the cells to the
+      desired values, check the 'enable' box and then press 'Save
+      changes' to activate the new entry.
 
-  <li>To delete one or more entries, select the lines (by clicking once on 
-      them), and press the 'Delete selected' button. A popup
+  <li>To delete one or more entries, select the lines (by clicking
+      once on them), and press the 'Delete selected' button. A popup
       will ask you to confirm your request.
  </ul>
 
@@ -33,13 +34,14 @@ The columns have the following functions:
 
  <dl>
   <dt>Enabled
-  <dd>If checked the rule is active. If unchecked the rule will not trig any new
-      recording sessions.
+  <dd>
+  If checked the rule is active. If unchecked the rule will not trig
+  any new recording sessions.
 
   <dt>Title
   <dd>
-  Only matches events with the given title. The filter uses case insensitive regular
-  expression.
+  Only matches events with the given title. The filter uses case
+  insensitive regular expression.
 
   <dt>Channel
   <dd>
@@ -54,6 +56,15 @@ The columns have the following functions:
   <dd>
   Only match events belonging to the given content group.
 
+  <dt>Weekdays
+  <dd>
+  Only record events if they occur on one of these days. By default all days
+  are marked as active.
+
+  <dt>Starting around
+  <dd>
+  Only record events if they are scheduled +-15 minutes from this given time.
+
   <dt>Created by
   <dd>
   Free text field, but will be copied to the recording session.

diff --git a/docs/html/config_channels.html b/docs/html/config_channels.html
index 243c777d53715dfbe7a645ae752600d6156820a4..f8b38d3062ed38f58113c3cb5dec6d5ea319b352 100644 (file)
--- a/docs/html/config_channels.html
+++ b/docs/html/config_channels.html
@@ -64,6 +64,12 @@
       to end 20:30 will stop to record at 20:35. This setting overrides the
       Extra time after recordings DVR setting.
 
+  <dt>Merge button
+  <dd>If you have two channels that are actually the same you can
+      press the merge button on one of the channels to merge that into
+      another channel.  After the merge the channel you pressed this
+      function on will be removed and all services connected to it
+      will be added to the target channel.
   </dl>
  </div>
  </div>

diff --git a/docs/html/config_dvr.html b/docs/html/config_dvr.html
index 949820a5cde22208bd4d1e6504bd6999c9981442..370f4098049510a67d1cd525af37c910e629680e 100644 (file)
--- a/docs/html/config_dvr.html
+++ b/docs/html/config_dvr.html
@@ -25,8 +25,13 @@
 
   <dt>Make sub-directories per channel
   <dd>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.
+      events. If both this and the 'directory per day' checkbox is enabled,
+      the date-directory will be parent to the per-channel directory.
+
+  <dt>Make sub-directories per title
+  <dd>If checked, Tvheadend will create a directory per title when storing
+      events. If the day/channel directory checkboxes are also enabled, those
+      directories will be parents of this directory.
 
   <dt>Include channel name in title
   <dd>If checked, Tvheadend will include the name of the channel in the
@@ -42,6 +47,11 @@
   <dd>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 file name itself.
+
+  <dt>Include episode in title
+  <dd>If checked, Tvheadend will include the season and episode in the
+      title (if such info is available).
+
   <dt>Post-processor command
   <dd>Command to run after finishing a recording. The command will be
       run in background and is executed even if a recording is aborted

diff --git a/docs/html/dvr.html b/docs/html/dvr.html
index 33f65409c28ccf66170e724dead58341e5f7331b..418a793c8f8c2e91b5f6c0ba791dade3b3060a0c 100644 (file)
--- a/docs/html/dvr.html
+++ b/docs/html/dvr.html
@@ -2,8 +2,10 @@
 Under the 'Digital Video Recorder' tab you can administer and list status of
 individual recordings and configure rules for the automatic recorder.
 <p>
-To access the DVR tab you must be logged in sufficient access credentials.
+To access the DVR tab you must be logged in sufficient access
+credentials.
 <p>
-For general configuration of the DVR (such as where and how to store the recordings,
-please see the DVR section in the configuration chapter)
+For general configuration of the DVR (such as where and how to store
+the recordings, please see the DVR section in the configuration
+chapter)
 </div>

diff --git a/docs/html/dvrlog.html b/docs/html/dvrlog.html
index 33e0f65ccf3ce0bbd62f1fa73c5f32219cb7c50a..1b2de7c359f0ce498d45b21fe3d9e126178d3b69 100644 (file)
--- a/docs/html/dvrlog.html
+++ b/docs/html/dvrlog.html
@@ -1,18 +1,21 @@
 <div class="hts-doc-text">
-The DVR log displays a paged grid containing all scheduled, current and completed
-recordings. The list is sorted based on start time.
+The DVR log displays a paged grid containing all scheduled, current
+and completed recordings. The list is sorted based on start time.
 <p>
-Use the bottom toolbar (not displayed in this manual) to navigate between pages
-in the grid.
+Use the bottom toolbar (not displayed in this manual) to navigate
+between pages in the grid.
 <img src="docresources/dvrlog.png">
 <p>
-To see more details about a recorded event, just click on it and a pop up will appear:
+To see more details about a recorded event, just click on it and a pop
+up will appear:
 <p>
 <img src="docresources/dvrlogentry.png">
 <p>
-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.
+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.
 <p>
-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.
+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.
 </div>