diff options
author | Dennis Kempin <denniskempin@google.com> | 2016-12-08 13:42:04 -0800 |
---|---|---|
committer | Dennis Kempin <denniskempin@google.com> | 2016-12-19 19:31:19 +0000 |
commit | 293a0fb21eafd159514a0ac98d687669f9bb55b1 (patch) | |
tree | 5547dca72dec04a2143d536f72269b793a8bef54 /doc | |
parent | cf7e256453b7b59d456aff9a28823751ceee908d (diff) | |
download | wayland-293a0fb21eafd159514a0ac98d687669f9bb55b1.tar.gz |
external/wayland: Uprev to 6a18a87727c64719c68168568b9ab1e4d7c2d9c1
This is the version of wayland used by chrome, which includes a
required update to the wl_touch protocol to v6.
Bug: 33457871
Test: None
Change-Id: I8fe14f1161766e5f5046181473e1d87c547eae74
Diffstat (limited to 'doc')
-rw-r--r-- | doc/publican/doxygen-to-publican.xsl | 2 | ||||
-rw-r--r-- | doc/publican/sources/Book_Info.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/publican/doxygen-to-publican.xsl b/doc/publican/doxygen-to-publican.xsl index 7c3b507..e13dcd7 100644 --- a/doc/publican/doxygen-to-publican.xsl +++ b/doc/publican/doxygen-to-publican.xsl @@ -101,7 +101,7 @@ <!-- methods --> <xsl:template match="memberdef" > - <xsl:if test="@kind = 'function' and @static = 'no' or + <xsl:if test="@kind = 'function' and @static = 'no' and @prot = 'public' or @kind !='function' and normalize-space(briefdescription) != ''"> <varlistentry id="{$which}-{@id}"> <term> diff --git a/doc/publican/sources/Book_Info.xml b/doc/publican/sources/Book_Info.xml index e9e5ff0..0b7bf07 100644 --- a/doc/publican/sources/Book_Info.xml +++ b/doc/publican/sources/Book_Info.xml @@ -5,7 +5,7 @@ ]> <bookinfo id="book-Wayland-Wayland"> <title>Wayland</title> - <subtitle>The Wayland display server</subtitle> + <subtitle>The Wayland Protocol</subtitle> <productname>Documentation</productname> <productnumber>0.1</productnumber> <edition>1</edition> |