Documentation: typec.rst: Use literal-block element with ascii art

This fixes a fatal error in the doc build process.
This commit is contained in:
Ben Hutchings 2018-04-20 00:50:39 +01:00
parent a5cb9ae406
commit d04e628f00
3 changed files with 33 additions and 0 deletions

1
debian/changelog vendored
View File

@ -8,6 +8,7 @@ linux (4.17~rc1-1~exp1) UNRELEASED; urgency=medium
* Drop our patch "Kbuild: kconfig: Verbose version of --listnewconfig";
listnewconfig now shows symbol values by default
* debian/rules.real: Stop enabling verbose output for listnewconfig target
* Documentation: typec.rst: Use literal-block element with ascii art
-- Ben Hutchings <ben@decadent.org.uk> Thu, 19 Apr 2018 21:37:24 +0100

View File

@ -0,0 +1,31 @@
From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Date: Fri, 6 Apr 2018 15:41:22 +0300
Subject: Documentation: typec.rst: Use literal-block element with ascii art
Origin: git://git.lwn.net/linux.git#6d9094862b70020c684588147e5eff52dec19c8d
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>
Reviewed-and-tested-by: Jani Nikula <jani.nikula@intel.com>
Fixes: bdecb33af34f ("usb: typec: API for controlling USB Type-C Multiplexers")
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---
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 |

View File

@ -79,6 +79,7 @@ bugfix/all/partially-revert-usb-kconfig-using-select-for-usb_co.patch
bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch
debian/revert-objtool-fix-config_stack_validation-y-warning.patch
bugfix/all/i40e-build-for-64-bit-targets-only.patch
bugfix/all/documentation-typec.rst-use-literal-block-element-wi.patch
# Miscellaneous features