Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Oct 2013 14:15:15 +0000 (UTC)
From:      Dru Lavigne <dru@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org
Subject:   svn commit: r42872 - head/en_US.ISO8859-1/books/handbook/desktop
Message-ID:  <201310071415.r97EFFTc046715@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dru
Date: Mon Oct  7 14:15:15 2013
New Revision: 42872
URL: http://svnweb.freebsd.org/changeset/doc/42872

Log:
  This patch does the following:
  
  - comments authors
  
  - spells out or rewords hyperlinks
  
  - adds note about PC-BSD
  
  - minor wordsmithing
  
  The next patch for this chapter will make igor happy.
  
  Approved by:	bcr (mentor)

Modified:
  head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml	Mon Oct  7 10:29:38 2013	(r42871)
+++ head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml	Mon Oct  7 14:15:15 2013	(r42872)
@@ -6,13 +6,13 @@
 
 <chapter id="desktop">
   <chapterinfo>
-    <authorgroup>
+ <!--   <authorgroup>
       <author>
 	<firstname>Christophe</firstname>
 	<surname>Juniet</surname>
 	<contrib>Contributed by </contrib>
       </author>
-    </authorgroup>
+    </authorgroup>-->
   </chapterinfo>
 
   <title>Desktop Applications</title>
@@ -22,14 +22,20 @@
 
     <para>While &os; is popular as a server for its performance and
       stability, it is also suited for day-to-day use as a desktop.
-      With over &os.numports; applications available as <link
-	linkend="packages-using">packages</link> or <link
-	linkend="ports-using">ports</link>, it is easy to build a
+      With over &os.numports; applications available as &os; packages or
+      ports, it is easy to build a
       customized desktop that runs a wide variety of desktop
       applications.  This chapter demonstrates how to install some
-      popular desktop applications effortlessly using packages or the
+      popular desktop applications using packages or the
       &os; Ports Collection.</para>
 
+     <note>
+      <para>Users who prefer to install a pre-built desktop
+	version of FreeBSD rather than configuring one from scratch
+	should refer to the <ulink url="http://www.pcbsd.org/">pcbsd.org
+	  website.</ulink></para>
+    </note>
+
     <para>As &os; features <link linkend="linuxemu">&linux; binary
 	compatibility</link>, many applications developed for &linux;
       can be installed on a &os; desktop.  Many of the ports using
@@ -115,7 +121,7 @@
 		OpenOffice</application></entry>
 	    <entry><literal>openoffice</literal></entry>
 	    <entry><filename
-		role="package">editors/openoffice-3</filename></entry>
+		role="package">editors/openoffice-4</filename></entry>
 	  </row>
 
 	  <row>
@@ -191,18 +197,20 @@
     <itemizedlist>
       <listitem>
 	<para>Install additional software using packages or
-	  ports.</para>
+	  ports as described in <xref linkend="ports"/>.</para>
+      </listitem>
+      
+      <listitem>
+	<para>Install X and a window manager as described in <xref linkend="x11"/>.</para>
       </listitem>
 
       <listitem>
-	<para>Enable &linux; binary compatibility.</para>
+	<para>Enable &linux; binary compatibility as described in <xref linkend="linuxemu"/>.</para>
       </listitem>
     </itemizedlist>
 
     <para>For information on how to configure a multimedia
-      environment, refer to <xref linkend="multimedia"/>.  For
-      information on how to set up and use electronic mail, refer to
-      <xref linkend="mail"/>.</para>
+      environment, refer to <xref linkend="multimedia"/>.</para>
   </sect1>
 
   <sect1 id="desktop-browsers">
@@ -252,7 +260,7 @@
 	    <entry><application>Firefox</application></entry>
 	    <entry>medium</entry>
 	    <entry>heavy</entry>
-	    <entry>&os; and &linux; versions are available</entry>
+	    <entry>&os;, &linux;, and localized versions are available</entry>
 	  </row>
 
 	  <row>
