From owner-svn-doc-translations@FreeBSD.ORG Sun Nov 4 22:42:54 2012 Return-Path: Delivered-To: svn-doc-translations@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B8615C3B; Sun, 4 Nov 2012 22:42:54 +0000 (UTC) (envelope-from gjb@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 9A26E8FC0A; Sun, 4 Nov 2012 22:42:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA4Mgssu070576; Sun, 4 Nov 2012 22:42:54 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA4MgsOL070558; Sun, 4 Nov 2012 22:42:54 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201211042242.qA4MgsOL070558@svn.freebsd.org> From: Glen Barber Date: Sun, 4 Nov 2012 22:42:54 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-translations@freebsd.org Subject: svn commit: r39941 - in translations/share: examples/vim mk pgpkeys xml X-SVN-Group: doc-translations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-translations@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc translations trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2012 22:42:55 -0000 Author: gjb Date: Sun Nov 4 22:42:54 2012 New Revision: 39941 URL: http://svnweb.freebsd.org/changeset/doc/39941 Log: Merge r39761 through r39932 from head/ to translations/ Added: translations/share/examples/vim/edit-xml.vim - copied unchanged from r39932, head/share/examples/vim/edit-xml.vim translations/share/pgpkeys/gblach.key - copied unchanged from r39932, head/share/pgpkeys/gblach.key translations/share/pgpkeys/sjg.key - copied unchanged from r39932, head/share/pgpkeys/sjg.key Deleted: translations/share/examples/vim/edit-sgml.vim Modified: translations/share/mk/doc.xml.mk translations/share/pgpkeys/loader.key translations/share/pgpkeys/pgpkeys-developers.xml translations/share/pgpkeys/pgpkeys.ent translations/share/xml/authors.ent translations/share/xml/bibliography.xml translations/share/xml/commercial.isp.xml translations/share/xml/developers.ent translations/share/xml/events2012.xml translations/share/xml/navibar.ent translations/share/xml/news.xml translations/share/xml/release.ent translations/share/xml/trademarks.ent Directory Properties: translations/share/ (props changed) Copied: translations/share/examples/vim/edit-xml.vim (from r39932, head/share/examples/vim/edit-xml.vim) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ translations/share/examples/vim/edit-xml.vim Sun Nov 4 22:42:54 2012 (r39941, copy of r39932, head/share/examples/vim/edit-xml.vim) @@ -0,0 +1,11 @@ +" formatting XML documents +" $FreeBSD$ + +if !exists("format_fdp_xml") + let format_fdp_xml = 1 + " correction for highlighting special characters + autocmd BufNewFile,BufRead *.xml,*.ent,*.html syn match xmlSpecial "&[^;]*;" + + " formatting FreeBSD XML/Docbook + autocmd BufNewFile,BufRead *.xml,*.ent set autoindent formatoptions=tcq2l textwidth=70 shiftwidth=2 softtabstop=2 tabstop=8 +endif Modified: translations/share/mk/doc.xml.mk ============================================================================== --- translations/share/mk/doc.xml.mk Sun Nov 4 22:40:53 2012 (r39940) +++ translations/share/mk/doc.xml.mk Sun Nov 4 22:42:54 2012 (r39941) @@ -27,13 +27,14 @@ _XML_INCLIST= libcommon.l10n.xsl \ header.l10n.ent \ iso8879.ent \ l10n.ent \ - release.ent -.for F in ${_INCLIST} + release.ent \ + release.l10n.ent +.for F in ${_XML_INCLIST} .if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/${F}) -XML_INCLUDES+= ${F} +XML_INCLUDES+= ${DOC_PREFIX}/${LANGCODE}/share/xml/${F} .endif .if exists(${DOC_PREFIX}/share/xml/${F}) -XML_INCLUDES+= ${F} +XML_INCLUDES+= ${DOC_PREFIX}/share/xml/${F} .endif .endfor Copied: translations/share/pgpkeys/gblach.key (from r39932, head/share/pgpkeys/gblach.key) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ translations/share/pgpkeys/gblach.key Sun Nov 4 22:42:54 2012 (r39941, copy of r39932, head/share/pgpkeys/gblach.key) @@ -0,0 +1,41 @@ + + + +sub 2048R/5DE28719 2012-11-03 [expires: 2014-11-03] +]]> + Modified: translations/share/pgpkeys/loader.key ============================================================================== --- translations/share/pgpkeys/loader.key Sun Nov 4 22:40:53 2012 (r39940) +++ translations/share/pgpkeys/loader.key Sun Nov 4 22:42:54 2012 (r39941) @@ -1,51 +1,76 @@ -sub 4096g/9E53A5C7 2007-08-01 [expires: 2010-07-31] +uid loader +sub 4096R/1036D26C 2012-10-26 ]]> Modified: translations/share/pgpkeys/pgpkeys-developers.xml ============================================================================== --- translations/share/pgpkeys/pgpkeys-developers.xml Sun Nov 4 22:40:53 2012 (r39940) +++ translations/share/pgpkeys/pgpkeys-developers.xml Sun Nov 4 22:42:54 2012 (r39941) @@ -124,6 +124,11 @@ &pgpkey.tdb; + + &a.gblach; + &pgpkey.gblach; + + &a.mbr; &pgpkey.mbr; @@ -516,6 +521,11 @@ &pgpkey.danger; + + &a.sjg; + &pgpkey.sjg; + + &a.gibbs; &pgpkey.gibbs; Modified: translations/share/pgpkeys/pgpkeys.ent ============================================================================== --- translations/share/pgpkeys/pgpkeys.ent Sun Nov 4 22:40:53 2012 (r39940) +++ translations/share/pgpkeys/pgpkeys.ent Sun Nov 4 22:42:54 2012 (r39941) @@ -122,6 +122,7 @@ + @@ -333,6 +334,7 @@ + Copied: translations/share/pgpkeys/sjg.key (from r39932, head/share/pgpkeys/sjg.key) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ translations/share/pgpkeys/sjg.key Sun Nov 4 22:42:54 2012 (r39941, copy of r39932, head/share/pgpkeys/sjg.key) @@ -0,0 +1,70 @@ + + + +uid Simon J. Gerraty +uid Simon J. Gerraty +uid Simon J. Gerraty +sub 1024g/D94B72B9 2002-06-12 +]]> + Modified: translations/share/xml/authors.ent ============================================================================== --- translations/share/xml/authors.ent Sun Nov 4 22:40:53 2012 (r39940) +++ translations/share/xml/authors.ent Sun Nov 4 22:42:54 2012 (r39941) @@ -446,6 +446,8 @@ gber@FreeBSD.org"> +gblach@FreeBSD.org"> + gclarkii@FreeBSD.org"> gehenna@FreeBSD.org"> @@ -1190,6 +1192,8 @@ simon@FreeBSD.org"> +sjg@FreeBSD.org"> + skreuzer@FreeBSD.org"> skv@FreeBSD.org"> Modified: translations/share/xml/bibliography.xml ============================================================================== --- translations/share/xml/bibliography.xml Sun Nov 4 22:40:53 2012 (r39940) +++ translations/share/xml/bibliography.xml Sun Nov 4 22:42:54 2012 (r39941) @@ -292,26 +292,6 @@ - - - The FreeBSD Handbook - - FreeBSD Documentation Project - - - BSDi - - - 1st edition - - November 1999 - - 489 pages - - ISBN 1-57176-241-8 - - - McKusick et al, 1994 Modified: translations/share/xml/commercial.isp.xml ============================================================================== --- translations/share/xml/commercial.isp.xml Sun Nov 4 22:40:53 2012 (r39940) +++ translations/share/xml/commercial.isp.xml Sun Nov 4 22:42:54 2012 (r39941) @@ -34,6 +34,23 @@ + + Hub Hosting Services + http://hub.org/ + + Hub.Org has provided Open-Source Web Hosting services since 1997. + Our solutions include FreeBSD VPS Hosting + and self-managed + VPS hosting among many others. Hub has several cost-effective + hosting plans to fit your business, whether it is a new site or + several busy ones. Hub.Org has been actively involved in several + leading, open-source projects (FreeBSD InterNet News (INN), WU-FTPd, + OpenSSH), and providing hosting for open-source projects include + PostgreSQL and Horde. + + + IP Global.net http://www.ipglobal.net/ Modified: translations/share/xml/developers.ent ============================================================================== --- translations/share/xml/developers.ent Sun Nov 4 22:40:53 2012 (r39940) +++ translations/share/xml/developers.ent Sun Nov 4 22:42:54 2012 (r39941) @@ -214,6 +214,7 @@ $FreeBSD$ + @@ -577,6 +578,7 @@ $FreeBSD$ + @@ -705,14 +707,14 @@ $FreeBSD$ - + - + - - + + Modified: translations/share/xml/events2012.xml ============================================================================== --- translations/share/xml/events2012.xml Sun Nov 4 22:40:53 2012 (r39940) +++ translations/share/xml/events2012.xml Sun Nov 4 22:42:54 2012 (r39941) @@ -234,4 +234,33 @@ experts. + + + BSDday Argentina 2012 + http://www.bsdday.org/ + + 2012 + 11 + 17 + + + 2012 + 11 + 17 + + + Argentina + Buenos Aires City + Universidad Tecnologica Nacional + + + BSDday Argentina is a conference for users, sysadmins + and developers of BSD software and based systems. The + conference is for anyone developing, deploying and using systems + based on FreeBSD, NetBSD, OpenBSD, DragonFlyBSD and others *BSD. + BSDday Argentina is a technical conference and aims to collect + the best technical papers and presentations available to ensure + that the latest developments in our open source community are + shared with the widest possible audience. + Modified: translations/share/xml/navibar.ent ============================================================================== --- translations/share/xml/navibar.ent Sun Nov 4 22:40:53 2012 (r39940) +++ translations/share/xml/navibar.ent Sun Nov 4 22:42:54 2012 (r39941) @@ -76,14 +76,14 @@ Upcoming Release: &betarel.current; +
  • Upcoming Release:
    &betarel.current;
    • '> ]]> Upcoming Release: &betarel2.current; +
  • Upcoming Release:
    &betarel2.current;
    • '> ]]> @@ -95,10 +95,11 @@
  • Get FreeBSD
  • Release Information
    • Modified: translations/share/xml/news.xml ============================================================================== --- translations/share/xml/news.xml Sun Nov 4 22:40:53 2012 (r39940) +++ translations/share/xml/news.xml Sun Nov 4 22:42:54 2012 (r39941) @@ -31,9 +31,75 @@ 2012 + 11 + + + 4 + + +

    New committer: + Grzegorz Blach (ports)

    +     +     + + + 3 + + + &os; 9.1-RC3 Available + +

    The third RC build for the &os;-9.1 release cycle is + now available. ISO images for the amd64, i386, sparc64, and + powerpc64 architectures are available + on most of our &os; + mirror sites.

    +     +     +     + + 10 + 24 + + +

    Enhanced commit privileges: Erwin Lansing + (src, ports)

    +     +     + + + 23 + + +

    New committer: + Simon J. Gerraty (src)

    +     +     + + + 20 + + +

    Enhanced commit privileges: Eitan Adler + (src, ports, doc)

    +     +     + + + 19 + +

    New member for the Ports Management team: + Bernhard Fröhlich.

    +     +     + + 10 &os; 9.1-RC2 Available Modified: translations/share/xml/release.ent ============================================================================== --- translations/share/xml/release.ent Sun Nov 4 22:40:53 2012 (r39940) +++ translations/share/xml/release.ent Sun Nov 4 22:42:54 2012 (r39941) @@ -32,7 +32,7 @@ - + + 3Com"> 3ware and Escalade are registered @@ -426,14 +426,14 @@ Coverity, Inc."> - Redistribution and use in source (SGML DocBook) and 'compiled' - forms (SGML, HTML, PDF, PostScript, RTF and so forth) with or without + Redistribution and use in source (XML DocBook) and 'compiled' + forms (XML, HTML, PDF, PostScript, RTF and so forth) with or without modification, are permitted provided that the following conditions are met: - Redistributions of source code (SGML DocBook) must retain the + Redistributions of source code (XML DocBook) must retain the above copyright notice, this list of conditions and the following disclaimer as the first lines of this file unmodified.