From owner-svn-doc-projects@FreeBSD.ORG Thu May 30 20:09:46 2013 Return-Path: Delivered-To: svn-doc-projects@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 0E887BC9; Thu, 30 May 2013 20:09:46 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id F41122B4; Thu, 30 May 2013 20:09:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4UK9j8b036221; Thu, 30 May 2013 20:09:45 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4UK9jfP036212; Thu, 30 May 2013 20:09:45 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201305302009.r4UK9jfP036212@svn.freebsd.org> From: Gabor Kovesdan Date: Thu, 30 May 2013 20:09:45 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41780 - in projects/db5/share: mk xml X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 May 2013 20:09:46 -0000 Author: gabor Date: Thu May 30 20:09:44 2013 New Revision: 41780 URL: http://svnweb.freebsd.org/changeset/doc/41780 Log: - Port some of the customizations to DocBook 5.0 - Add namespace declaration to DocBook elements in entities since DocBook 5.0 uses a namespace - Drop Jade-specific compatibility nits Added: projects/db5/share/xml/freebsd50.dtd - copied, changed from r41725, projects/db5/share/xml/freebsd45.dtd Deleted: projects/db5/share/xml/freebsd45.dtd Modified: projects/db5/share/mk/doc.docbook.mk projects/db5/share/xml/freebsd.ent projects/db5/share/xml/man-refs.ent projects/db5/share/xml/trademarks.ent Modified: projects/db5/share/mk/doc.docbook.mk ============================================================================== --- projects/db5/share/mk/doc.docbook.mk Thu May 30 15:43:27 2013 (r41779) +++ projects/db5/share/mk/doc.docbook.mk Thu May 30 20:09:44 2013 (r41780) @@ -254,21 +254,11 @@ ${sch}.xsl: ${sch} # Parsed XML ------------------------------------------------------- ${DOC}.parsed.xml: ${SRCS} - ${GREP} '^' ${DOC}.xml > ${.TARGET}.tmp -.if ${DOC} == "book" - ${ECHO_CMD} '' >> ${.TARGET}.tmp -.else - ${ECHO_CMD} '' >> ${.TARGET}.tmp -.endif - @${ECHO} "==> Basic validation" - ${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} | \ - ${GREP} -v '^' >> ${.TARGET}.tmp + ${XMLLINT} --nonet --noent --valid --xinclude ${MASTERDOC} > ${.TARGET} .if defined(PROFILING) @${ECHO} "==> Profiling" ${XSLTPROC} ${PROFILING} ${XSLPROF} ${.TARGET}.tmp > ${.TARGET} - ${RM} ${.TARGET}.tmp .else - ${MV} ${.TARGET}.tmp ${.TARGET} ${SED} 's|@@URL_RELPREFIX@@|http://www.FreeBSD.org|g' < ${.TARGET} > ${DOC}.parsed.print.xml ${SED} -i '' 's|@@URL_RELPREFIX@@|../../../..|g' ${.TARGET} .endif @@ -385,15 +375,8 @@ ${DOC}.${_curformat}: # lint validate: ${SRCS} ${schxslts} - @${GREP} '^' ${DOC}.xml > ${DOC}.parsed.xml -.if ${DOC} == "book" - @${ECHO_CMD} '' >> ${DOC}.parsed.xml -.else - @${ECHO_CMD} '' >> ${DOC}.parsed.xml -.endif @${ECHO} "==> Basic validation" - @${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} | \ - ${GREP} -v '^' >>${DOC}.parsed.xml + @${XMLLINT} --nonet --noent --valid --xinclude ${MASTERDOC} > ${DOC}.parsed.xml .if defined(schxslts) @${ECHO} "==> Validating with Schematron constraints" .for sch in ${schxslts} Modified: projects/db5/share/xml/freebsd.ent ============================================================================== --- projects/db5/share/xml/freebsd.ent Thu May 30 15:43:27 2013 (r41779) +++ projects/db5/share/xml/freebsd.ent Thu May 30 20:09:44 2013 (r41780) @@ -11,8 +11,8 @@ used in both environments. -#"> -%"> +#'> +%'> -UNIX"> -NIS"> +UNIX'> +NIS'> -TeX'> -LaTeX'> +TeX'> +LaTeX'> @@ -102,7 +102,7 @@ used in both environments. -[ OK ]"> -[ Cancel ]"> -[ Yes ]"> -[ No ]"> +[ OK ]'> +[ Cancel ]'> +[ Yes ]'> +[ No ]'> Copied and modified: projects/db5/share/xml/freebsd50.dtd (from r41725, projects/db5/share/xml/freebsd45.dtd) ============================================================================== --- projects/db5/share/xml/freebsd45.dtd Thu May 23 15:40:43 2013 (r41725, copy source) +++ projects/db5/share/xml/freebsd50.dtd Thu May 30 20:09:44 2013 (r41780) @@ -1,42 +1,28 @@ - - - + - - - -]]> - - - - - - - - - - - - - - - - - - - + @@ -55,11 +41,14 @@ xmlns:xi CDATA #FIXED "http://www.w3.org/2001/XInclude" > - + %orig-docbook; - +%iso8879.ent; + %authors; @@ -71,51 +60,3 @@ %orig-entities; -]]> - - - - - - - - - - - - - - - - - - - - - - - - -#"> -%"> Modified: projects/db5/share/xml/man-refs.ent ============================================================================== --- projects/db5/share/xml/man-refs.ent Thu May 30 15:43:27 2013 (r41779) +++ projects/db5/share/xml/man-refs.ent Thu May 30 20:09:44 2013 (r41780) @@ -24,5417 +24,5417 @@ $FreeBSD$ --> -[1"> -CC1"> -Mail1"> +[1"> +CC1"> +Mail1"> -X1"> -XFree861"> -Xorg1"> -a2p1"> -addftinfo1"> -addr2line1"> -afmtodit1"> -alias1"> -alloc1"> -apply1"> -apropos1"> -ar1"> -as1"> -asa1"> -at1"> -atq1"> -atrm1"> -auditreduce1"> -awk1"> -b64decode1"> -b64encode1"> -basename1"> -bash1"> -batch1"> -bc1"> -bdes1"> -bg1"> -biff1"> -bindkey1"> -brandelf1"> -break1"> -breaksw1"> -bsdiff1"> -bsdtar1"> -bsnmpd1"> -bspatch1"> -btsockstat1"> -builtin1"> -builtins1"> -byacc1"> -bzegrep1"> -bzfgrep1"> -bzgrep1"> -bzip21"> -c++1"> -c2ph1"> -c891"> -c991"> -cal1"> -calendar1"> -cap_mkdb1"> -case1"> -cat1"> -catman1"> -cc1"> -cccp1"> -cd1"> -cdcontrol1"> -cdrecord1"> -chdir1"> -checknr1"> -chflags1"> -chfn1"> -chgrp1"> -chio1"> -chkey1"> -chmod1"> -chpass1"> -chsh1"> -ci1"> -ckdist1"> -cksum1"> -clear1"> -clang1"> -clang++1"> -clang-cpp1"> -cmp1"> -co1"> -col1"> -colcrt1"> -colldef1"> -colrm1"> -column1"> -comm1"> -command1"> -compile_et1"> -complete1"> -compress1"> -continue1"> -cp1"> -cpio1"> -cpp1"> -cpuset1"> -crontab1"> -crunchgen1"> -crunchide1"> -crypt1"> -csh1"> -csplit1"> -csup1"> -ctags1"> -ctm1"> -ctm_dequeue1"> -ctm_rmail1"> -ctm_smail1"> -cu1"> -cursor1"> -cut1"> -cvs1"> -cvsup1"> -date1"> -dc1"> -dd1"> -default1"> -df1"> -dga1"> -dialog1"> -diff1"> -diff31"> -dig1"> -dirname1"> -dirs1"> -dnskeygen1"> -dnsquery1"> -do1"> -domainname1"> -done1"> -doscmd1"> -dprofpp1"> -dtmfdecode1"> -dtrace1"> -dtruss1"> -du1"> -echo1"> -echotc1"> -ed1"> -edit1"> -ee1"> -egrep1"> -elfdump1"> -elif1"> -else1"> -emacs1"> -end1"> -endif1"> -endsw1"> -enigma1"> -env1"> -eqn1"> -esac1"> -eval1"> -ex1"> -exec1"> -exit1"> -expand1"> -export1"> -expr1"> -f771"> -false1"> -fc1"> -fdformat1"> -fdread1"> -fdwrite1"> -fetch1"> -fg1"> -fgrep1"> -fi1"> -fifolog1"> -file1"> -file2c1"> -filetest1"> -find1"> -finger1"> -flex1"> -flex++1"> -fmt1"> -fold1"> -fontedit1"> -for1"> -foreach1"> -from1"> -fstat1"> -fsync1"> -ftp1"> -g++1"> -g711conv1"> -gasp1"> -gate-ftp1"> -gawk1"> -gcc1"> -gcore1"> -gdb1"> -gdbserver1"> -gencat1"> -getNAME1"> -getconf1"> -getent1"> -getfacl1"> -getopt1"> -getopts1"> -glob1"> -goto1"> -gperf1"> -gprof1"> -grep1"> -grn1"> -grodvi1"> -groff1"> -grog1"> -grohtml1"> -grolbp1"> -grolj41"> -grops1"> -grotty1"> -groups1"> -growisofs1"> -gs1"> -gtar1"> -gunzip1"> -gzcat1"> -gzexe1"> -gzip1"> -h2ph1"> -h2xs1"> -hash1"> -hashstat1"> -hd1"> -head1"> -hesinfo1"> -hexdump1"> -history1"> -host1"> -hostname1"> -hpftodit1"> -hup1"> -id1"> -ident1"> -idprio1"> -if1"> -imake1"> -imwheel1"> -indent1"> -indxbib1"> -info1"> -install1"> -install-info1"> -intro1"> -introduction1"> -ipcrm1"> -ipcs1"> -ipftest1"> -ipnat1"> -ipresend1"> -ipsend1"> -iptest1"> -jobid1"> -jobs1"> -join1"> -jot1"> -kbdcontrol1"> -kbdmap1"> -kcon1"> -kdump1"> -kenv1"> -kerberos1"> -key1"> -keyinfo1"> -keyinit1"> -keylogin1"> -keylogout1"> -kgdb1"> -kill1"> -killall1"> -ksu1"> -ktrace1"> -lam1"> -last1"> -lastcomm1"> -ld1"> -ld-elf.so.11"> -ldd1"> -leave1"> -less1"> -lesskey1"> -lex1"> -lex++1"> -limit1"> -limits1"> -link1"> -lint1"> -lkbib1"> -ln1"> -lndir1"> -loadfont1"> -locale1"> -locate1"> -lock1"> -lockf1"> -log1"> -logger1"> -login1"> -logins1"> -logname1"> -logout1"> -look1"> -lookbib1"> -lorder1"> -lp1"> -lpq1"> -lpr1"> -lprm1"> -lptest1"> -ls1"> -ls-F1"> -lsvfs1"> -lynx1"> -lzcat1"> -lzma1"> -lzmadec1"> -lzmainfo1"> -m41"> -mail1"> -mailq1"> -make1"> -makeinfo1"> -makewhatis1"> -man1"> -manpath1"> -mcon1"> -md51"> -merge1"> -mesg1"> -minigzip1"> -ministat1"> -mk_cmds1"> -mkdep1"> -mkdir1"> -mkfifo1"> -mkfontdir1"> -mklocale1"> -mkstr1"> -mktemp1"> -mmroff1"> -more1"> -mptable1"> -msgs1"> -mt1"> -mv1"> -nc1"> -ncal1"> -ncplist1"> -ncplogin1"> -ncplogout1"> -neqn1"> -netstat1"> -newaliases1"> -newgrp1"> -nex1"> -nfsstat1"> -nice1"> -nl1"> -nm1"> -nohup1"> -notify1"> -nroff1"> -nsgmls1"> -nsupdate1"> -nvi1"> -nview1"> -objcopy1"> -objdump1"> -objformat1"> -od1"> -omshell1"> -onintr1"> -openssl1"> -opieinfo1"> -opiekey1"> -opiepasswd1"> -otp-md41"> -otp-md51"> -pagesize1"> -passwd1"> -paste1"> -patch1"> -pathchk1"> -pawd1"> -pax1"> -perl1"> -perl5004delta1"> -perl5005delta1"> -perlapi1"> -perlapio1"> -perlbc1"> -perlbook1"> -perlboot1"> -perlbot1"> -perlbug1"> -perlcall1"> -perlcc1"> -perlcompile1"> -perldata1"> -perldbmfilter1"> -perldebguts1"> -perldebug1"> -perldelta1"> -perldiag1"> -perldoc1"> -perldsc1"> -perlembed1"> -perlfaq1"> -perlfaq11"> -perlfaq21"> -perlfaq31"> -perlfaq41"> -perlfaq51"> -perlfaq61"> -perlfaq71"> -perlfaq81"> -perlfaq91"> -perlfork1"> -perlform1"> -perlfunc1"> -perlguts1"> -perlhack1"> -perlhist1"> -perlintern1"> -perlipc1"> -perllocale1"> -perllol1"> -perlmod1"> -perlmodinstall1"> -perlmodlib1"> -perlnumber1"> -perlobj1"> -perlop1"> -perlopentut1"> -perlpod1"> -perlport1"> -perlre1"> -perlref1"> -perlreftut1"> -perlrun1"> -perlsec1"> -perlstyle1"> -perlsub1"> -perlsyn1"> -perlthrtut1"> -perltie1"> -perltoc1"> -perltodo1"> -perltoot1"> -perltootc1"> -perltrap1"> -perlvar1"> -perlxs1"> -perlxstut1"> -pfbtops1"> -pftp1"> -pgrep1"> -pic1"> -pim6stat1"> -pkg_add1"> -pkg_check1"> -pkg_create1"> -pkg_delete1"> -pkg_info1"> -pkg_sign1"> -pkg_update1"> -pkg_version1"> -pkgdb1"> -pkill1"> -pl2pm1"> -pod2html1"> -pod2man1"> -popd1"> -portaudit1"> -portlint1"> -portmanager1"> -portupgrade1"> -pr1"> -praudit1"> -printenv1"> -printf1"> -procstat1"> -ps1"> -psbb1"> -psroff1"> -pushd1"> -pwait1"> -pwd1"> -quota1"> -ranlib1"> -rcp1"> -rcs1"> -rcsclean1"> -rcsdiff1"> -rcsfreeze1"> -rcsintro1"> -rcsmerge1"> -rdist1"> -read1"> -readelf1"> -readonly1"> -realpath1"> -red1"> -ree1"> -refer1"> -rehash1"> -repeat1"> -reset1"> -rev1"> -revoke1"> -rfcomm_sppd1"> -rlog1"> -rlogin1"> -rm1"> -rmd1601"> -rmdir1"> -rpcgen1"> -rs1"> -rsh1"> -rsync1"> -rtld1"> -rtprio1"> -rup1"> -ruptime1"> -rusers1"> -rwall1"> -rwho1"> -rxvt1"> -s2p1"> -sane-find-scanner1"> -sasc1"> -scanimage1"> -sccs1"> -sched1"> -scon1"> -scp1"> -script1"> -sdiff1"> -sed1"> -send-pr1"> -sendbug1"> -set1"> -setbuf1"> -setenv1"> -setfacl1"> -setfib1"> -settc1"> -setty1"> -setvar1"> -setxkbmap1"> -sftp1"> -sgmlnorm1"> -sgsc1"> -sh1"> -sha11"> -sha2561"> -shar1"> -shift1"> -shutdown1"> -size1"> -skey1"> -sleep1"> -slogin1"> -smbutil1"> -sockstat1"> -soelim1"> -sort1"> -source1"> -split1"> -ssh1"> -ssh-add1"> -ssh-agent1"> -ssh-keygen1"> -ssh-keyscan1"> -startslip1"> -startx1"> -stat1"> -stop1"> -strings1"> -strip1"> -stty1"> -su1"> -sum1"> -suspend1"> -svn1"> -switch1"> -symorder1"> -systat1"> -tabs1"> -tail1"> -talk1"> -tar1"> -tbl1"> -tcopy1"> -tcpdump1"> -tcpslice1"> -tcsh1"> -tee1"> -telltc1"> -telnet1"> -test1"> -texindex1"> -tfmtodit1"> -tftp1"> -then1"> -time1"> -tip1"> -top1"> -touch1"> -tput1"> -tr1"> -trace1"> -trap1"> -troff1"> -true1"> -truncate1"> -truss1"> -tset1"> -tsort1"> -tty1"> -type1"> -uhsoctl1"> -ul1"> -ulimit1"> -umask1"> -unalias1"> -uname1"> -uncomplete1"> -uncompress1"> -unexpand1"> -unhash1"> -unifdef1"> -uniq1"> -units1"> -unlimit1"> -unlink1"> -unlzma1"> -unset1"> -unsetenv1"> -until1"> -unvis1"> -unxz1"> -unzip1"> -uptime1"> -usbhidaction1"> -usbhidctl1"> -users1"> -uuconv1"> -uucp1"> -uudecode1"> -uuencode1"> -uuidgen1"> -uulog1"> -uuname1"> -uupick1"> -uustat1"> -uuto1"> -uux1"> -vacation1"> -vgrind1"> -vi1"> -vidcontrol1"> -vidfont1"> -view1"> -vim1"> -vis1"> -vt220keys1"> -vttest1"> -w1"> -w3m1"> -wait1"> -wall1"> -wc1"> -what1"> -whatis1"> -where1"> -whereis1"> -which1"> -while1"> -who1"> -whoami1"> -whois1"> -window1"> -write1"> -wtmpcvt1"> -xargs1"> -xdm1"> -xdpyinfo1"> -xf86cfg1"> -xf86config1"> -xfontsel1"> -xlsfonts1"> -xmodmap1"> +X1"> +XFree861"> +Xorg1"> +a2p1"> +addftinfo1"> +addr2line1"> +afmtodit1"> +alias1"> +alloc1"> +apply1"> +apropos1"> +ar1"> +as1"> +asa1"> +at1"> +atq1"> +atrm1"> +auditreduce1"> +awk1"> +b64decode1"> +b64encode1"> +basename1"> +bash1"> +batch1"> +bc1"> +bdes1"> +bg1"> +biff1"> +bindkey1"> +brandelf1"> +break1"> +breaksw1"> +bsdiff1"> +bsdtar1"> +bsnmpd1"> +bspatch1"> +btsockstat1"> +builtin1"> +builtins1"> +byacc1"> +bzegrep1"> +bzfgrep1"> +bzgrep1"> +bzip21"> +c++1"> +c2ph1"> +c891"> +c991"> +cal1"> +calendar1"> +cap_mkdb1"> +case1"> +cat1"> +catman1"> +cc1"> +cccp1"> +cd1"> +cdcontrol1"> +cdrecord1"> +chdir1"> +checknr1"> +chflags1"> +chfn1"> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***