@@ -287,15 +295,15 @@
 	<primary><application>Firefox</application></primary>
       </indexterm>
 
-      <para><application>Firefox</application> is a modern, free,
+      <para><application>Firefox</application> is an
 	open source browser that is fully ported to &os;.  It
 	features a standards-compliant HTML display engine, tabbed
 	browsing, popup blocking, extensions, improved security, and
 	more.  <application>Firefox</application> is based on the
 	<application>Mozilla</application> codebase.</para>
 
-      <para>Install the package of the latest release version of
-	<application>Firefox</application> by typing:</para>
+      <para>To install the package of the latest release version of
+	<application>Firefox</application>, type:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r firefox</userinput></screen>
 
@@ -309,7 +317,7 @@
 	  role="package">www/firefox-esr-i18n</filename>.</para>
 
       <para>The Ports Collection can instead be used to compile
-	the desired version of <application>firefox</application> from
+	the desired version of <application>Firefox</application> from
 	source code.  This example builds <filename
 	  role="package">www/firefox</filename>, where
 	<literal>firefox</literal> can be replaced with the ESR or
@@ -321,13 +329,9 @@
     <sect3 id="moz-java-plugin">
       <title>Firefox and &java; Plugin</title>
 
-      <note>
-	<para>The following sections assume that
-	  <application>Firefox</application> is already
-	  installed.</para>
-      </note>
-
-      <para><filename role="package">java/icedtea-web</filename>
+      <para>The installation of
+	<application>Firefox</application> does not include &java;
+	support. However, <filename role="package">java/icedtea-web</filename>
 	provides a free software web browser plugin for running
 	Java applets.  It can be installed as a package.  To
 	alternately compile the port:</para>
@@ -362,11 +366,11 @@
       </indexterm>
 
       <para>A native &adobe; &flash; plugin is not available for &os;.
-	However, a software layer (wrapper) for running the &linux;
-	version of the plugin exists.  This wrapper also provides
+	However, a software wrapper for running the &linux;
+	version of the plugin is available.  This wrapper also provides
 	support for other browser plugins such as &realplayer;.</para>
 
-      <para>To install and enable this plugin:</para>
+      <para>To install and enable this plugin, perform these steps:</para>
 
       <procedure>
 	<step>
@@ -415,11 +419,10 @@
     <sect3 id="moz-swfdec-flash-plugin">
       <title>Firefox and Swfdec &flash; Plugin</title>
 
-      <para>Swfdec is the library for decoding and rendering &flash;
-	animations.  Swfdec-Mozilla is a plugin for
+      <para><application>Swfdec</application> is a decoder and renderer for &flash;
+	animations.  <application>Swfdec-Mozilla</application> is a plugin for
 	<application>Firefox</application> browsers that uses the
-	Swfdec library for playing SWF files.  It is still in heavy
-	development.</para>
+	Swfdec library for playing SWF files.</para>
 
       <para>To install the package:</para>
 
@@ -431,8 +434,7 @@
       <screen>&prompt.root; <userinput>cd /usr/ports/www/swfdec-plugin</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-	<para>Restart the browser for this plugin to take
-	  effect.</para>
+	<para>Restart the browser to activate this plugin.</para>
       </sect3>
     </sect2>
 
@@ -473,7 +475,7 @@
 	as a package is not available due to licensing restrictions.
 	Then install either the <filename
 	  role="package">www/opera-linuxplugins</filename> port
-	or package.  This example compiles both from ports:</para>
+	or package.  This example compiles both applications from ports:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/www/linux-f10-flashplugin11</userinput>
 &prompt.root; <userinput>make install clean</userinput>
@@ -487,8 +489,7 @@
 	all the currently available plugins.</para>
 
       <para>To add the <application>&java;</application> plugin,
-	follow the <link linkend="moz-java-plugin">instructions for
-	  Firefox</link>.</para>
+	follow the instructions in <xref linkend="moz-java-plugin"/>.</para>
     </sect2>
 
     <sect2>
