[kaffeine] doc: Merge branch 'master' of git://anongit.kde.org/kaffeine

[Antoni Bella Pérez]

Git commit eb3ebf0caf9580e0f4c8bb3839e5450606c4c3be by Antoni Bella Pérez.
Committed on 27/11/2017 at 18:09.
Pushed by bellaperez into branch 'master'.

Merge branch 'master' of git://anongit.kde.org/kaffeine

M  +7    -7    doc/index.docbook

https://commits.kde.org/kaffeine/eb3ebf0caf9580e0f4c8bb3839e5450606c4c3be

diff --cc doc/index.docbook
index a6f51a8,7255325..1c142bf
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@@ -822,10 -822,10 +822,10 @@@ the recording schedule
  <keycombo action="simul">&Space;</keycombo>
  </shortcut>
  <guimenu>Playback</guimenu>
 -<guimenuitem>Play\Pause</guimenuitem>
 +<guimenuitem>Play/Pause</guimenuitem>
  </menuchoice></term>
  <listitem><para>
- <inlinemediaobject><imageobject><imagedata fileref="media-playback-start.png" format="PNG"/></imageobject></inlinemediaobject> and <inlinemediaobject><imageobject><imagedata fileref="media-playback-pause.png" format="PNG"/></imageobject></inlinemediaobject> icons. <action>With A check box for play a stream or pause</action> what you are watching. On a television's stream will proceed to record it, this is known as <ulink url="https://en.wikipedia.org/wiki/Time_shifting">time shifting</ulink>.
+ <inlinemediaobject><imageobject><imagedata fileref="media-playback-start.png" format="PNG"/></imageobject></inlinemediaobject> and <inlinemediaobject><imageobject><imagedata fileref="media-playback-pause.png" format="PNG"/></imageobject></inlinemediaobject> icons. <action>With a check box for play a stream or pause</action> what you are watching. On a television's stream will proceed to record it, this is known as <ulink url="https://en.wikipedia.org/wiki/Time_shifting">time shifting</ulink>.
  </para></listitem>
  </varlistentry>
  
@@@ -896,10 -896,10 +896,10 @@@ Offers a drop-down list with <action>op
    <term><menuchoice>
    <guimenu>Playback</guimenu>
    <guisubmenu>Subtitle</guisubmenu>
 -  <guimenuitem>off\<replaceable>Name-of-subtitle</replaceable></guimenuitem>
 +  <guimenuitem>off/<replaceable>Name-of-subtitle</replaceable></guimenuitem>
    </menuchoice></term>
    <listitem><para>
-   <action>Select the avaible subtitle</action> from this drop-down list. These subtitles channels will vary depending on the content of the source stream.
+   <action>Select the available subtitle</action> from this drop-down list. These subtitles channels will vary depending on the content of the source stream.
    </para></listitem>
    </varlistentry>