WEBUI: Correct help and cosmetic

diff --git a/docs/html/config_access.html b/docs/html/config_access.html
index 538246b4000f96d2a12d40c3ae5234029a5930d2..d13eb637056f29dfcbc31e25552354a753691a7b 100644 (file)
--- a/docs/html/config_access.html
+++ b/docs/html/config_access.html
@@ -41,18 +41,15 @@ The columns have the following functions:
 
 <dl>
  <dt><b>Enabled</b>
- <dd>Make the entry participate in access control. If disabled, the entry
-     is inactive.
+ <dd>Enable this access control rule. Uncheck the box to disable.
 
   <dt><b>Username</b>
   <dd>
-  Name of user, if no username is needed for match it should contain a
-  single asterisk (*).
+  Login name to be used. If no username is required, this entry should contain a single asterisk (*).
 
   <dt><b>Password</b>
   <dd>
-  Password to combine with user, if username is '*' (unused), the password
-  should be the same.
+  Login password to be used. If username is '*' (unused), the password should be the same (i.e. match any username/password combination, or no username/password required).
 
   <dt><b>Network prefix</b>
   <dd>
@@ -61,8 +58,7 @@ The columns have the following functions:
 
   <dt><b>Streaming</b>
   <dd>
-  Enables access to streaming function. The 'streaming' access is enough to
-  make Showtime (over HTSP) work.
+  Enables access to streaming functionality. This permission is enough to stream over HTSP to VLC, Showtime and similar.
 
   <dt><b>Advanced Streaming</b>
   <dd>
@@ -89,18 +85,15 @@ The columns have the following functions:
   
   <dt><b>Limit Connections</b>
   <dd>
-  If nonzero, the user will be limited to this amount of streaming
-  connection at a time.
+  If set, this will limit the number of concurrent streaming connections a user is permitted to have. 0=disabled
 
   <dt><b>Min Channel Num</b>
   <dd>
-  If nonzero, the user will only be able to access channels with
-  a channel number equal or greater to this value.
+  If non-zero, this sets the lower limit of the channels accessible by a user, i.e. the user will only be able to access channels where the channel number is equal to or greater than this value.
 
   <dt><b>Max Channel Num</b>
   <dd>
-  If nonzero, the user will only be able to access channels with
-  a channel number equal or lower to this value.
+  If non-zero, this sets the upper limit of the channels accessible by a user, i.e. the user will only be able to access channels where the channel number is equal to or less than this value.
 
   <dt><b>Channel Tag</b>
   <dd>

diff --git a/docs/html/config_dvrfailed.html b/docs/html/config_dvrfailed.html
index da40a3eabea4ac5af0da754e371e93bf8e938bf4..a500c569f6128f712a50de9d231e279e98113bc3 100644 (file)
--- a/docs/html/config_dvrfailed.html
+++ b/docs/html/config_dvrfailed.html
@@ -18,7 +18,7 @@ Buttons have the following functions:
 <p>
   <dt><b>Download</b>
   <dd>
-  If clicked download selected failed recordings you can downloaded recordings to your disk. After clicked you ask to select path.
+  Click this button to download the selected failed recordings to a local disk. You will be prompted to select the path for the saved file(s).
 </dl>
 <p>
 <br>

diff --git a/docs/html/config_dvrfinished.html b/docs/html/config_dvrfinished.html
index e7beec6a38a1d1eb9d131ba75ca3e4eb7c3820fe..e25f148a53945bd6ef563df7d46a310af074bf86 100644 (file)
--- a/docs/html/config_dvrfinished.html
+++ b/docs/html/config_dvrfinished.html
@@ -18,7 +18,7 @@ Buttons have the following functions:
 <p>
   <dt><b>Download</b>
   <dd>
-  If clicked download selected finished recordings you can downloaded recordings to your disk. After clicked you ask to select path.
+  Click this button to download the selected finished recordings to a local disk. You will be prompted to select the path for the saved file(s).
 </dl>
 <p>
 <br>

diff --git a/docs/html/config_dvrupcoming.html b/docs/html/config_dvrupcoming.html
index bd2182ad11821d5a99e868d3469e6ad060a90887..b619ed3e02e2c9c9b27484a6aad27c25c75f7848 100644 (file)
--- a/docs/html/config_dvrupcoming.html
+++ b/docs/html/config_dvrupcoming.html
@@ -12,10 +12,31 @@ This tab show your all upcoming/current recordings.
 Buttons have the following functions:
 <br><br>
 <dl>
+  <dt><b>Add</b>
+  <dd>
+  Add and configure a recording event by hand as opposed to choosing something from the EPG. This is useful if you wish to record something that isn't yet in the EPG, or record at a particular time that perhaps spans several EPG events.
+  <p>
   <dt><b>Delete</b>
   <dd>
   If clicked delete selected upcoming/current recordings you delete recordings. Before deleted show message: Do you really want to delete the selection ? Answer Yes or No.