@@ -498,11 +499,10 @@
 	<primary><application>Konqueror</application></primary>
       </indexterm>
 
-      <para><application>Konqueror</application> is part of <filename
-	  role="package">x11/kde4-baseapps</filename>.
-	<application>Konqueror</application> is more than a web
+      <para><application>Konqueror</application> is more than a web
 	browser as it is also a file manager and a multimedia
-	viewer.</para>
+	viewer.  It is included in the <filename
+	  role="package">x11/kde4-baseapps</filename> package or port.</para>
 
       <para><application>Konqueror</application> supports WebKit as
 	well as its own KHTML.  WebKit is a rendering engine used by
@@ -565,23 +565,19 @@
     <sect3 id="chromium-java-plugin">
       <title>Chromium and &java; Plugin</title>
 
-      <note>
-	<para>The following sections assume that
-	  <application>Chromium</application> is already
-	  installed.</para>
-      </note>
-
-      <para>To install &java; plugin support, follow the instructions
+      <para>The installation of
+	<application>Chromium</application> does not include &java;
+	support.  To install &java; plugin support, follow the instructions
 	in <xref linkend="moz-java-plugin"/>.</para>
 
       <para>Once &java; support is installed, start
-	<application>Chromium</application>, and enter
+	<application>Chromium</application> and enter
 	<literal>about:plugins</literal> in the address bar.
 	IcedTea-Web should be listed as one of the installed
 	plugins.</para>
 
       <para>If <application>Chromium</application> does not display
-	the IcedTea-Web plugin, run the following commands, and
+	the IcedTea-Web plugin, run the following commands and
 	restart the web browser:</para>
 
       <screen>&prompt.root; <userinput>mkdir -p /usr/local/share/chromium/plugins
@@ -594,8 +590,7 @@
 
 	<para>Configuring <application>Chromium</application> and
 	  &adobe;&nbsp;&flash; is similar to the
-	  <link linkend="moz-flash-plugin">instructions for
-	  Firefox</link>.  No additional configuration should be
+	  the instructions in <xref linkend="moz-java-plugin"/>.  No additional configuration should be
 	  necessary, since <application>Chromium</application> is able
 	  to use some plugins from other browsers.</para>
       </sect3>
@@ -605,13 +600,13 @@
   <sect1 id="desktop-productivity">
     <title>Productivity</title>
 
-    <para>When it comes to productivity, new users often look for a
-      good office suite or a friendly word processor.  While some
+    <para>When it comes to productivity, new users often look for an
+      office suite or an easy-to-use word processor.  While some
       <link linkend="x11-wm">desktop environments</link> like
-      <application>KDE</application> already provide an office suite,
+      <application>KDE</application> provide an office suite,
       there is no default productivity package.  Several office
-      suites and word processors are available for &os;, regardless
-      of the installed desktop environment.</para>
+      suites and graphical word processors are available for &os;, regardless
+      of the installed window manager.</para>
 
     <para>This section demonstrates how to install the following
       popular productivity software and indicates if the application
@@ -685,8 +680,8 @@
 	<secondary><application>Calligra</application></secondary>
       </indexterm>
 
-      <para>The KDE community provides its desktop environment with
-	an office suite which can be used outside of
+      <para>The KDE desktop environment includes
+	an office suite which can be installed separately from
 	<application>KDE</application>.
 	<application>Calligra</application> includes standard
 	components that can be found in other office suites.
@@ -696,7 +691,7 @@
 	and <application>Karbon</application> is used to draw
 	graphical documents.</para>
 
-      <para><filename
+      <para>In &os;, <filename
 	  role="package">editors/calligra</filename> can be installed
 	as a package or a port.  To install the package:</para>
 
@@ -718,13 +713,12 @@
 
       <para><application>AbiWord</application> is a free word
 	processing program similar in look and feel to
