PERFORCE change 190569 for review

Rene Ladan rene at FreeBSD.org
Sat Mar 26 10:06:08 UTC 2011


http://p4web.freebsd.org/@@190569?ac=10

Change 190569 by rene at rene_acer on 2011/03/26 10:05:02

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#38 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#90 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#34 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#15 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#19 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#20 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#20 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#15 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#21 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#18 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#58 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#19 integrate
.. //depot/projects/docproj_nl/www/en/projects/newbies.sgml#4 integrate
.. //depot/projects/docproj_nl/www/nl/administration.sgml#28 integrate
.. //depot/projects/docproj_nl/www/share/sgml/events.xml#38 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#38 (text+ko) ====

@@ -9,7 +9,7 @@
 
     <corpauthor>The &os; Documentation Project</corpauthor>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.297 2011/03/17 19:05:11 blackend Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.298 2011/03/24 20:09:24 cperciva Exp $</pubdate>
 
     <copyright>
       <year>1999</year>
@@ -1505,21 +1505,6 @@
     <variablelist>
 
       <varlistentry>
-	<term>&a.jhb;</term>
-
-	<listitem>
-	  <para>John is the manager of the SMPng Project, and has
-	    authority over the architectural design and implementation
-	    of the move to fine-grained kernel threading and locking.
-	    He is also the editor of the SMPng Architecture Document.
-	    If you are working on fine-grained SMP and locking, please
-	    coordinate with John.  You can learn more about the
-	    SMPng Project on its home page:
-	    <ulink url="http://www.FreeBSD.org/smp/"></ulink></para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
 	<term>&a.doceng;</term>
 
 	<listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#90 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.991 2011/03/18 08:56:52 sbz Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.992 2011/03/24 09:06:36 osa Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -8902,6 +8902,11 @@
     </listitem>
 
     <listitem>
+      <para>Sergey V. Dyatko
+	<email>sergey.dyatko at gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Sergey Gershtein
 	<email>sg at mplik.ru</email></para>
     </listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#34 (text+ko) ====

@@ -12,7 +12,7 @@
 
     <corpauthor>The &os; Documentation Project</corpauthor>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1133 2011/03/08 09:42:08 danger Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1134 2011/03/21 17:42:38 chinsan Exp $</pubdate>
 
     <copyright>
       <year>1995</year>
@@ -4155,7 +4155,9 @@
 	<answer>
 	  <para>The open-source <application><ulink
 	      url="http://www.openoffice.org">OpenOffice.org</ulink></application>
-	    office suite works natively on &os;.  The &linux; version of
+	    and <application><ulink
+              url="http://www.libreoffice.org">LibreOffice</ulink></application>
+            office suites work natively on &os;.  The &linux; version of
 	    <application><ulink
 	      url="http://www.oracle.com/us/products/applications/open-office/index.html">Oracle Open Office</ulink></application>,
 	    the value-added closed-source version of OpenOffice.org,

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#15 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v 1.245 2010/12/01 20:37:03 rene Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v 1.246 2011/03/21 17:42:38 chinsan Exp $
 -->
 
 <chapter id="config-tuning">
@@ -135,9 +135,9 @@
 	    with &man.pkg.add.1; the packaging tools extract a temporary copy
 	    of the packages under <filename class="directory">/var/tmp</filename>.  Large
 	    software packages, like <application>Firefox</application>,
-	    or <application>OpenOffice</application> may be tricky to install
-	    if there is not enough disk space
-	    under <filename class="directory">/var/tmp</filename>.</para>
+	    <application>OpenOffice</application> or <application>LibreOffice</application>
+	    may be tricky to install if there is not enough disk space under 
+	    <filename class="directory">/var/tmp</filename>.</para>
 	</note>
 
 	<para>The <filename class="directory">/usr</filename> partition holds many

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#19 (text+ko) ====

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.101 2011/02/25 09:12:49 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.103 2011/03/22 13:35:13 chinsan Exp $
 -->
 
 <chapter id="desktop">
@@ -59,7 +59,8 @@
           <application>KOffice</application>,
           <application>AbiWord</application>,
           <application>The GIMP</application>,
-          <application>OpenOffice.org</application>)</para>
+          <application>OpenOffice.org</application>,
+          <application>LibreOffice</application>)</para>
       </listitem>
 
       <listitem>
@@ -527,6 +528,14 @@
             <entry>huge</entry>
             <entry><application>&jdk;</application>, <application>Mozilla</application></entry>
           </row>
+
+          <row>
+            <entry><application>LibreOffice</application></entry>
+            <entry>somewhat heavy</entry>
+            <entry>huge</entry>
+            <entry><application>Gtk+</application>, or <application>KDE</application>/ 
+	    <application>GNOME</application>, or <application>&jdk;</application></entry>
+          </row>
         </tbody>
       </tgroup>
     </informaltable>
