PERFORCE change 177517 for review
Rene Ladan
rene at FreeBSD.org
Fri Apr 30 12:53:27 UTC 2010
http://p4web.freebsd.org/@@177517?ac=10
Change 177517 by rene at rene_acer on 2010/04/30 12:53:14
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#11 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#77 integrate
.. //depot/projects/docproj_nl/www/share/sgml/events.xml#27 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#78 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#11 (text+ko) ====
@@ -1,6 +1,6 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.91 2009/08/19 07:26:21 blackend Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.93 2010/04/30 08:06:15 blackend Exp $
-->
<chapter id="desktop">
@@ -463,7 +463,7 @@
<entry><application>OpenOffice.org</application></entry>
<entry>heavy</entry>
<entry>huge</entry>
- <entry><application>&jdk; 1.4</application>, <application>Mozilla</application></entry>
+ <entry><application>&jdk;</application>, <application>Mozilla</application></entry>
</row>
</tbody>
</tgroup>
@@ -638,7 +638,7 @@
<note>
<para>During the first launch, you will be asked some
- questions and a <filename>.openoffice.org2</filename> folder
+ questions and a <filename>.openoffice.org</filename> folder
will be created in your home directory.</para>
</note>
@@ -647,7 +647,7 @@
port. However, you must bear in mind that it requires a lot of
disk space and a fairly long time to compile.</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice.org-2</userinput>
+ <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice.org-3</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
<note>
@@ -743,10 +743,10 @@
for Linux. As FreeBSD can run Linux binaries, it is also
available for FreeBSD.</para>
- <para>To install <application>&acrobat.reader; 7</application> from
+ <para>To install <application>&acrobat.reader; 9</application> from
the Ports collection, do:</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/print/acroread7</userinput>
+ <screen>&prompt.root; <userinput>cd /usr/ports/print/acroread9</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
<para>A package is not available due to licencing restrictions.</para>
@@ -1088,13 +1088,13 @@
<row>
<entry><application>OpenOffice.org</application></entry>
<entry><literal>openoffice</literal></entry>
- <entry><filename role="package">editors/openoffice-1.1</filename></entry>
+ <entry><filename role="package">editors/openoffice-3</filename></entry>
</row>
<row>
<entry><application>&acrobat.reader;</application></entry>
<entry><literal>acroread</literal></entry>
- <entry><filename role="package">print/acroread7</filename></entry>
+ <entry><filename role="package">print/acroread9</filename></entry>
</row>
<row>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#77 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1056 2010/04/16 20:50:10 dougb Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1057 2010/04/27 22:00:37 gahr Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -5149,7 +5149,7 @@
<para>The Mesa Project is an effort to provide free OpenGL
implementation. You can specify a dependency on various components
of this project with <makevar>USE_GL</makevar> variable.
- Valid options are: <literal>glut, glu, glw, gl</literal> and
+ Valid options are: <literal>glut, glu, glw, glew, gl</literal> and
<literal>linux</literal>. For backwards compatibility, the value
of <literal>yes</literal> maps to <literal>glu</literal>.</para>
==== //depot/projects/docproj_nl/www/share/sgml/events.xml#27 (text+ko) ====
@@ -10,7 +10,7 @@
<events>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $FreeBSD: www/share/sgml/events.xml,v 1.82 2010/02/20 11:22:05 brueffer Exp $
+ $FreeBSD: www/share/sgml/events.xml,v 1.83 2010/04/28 11:37:13 danger Exp $
</cvs:keyword>
</cvs:keywords>
@@ -111,6 +111,31 @@
track, tutorials, and FreeBSD developer summit.</description>
</event>
+ <event it="meetbsd-2010">
+ <name>meetBSD 2010</name>
+ <url>http://www.meetBSD.org/</url>
+ <startdate>
+ <year>2010</year>
+ <month>7</month>
+ <day>2</day>
+ </startdate>
+ <enddate>
+ <year>2010</year>
+ <month>7</month>
+ <day>3</day>
+ </enddate>
+ <location>
+ <country code="PL">Poland</country>
+ <city>Krakow</city>
+ <site>Jagiellonian University</site>
+ </location>
+ <description>meetBSD is an annual event gathering users and developers of
+ the BSD operating systems family, mostly &os;, NetBSD and OpenBSD.
+ After the special California edition for the 10th FreeBSD anniversary,
+ meetBSD Wintercamp in Livigno, this year we are back to Krakow,
+ Poland.</description>
+ </event>
+
<event id="lsm-2010">
<name>11th Libre Software Meeting</name>
<url>http://2010.rmll.info/</url>
==== //depot/projects/docproj_nl/www/share/sgml/news.xml#78 (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.315 2010/04/24 23:29:19 danger Exp $
+ $FreeBSD: www/share/sgml/news.xml,v 1.316 2010/04/30 07:15:32 mm Exp $
</cvs:keyword>
</cvs:keywords>
@@ -36,6 +36,16 @@
<name>4</name>
<day>
+ <name>29</name>
+
+ <event>
+ <p>Enhanced commit privileges: <a
+ href="mailto:mm at FreeBSD.org">Martin Matuška</a>
+ (src, ports)</p>
+ </event>
+ </day>
+
+ <day>
<name>22</name>
<event>
More information about the p4-projects
mailing list