From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6151858974 for ; Mon, 25 Jan 2016 09:22:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA7C6E08CD; Mon, 25 Jan 2016 09:22:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 63C43E08CD for ; Mon, 25 Jan 2016 09:22:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 803F8340940 for ; Mon, 25 Jan 2016 09:22:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 599091018 for ; Mon, 25 Jan 2016 09:21:59 +0000 (UTC) From: "Ulrich Müller" 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" Message-ID: <1299684663.86251a7c37c55cf30fb598c96266093aa47790a7.ulm@gentoo> Subject: [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: / X-VCS-Repository: proj/nxml-gentoo-schemas X-VCS-Files: book.rnc guide.rnc metadata.rnc userinfo.rnc X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 86251a7c37c55cf30fb598c96266093aa47790a7 X-VCS-Branch: master Date: Mon, 25 Jan 2016 09:21:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 52dc78a0-ddb2-4a3b-a56b-1dfb8756fa5f X-Archives-Hash: 27b850c89bb2af3f4c2f7194640bedb3 commit: 86251a7c37c55cf30fb598c96266093aa47790a7 Author: Diego Elio Pettenò gmail com> AuthorDate: Wed Mar 9 15:31:03 2011 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Mar 9 15:31:03 2011 +0000 URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=86251a7c Update schemas. book.rnc | 2 +- guide.rnc | 8 ++++++-- metadata.rnc | 13 ++++++++++++- userinfo.rnc | 6 +++--- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/book.rnc b/book.rnc index ebec9f6..b7ebf7e 100644 --- a/book.rnc +++ b/book.rnc @@ -42,4 +42,4 @@ subsection.attlist &= attribute id { text }?, attribute test { text }? body = element body { body.attlist, (\include | block.class+) } -start = glepindex | book | included | sections | summary +start = summary | glepindex | included | sections | book diff --git a/guide.rnc b/guide.rnc index 6b5a014..1ef1921 100644 --- a/guide.rnc +++ b/guide.rnc @@ -46,7 +46,9 @@ news = element news { news.attlist, poster, date, title, summary?, body } news.attlist &= [ a:defaultValue = "no" ] attribute gentoo { "yes" | "no" }?, - attribute category { "gentoo" | "main" | "linux" | "moo" | "plans" } + attribute category { + "gentoo" | "main" | "linux" | "moo" | "plans" | "birthday" + } subtitle = element subtitle { subtitle.attlist, text } subtitle.attlist &= empty poster = element poster { poster.attlist, text } @@ -78,4 +80,6 @@ glsa-latest.attlist &= empty mirrorlist = element mirrorlist { mirrorlist.attlist, empty } mirrorlist.attlist &= [ a:defaultValue = "full" ] attribute select { "full" | "partial" }? -start = news | included | mainpage | guide +mirrorlist.attlist &= + [ a:defaultValue = "/main/en/mirrors3.xml" ] attribute src { text }? +start = guide | included | news | mainpage diff --git a/metadata.rnc b/metadata.rnc index 4fb8abd..e325a21 100644 --- a/metadata.rnc +++ b/metadata.rnc @@ -94,7 +94,18 @@ attlist.bugs-to &= empty # specify a type of package identification tracker remote-id = element remote-id { attlist.remote-id, text } attlist.remote-id &= - attribute type { "freshmeat" | "sourceforge" | "cpan" | "vim" } + attribute type { + "freshmeat" + | "sourceforge" + | "sourceforge-jp" + | "cpan" + | "vim" + | "google-code" + | "ctan" + | "pypi" + | "rubyforge" + | "cran" + } # category/package information for cross-linking in descriptions # and useflag descriptions pkg = element pkg { attlist.pkg, text } diff --git a/userinfo.rnc b/userinfo.rnc index fa3492c..54a1305 100644 --- a/userinfo.rnc +++ b/userinfo.rnc @@ -4,11 +4,11 @@ user = element user { attlist.user, realname, - pgpkey, + pgpkey+, alias*, email+, - joined, - retired?, + joined*, + retired*, status?, roles?, location?