LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH v2] Documentation: typec.rst: Use literal-block element with ascii art
@ 2018-04-06 12:41 Heikki Krogerus
2018-04-06 14:10 ` Jani Nikula
2018-04-25 13:47 ` Jani Nikula
0 siblings, 2 replies; 5+ messages in thread
From: Heikki Krogerus @ 2018-04-06 12:41 UTC (permalink / raw)
To: Greg KH, Jonathan Corbet
Cc: Masanari Iida, linux-kernel, linux-doc, Markus Heiser,
Jani Nikula, linux-usb
Using reStructuredText literal-block element with ascii-art.
That prevents the ascii art from being processed as
reStructuredText.
Reported-by: Masanari Iida <standby24x7@gmail.com>
Fixes: bdecb33af34f ("usb: typec: API for controlling USB Type-C Multiplexers")
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Tested-by: Jani Nikula <jani.nikula@intel.com>
Reported-by: Hans de Goede <hdegoede@redhat.com>
---
Changed since v1:
- Using literal-block element instead of comment
- Subject in v1 was "Documentation: typec.rst: Mark ascii art as a comment"
---
Documentation/driver-api/usb/typec.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/driver-api/usb/typec.rst b/Documentation/driver-api/usb/typec.rst
index feb31946490b..48ff58095f11 100644
--- a/Documentation/driver-api/usb/typec.rst
+++ b/Documentation/driver-api/usb/typec.rst
@@ -210,7 +210,7 @@ If the connector is dual-role capable, there may also be a switch for the data
role. USB Type-C Connector Class does not supply separate API for them. The
port drivers can use USB Role Class API with those.
-Illustration of the muxes behind a connector that supports an alternate mode:
+Illustration of the muxes behind a connector that supports an alternate mode::
------------------------
| Connector |
--
2.16.3
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] Documentation: typec.rst: Use literal-block element with ascii art
2018-04-06 12:41 [PATCH v2] Documentation: typec.rst: Use literal-block element with ascii art Heikki Krogerus
@ 2018-04-06 14:10 ` Jani Nikula
2018-04-25 13:47 ` Jani Nikula
1 sibling, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2018-04-06 14:10 UTC (permalink / raw)
To: Heikki Krogerus, Greg KH, Jonathan Corbet
Cc: Masanari Iida, linux-kernel, linux-doc, Markus Heiser, linux-usb
On Fri, 06 Apr 2018, Heikki Krogerus <heikki.krogerus@linux.intel.com> wrote:
> Using reStructuredText literal-block element with ascii-art.
> That prevents the ascii art from being processed as
> reStructuredText.
>
> Reported-by: Masanari Iida <standby24x7@gmail.com>
> Fixes: bdecb33af34f ("usb: typec: API for controlling USB Type-C Multiplexers")
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-and-tested-by: Jani Nikula <jani.nikula@intel.com>
> ---
> Changed since v1:
> - Using literal-block element instead of comment
> - Subject in v1 was "Documentation: typec.rst: Mark ascii art as a comment"
> ---
> Documentation/driver-api/usb/typec.rst | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/driver-api/usb/typec.rst b/Documentation/driver-api/usb/typec.rst
> index feb31946490b..48ff58095f11 100644
> --- a/Documentation/driver-api/usb/typec.rst
> +++ b/Documentation/driver-api/usb/typec.rst
> @@ -210,7 +210,7 @@ If the connector is dual-role capable, there may also be a switch for the data
> role. USB Type-C Connector Class does not supply separate API for them. The
> port drivers can use USB Role Class API with those.
>
> -Illustration of the muxes behind a connector that supports an alternate mode:
> +Illustration of the muxes behind a connector that supports an alternate mode::
>
> ------------------------
> | Connector |
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] Documentation: typec.rst: Use literal-block element with ascii art
2018-04-06 12:41 [PATCH v2] Documentation: typec.rst: Use literal-block element with ascii art Heikki Krogerus
2018-04-06 14:10 ` Jani Nikula
@ 2018-04-25 13:47 ` Jani Nikula
2018-04-25 13:55 ` Jonathan Corbet
2018-04-25 14:00 ` Greg KH
1 sibling, 2 replies; 5+ messages in thread
From: Jani Nikula @ 2018-04-25 13:47 UTC (permalink / raw)
To: Heikki Krogerus, Greg KH, Jonathan Corbet
Cc: Masanari Iida, linux-kernel, linux-doc, Markus Heiser, linux-usb
On Fri, 06 Apr 2018, Heikki Krogerus <heikki.krogerus@linux.intel.com> wrote:
> Using reStructuredText literal-block element with ascii-art.
> That prevents the ascii art from being processed as
> reStructuredText.
>
> Reported-by: Masanari Iida <standby24x7@gmail.com>
> Fixes: bdecb33af34f ("usb: typec: API for controlling USB Type-C Multiplexers")
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Jon, this fixes a documentation build failure in v4.17-rc1. It's not
just a warning, it's a complete fail. Our docs builder at 01.org is
failing, apparently the same at kernel.org. Please pick it up soon.
Thanks,
Jani.
> ---
> Changed since v1:
> - Using literal-block element instead of comment
> - Subject in v1 was "Documentation: typec.rst: Mark ascii art as a comment"
> ---
> Documentation/driver-api/usb/typec.rst | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/driver-api/usb/typec.rst b/Documentation/driver-api/usb/typec.rst
> index feb31946490b..48ff58095f11 100644
> --- a/Documentation/driver-api/usb/typec.rst
> +++ b/Documentation/driver-api/usb/typec.rst
> @@ -210,7 +210,7 @@ If the connector is dual-role capable, there may also be a switch for the data
> role. USB Type-C Connector Class does not supply separate API for them. The
> port drivers can use USB Role Class API with those.
>
> -Illustration of the muxes behind a connector that supports an alternate mode:
> +Illustration of the muxes behind a connector that supports an alternate mode::
>
> ------------------------
> | Connector |
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] Documentation: typec.rst: Use literal-block element with ascii art
2018-04-25 13:47 ` Jani Nikula
@ 2018-04-25 13:55 ` Jonathan Corbet
2018-04-25 14:00 ` Greg KH
1 sibling, 0 replies; 5+ messages in thread
From: Jonathan Corbet @ 2018-04-25 13:55 UTC (permalink / raw)
To: Jani Nikula
Cc: Heikki Krogerus, Greg KH, Masanari Iida, linux-kernel, linux-doc,
Markus Heiser, linux-usb
On Wed, 25 Apr 2018 16:47:01 +0300
Jani Nikula <jani.nikula@linux.intel.com> wrote:
> On Fri, 06 Apr 2018, Heikki Krogerus <heikki.krogerus@linux.intel.com> wrote:
> > Using reStructuredText literal-block element with ascii-art.
> > That prevents the ascii art from being processed as
> > reStructuredText.
> >
> > Reported-by: Masanari Iida <standby24x7@gmail.com>
> > Fixes: bdecb33af34f ("usb: typec: API for controlling USB Type-C Multiplexers")
> > Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
>
> Jon, this fixes a documentation build failure in v4.17-rc1. It's not
> just a warning, it's a complete fail. Our docs builder at 01.org is
> failing, apparently the same at kernel.org. Please pick it up soon.
Sorry, I'd seen the attached and was assuming Greg would ship it
Linusward. I'll get it upstream soon.
jon
From: Greg KH <gregkh@linuxfoundation.org>
To: changbin.du@intel.com
Cc: corbet@lwn.net, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Documentation: fix reST markup error in driver-api/usb/typec.rst
Date: Sun, 8 Apr 2018 09:19:58 +0200
Sender: linux-kernel-owner@vger.kernel.org
On Sun, Apr 08, 2018 at 10:47:12AM +0800, changbin.du@intel.com wrote:
> From: Changbin Du <changbin.du@intel.com>
>
> There is an format error in driver-api/usb/typec.rst that breaks sphinx
> docs building.
>
> reST markup error:
> /home/changbin/work/linux/Documentation/driver-api/usb/typec.rst:215: (SEVERE/4) Unexpected section title or transition.
>
> ------------------------
> Documentation/Makefile:68: recipe for target 'htmldocs' failed
> make[1]: *** [htmldocs] Error 1
> Makefile:1527: recipe for target 'htmldocs' failed
> make: *** [htmldocs] Error 2
>
> Signed-off-by: Changbin Du <changbin.du@intel.com>
> ---
> Documentation/driver-api/usb/typec.rst | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Thanks, someone else already sent this, sorry. I'll be sending it
onward after 4.17-rc1 is out.
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] Documentation: typec.rst: Use literal-block element with ascii art
2018-04-25 13:47 ` Jani Nikula
2018-04-25 13:55 ` Jonathan Corbet
@ 2018-04-25 14:00 ` Greg KH
1 sibling, 0 replies; 5+ messages in thread
From: Greg KH @ 2018-04-25 14:00 UTC (permalink / raw)
To: Jani Nikula
Cc: Heikki Krogerus, Jonathan Corbet, Masanari Iida, linux-kernel,
linux-doc, Markus Heiser, linux-usb
On Wed, Apr 25, 2018 at 04:47:01PM +0300, Jani Nikula wrote:
> On Fri, 06 Apr 2018, Heikki Krogerus <heikki.krogerus@linux.intel.com> wrote:
> > Using reStructuredText literal-block element with ascii-art.
> > That prevents the ascii art from being processed as
> > reStructuredText.
> >
> > Reported-by: Masanari Iida <standby24x7@gmail.com>
> > Fixes: bdecb33af34f ("usb: typec: API for controlling USB Type-C Multiplexers")
> > Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
>
> Jon, this fixes a documentation build failure in v4.17-rc1. It's not
> just a warning, it's a complete fail. Our docs builder at 01.org is
> failing, apparently the same at kernel.org. Please pick it up soon.
This is in my tree, will go to Linus in a day or so.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-04-25 14:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-06 12:41 [PATCH v2] Documentation: typec.rst: Use literal-block element with ascii art Heikki Krogerus
2018-04-06 14:10 ` Jani Nikula
2018-04-25 13:47 ` Jani Nikula
2018-04-25 13:55 ` Jonathan Corbet
2018-04-25 14:00 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).