From: Akira Yokosawa <akiyks@gmail.com>
To: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>,
Martin Jerabek <martin.jerabek01@gmail.com>,
Ondrej Ille <ondrej.ille@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
netdev@vger.kernel.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH net-next] docs: ctucanfd: Use 'kernel-figure' directive instead of 'figure'
Date: Wed, 11 May 2022 08:34:58 +0900 [thread overview]
Message-ID: <268372a9-2f6a-74f3-29ea-c51536a73dba@gmail.com> (raw)
In-Reply-To: <202205101825.15126.pisa@cmp.felk.cvut.cz>
On Tue, 10 May 2022 18:25:15 +0200,
Pavel Pisa wrote:
> Hello Akira,
>
> On Tuesday 10 of May 2022 11:34:37 Akira Yokosawa wrote:
>> Two issues were observed in the ReST doc added by commit c3a0addefbde
>> ("docs: ctucanfd: CTU CAN FD open-source IP core documentation.").
>
> Thanks for the fix
>
>> The plain "figure" directive broke "make pdfdocs" due to a missing
>> PDF figure. For conversion of SVG -> PDF to work, the "kernel-figure"
>> directive, which is an extension for kernel documentations, should
>> be used instead.
>
> I have not noticed that there is kernel-figure
> option. We have setup own Sphinx 1.4.9 based build for driver
> documentation out of the tree compilation, I am not sure if that
> would work with this option but if not we keep this version
> modified. There are required modification for sources location anyway...
>
> https://canbus.pages.fel.cvut.cz/ctucanfd_ip_core/doc/linux_driver/build/ctucanfd-driver.html
You might want to see kernel's doc-guide at
https://www.kernel.org/doc/html/latest/doc-guide/sphinx.html
, or its source
Documentation/doc-guide/sphinx.rst
>
>> The directive of "code:: raw" causes a warning from both
>> "make htmldocs" and "make pdfdocs", which reads:
>>
>> [...]/can/ctu/ctucanfd-driver.rst:75: WARNING: Pygments lexer name
>> 'raw' is not known
>
> Strange I have not seen any warning when building htmldocs
> in my actual linux kernel tree. I have cleaned docs to be warnings
> free, but it is possible that I have another tools versions.
Well, I don't think "make htmldocs" runs with Sphinx 1.4.9.
You mean 1.7.9?
Then the above mentioned warning is not shown.
I see the warning with Sphinx versions 2.4.4. and 4.5.0.
I'll amend the changelog to mention the Sphinx versions and
post as v2.
Thanks, Akira
>
> Anyway thanks for cleanup.
>
>> A plain literal-block marker should suffice where no syntax
>> highlighting is intended.
>>
>> Fix the issues by using suitable directive and marker.
>>
>> Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
>> Fixes: c3a0addefbde ("docs: ctucanfd: CTU CAN FD open-source IP core
>> documentation.") Cc: Pavel Pisa <pisa@cmp.felk.cvut.cz>
>> Cc: Martin Jerabek <martin.jerabek01@gmail.com>
>> Cc: Ondrej Ille <ondrej.ille@gmail.com>
>> Cc: Marc Kleine-Budde <mkl@pengutronix.de>
>
> Acked-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
>
>> ---
>> .../networking/device_drivers/can/ctu/ctucanfd-driver.rst | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git
>> a/Documentation/networking/device_drivers/can/ctu/ctucanfd-driver.rst
>> b/Documentation/networking/device_drivers/can/ctu/ctucanfd-driver.rst index
>> 2fde5551e756..40c92ea272af 100644
>> --- a/Documentation/networking/device_drivers/can/ctu/ctucanfd-driver.rst
>> +++ b/Documentation/networking/device_drivers/can/ctu/ctucanfd-driver.rst
>> @@ -72,7 +72,7 @@ it is reachable (on which bus it resides) and its
>> configuration – registers address, interrupts and so on. An example of such
>> a device tree is given in .
>>
>> -.. code:: raw
>> +::
>>
>> / {
>> /* ... */
>> @@ -451,7 +451,7 @@ the FIFO is maintained, together with priority
>> rotation, is depicted in
>>
>>
>>
>> -.. figure:: fsm_txt_buffer_user.svg
>> +.. kernel-figure:: fsm_txt_buffer_user.svg
>>
>> TX Buffer states with possible transitions
>
>
next prev parent reply other threads:[~2022-05-10 23:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-10 9:34 [PATCH net-next] docs: ctucanfd: Use 'kernel-figure' directive instead of 'figure' Akira Yokosawa
2022-05-10 16:25 ` Pavel Pisa
2022-05-10 23:34 ` Akira Yokosawa [this message]
2022-05-11 7:23 ` Pavel Pisa
2022-05-10 23:45 ` [PATCH net-next v2] " Akira Yokosawa
2022-05-16 11:24 ` Akira Yokosawa
2022-05-16 19:31 ` Pavel Pisa
2022-05-11 6:37 ` [PATCH net-next] " Bagas Sanjaya
2022-05-11 10:52 ` Akira Yokosawa
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=268372a9-2f6a-74f3-29ea-c51536a73dba@gmail.com \
--to=akiyks@gmail.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.jerabek01@gmail.com \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=ondrej.ille@gmail.com \
--cc=pisa@cmp.felk.cvut.cz \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.