-</dl>
+  <p>
+  <dt><b>Abort</b>
+  <dd>
+  Abort an already-underway recording. Note that this does not remove the (partial) recording file from disk.
+  <p>
+  <dt><b>Edit</b>
+  <dd>
+  Manually edit an already-scheduled recording event. This uses the same fields as <b>Add</b>, but they're obviously pre-populated with their current values.
+  <p>
+  <dt><b>Save</b>
+  <dd>
+  Saves any changes made to the recording list.
+  <p>
+  <dt><b>Undo</b>
+  <dd>
+  Undoes any changes made to the recording list.
+  <p>
+  </dl>
 <p>
 <br>
 <hr>
@@ -26,49 +47,57 @@ The columns have the following functions:
  <dl>
   <dt><b>Details</b>
   <dd>
-  Show clock status or red point status and blue icon "i". Red point status means current recording and clock status means scheduled recording. After click on icon "i" you see info about select upcoming/current recordings.
+  Shows the status of the recording event:<br>
+  <br>
+  <b>Clock</b> - the recording is scheduled (upcoming).<br>
+  <br>
+  <b>Record symbol (red circle)</b> - the recording is active and underway (current).<br>
+  <br>
+  <b>InInfo</b> - displays detailed information about the selected recording (upcoming or current).<br>
  <p>
  <img src="docresources/upcomingrecordings2.png">
   <p>
 <dt><b>Title</b>
   <dd>
-  Showing title of record.
+  The title (name) of the recording. While this is copied from the EPG when you create a recording, it's not used to match the event itself and is thus used here as the name of the event (see also: adding an event manually with the <b>Add</b> button).
  <p>
- <dt><b>Episod</b>
+ <dt><b>Episode</b>
   <dd>
-  Showing number episod of record.
+  The episode number of the recording (whether this is available depends on your broadcaster and/or EPG data source).
  <p>
  <dt><b>Priority</b>
   <dd>
-  Showing priority of record.
+  The priority of the recording: Not set, Important, High, Normal, Low, Unimportant.
+  <br>
+  If there is a clash, more important recordings will take priority over less important ones.
  <p>
  <dt><b>Scheduled Start Time</b>
   <dd>
-  Showing date and time when the recording was started.
+  The date and time when the scheduled recording will start. Note that this includes any extra time defined in the recording profile (e.g. "start two minutes earlier than the EPG start time").
  <p>
  <dt><b>Scheduled Stop Time</b>
   <dd>
-  Showing date and time when the recording was stoped.
+  The date and time when the scheduled recording will stop. Note that this includes any extra time defined in the recording profile (e.g. "finish recording five minutes after the EPG stop time").
  <p>
  <dt><b>Duration</b>
   <dd>
-  Showing how long it took the recording.
+  The total duration of the scheduled recording, including any extra time before or after.
  <p>
   <dt><b>Channel Name</b>
   <dd>
-  Showing the name of the channel from which the recording will be made.
+  The channel to be recorded.
  <p>
  <dt><b>Creator</b>
   <dd>
-  Showing the name of the user who created the recording.
+  The user who created the recording or the auto-recording source and IP address if scheduled by a matching rule.
  <p>
  <dt><b>DVR Configuration</b>
   <dd>
-  Showing the name of DVR Configuration which is use to record.
+  The DVR configuration to be used for this recording.
  <p>
  <dt><b>Schedule Status</b>
   <dd>
-  Showing the status info of record.
+  The status of the recording(scheduled or recording).
  <p>
 
 </div>
\ No newline at end of file

diff --git a/docs/html/config_tvadapters.html b/docs/html/config_tvadapters.html
index a6433445a436675ebb58845cf10523e5af2998ab..a65428d4c539744c55c177ca84f86c4f1a6fdec0 100644 (file)
--- a/docs/html/config_tvadapters.html
+++ b/docs/html/config_tvadapters.html
@@ -19,11 +19,11 @@
   <dt>Name</dt>
   <dd>The name of this tuner.</dd>
 
-  <dt>Over-the-air EPG</dt>
-  <dd>Allow OTA EPG (epggrab) scan on this input device</dd>
+  <dt>Over-the-Air EPG</dt>
+  <dd>Enable over-the-air programme guide (EPG) scanning on this input device.</dd>
 
   <dt>Networks</dt>
-  <dd>Allow to select networks which use on this input device</dd>
+  <dd>Associate this device with one or more networks.</dd>
   
   <dt>Priority</dt>
   <dd>The tuner priority value (higher value = higher priority to use this