From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
To: Linux Doc Mailing List <linux-doc@vger.kernel.org>,
Linux Media Mailing List <linux-media@vger.kernel.org>
Cc: Mauro Carvalho Chehab <mchehab@s-opensource.com>,
Mauro Carvalho Chehab <mchehab@infradead.org>,
linux-kernel@vger.kernel.org, Jonathan Corbet <corbet@lwn.net>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Hans Verkuil <hans.verkuil@cisco.com>,
Masanari Iida <standby24x7@gmail.com>
Subject: [PATCH 03/12] media: vidioc-g-tuner.rst: Fix table number of cols
Date: Sat, 2 Sep 2017 23:34:55 -0300 [thread overview]
Message-ID: <792e51cd3047467692c4e3c39572950ba342ecdf.1504405125.git.mchehab@s-opensource.com> (raw)
In-Reply-To: <cover.1504405124.git.mchehab@s-opensource.com>
In-Reply-To: <cover.1504405124.git.mchehab@s-opensource.com>
The Tuner Audio Matrix table is broken: the first row has 7
columns instead of 6, causing it to be parsed wrong and displayed
very badly on PDF output.
Fix it and adjust the table to look nice at PDF output
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
Documentation/media/uapi/v4l/vidioc-g-tuner.rst | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/Documentation/media/uapi/v4l/vidioc-g-tuner.rst b/Documentation/media/uapi/v4l/vidioc-g-tuner.rst
index 491866484f57..acdd15901a51 100644
--- a/Documentation/media/uapi/v4l/vidioc-g-tuner.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-tuner.rst
@@ -395,20 +395,23 @@ To change the radio frequency the
\scriptsize
+.. tabularcolumns:: |p{1.5cm}|p{1.5cm}|p{2.9cm}|p{2.9cm}|p{2.9cm}|p{2.9cm}|
+
.. _tuner-matrix:
.. flat-table:: Tuner Audio Matrix
:header-rows: 2
:stub-columns: 0
+ :widths: 7 7 14 14 14 14
* -
- - :cspan:`5` Selected ``V4L2_TUNER_MODE_``
+ - :cspan:`4` Selected ``V4L2_TUNER_MODE_``
* - Received ``V4L2_TUNER_SUB_``
- ``MONO``
- ``STEREO``
- ``LANG1``
- ``LANG2 = SAP``
- - ``LANG1_LANG2``\ [#f1]_
+ - ``LANG1_LANG2``\ [#f1]_
* - ``MONO``
- Mono
- Mono/Mono
@@ -435,7 +438,7 @@ To change the radio frequency the
- L+R/SAP (preferred) or L/R or L+R/L+R
* - ``LANG1 | LANG2``
- Language 1
- - Lang1/Lang2 (deprecated [#f2]_) or Lang1/Lang1
+ - Lang1/Lang2 (deprecated\ [#f2]_) or Lang1/Lang1
- Language 1
- Language 2
- Lang1/Lang2 (preferred) or Lang1/Lang1
--
2.13.5
next prev parent reply other threads:[~2017-09-03 2:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-03 2:34 [PATCH 00/12] media documentation ReST fixes Mauro Carvalho Chehab
2017-09-03 2:34 ` [PATCH 01/12] media: v4l uAPI: add descriptions for arguments to all ioctls Mauro Carvalho Chehab
2017-09-03 2:34 ` [PATCH 02/12] media: vidioc-querycap: use a more realistic value for KERNEL_VERSION Mauro Carvalho Chehab
2017-09-03 2:34 ` Mauro Carvalho Chehab [this message]
2017-09-03 2:34 ` [PATCH 04/12] media: v4l uAPI docs: adjust some tables for PDF output Mauro Carvalho Chehab
2017-09-03 2:34 ` [PATCH 05/12] media: docs: fix PDF build with Sphinx 1.4 Mauro Carvalho Chehab
2017-09-03 2:34 ` [PATCH 06/12] media: rc-sysfs-nodes.rst: better use literals Mauro Carvalho Chehab
2017-09-03 2:34 ` [PATCH 07/12] media: mc uapi: adjust some table sizes for PDF output Mauro Carvalho Chehab
2017-09-03 2:35 ` [PATCH 08/12] media: cec uapi: Adjust " Mauro Carvalho Chehab
2017-09-03 2:35 ` [PATCH 09/12] media: docs: don't show ToC for each part on " Mauro Carvalho Chehab
2017-09-03 2:35 ` [PATCH 10/12] media: v4l2-event.rst: adjust table to fit " Mauro Carvalho Chehab
2017-09-03 2:35 ` [PATCH 11/12] media: em28xx-cardlist.rst: update to reflect last changes Mauro Carvalho Chehab
2017-09-03 2:35 ` [PATCH 12/12] media: docs-rst: cardlists: change their format to flat-tables Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=792e51cd3047467692c4e3c39572950ba342ecdf.1504405125.git.mchehab@s-opensource.com \
--to=mchehab@s-opensource.com \
--cc=corbet@lwn.net \
--cc=hans.verkuil@cisco.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=standby24x7@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®