-	<application>&microsoft; Word</application>.  It is suitable
-	for typing papers, letters, reports, memos, and so forth.  It
+	<application>&microsoft; Word</application>.  It
 	is fast, contains many features, and is user-friendly.</para>
 
       <para><application>AbiWord</application> can import or export
 	many file formats, including some proprietary ones like
-	&microsoft; <filename>.doc</filename>.</para>
+	&microsoft; <filename>.rtf</filename>.</para>
 
       <para>To install the <application>AbiWord</application>
 	package:</para>
@@ -763,9 +757,9 @@
       <screen>&prompt.root; <userinput>cd /usr/ports/graphics/gimp</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-      <para>The <ulink
-	  url="http://www.FreeBSD.org/ports/graphics.html">graphics</ulink>;
-	category of the Ports Collection contains several
+      <para>The graphics category (<ulink
+	  url="http://www.FreeBSD.org/ports/graphics.html">freebsd.org/ports/graphics.html</ulink>)
+	of the Ports Collection contains several
 	  <application>GIMP</application>-related plugins, help
 	files, and user manuals.</para>
 
@@ -786,19 +780,14 @@
 	</secondary>
       </indexterm>
 
-      <para>On 1 June 2011, &oracle; donated the
-	<application>OpenOffice.org</application> code base to the
-	Apache Software Foundation.
-	<application>OpenOffice.org</application> is now known as
-	<application>Apache OpenOffice</application> and is developed
+      <para><application>Apache OpenOffice</application> is an open
+	source office suite which is developed
 	under the wing of the Apache Software Foundation's
-	Incubator.</para>
-
-      <para><application>Apache OpenOffice</application> includes all
-	of the mandatory applications in a complete office
+	Incubator.  It includes all
+	of the applications found in a complete office
 	productivity suite:  a word processor, spreadsheet,
 	presentation manager, and drawing program.  Its user
-	interface is very similar to other office suites, and it can
+	interface is similar to other office suites, and it can
 	import and export in various popular file formats.  It is
 	available in a number of different languages and
 	internationalization has been extended to interfaces, spell
@@ -812,29 +801,16 @@
 	<application>Apache OpenOffice</application> is stable and
 	runs natively on &windows;, &solaris;, &linux;, &os;, and
 	&macos;&nbsp;X.  More information about <application>Apache
-	  OpenOffice</application> can be found on the <ulink
-	  url="http://incubator.apache.org/openofficeorg/">Apache
-	  OpenOffice web site</ulink>.  For &os; specific
-	information, and to directly download packages, refer to the
-	web site of the <ulink
-	  url="http://porting.openoffice.org/freebsd/">&os; Apache
-	  OpenOffice Porting Team</ulink>.</para>
+	  OpenOffice</application> can be found at <ulink
+	  url="http://openoffice.org/">openoffice.org</ulink>.  For &os; specific
+	information refer to <ulink
+	  url="http://porting.openoffice.org/freebsd/">porting.openoffice.org/freebsd/</ulink>.</para>;
 
       <para>To install the <application>Apache
 	  OpenOffice</application> package:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r apache-openoffice</userinput></screen>
 
-      <note>
-	<para>When running a -RELEASE version of &os;, this should
-	  work.  Otherwise, download the latest package from the
-	  website of the &os;
-	  <application>Apache OpenOffice</application> Porting Team
-	  and install it using &man.pkg.add.1;.  Both the current
-	  release and development versions are available for download
-	  at this web site.</para>
-      </note>
-
       <para>Once the package is installed, type the following command
 	to launch <application>Apache OpenOffice</application>:</para>
 
@@ -842,20 +818,17 @@
 
       <para>where <replaceable>X.Y.Z</replaceable> is the version
 	number of the installed version of
-	<application>Apache OpenOffice</application>.</para>
-
-      <note>
-	<para>During the first launch, some questions will be asked
-	  and a <filename>.openoffice.org</filename> folder
+	<application>Apache OpenOffice</application>.  The first time
+	<application>Apache OpenOffice</application> launches, some questions will be asked
+	  and a <filename class="directory">.openoffice.org</filename> folder
 	  will be created in the user's home directory.</para>
