From owner-p4-projects@FreeBSD.ORG Mon Dec 8 08:40:42 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 642B71065672; Mon, 8 Dec 2008 08:40:42 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 0EBE01065675
for ; Mon, 8 Dec 2008 08:40:42 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id F01368FC14
for ; Mon, 8 Dec 2008 08:40:41 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB88eXEf004975
for ; Mon, 8 Dec 2008 08:40:33 GMT
(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB88eUnw004966
for perforce@freebsd.org; Mon, 8 Dec 2008 08:40:30 GMT
(envelope-from rene@FreeBSD.org)
Date: Mon, 8 Dec 2008 08:40:30 GMT
Message-Id: <200812080840.mB88eUnw004966@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
rene@FreeBSD.org using -f
From: Rene Ladan
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 154321 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Mon, 08 Dec 2008 08:40:42 -0000
http://perforce.freebsd.org/chv.cgi?CH=154321
Change 154321 by rene@rene_self on 2008/12/08 08:39:55
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#11 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/book.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#6 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#11 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#11 (text+ko) ====
@@ -12,7 +12,7 @@
The &os; Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1102 2008/10/18 08:54:27 manolis Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1103 2008/12/07 20:44:01 pgj Exp $1995
@@ -7426,49 +7426,10 @@
- &os; have a feature to allow the display of
- splash screens during the boot messages. The
- splash screens currently must be a 256 color bitmap
- (*.BMP) or ZSoft PCX
- (*.PCX) file. In addition, they must
- have a resolution of 320x200 or less to work on standard VGA
- adapters. If you compile VESA support into your kernel,
- then you can use larger bitmaps up to 1024x768. The actual
- VESA support can either be compiled directly into the kernel
- with the VESA kernel config option or by
- loading the VESA kld module during bootup.
-
- To use a splash screen, you need to modify the startup
- files that control the boot process for &os;.
-
- You need to create a
- /boot/loader.rc file that contains the
- following lines:
-
- include /boot/loader.4th
-start
-
- and a /boot/loader.conf that
- contains the following:
-
- splash_bmp_load="YES"
-bitmap_load="YES"
-
- This assumes you are using
- /boot/splash.bmp for your splash
- screen. If you would rather use a PCX file, copy it to
- /boot/splash.pcx, create a
- /boot/loader.rc as instructed above,
- and create a /boot/loader.conf that
- contains:
-
- splash_pcx_load="YES"
-bitmap_load="YES"
-bitmap_name="/boot/splash.pcx"
-
- Now all you need is a splash screen. For that you can
- surf on over to the gallery at .
+ The detailed answer for this question can be found in
+ the Boot Time Splash Screens
+ section of the &os; Handbook.
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/book.sgml#3 (text+ko) ====
@@ -27,7 +27,7 @@
ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.31 2008/10/02 12:14:31 pgj Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.32 2008/12/07 22:03:48 pgj Exp $
-->
DocEng
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.31 2008/10/02 12:14:31 pgj Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.32 2008/12/07 22:03:48 pgj Exp $
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.31 2008/10/02 12:14:31 pgj Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.32 2008/12/07 22:03:48 pgj Exp $
&bookinfo.legalnotice;
@@ -192,7 +192,7 @@
- Notes, tips, important information, warnings, and examples
+ Notes, Tips, Important Information, Warnings, and ExamplesWithin the text appear notes, warnings, and examples.
@@ -220,7 +220,7 @@
- A sample example
+ A Sample ExampleExamples are represented like this, and typically contain
examples you should walk through, or show you what the results of a
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 (text+ko) ====
@@ -27,7 +27,7 @@
ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml,v 1.23 2005/02/20 16:46:26 simon Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml,v 1.24 2008/12/07 22:03:48 pgj Exp $
-->
@@ -146,7 +146,7 @@
- Before you start
+ Before You StartThis document assumes that you already know:
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#3 (text+ko) ====
@@ -27,7 +27,7 @@
ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.76 2008/12/06 22:09:01 pgj Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.77 2008/12/07 22:03:48 pgj Exp $
-->
@@ -172,8 +172,8 @@
Leaving gaps in the numbering is to be avoided.
- Bad ordering of
- hn elements
+ Bad Ordering of
+ hn ElementsUse:
@@ -2023,7 +2023,7 @@
- hostid and roles
+ hostid and RolesUse:
@@ -2190,8 +2190,8 @@
- Showing items that the user must fill
- in
+ Showing Items That the User Must Fill
+ InThere will often be times when you want to show the user what to
do, or refer to a file, or command line, or similar, where the user
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#3 (text+ko) ====
@@ -27,7 +27,7 @@
ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml,v 1.48 2008/10/31 12:23:35 pgj Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml,v 1.49 2008/12/07 22:03:48 pgj Exp $
-->
@@ -157,7 +157,7 @@
- Elements, tags, and attributes
+ Elements, Tags, and AttributesAll the DTDs written in SGML share certain characteristics. This is
hardly surprising, as the philosophy behind SGML will inevitably show
@@ -209,7 +209,7 @@
/element-name.
- Using an element (start and end tags)
+ Using an Element (Start and End Tags)HTML has an element for indicating that the content enclosed by
the element is a paragraph, called p. This
@@ -228,7 +228,7 @@
the start tag is required for this element.
- Using an element (start tag only)
+ Using an Element (Start Tag Only)HTML has an element for indicating a horizontal rule, called
hr. This element does not wrap content, so only
@@ -248,7 +248,7 @@
on.
- Elements within elements; em
+ Elements within Elements; emThis is a simple paragraph where some
of the words have been emphasized.
]]>
@@ -298,7 +298,7 @@
left.
- Using an element with an attribute
+ Using An Element with An AttributeThe inclusion of the align attribute
on this paragraph was superfluous, since the default is left.
@@ -313,7 +313,7 @@
the attribute value.
- Single quotes around attributes
+ Single Quotes Around AttributesI am on the right!]]>
@@ -332,7 +332,7 @@
catalog files.
- For you to do…
+ For You to Do…In order to run the examples in this document you will need to
install some software on your system and ensure that an environment
@@ -356,7 +356,7 @@
.profile, for &man.sh.1; and
- &man.bash.1; users
+ &man.bash.1; Users
SGML_ROOT=/usr/local/share/sgml
SGML_CATALOG_FILES=${SGML_ROOT}/jade/catalog
@@ -370,7 +370,7 @@
.cshrc, for &man.csh.1; and
- &man.tcsh.1; users
+ &man.tcsh.1; Users
setenv SGML_ROOT /usr/local/share/sgml
setenv SGML_CATALOG_FILES ${SGML_ROOT}/jade/catalog
@@ -395,7 +395,7 @@
- An example HTML file
+ An Example HTML File
@@ -526,7 +526,7 @@
- The DOCTYPE declaration
+ The DOCTYPE DeclarationThe beginning of each document that you write must specify the name
of the DTD that the document conforms to. This is so that SGML parsers
@@ -692,7 +692,7 @@
- catalog files
+ catalog FilesIf you use the syntax above and process this document
using an SGML processor, the processor will need to have some way of
@@ -779,7 +779,7 @@
- Escaping back to SGML
+ Escaping Back to SGMLAs mentioned earlier, SGML is only used when writing a
DTD. This is not strictly true. There is certain SGML syntax that you
@@ -814,7 +814,7 @@
opens a comment, and the second closes it.
- SGML generic comment
+ SGML Generic Comment<!-- test comment -->
@@ -832,7 +832,7 @@
- Use 2 dashes
+ Use 2 DashesThere is a problem with producing the Postscript and PDF versions
of this document. The above example probably shows just one hyphen
@@ -861,7 +861,7 @@
will reject documents that make that error.
- Erroneous SGML comments
+ Erroneous SGML Comments
- For you to do…
+ For You to Do…
@@ -964,7 +964,7 @@
declaration.
- Defining general entities
+ Defining General Entities
@@ -982,7 +982,7 @@
- Parameter entities
+ Parameter EntitiesLike general
entities, parameter entities are used to assign names to
@@ -1003,7 +1003,7 @@
entity.
- Defining parameter entities
+ Defining Parameter Entities
@@ -1018,7 +1018,7 @@
- For you to do…
+ For You to Do…
@@ -1031,7 +1031,7 @@
- An example HTML file
+ An Example HTML File
@@ -1098,7 +1098,7 @@
- Using entities to include files
+ Using Entities to Include FilesEntities (both general and
- Using general entities to include files
+ Using General Entities to Include FilesSuppose you have some content for an SGML book organized into
files, one file per chapter, called
@@ -1121,7 +1121,7 @@
the value of the entity.
- Using general entities to include files
+ Using General Entities to Include Files
@@ -1150,7 +1150,7 @@
- Using parameter entities to include files
+ Using Parameter Entities to Include FilesRecall that parameter entities can only be used inside an SGML
context. Why then would you want to include a file within an SGML
@@ -1171,7 +1171,7 @@
document.
- Using parameter entities to include files
+ Using Parameter Entities to Include FilesFirst, place your entity definitions in a separate file, called
chapters.ent. This file contains the
@@ -1203,10 +1203,10 @@
- For you to do…
+ For You to Do…
- Use general entities to include files
+ Use General Entities to Include Files
@@ -1232,7 +1232,7 @@
- An example HTML file
+ An Example HTML File
@@ -1262,7 +1262,7 @@
- Use parameter entities to include files
+ Use Parameter Entities to Include FilesYou must have taken the previous steps first.
@@ -1279,7 +1279,7 @@
- An example HTML file
+ An Example HTML File
@@ -1321,14 +1321,14 @@
- Marked sections
+ Marked SectionsSGML provides a mechanism to indicate that particular pieces of the
document should be processed in a special way. These are termed
marked sections.
- Structure of a marked section
+ Structure of A Marked Section<![ KEYWORD [
Contents of marked section
@@ -1352,7 +1352,7 @@
>.
- Marked section keywords
+ Marked Section KeywordsCDATA, RCDATA
@@ -1409,7 +1409,7 @@
- Using a CDATA marked section
+ Using a CDATA Marked Section<para>Here is an example of how you would include some text
that contained many <literal><</literal>
@@ -1451,7 +1451,7 @@
Using INCLUDE and
- IGNORE in marked sections
+ IGNORE in Marked Sections
<![ INCLUDE [
This text will be processed and included.
@@ -1488,8 +1488,8 @@
reprocess the document.
- Using a parameter entity to control a marked
- section
+ Using A Parameter Entity to Control a Marked
+ Section<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY % electronic.copy "INCLUDE">
@@ -1515,7 +1515,7 @@
- For you to do…
+ For You to Do…
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 (text+ko) ====
@@ -27,7 +27,7 @@
ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml,v 1.13 2007/01/15 23:29:57 keramida Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml,v 1.14 2008/12/07 22:03:48 pgj Exp $
-->
@@ -70,7 +70,7 @@
HTML document without abusing HTML to do so.
- The DocBook documents
+ The DocBook DocumentsThe FreeBSD DSSSL stylesheets include a reference to a stylesheet,
docbook.css, which is expected to appear in the
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#3 (text+ko) ====
@@ -27,7 +27,7 @@
ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml,v 1.33 2008/10/13 06:57:53 pgj Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml,v 1.34 2008/12/07 22:03:48 pgj Exp $
-->
@@ -47,7 +47,7 @@
tools is covered in later chapters.
- Use textproc/docproj if possible
+ Use textproc/docproj If PossibleYou can save yourself a lot of time if you install the
textproc/docproj port. This is a
@@ -83,7 +83,7 @@
- Mandatory tools
+ Mandatory ToolsSoftware
@@ -199,7 +199,7 @@
- Optional tools
+ Optional ToolsYou do not need to have any of the following installed. However,
you may find it easier to work with the documentation if you do, and
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#3 (text+ko) ====
@@ -1,7 +1,7 @@
@@ -614,8 +614,8 @@
Enabling the Splash Screen FunctionThe splash screen (.bmp) or
- (.pcx) file has to be placed in the
- .pcx) file has to be placed on the
+ root partition, for example in the /boot directory.For default boot display resolution (256-color, 320 by
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#6 (text+ko) ====
@@ -1,6 +1,6 @@
@@ -199,7 +199,7 @@
- Firefox and &java; plugin
+ Firefox and &java; PluginIn this section and in the next one, we assume you have
@@ -232,12 +232,12 @@
&prompt.root; ln -s /usr/local/diablo-jre1.6.0/plugin/i386/ns7/libjavaplugin_oji.so \
/usr/local/lib/browser_plugins/
- then relaunch your browser.
+ Then relaunch your browser.
- Firefox and ¯omedia; &flash; plugin
+ Firefox and ¯omedia; &flash; PluginFlash
@@ -247,18 +247,41 @@
exists. This wrapper also supports &adobe; &acrobat; plugin,
&realplayer; plugin and more.
+
+ The following text covers the installation of &flash;
+ 9.X on recent -STABLE branch, &os; 7.1-RELEASE and above.
+ If you run an older version of &os; or encounter issues, you
+ should install www/linux-flashplugin7 and skip
+ the &man.linprocfs.5; part.
+
+
Install the www/nspluginwrapper
port. This port requires
emulators/linux_base which is a
large port.The next step is to install the www/linux-flashplugin7 port. Once
+ role="package">www/linux-flashplugin9 port. Once
this port is installed, the plugin must be installed by each
user with nspluginwrapper:&prompt.user; nspluginwrapper -v -a -i
+ The &linux; process file system, &man.linprocfs.5; has to
+ be mounted on /usr/compat/linux/proc, if one
+ wants to play &flash; animations. This can be done via the
+ following command:
+
+ &prompt.user; mount -t linprocfs linproc /usr/compat/linux/proc
+
+ This point can be automated at boot time with the addition
+ of the matching line in
+ /etc/fstab:
+
+ linproc /usr/compat/linux/proc linprocfs rw 0 0
+
Then, start your browser, enter
about:plugins in the location bar and press
Enter.
@@ -267,7 +290,7 @@
- Firefox and Swfdec &flash; plugin
+ Firefox and Swfdec &flash; PluginSwfdec is the library for decoding and rendering &flash; animations.
And Swfdec-Mozilla is a plugin for Firefox
@@ -279,7 +302,7 @@
&prompt.root; pkg_add -r swfdec-plugin
- if the package is not available, you can compile and install it
+ If the package is not available, you can compile and install it
from the Ports Collection:&prompt.root; cd /usr/ports/www/swfdec-plugin
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#11 (text+ko) ====
@@ -1,7 +1,7 @@