From owner-freebsd-doc@FreeBSD.ORG Sat Jul 6 16:02:40 2013 Return-Path: Delivered-To: doc@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1F3958DC; Sat, 6 Jul 2013 16:02:40 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from server.mypc.hu (server.mypc.hu [87.229.73.95]) by mx1.freebsd.org (Postfix) with ESMTP id 91DFE1BA4; Sat, 6 Jul 2013 16:02:39 +0000 (UTC) Received: from server.mypc.hu (localhost [127.0.0.1]) by server.mypc.hu (Postfix) with ESMTP id 53A6814D250C; Sat, 6 Jul 2013 18:02:30 +0200 (CEST) X-Virus-Scanned: amavisd-new at !change-mydomain-variable!.example.com Received: from server.mypc.hu ([127.0.0.1]) by server.mypc.hu (server.mypc.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id BOWEaXJgb8PC; Sat, 6 Jul 2013 18:02:25 +0200 (CEST) Received: from [192.168.0.10] (54034B4D.catv.pool.telekom.hu [84.3.75.77]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by server.mypc.hu (Postfix) with ESMTPSA id 610A214D242E; Sat, 6 Jul 2013 18:02:25 +0200 (CEST) Message-ID: <51D83F92.7030808@FreeBSD.org> Date: Sat, 06 Jul 2013 18:02:26 +0200 From: Gabor Kovesdan User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:22.0) Gecko/20100101 Thunderbird/22.0 MIME-Version: 1.0 To: =?ISO-8859-1?Q?Ren=E9_Ladan?= , FBSD Doc project Subject: Re: [CFT] merging projects/entities References: <51D7F70B.8000206@freebsd.org> In-Reply-To: <51D7F70B.8000206@freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit 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: Sat, 06 Jul 2013 16:02:40 -0000 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. 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: + + < + + + + + + + + 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 @@ + + + The rest looks fine, thanks for your work on this! Gabor