@@ -732,6 +741,91 @@
 
       <screen>&prompt.user; <userinput>openoffice.org</userinput></screen>
     </sect2>
+
+    <sect2>
+      <title>LibreOffice</title>
+      <indexterm>
+	<primary><application>LibreOffice</application></primary>
+      </indexterm>
+      <indexterm>
+	<primary>office suite</primary>
+	<secondary><application>LibreOffice</application></secondary>
+      </indexterm>
+
+      <para><application>LibreOffice</application> is a free software
+	office suite developed by <ulink
+	  url="http://www.documentfoundation.org/">The Document
+	Foundation</ulink> that is compatible with other
+	major office suites and available on a variety of platforms.
+	It is a rebranded fork of
+	<application>OpenOffice.org</application> which includes all of the
+        mandatory applications in a complete office productivity
+        suite: a word processor, a spreadsheet, a presentation manager,
+        a drawing program, a database management program, and a tool for
+	creating and editing mathematical formula.  It is available in a
+	number of different languages &mdash; internationalization has been
+        extended to interfaces, spell checkers, and dictionaries.</para>
+
+      <para>The word processor of <application>LibreOffice</application> 
+	uses a native XML file format for increased portability and 
+	flexibility.  The spreadsheet program features a macro language 
+	and it can be interfaced with external databases.
+        <application>LibreOffice</application> is already stable
+        and runs natively on &windows;, Linux, FreeBSD, and 
+	&macos;&nbsp;X.  More information about <application>LibreOffice
+	</application> can be found on the
+	<ulink url="http://www.libreoffice.org/">LibreOffice web site</ulink>.
+	</para>
+
+      <para>To install <application>LibreOffice</application> as package, 
+	do:</para>
+
+      <screen>&prompt.root; <userinput>pkg_add -r libreoffice</userinput></screen>
+
+      <note>
+	<para>When running a -RELEASE version of &os;, this should work.
+      </note>
+
+      <para>Once the package is installed, you need to type the following 
+	command to run <application>LibreOffice</application>:
+      </para>
+
+      <screen>&prompt.user; <userinput>libreoffice</userinput></screen>
+
+      <note>
+	<para>During the first launch, you will be asked some
+	  questions and a <filename>.libreoffice</filename> folder
+	  will be created in your home directory.</para>
+      </note>
+
+      <para>If the <application>LibreOffice</application> packages
+        are not available, you still have the option to compile the
+        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/libreoffice</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+      <note>
+	<para>If you want to build a localized version, replace the
+	  previous command line with the following:</para>
+
+	<screen>&prompt.root; <userinput>make LOCALIZED_LANG=<replaceable>your_language</replaceable> install clean</userinput></screen>
+
+	<para>You have to replace
+	  <replaceable>your_language</replaceable> with the correct
+	  language ISO-code.  A list of supported language codes are 
+	  available in the <maketarget>pre-fetch</maketarget> target of
+	  the port <filename>Makefile</filename>.
+	</para>
+      </note>
+
+      <para>Once this is done,
+	<application>LibreOffice</application> can be launched with
+	the command:</para>
+
+      <screen>&prompt.user; <userinput>libreoffice</userinput></screen>
+    </sect2>
   </sect1>
 
   <sect1 id="desktop-viewers">
@@ -1154,6 +1248,12 @@
 	  </row>
 
 	  <row>
+            <entry><application>LibreOffice</application></entry>
+	    <entry><literal>libreoffice</literal></entry>
+	    <entry><filename role="package">editors/libreoffice</filename></entry>
+	  </row>
+
+	  <row>
             <entry><application>&acrobat.reader;</application></entry>
 	    <entry><literal>acroread</literal></entry>
 	    <entry><filename role="package">print/acroread8</filename></entry>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#20 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.306 2011/03/10 18:03:32 bcr Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.307 2011/03/21 14:04:13 gjb Exp $
 -->
 
 <chapter id="disks">
@@ -4250,7 +4250,7 @@
 	loadable module is available in the default &os; installation.
 	For stripped-down systems, make sure this module is available.
 	Alternatively, it is possible to build
-	<acronym>GEOM_GATE</acronym> support into the kernel
+	<literal>GEOM_GATE</literal> support into the kernel
 	statically, by adding the following line to the custom kernel
 	configuration file:</para>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#20 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.139 2010/12/01 20:37:04 rene Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.140 2011/03/26 06:17:21 manolis Exp $
 -->
 
 <chapter id="introduction">
@@ -654,7 +654,7 @@
       <para>The RELENG_7 branch was created in October 2007.  The first
 	release of this branch was 7.0-RELEASE, which came
 	out in February 2008.  The most recent &rel2.current;-RELEASE came out