-      </note>
 
       <para>If the desired <application>Apache
 	  OpenOffice</application> package is not available, compiling
-	the port is still an opton.  However, this requires a lot of
+	the port is still an option.  However, this requires a lot of
 	disk space and a fairly long time to compile:</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice-3</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice-4</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <note>
@@ -886,15 +859,14 @@
 
       <para><application>LibreOffice</application> is a free software
 	office suite developed by <ulink
-	  url="http://www.documentfoundation.org/">The Document
-	  Foundation</ulink>.  It is compatible with other major
+	  url="http://www.documentfoundation.org/">documentfoundation.org</ulink>.  It 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
+	and includes applications found in a complete
 	office productivity suite: a word processor, spreadsheet,
 	presentation manager, drawing program, database management
 	program, and a tool for creating and editing mathematical
-	formula.  It is available in a number of different languages
+	formul&aelig;.  It is available in a number of different languages
 	and internationalization has been extended to interfaces,
 	spell checkers, and dictionaries.</para>
 
@@ -906,18 +878,17 @@
 	<application>LibreOffice</application> is stable and runs
 	natively on &windows;, &linux;, &os;, 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>
+	<application>LibreOffice </application> can be found at
+	<ulink url="http://www.libreoffice.org/">libreoffice.org</ulink>.</para>;
 
       <para>To install the English version of the
 	<application>LibreOffice</application> package:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r libreoffice</userinput></screen>
 
-      <para>The <ulink
-	  url="http://www.FreeBSD.org/ports/editors.html">editors</ulink>;
-	category of the Ports Collection contains several
+      <para>The editors category (<ulink
+	  url="http://www.FreeBSD.org/ports/editors.html">freebsd.org/ports/editors.html</ulink>)
+	of the Ports Collection contains several
 	localizations for <application>LibreOffice</application>.
 	When installing a localized package, replace
 	<literal>libreoffice</literal> with the name of the
@@ -928,11 +899,9 @@
 
       <screen>&prompt.user; <userinput>libreoffice</userinput></screen>
 
-      <note>
 	<para>During the first launch, some questions will be asked
 	  and a <filename class="directory">.libreoffice</filename>
 	  folder will be created in the user's home directory.</para>
-      </note>
 
       <para>If the desired <application>LibreOffice</application>
 	package is not available, compiling the port is still an
@@ -947,9 +916,9 @@
 	<para>To build a localized version,
 	  <application>cd</application> into the port directory
 	  of the desired language.  Supported languages can be found
-	  in the <ulink
-	    url="http://www.FreeBSD.org/ports/editors.html">editors</ulink>;
-	  category of the Ports Collection.</para>
+	  in the editors category (<ulink
+	    url="http://www.FreeBSD.org/ports/editors.html">freebsd.org/ports/editors.html</ulink>)
+	  of the Ports Collection.</para>
       </note>
     </sect2>
   </sect1>
@@ -960,7 +929,7 @@
     <para>Some new document formats have gained popularity since
       the advent of &unix; and the viewers they require may not be
       available in the base system.  This section demonstrates how to
-      install the following viewers:</para>
+      install the following document viewers:</para>
 
     <informaltable frame="none" pgwide="1">
       <tgroup cols="4">
@@ -1018,15 +987,15 @@
       </indexterm>
 
       <para>Many documents are now distributed as Portable Document
-	Format (PDF) files.  One popular viewer for PDFs is
+	Format (PDF) files.  One popular PDF viewer is
 	<application>&acrobat.reader;</application>,
 	released by &adobe; for &linux;.  As &os; can run &linux;
 	binaries, it is also available for &os;.  Due to
-	licensing restrictions, a package is not available so it must
+	licensing restrictions, a package is not available, meaning that this application must
 	be compiled from ports.  Several localizations are
