From owner-freebsd-doc@FreeBSD.ORG Sun Jul 7 15:19:37 2013 Return-Path: Delivered-To: doc@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 35939652; Sun, 7 Jul 2013 15:19:37 +0000 (UTC) (envelope-from r.c.ladan@gmail.com) Received: from mail-ea0-x235.google.com (mail-ea0-x235.google.com [IPv6:2a00:1450:4013:c01::235]) by mx1.freebsd.org (Postfix) with ESMTP id 9708B1861; Sun, 7 Jul 2013 15:19:36 +0000 (UTC) Received: by mail-ea0-f181.google.com with SMTP id a15so2442501eae.12 for ; Sun, 07 Jul 2013 08:19:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:content-type :content-transfer-encoding; bh=bt5g6PaXVRbbG/VkkV7my/rOvJ5Mem8TNwZT1kNXG44=; b=Q8baj0rDmj9IblLJjJUqg55GQdpqbQcLGEKS3cSIOmDzM4k2ee5yKw4UOKNxubgg1n uH4n8m7hGgtLQroWam1JHJccBDA4x2xXomns868DOxnlCgnRMGjUKxHMMZqRMqSrBOW1 JLBPxNkgk1WibJa2vkIHxcZY00I4xSOu8JJc1MHWyJGzLmYwthTqrvKsuz6vIRV55xH5 vx8kRNzGdusX6SZUUNPysGlyq39eqDaknPHQq9ElFkK6DMcEZHhwcV41tjUPH3CP4E8j lJSU+z15/fOoTl9lREl2U4mP03QU+/U0wOWpozznVeSA4vOL65afakf8k/HVnJT9KaMh +Mgw== X-Received: by 10.14.47.73 with SMTP id s49mr21059275eeb.71.1373210375633; Sun, 07 Jul 2013 08:19:35 -0700 (PDT) Received: from [192.168.123.167] (136-206-ftth.onsbrabantnet.nl. [88.159.206.136]) by mx.google.com with ESMTPSA id bj46sm33753970eeb.13.2013.07.07.08.19.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 07 Jul 2013 08:19:34 -0700 (PDT) Sender: =?UTF-8?Q?Ren=C3=A9_Ladan?= Message-ID: <51D98705.4070403@freebsd.org> Date: Sun, 07 Jul 2013 17:19:33 +0200 From: =?ISO-8859-1?Q?Ren=E9_Ladan?= User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130701 Thunderbird/17.0.7 MIME-Version: 1.0 To: Gabor Kovesdan Subject: Re: [CFT] merging projects/entities References: <51D7F70B.8000206@freebsd.org> <51D83F92.7030808@FreeBSD.org> In-Reply-To: <51D83F92.7030808@FreeBSD.org> X-Enigmail-Version: 1.5.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit Cc: FBSD Doc project X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Jul 2013 15:19:37 -0000 On 06-07-2013 18:02, Gabor Kovesdan wrote: > Em 06-07-2013 12:52, René Ladan escreveu: >> To test, you can either check out doc/projects/entities or doc/head and >> apply the patch at [1]. After that, run 'make' in en_US.ISO8859-1/ or >> 'make WEB_ONLY=yes ENGLISH_ONLY=yes' in en_US.ISO8859-1/htdocs/ as >> usual. >> >> [1]ftp://rene-ladan.nl/pub/freebsd/entities-r42173.diff >> SHA256 = >> d6685fb654e9624f2e733fa7feb852515c2aed566150f588359fb89bbf72e2b3 >> SIZE = 423519 > There are indentation-only changes in share/xml/catalog.xml. These > parts shouldn't be changed or at least not with other changes if you > want to improve them. Also, the real changes seem to be a bit messy, > there are duplicated entries and some commented out ones and all of > this intermixed with indentation changes so it is hard to see the > overall effect. This file should be reviewed. > I indeed committed a white-space only change here, r40263. Should I also change this in head/ or revert this commit and worry about white-space later? > As for the email element, it doesn't logically belong to HTML so it > shouldn't have the XHTML namespace. Actually, it is borrowed from > DocBook, which doesn't have a namespace up to version 4.5. In turn, > DocBook 5.0 has its own namespace. So I suggest to leave the email > element in the empty namespace for now and with the DB 5.0 migration > it will go to the DocBook namespace. For this, you also need to modify > share/xml/xhtml.xsl and remove the namespace prefix in the match > attribute: > Do you mean that the email declarations in share/xml/authors.ent should be removed again? For clarity I would prefer this, but this (and the email XSLT templates) seem necessary to get &a.committer.email; working in both the articles/books and webpages, and for the latter it removes the need to write the cumbersome "&a.committer; <committer@FreeBSD.org>" (in head, with &a.committer pulled in from the removed share/xml/developers.ent) as "&a.committer.email;" suffices. > + > + < > + > + > + > + > + > + > + > + mailto: > + > + > + > + > + > + > + > > + > > And with this change, this part becomes redundant: > > --- share/xsl/freebsd-xhtml-common.xsl > (svn+ssh://svn.freebsd.org/doc/projects/entities) (working copy) > +++ svn+ssh://svn.freebsd.org/doc/projects/entities (revision 42173) > @@ -6,6 +6,7 @@ > version='1.0' > xmlns="http://www.w3.org/TR/xhtml1/transitional" > xmlns:str="http://exslt.org/strings" > + xmlns:xhtml="http://www.w3.org/1999/xhtml" > extension-element-prefixes="str" > exclude-result-prefixes="#default"> > > @@ -162,6 +163,27 @@ > > > > + > + > + > If it works, shorter XSLT files are fine with me. > The rest looks fine, thanks for your work on this! > Thanks, René