-	in &rel2.current.date;.  There will be additional releases from the
+	in &rel2.current.date;.  There will be no additional releases from the
 	RELENG_7 branch.</para>
 
       <para>The tree was branched again in August 2009, this time for
@@ -844,7 +844,7 @@
 	      is one of the functions of the core team, as is the
 	      recruitment of new core team members as others move on.
 	      The current core team was elected from a pool of committer
-	      candidates in July 2008.  Elections are held
+	      candidates in July 2010.  Elections are held
 	      every 2 years.</para>
 
 	    <para>Some core team members also have specific areas of

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#15 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: doc/nl_NL.ISO8859-1/articles/Makefile,v 1.6 2009/09/06 20:51:35 rene Exp $
+# $FreeBSD: doc/nl_NL.ISO8859-1/articles/Makefile,v 1.7 2011/03/20 10:57:10 rene Exp $
 
 # %SOURCE%	en_US.ISO8859-1/articles/Makefile
 # %SRCID%	1.62

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#21 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
     The FreeBSD Dutch Documentation Project
 
-    $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml,v 1.8 2010/09/06 11:29:02 remko Exp $
+    $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml,v 1.9 2011/03/20 11:20:04 rene Exp $
 
     %SOURCE%	en_US.ISO8859-1/books/handbook/jails/chapter.sgml
     %SRCID%	1.22

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#18 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.18 2011/02/02 08:54:11 remko Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.19 2011/03/20 11:20:04 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
      %SRCID%	1.196

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#58 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.42 2011/02/02 09:48:12 remko Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.43 2011/03/20 11:20:04 rene Exp $
      Vertaald door: Siebrand Mazeland / Rene Ladan
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#19 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml,v 1.20 2011/02/02 10:10:39 remko Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml,v 1.21 2011/03/20 11:20:04 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/security/chapter.sgml
      %SRCID%	1.338

==== //depot/projects/docproj_nl/www/en/projects/newbies.sgml#4 (text+ko) ====

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/projects/newbies.sgml,v 1.61 2010/12/14 14:28:59 ryusuke Exp $">
+<!ENTITY date "$FreeBSD: www/en/projects/newbies.sgml,v 1.62 2011/03/21 14:03:26 gjb Exp $">
 <!ENTITY title 'Resources for Newbies'>
 <!ENTITY % navinclude.docs "INCLUDE">
 <!ENTITY url.articles "&base;/doc/en_US.ISO8859-1/articles">
@@ -268,7 +268,7 @@
     
     <p>Before talking to real humans about your new skills, you might
       want to check the <a
-      href="http://catb.org/~esr/jargon/html/index.html">Jargon File</a>.</p>
+      href="http://www.catb.org/jargon/">Jargon File</a>.</p>
 
       &footer;
   </body>

==== //depot/projects/docproj_nl/www/nl/administration.sgml#28 (text+ko) ====

@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/nl/administration.sgml,v 1.13 2011/02/20 08:57:02 remko Exp $">
+<!ENTITY date "$FreeBSD: www/nl/administration.sgml,v 1.14 2011/03/20 10:23:10 rene Exp $">
 <!ENTITY title "&os; Project Regelgeving en Beheer">
 <!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "../en/developers.sgml"> %developers;

==== //depot/projects/docproj_nl/www/share/sgml/events.xml#38 (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.94 2011/02/04 11:57:42 jkois Exp $
+      $FreeBSD: www/share/sgml/events.xml,v 1.95 2011/03/24 13:23:58 jkois Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -116,6 +116,32 @@
       from commercial vendors.</description>
   </event>
 
+  <event id="graz-linuxtag-2011">
+    <name>Grazer Linuxtag 2011</name>
+    <url>http://www.linuxtage.at/</url>
+    <startdate>
+      <year>2011</year>
+      <month>04</month>
+      <day>09</day>
+    </startdate>
+    <enddate>
+      <year>2011</year>
+      <month>04</month>
+      <day>09</day>
+    </enddate>
+    <location>
+      <country code="AT">Austria</country>
+      <city>Graz</city>
+      <site>FH Joanneum Graz</site>
+    </location>
+    <description>The Grazer Linuxtag is a one day event on Linux and free
+      software in general.  Besides a FreeBSD booth and the possibility
+      to take the BSDA certification exam there will also be a
+      <quote>BSD Bootcamp</quote> with live workshops covering
+      different FreeBSD topics.  More information can be found <a
+      href="http://www.bsdbootcamp.org/">here</a>.</description>
+  </event>
+
   <event id="linuxfest-2011">
     <name>Indiana LinuxFest 2011</name>
     <url>http://www.indianalinux.org/cms/</url>


More information about the p4-projects mailing list