-	available from the <ulink
-	  url="http://www.FreeBSD.org/ports/print.html">print</ulink>;
-	category of the Ports Collection.</para>
+	available from the print category (<ulink
+	  url="http://www.FreeBSD.org/ports/print.html">freebsd.org/ports/print.html</ulink>)
+	of the Ports Collection.</para>
 
       <para>This command installs the English version of
 	<application>&acrobat.reader; 9</application> from the Ports
@@ -1054,12 +1023,11 @@
 	<secondary>viewing</secondary>
       </indexterm>
 
-      <para><ulink
-	  url="http://www.gnu.org/software/gv/">gv</ulink>; is a
+      <para><application>gv</application> is a
 	&postscript; and PDF viewer.  It is based on
 	<application>ghostview</application>, but has a nicer look
-	due to the <application>Xaw3d</application> library.  It is
-	fast with a clean interface.  <application>gv</application>
+	as it is based on the <application>Xaw3d</application> widget toolkit.
+	<application>gv</application>
 	has many configurable features, such as orientation, paper
 	size, scale, and anti-aliasing.  Almost any operation can be
 	performed with either the keyboard or the mouse.</para>
@@ -1088,12 +1056,11 @@
       </indexterm>
 
       <para>For users that prefer a small &os; PDF viewer,
-	<ulink
-	  url="http://www.foolabs.com/xpdf/">xpdf</ulink>; provides a
+	<application>Xpdf</application> provides a
 	light-weight and efficient viewer which requires few
 	resources.  It uses the standard X fonts and does not require
-	<application>&motif;</application> or any other X
-	toolkit.</para>
+	any additional
+	toolkits.</para>
 
       <para>To install the <application>Xpdf</application>
 	package:</para>
@@ -1118,8 +1085,7 @@
 	<primary><application>GQview</application></primary>
       </indexterm>
 
-      <para><ulink
-	  url="http://gqview.sourceforge.net/">GQview</ulink>; is
+      <para><application>GQview</application> is
 	an image manager which supports viewing a file with a single
 	click, launching an external editor, and thumbnail previews.
 	It also features a slideshow mode and some basic file
@@ -1195,8 +1161,7 @@
 	<primary><application>GnuCash</application></primary>
       </indexterm>
 
-      <para><ulink
-	  url="http://www.gnucash.org/">GnuCash</ulink>; is part of the
+      <para><application>GnuCash</application> is part of the
 	<application>GNOME</application> effort to provide
 	user-friendly, yet powerful, applications to end-users.
 	<application>GnuCash</application> can be used to keep track
@@ -1235,11 +1200,10 @@
 	<secondary><application>Gnumeric</application></secondary>
       </indexterm>
 
-      <para><ulink
-	  url="http://projects.gnome.org/gnumeric/index.shtml">Gnumeric</ulink>;
+      <para><application>Gnumeric</application>
 	is a spreadsheet program developed by the
 	<application>GNOME</application> community.  It features
-	convenient automatic <quote>guessing</quote> of user input
+	convenient automatic guessing of user input
 	according to the cell format with an autofill system for many
 	sequences.  It can import files in a number of popular
 	formats, including <application>Excel</application>,
@@ -1270,16 +1234,15 @@
 	<secondary><application>KMyMoney</application></secondary>
       </indexterm>
 
-      <para><ulink
-	  url="http://kmymoney2.sourceforge.net">KMyMoney</ulink>;
+      <para><application>KMyMoney</application>
 	is a personal finance application created by the
 	<application>KDE</application> community.
-	<application>KMyMoney</application> intends to provide and
-	incorporate all the important features found in commercial
+	<application>KMyMoney</application> aims to provide
+	the important features found in commercial
 	personal finance manager applications.  It also highlights
 	ease-of-use and proper double-entry accounting among its
 	features.  <application>KMyMoney</application> imports from
-	standard Quicken Interchange Format (QIF) files, tracks
+	standard <application>Quicken</application> QIF files, tracks
 	investments, handles multiple currencies, and provides a
 	wealth of reports.</para>
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310071415.r97EFFTc046715>