From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1685207-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 59BA4158042
for <garchives@archives.gentoo.org>; Thu, 31 Oct 2024 19:27:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6796FE087B;
Thu, 31 Oct 2024 19:27:30 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 53E14E087B
for <gentoo-commits@lists.gentoo.org>; Thu, 31 Oct 2024 19:27:30 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 94A3F3430E3
for <gentoo-commits@lists.gentoo.org>; Thu, 31 Oct 2024 19:27:29 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 358CF11DF
for <gentoo-commits@lists.gentoo.org>; Thu, 31 Oct 2024 19:27:28 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1730401836.3d543ce1b29808478ad09cf70cac8a0b7f7a9f83.ulm@gentoo>
Subject: [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
X-VCS-Repository: proj/nxml-gentoo-schemas
X-VCS-Files: devbook.rnc devmanual
X-VCS-Directories: /
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 3d543ce1b29808478ad09cf70cac8a0b7f7a9f83
X-VCS-Branch: master
Date: Thu, 31 Oct 2024 19:27:28 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 8dc4da39-3dfc-4eec-a538-4686d5cb3c34
X-Archives-Hash: 6400179bc080e32446030234f5496146
commit: 3d543ce1b29808478ad09cf70cac8a0b7f7a9f83
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 31 19:10:36 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 19:10:36 2024 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=3d543ce1
devbook.rnc: Update from devmanual
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
devbook.rnc | 12 ++++++++++--
devmanual | 2 +-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/devbook.rnc b/devbook.rnc
index 22f7c09..06b5f5b 100644
--- a/devbook.rnc
+++ b/devbook.rnc
@@ -56,11 +56,15 @@ contentsTree = element contentsTree {
p = element p { inline }
-pre = element pre { text }
+pre = element pre {
+ attribute caption { text }?,
+ text
+}
codesample = element codesample {
attribute lang { "c" | "ebuild" | "make" | "m4" | "sgml" },
attribute numbering { "lines" }?,
+ attribute caption { text }?,
text
}
@@ -75,7 +79,11 @@ figure = element figure {
attribute caption { text }?
}
-table = element table { tr+ }
+table = element table {
+ attribute caption { text }?,
+ tr+
+}
+
tr = element tr { (th | ti)+ }
th = element th {
diff --git a/devmanual b/devmanual
index bd47497..a104fe1 160000
--- a/devmanual
+++ b/devmanual
@@ -1 +1 @@
-Subproject commit bd474970728035c6286f1071162efefd6f8d63e9
+Subproject commit a104fe1378cebfb50494565fb0d2cb589a682831