Date: Fri, 13 Apr 2012 19:59:38 GMT From: Rene Ladan <rene@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 209546 for review Message-ID: <201204131959.q3DJxcMK048927@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@209546?ac=10 Change 209546 by rene@rene_acer on 2012/04/13 19:58:40 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#135 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#80 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#11 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#136 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#73 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#35 integrate .. //depot/projects/docproj_nl/share/pgpkeys/madpilot.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#74 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#71 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#73 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#138 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#135 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1077 2012/04/07 14:45:09 crees Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1078 2012/04/12 20:19:17 madpilot Exp $ --> <!-- NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical order by first name. @@ -3588,11 +3588,6 @@ </listitem> <listitem> - <para>Guido Falsi - <email>mad@madpilot.net</email></para> - </listitem> - - <listitem> <para>Guillaume Paquet <email>amyfoub@videotron.ca</email></para> </listitem> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#80 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.354 2012/03/23 13:46:24 cherry Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.356 2012/04/13 16:47:39 monthadar Exp $ --> <!-- NOTE TO NEW COMMITTERS: Core and committers lists are sorted in alphabetical order by last name. Please keep in mind that fact while @@ -23,6 +23,10 @@ </listitem> <listitem> + <para>&a.monthadar;</para> + </listitem> + + <listitem> <para>&a.ambrisko;</para> </listitem> @@ -375,6 +379,10 @@ </listitem> <listitem> + <para>&a.madpilot;</para> + </listitem> + + <listitem> <para>&a.rafan;</para> </listitem> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml,v 1.75 2012/02/11 04:01:48 eadler Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml,v 1.76 2012/04/12 00:55:31 eadler Exp $ --> <chapter id="boot"> @@ -600,9 +600,10 @@ <sect4 id="boot-splash-function"> <title>Splash Screen Function</title> - <para>The splash screen function only supports 256-color - bitmap (<filename>.bmp</filename>) or ZSoft - <acronym>PCX</acronym> (<filename>.pcx</filename>) files. + <para>The splash screen function supports 256-color + bitmap (<filename>.bmp</filename>), ZSoft + <acronym>PCX</acronym> (<filename>.pcx</filename>), or + TheDraw (<filename>.bin</filename>) files. In addition, the splash image files must have a resolution of 320 by 200 pixels or less to work on standard VGA adapters.</para> @@ -654,10 +655,11 @@ <sect4 id="boot-splash-enable"> <title>Enabling the Splash Screen Function</title> - <para>The splash screen (<filename>.bmp</filename>) or - (<filename>.pcx</filename>) file has to be placed on the - root partition, for example in the <filename - class="directory">/boot</filename> directory.</para> + <para>The splash screen (<filename>.bmp</filename>, + <filename>.pcx</filename>, or <filename>.bin</filename>) + file has to be placed on the root partition, for example + in the <filename class="directory">/boot</filename> + directory.</para> <para>For default boot display resolution (256-color, 320 by 200 pixels, or less), edit @@ -689,13 +691,20 @@ bitmap_load="YES" bitmap_name="<replaceable>/boot/splash.pcx</replaceable>"</programlisting> - <para>The file name is not restricted to - <quote>splash</quote> as shown in the above example. It - can be anything as long as it has type of - <acronym>BMP</acronym> or <acronym>PCX</acronym>, such as + <para>In version 8.3 another option is to use ascii art in + <ulink url="https://en.wikipedia.org/wiki/TheDraw">TheDraw</ulink>; + format.</para> + + <programlisting>splash_txt="YES" +bitmap_load="YES" +bitmap_name="<replaceable>/boot/splash.bin</replaceable>"</programlisting> + + <para>The file name is not restricted to <quote>splash</quote> + as shown in the above example. It can be anything as long + as it is one of the above types such as, <filename><replaceable>splash_640x400</replaceable>.bmp</filename> or - <filename><replaceable>blue_wave</replaceable>.pcx</filename>.</para> + <filename><replaceable>bluewave</replaceable>.pcx</filename>.</para> <para>Some other interesting <filename>loader.conf</filename> options:</para> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#136 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1175 2012/04/02 20:31:56 wblock Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1176 2012/04/12 18:51:09 eadler Exp $ --> <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -10684,13 +10684,15 @@ &prompt.user; <userinput>portaudit clamav-0.65_6</userinput></screen> <para>If there is none found, you have the green light to add - a new entry for this vulnerability. Now you can generate - a brand-new UUID (assume it is - <literal>74a9541d-5d6c-11d8-80e3-0020ed76ef5a</literal>) and - add your new entry to the VuXML database. Please verify - its syntax after that as follows:</para> + a new entry for this vulnerability.</para> + + <screen>&prompt.user; <userinput>cd ${PORTSDIR}/security/vuxml</userinput> +&prompt.user; <userinput>make newentry</userinput></screen> + + <para>When you are done verify its syntax and + formatting.</para> - <screen>&prompt.user; <userinput>cd ${PORTSDIR}/security/vuxml && make validate</userinput></screen> + <screen>&prompt.user; <userinput>make validate</userinput></screen> <note> <para>You will need at least one of the following packages @@ -10708,7 +10710,7 @@ section of your entry will match correct package(s), issue the following command:</para> - <screen>&prompt.user; <userinput>portaudit -f /usr/ports/INDEX -r 74a9541d-5d6c-11d8-80e3-0020ed76ef5a</userinput></screen> + <screen>&prompt.user; <userinput>portaudit -f /usr/ports/INDEX -r <replaceable>uuid</replaceable></userinput></screen> <note> <para>Please refer to &man.portaudit.1; for better ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#73 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.571 2012/03/23 13:46:25 cherry Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.573 2012/04/13 16:47:40 monthadar Exp $ --> <!ENTITY a.aaron "Aaron Dalton <email>aaron@FreeBSD.org</email>"> @@ -768,6 +768,8 @@ <!ENTITY a.lx "David Thiel <email>lx@FreeBSD.org</email>"> +<!ENTITY a.madpilot "Guido Falsi <email>madpilot@FreeBSD.org</email>"> + <!ENTITY a.maho "Maho Nakata <email>maho@FreeBSD.org</email>"> <!ENTITY a.makc "Max Brazhnikov <email>makc@FreeBSD.org</email>"> @@ -866,6 +868,8 @@ <!ENTITY a.mohans "Mohan Srinivasan <email>mohans@FreeBSD.org</email>"> +<!ENTITY a.monthadar "Monthadar Al Jaberi <email>monthadar@FreeBSD.org</email"> + <!ENTITY a.motoyuki "Motoyuki Konno <email>motoyuki@FreeBSD.org</email>"> <!ENTITY a.mp "Mark Peek <email>mp@FreeBSD.org</email>"> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#35 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.24 2012/02/05 15:49:11 rene Exp $ + $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.25 2012/04/10 18:39:27 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/introduction/chapter.sgml %SRCID% 1.144 ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#74 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.177 2012/03/23 13:46:25 cherry Exp $ + $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.178 2012/04/12 20:19:17 madpilot Exp $ --> <sect2 id="pgpkey-ariff"> @@ -431,6 +431,11 @@ &pgpkey.bf; </sect2> + <sect2 id="pgpkey-madpilot"> + <title>&a.madpilot;</title> + &pgpkey.madpilot; + </sect2> + <sect2 id="pgpkey-rafan"> <title>&a.rafan;</title> &pgpkey.rafan; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#71 (text+ko) ==== @@ -1,5 +1,5 @@ -<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.267 2012/03/23 13:46:25 cherry Exp $ --> +<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.268 2012/04/12 20:19:17 madpilot Exp $ --> <!-- PGP keyblocks --> <!ENTITY pgpkey.aaron SYSTEM "aaron.key"> <!ENTITY pgpkey.ache SYSTEM "ache.key"> @@ -206,6 +206,7 @@ <!ENTITY pgpkey.luoqi SYSTEM "luoqi.key"> <!ENTITY pgpkey.lwhsu SYSTEM "lwhsu.key"> <!ENTITY pgpkey.lx SYSTEM "lx.key"> +<!ENTITY pgpkey.madpilot SYSTEM "madpilot.key"> <!ENTITY pgpkey.maho SYSTEM "maho.key"> <!ENTITY pgpkey.makc SYSTEM "makc.key"> <!ENTITY pgpkey.mandree SYSTEM "mandree.key"> ==== //depot/projects/docproj_nl/www/en/developers.sgml#73 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.313 2012/03/23 13:46:25 cherry Exp $ +$FreeBSD: www/en/developers.sgml,v 1.316 2012/04/13 16:49:53 monthadar Exp $ --> @@ -370,6 +370,7 @@ <!ENTITY a.luoqi "Luoqi Chen"> <!ENTITY a.lwhsu "Li-Wen Hsu"> <!ENTITY a.lx "David Thiel"> +<!ENTITY a.madpilot "Guido Falsi"> <!ENTITY a.maho "Maho Nakata"> <!ENTITY a.makc "Max Brazhnikov"> <!ENTITY a.mandree "Matthias Andree"> @@ -418,6 +419,7 @@ <!ENTITY a.mm "Martin Matuska"> <!ENTITY a.mnag "Marcus Alves Grando"> <!ENTITY a.mohans "Mohan Srinivasan"> +<!ENTITY a.monthadar "Monthadar Al Jaberi"> <!ENTITY a.motoyuki "Motoyuki Konno"> <!ENTITY a.mp "Mark Peek"> <!ENTITY a.mph "Matthew Hunt"> ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#138 (text+ko) ==== @@ -25,7 +25,7 @@ <news> <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0"> <cvs:keyword name="freebsd"> - $FreeBSD: www/share/sgml/news.xml,v 1.428 2012/04/02 15:59:22 gjb Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.431 2012/04/13 16:49:53 monthadar Exp $ </cvs:keyword> </cvs:keywords> @@ -34,6 +34,22 @@ <month> <name>4</name> <day> + <name>13</name> + <event> + <p>New committer: + <a href="mailto:monthadar@FreeBSD.org">Monthadar Al Jaberi</a> (src) + </p> + </event> + </day> + <day> + <name>12</name> + <event> + <p>New committer: + <a href="mailto:madpilot@FreeBSD.org">Guido Falsi</a> (ports)</p> + </event> + </day> + + <day> <name>2</name> <event> <title>&os; 8.3-RC2 Available</title>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204131959.q3DJxcMK048927>