1
## Description: Fix documentation for MENU_ENTER and MENU_BACK, remove all historic "added in tvtime 0.9.x" notes from usage.html
2
## Origin: upstream, http://tvtime.cvs.sourceforge.net/viewvc/tvtime/tvtime/docs/html/usage.html?r1=1.19&r2=1.20&view=patch
3
## Bug-Ubuntu: http://launchpad.net/bugs/372822
5
## Author: Mikael Magnusson
6
## Forwarded: not-needed
7
Index: tvtime-1.0.2/docs/html/usage.html
8
===================================================================
9
--- tvtime-1.0.2.orig/docs/html/usage.html 2012-03-06 10:04:19.452349000 +0000
10
+++ tvtime-1.0.2/docs/html/usage.html 2012-03-06 10:19:18.321412987 +0000
13
<h3>Non-English characters in channel names</h3>
15
-<p>Since 0.9.8.2 it is possible to use non-English characters in channel
16
-names. To do this, you first need to specify a character set for the XML
17
-document. This is done by changing <tt><?xml version="1.0"?></tt>
18
-to for example <tt><?xml version="1.0" encoding="ISO-8859-1"?></tt>,
19
-depending on what encoding you want. If no encoding is specified, UTF-8
21
+<p>To use non-English characters in channel names, first need to specify a character set
22
+for the XML document. This is done by changing <tt><?xml version="1.0"?></tt>
23
+to for example <tt><?xml version="1.0" encoding="ISO-8859-1"?></tt>, depending
24
+on what encoding you want. If no encoding is specified, UTF-8 is assumed.</p>
26
<p><b>Note 1:</b> If you want to display an <tt>&</tt> sign, you have
27
to type <tt>&amp;</tt> since the file is XML.</p>
29
Automatically resize the window to match the content inside it. This
30
is for when you resize tvtime into, say, a long rectangle, and want it
31
to jump back to being a perfect 4:3 box around the content.
32
-</p><p>The <b>AUTO_ADJUST_WINDOW</b> command was added in tvtime 0.9.8.3.
35
<table width="90%" class="doclist">
37
<tr><th class="docboxleft">CHANNEL_DEC / CHANNEL_DOWN
38
<tr><td class="docentry"><p>
39
Move one channel down in the channel list.
40
-</p><p>The <b>CHANNEL_DEC</b> command was added in tvtime 0.9.8.1.
43
<table width="90%" class="doclist">
44
<tr><th class="docboxleft">CHANNEL_INC / CHANNEL_UP
45
<tr><td class="docentry"><p>
46
Move one channel up in the channel list.
47
-</p><p>The <b>CHANNEL_INC</b> command was added in tvtime 0.9.8.1.
50
<table width="90%" class="doclist">
52
<tr><td class="docentry"><p>
53
Changes to the last channel you were at. Useful for jumping back and
54
forth between two programs on distant channels.
55
-</p><p>The <b>CHANNEL_JUMP</b> command was added in tvtime 0.9.11.
58
<table width="90%" class="doclist">
60
This will display a message along the bottom of the OSD. Useful for
61
cron jobs or other scripts to send notifications to a user running
63
-</p><p>The <b>DISPLAY_MESSAGE</b> command was added in tvtime 0.9.9.
66
<table width="90%" class="doclist">
68
This command provides the dual functionality of channel down or menu arrow
69
down, depending on whether the menu is currently active. This command is
70
to be used together with the <b>LEFT</b>, <b>RIGHT</b> and <b>UP</b> commands.
71
-</p><p>The <b>DOWN</b> command was added in tvtime 0.9.11.
74
<table width="90%" class="doclist">
76
Sends a fake keystroke event to tvtime. This is useful for
77
doing complex operations via a remote control, as you can
78
indirect events to tvtime's internal key binding system.
79
-</p><p>The <b>KEY_EVENT</b> command was added in tvtime 0.9.9.
82
<table width="90%" class="doclist">
84
menu back command, depending on whether the menu is currently active.
85
This command is to be used together with the <B>RIGHT</b>, <b>UP</b>
86
and <b>DOWN</b> commands.
87
-</p><p>The <b>LEFT</b> command was added in tvtime 0.9.11.
90
<table width="90%" class="doclist">
91
<tr><th class="docboxleft">MENU_DOWN
92
<tr><td class="docentry"><p>
93
In menu mode, this command moves the cursor down one entry in the menu.
94
-</p><p>The <b>MENU_DOWN</b> command was added in tvtime 0.9.9.
97
<table width="90%" class="doclist">
99
<tr><td class="docentry"><p>
100
In menu mode, this command selects the current entry or moves forward
101
one level in the menu.
102
-</p><p>The <b>MENU_ENTER</b> command was added in tvtime 0.9.9.
105
<table width="90%" class="doclist">
106
<tr><th class="docboxleft">MENU_EXIT
107
<tr><td class="docentry"><p>
108
In menu mode, this command shuts off the menu.
109
-</p><p>The <b>MENU_EXIT</b> command was added in tvtime 0.9.9.
112
<table width="90%" class="doclist">
113
-<tr><th class="docboxleft">MENU_LEFT
114
+<tr><th class="docboxleft">MENU_BACK
115
<tr><td class="docentry"><p>
116
In menu mode, this command moves back one level in the menu.
117
-</p><p>The <b>MENU_LEFT</b> command was added in tvtime 0.9.9.
120
<table width="90%" class="doclist">
121
-<tr><th class="docboxleft">MENU_RIGHT
122
+<tr><th class="docboxleft">MENU_ENTER
123
<tr><td class="docentry"><p>
124
In menu mode, this command selects the current entry or moves forward
125
one level in the menu.
126
-</p><p>The <b>MENU_RIGHT</b> command was added in tvtime 0.9.9.
129
<table width="90%" class="doclist">
130
<tr><th class="docboxleft">MENU_UP
131
<tr><td class="docentry"><p>
132
In menu mode, this command moves the cursor up one entry in the menu.
133
-</p><p>The <b>MENU_UP</b> command was added in tvtime 0.9.9.
136
<table width="90%" class="doclist">
138
<tr><td class="docentry"><p>
139
Toggles the mute status with the mixer, and not with the capture card
140
like <b>TOGGLE_MUTE</b> does.
141
-</p><p>The <b>MIXER_TOGGLE_MUTE</b> command was added in tvtime 0.9.8.3.
144
<table width="90%" class="doclist">
146
<tr><td class="docentry"><p>
147
The command to do nothing. Useful for when you want to blank out one of
148
the default key bindings in tvtime.
149
-</p><p>The <b>NOOP</b> command was added in tvtime 0.9.11.
152
<table width="90%" class="doclist">
153
@@ -708,21 +690,18 @@
157
-</p><p>The <b>PICTURE</b> command was added in tvtime 0.9.9.
160
<table width="90%" class="doclist">
161
<tr><th class="docboxleft">PICTURE_UP
162
<tr><td class="docentry"><p>
163
Increases the current picture setting value (brightness/contrast/colour/hue).
164
-</p><p>The <b>PICTURE_UP</b> command was added in tvtime 0.9.9.
167
<table width="90%" class="doclist">
168
<tr><th class="docboxleft">PICTURE_DOWN
169
<tr><td class="docentry"><p>
170
Decreases the current picture setting value (brightness/contrast/colour/hue).
171
-</p><p>The <b>PICTURE_DOWN</b> command was added in tvtime 0.9.9.
174
<table width="90%" class="doclist">
176
<tr><td class="docentry"><p>
177
Asks tvtime to restart itself. This is used in the menu when we have changed
178
a value that we can't yet change at runtime.
179
-</p><p>The <b>RESTART</b> command was added in tvtime 0.9.9.
182
<table width="90%" class="doclist">
184
menu enter command, depending on whether the menu is currently active.
185
This command is to be used together with the <b>LEFT</b>, <b>UP</b>
186
and <b>DOWN</b> commands.
187
-</p><p>The <b>RIGHT</b> command was added in tvtime 0.9.11.
190
<table width="90%" class="doclist">
191
@@ -749,14 +726,12 @@
192
Instructs tvtime to spawn a command. This can be used to start a program using
193
a key in tvtime or lirc, such as to spawn mythepg or alevt. Using
194
tvtime-command run_command "xterm" will have tvtime call system( "xterm &" ).
195
-</p><p>The <b>RUN_COMMAND</b> command was added in tvtime 0.9.10.
198
<table width="90%" class="doclist">
199
<tr><th class="docboxleft">SAVE_PICTURE_GLOBAL
200
<tr><td class="docentry"><p>
201
Saves the current picture settings as the global defaults.
202
-</p><p>The <b>SAVE_PICTURE_GLOBAL</b> command was added in tvtime 0.9.9.
205
<table width="90%" class="doclist">
207
<tr><td class="docentry"><p>
208
Saves the current picture settings as the defaults for the current channel
210
-</p><p>The <b>SAVE_PICTURE_CHANNEL</b> command was added in tvtime 0.9.9.
213
<table width="90%" class="doclist">
215
<tr><td class="docentry"><p>
216
This command takes a parameter and sets the current audio mode. Valid
217
options are "mono", "stereo", "sap", "lang1" or "lang2".
218
-</p><p>The <b>SET_AUDIO_MODE</b> command was added in tvtime 0.9.9.
221
<table width="90%" class="doclist">
223
<tr><td class="docentry"><p>
224
This command takes a parameter and sets the current deinterlacer. Valid
225
options are the short name of any of the deinterlacers available in tvtime.
226
-</p><p>The <b>SET_DEINTERLACER</b> command was added in tvtime 0.9.9.
229
<table width="90%" class="doclist">
230
@@ -800,14 +772,12 @@
231
<tr><td class="docentry"><p>
232
This command takes a parameter and sets the current framerate. Valid
233
options are "full", "top" and "bottom".
234
-</p><p>The <b>SET_FRAMERATE</b> command was added in tvtime 0.9.9.
237
<table width="90%" class="doclist">
238
<tr><th class="docboxleft">SET_FREQUENCY_TABLE
239
<tr><td class="docentry"><p>
240
This command takes a parameter and sets the current frequency table.
241
-</p><p>The <b>SET_FREQUENCY_TABLE</b> command was added in tvtime 0.9.9.
244
<table width="90%" class="doclist">
246
<tr><td class="docentry"><p>
247
This command sets where widescreen output will be aligned when in fullscreen
248
mode, either top for the top of the screen, center, or bottom.
249
-</p><p>The <b>SET_FULLSCREEN_POSITION</b> command was added in tvtime 0.9.11.
252
<table width="90%" class="doclist">
254
This command takes a parameter and sets the the capture card input (0-n).
255
Among the Inputs are: the tuner, composite, or S-Video connectors on the
257
-</p><p>The <b>SET_INPUT</b> command was added in tvtime 0.9.14.
260
<table width="90%" class="doclist">
262
<tr><td class="docentry"><p>
263
This command takes a parameter and sets the current input width in pixels.
264
It will be used in tvtime after a restart.
265
-</p><p>The <b>SET_INPUT_WIDTH</b> command was added in tvtime 0.9.11.
268
<table width="90%" class="doclist">
270
a long, thin window, or for watching it at the top of the screen using
271
the fullscreen position option. Valid options here are 16:9, 1.85:1,
273
-</p><p>The <b>SET_MATTE</b> command was added in tvtime 0.9.10.
276
<table width="90%" class="doclist">
278
<tr><td class="docentry"><p>
279
This command takes a parameter and sets the current television standard.
280
It will be used in tvtime after a restart.
281
-</p><p>The <b>SET_NORM</b> command was added in tvtime 0.9.9.
284
<table width="90%" class="doclist">
286
<tr><td class="docentry"><p>
287
This command takes a station name or number as a parameter and changes
288
the channel to the station given.
289
-</p><p>The <b>SET_STATION</b> command was added in tvtime 0.9.13.
292
<table width="90%" class="doclist">
294
Set the preferred language code for XMLTV data. The argument can be
295
either the two-letter language code according to ISO 639 or a number
296
to select one of the known languages.
297
-</p><p>The <b>SET_XMLTV_LANGUAGE</b> command was added in tvtime 0.9.13.
300
<table width="90%" class="doclist">
301
@@ -876,22 +839,18 @@
302
<tr><td class="docentry"><p>
303
This command takes a parameter and sets the current sharpness in pixels.
304
It will be used in tvtime after a restart.
305
-</p><p>The <b>SET_SHARPNESS</b> command was added in tvtime 0.9.9 and
306
-replaced by <b>SET_INPUT_WIDTH</b> in tvtime 0.9.11.
309
<table width="90%" class="doclist">
310
<tr><th class="docboxleft">SHOW_DEINTERLACER_INFO
311
<tr><td class="docentry"><p>
312
Shows a help screen on the OSD describing the current deinterlacer setting.
313
-</p><p>The <b>SHOW_DEINTERLACER_INFO</b> command was added in tvtime 0.9.9.
316
<table width="90%" class="doclist">
317
<tr><th class="docboxleft">SHOW_MENU
318
<tr><td class="docentry"><p>
319
This command is used to bring up the tvtime setup menu.
320
-</p><p>The <b>SHOW_MENU</b> command was added in tvtime 0.9.9.
323
<table width="90%" class="doclist">
325
a certain amount of time. Sending this command will first activate the feature,
326
and sending it again will increase the timer up until a maximum value at which
327
point it is shut off.
328
-</p><p>The <b>SLEEP</b> command was added in tvtime 0.9.10.
331
<table width="90%" class="doclist">
333
If supported by your window manager, this command will ask to have the
334
window be put into an "always on top" state, where no other window can
336
-</p><p>The <b>TOGGLE_ALWAYSONTOP</b> command was added in tvtime 0.9.9.
339
<table width="90%" class="doclist">
341
<tr><td class="docentry"><p>
342
For PAL users, toggles the audio mode of the current channel between
343
the PAL-BG and PAL-DK audio norms.
344
-</p><p>The <b>TOGGLE_CHANNEL_PAL_DK</b> command was added in tvtime 0.9.13.
347
<table width="90%" class="doclist">
349
Enables or disables the chroma killer filter, which makes the input
350
black and white. Useful when watching a black-and-white movie to avoid
351
chrominance artifacts.
352
-</p><p>The <b>TOGGLE_CHROMA_KILL</b> command was added in tvtime 0.9.10.
355
<table width="90%" class="doclist">
357
Turns on or off the colour invert filter. This is (apparently) useful
358
for users of the Australian cable company Optus who want to avoid using
359
the decryption boxes and tune using their capture card directly.
360
-</p><p>The <b>TOGGLE_COLOUR_INVERT</b> and <b>TOGGLE_COLOR_INVERT</b> commands were added in tvtime 0.9.9.
363
<table width="90%" class="doclist">
365
Switches between the available mattes. This cuts off the top and
366
bottom of the input picture to help fit the window to the image
368
-</p><p>The <b>TOGGLE_MATTE</b> command was added in tvtime 0.9.9.
371
<table width="90%" class="doclist">
373
useful for using tvtime with mirroring projectors, although I don't
374
think it will actually work as intended yet since we don't mirror
375
the OSD output. :) Comments appreciated.
376
-</p><p>The <b>TOGGLE_MIRROR</b> command was added in tvtime 0.9.9.
379
<table width="90%" class="doclist">
380
@@ -1056,7 +1008,6 @@
381
<tr><td class="docentry"><p>
382
For PAL users, toggles the default audio mode of all channels between
383
the PAL-BG and PAL-DK audio norms.
384
-</p><p>The <b>TOGGLE_PAL_DK_AUDIO</b> command was added in tvtime 0.9.13.
387
<table width="90%" class="doclist">
388
@@ -1065,7 +1016,6 @@
389
Toggles between PAL and SECAM on the current channel. This feature is
390
useful for regions which receive both PAL and SECAM channels, such that
391
tvtime can be configured on a per-channel basis for the correct norm.
392
-</p><p>The <b>TOGGLE_PAL_SECAM</b> command was added in tvtime 0.9.9.
395
<table width="90%" class="doclist">
396
@@ -1089,7 +1039,6 @@
397
features like channel scanning and increases responsiveness on channels with
398
poor reception, but may make it impossible to watch stations where the
399
reception is too bad for the card to detect it reliably.
400
-</p><p>The <b>TOGGLE_SIGNAL_DETECTION</b> command was added in tvtime 0.9.10.
403
<table width="90%" class="doclist">
404
@@ -1099,7 +1048,6 @@
405
about the channel including the network name and call letters, and
406
sometimes information about the current show. This information is then shown
407
on the OSD and saved to the stationlist.xml file.
408
-</p><p>The <b>TOGGLE_XDS</b> command was added in tvtime 0.9.10.
411
<table width="90%" class="doclist">
412
@@ -1107,7 +1055,6 @@
413
<tr><td class="docentry"><p>
414
Toggles which language to show by default from the XMLTV file from
415
the ones available in the file.
416
-</p><p>The <b>TOGGLE_XMLTV_LANGUAGE</b> command was added in tvtime 0.9.13.
419
<table width="90%" class="doclist">
420
@@ -1116,7 +1063,6 @@
421
This command provides the dual functionality of channel up or menu arrow up,
422
depending on whether the menu is currently active. This command is to be
423
used together with the <b>LEFT</b>, <b>RIGHT</b> and <b>DOWN</b> commands.
424
-</p><p>The <b>UP</b> command was added in tvtime 0.9.11.
427
<table width="90%" class="doclist">
428
Index: tvtime-1.0.2/docs/man/de/tvtime-command.1
429
===================================================================
430
--- tvtime-1.0.2.orig/docs/man/de/tvtime-command.1 2012-03-06 10:04:19.452349000 +0000
431
+++ tvtime-1.0.2/docs/man/de/tvtime-command.1 2012-03-06 10:20:10.309411436 +0000
432
@@ -205,11 +205,11 @@
438
Geht eine Men�ebene zur�ck.
443
W�hlt den markierten Men�eintrag oder wechselt zur n�chsten Men�ebene.
446
Index: tvtime-1.0.2/docs/man/en/tvtime-command.1
447
===================================================================
448
--- tvtime-1.0.2.orig/docs/man/en/tvtime-command.1 2012-03-06 10:04:19.452349000 +0000
449
+++ tvtime-1.0.2/docs/man/en/tvtime-command.1 2012-03-06 10:20:57.169410041 +0000
450
@@ -190,11 +190,11 @@
451
In menu mode, this command shuts off the menu.
456
In menu mode, this command moves back one level in the menu.
461
In menu mode, this command selects the current entry or moves forward
462
one level in the menu.
464
Index: tvtime-1.0.2/docs/man/es/tvtime-command.1
465
===================================================================
466
--- tvtime-1.0.2.orig/docs/man/es/tvtime-command.1 2012-03-06 10:04:19.452349000 +0000
467
+++ tvtime-1.0.2/docs/man/es/tvtime-command.1 2012-03-06 10:21:47.265408550 +0000
468
@@ -196,11 +196,11 @@
469
En el modo menú, este comando sale del menú.
474
En el modo menú, este comando retrocede un nivel en el menú.
479
En el modo menú, este comando selecciona la opción actual o avanza un nivel