PERFORCE change 188897 for review

Remko Lodder remko at FreeBSD.org
Thu Feb 17 20:59:35 UTC 2011


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

Change 188897 by remko at remko_macosx on 2011/02/17 20:59:14

	MFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#33 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#16 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#20 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#35 integrate
.. //depot/projects/docproj_nl/www/en/gnome/news.xml#8 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#33 (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.290 2010/07/31 10:39:08 pgj Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.291 2011/02/17 15:43:01 ryusuke Exp $</pubdate>
 
     <copyright>
       <year>1999</year>
@@ -24,6 +24,7 @@
       <year>2008</year>
       <year>2009</year>
       <year>2010</year>
+      <year>2011</year>
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
@@ -126,7 +127,6 @@
 	  <row>
 	    <entry><emphasis>Noteworthy CVSup Tags</emphasis></entry>
 	    <entry>
-	      <literal>RELENG_6</literal> (6.X-STABLE), 
 	      <literal>RELENG_7</literal> (7.X-STABLE), 
 	      <literal>RELENG_8</literal> (8.X-STABLE), 
 	      <literal>HEAD</literal> (-CURRENT)
@@ -137,7 +137,6 @@
 	    <entry><emphasis>Noteworthy SVN Branches</emphasis></entry>
 
 	    <entry>
-	      <literal>stable/6</literal> (6.X-STABLE),
 	      <literal>stable/7</literal> (7.X-STABLE),
 	      <literal>stable/8</literal> (8.X-STABLE),
 	      <literal>head</literal> (-CURRENT)
@@ -2071,7 +2070,7 @@
 	    fixes, etc.)  In other words, apply common sense.</para>
 
 	  <para>Changes to the security branches
-	    (for example, <literal>RELENG_6_0</literal>) must be
+	    (for example, <literal>RELENG_7_0</literal>) must be
 	    approved by a member of the &a.security-officer;, or in
 	    some cases, by a member of the &a.re;.</para>
 	</listitem>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.416 2011/01/25 16:25:26 ryusuke Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.419 2011/02/17 19:32:59 remko Exp $
 -->
 
 <chapter id="install">
@@ -631,35 +631,87 @@
 	</step>
 
 	<step>
-	  <title>Prepare the Memory Stick</title>
+	  <title>Write The Image File to the Memory Stick</title>
+
+	  <procedure>
+	    <title>Using FreeBSD To Write the Image</title>
+
+	    <warning>
+	      <para>The example below
+		lists <filename class="devicefile">/dev/da0</filename> as the
+		target device from which you will be booting.  Be very careful
+		that you have the correct device as the output target, or you
+		may destroy your existing data.</para>
+	    </warning>
+
+	    <para>Set the <varname>kern.geom.debugflags</varname> sysctl to be
+	      able to write a master boot record to the target device.</para>
+
+	    <warning>
+	      <para>The example below
+		lists <filename class="devicefile">/dev/da0</filename> as the
+		target device where the image will be written. Be very careful
+		that you have the correct device as the output target, or you
+		may destroy your existing data.</para>
+	    </warning>
+
+	    <step>
+	      <title>Writing the Image with &man.dd.1;</title>
+
+	      <para>Set the <varname>kern.geom.debugflags</varname> sysctl to
+		be able to write a master boot record to the target
+		device.</para>
+
+	      <screen><userinput>&prompt.root; sysctl kern.geom.debugflags=16</userinput></screen>
+
+	      <para>The <filename>.img</filename> file
+		is <emphasis>not</emphasis> a regular file you copy to the
+		memory stick.  It is an image of the complete contents of the
+		disk.  This means that you <emphasis>cannot</emphasis> simply
+		copy files from one disk to another.  Instead, you must use
+		&man.dd.1; to write the image directly to the disk:</para>
+
+	      <screen>&prompt.root; <userinput>dd if=&os;-&rel.current;-RELEASE-&arch.i386;-memstick.img of=/dev/<replaceable>da0</replaceable> bs=64k</userinput></screen>
+	    </step>
+	  </procedure>
 
-	  <warning>
-	    <para>The example below lists
-	      <filename class="devicefile">/dev/da0</filename> as the target device from
-	      which you will be booting.  Be very careful that you
-	      have the correct device as the output target, or you may
-	      destroy your existing data.</para>
-	  </warning>
+	  <procedure>
+	    <title>Using &windows; To Write the Image</title>
 
-	  <para>Set the <varname>kern.geom.debugflags</varname> sysctl
-	    to be able to write a master boot record to the target
-	    device.</para>
+	    <warning>
+	      <para>The example below
+	        lists <filename class="devicefile">H:</filename> as the drive
+	        letter of the device where the image will be written.  Be very
+	        careful that you have the correct device as the output target,
+	        or you may destroy existing data.</para>
+	    </warning>
 
-	  <screen><userinput>&prompt.root; sysctl kern.geom.debugflags=16</userinput></screen>
-	</step>
+	    <step>
+	      <title>Obtaining <application>Image Writer for Windows</application></title>
 
-	<step>
-	  <title>Write the Image File to the Memory Stick</title>
+	      <para><application>Image Writer for Windows</application> is a
+	        free application that can correctly write an image file to a
+	        memory stick.  Download it
+	        from <ulink url="http://launchpad.net/win32-image-writer/0.2/0.2/+download/win32diskimager-RELEASE-0.2-r23-win32.zip"></ulink>
+	        and extract it into a folder.</para>
+	    </step>
 
-	  <para>The <filename>.img</filename> file is
-	    <emphasis>not</emphasis> a regular file you copy to the
-	    memory stick.  It is an image of the complete contents of
-	    the disk.  This means that you <emphasis>cannot</emphasis>
-	    simply copy files from one disk to another.  Instead, you
-	    must use &man.dd.1; to write the image directly to the
-	    disk:</para>
+	    <step>
+	      <title>Writing The Image with Image Writer</title>
 
-	  <screen>&prompt.root; <userinput>dd if=&os;-&rel.current;-RELEASE-&arch.i386;-memstick.img of=/dev/<replaceable>da0</replaceable> bs=64k</userinput></screen>
+	      <para>Double-click
+	        the <application>Win32DiskImager</application> icon to start
+	        the program.  Verify that the drive letter shown
+	        under <computeroutput>Device</computeroutput> is the drive
+	        with the memory stick.  Click the folder icon and select the
+	        image to be written to the memory stick.
+	        Click <guibutton>Save</guibutton> to accept the image file
+	        name.  Verify that everything is correct, and that no folders
+	        on the memory stick are open in other windows.  Finally,
+	        click <guibutton>Write</guibutton> to write the image file to
+	        the drive.</para>
+	    </step>
+	  </procedure>
 	</step>
       </procedure>
 

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.206 2011/02/05 21:26:02 gjb Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.207 2011/02/15 06:14:42 keramida Exp $
 -->
 
 <chapter id="x11">
@@ -1407,7 +1407,7 @@
         <programlisting>proc           /proc       procfs  rw  0   0</programlisting>
 
         <para>to <filename>/etc/fstab</filename> to mount
-          <filename>procfs</filename> automatically during
+          &man.procfs.5; automatically during
           startup.</para>
 
         <para>Once <application>GNOME</application> is installed,

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

@@ -1,9 +1,9 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.31 2011/02/08 06:25:00 remko Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.32 2011/02/17 19:12:59 remko Exp $
      %SOURCE%	en_US.ISO8859-1/books/handbook/x11/chapter.sgml
-     %SRCID%	1.206
+     %SRCID%	1.207
 -->
 
 <chapter id="x11">
@@ -1503,8 +1503,7 @@
 	<programlisting>proc           /proc       procfs  rw  0   0</programlisting>
 
 	<para>toe aan <filename>/etc/fstab</filename> om
-	  <filename>procfs</filename> automatisch te koppelen
-	  tijdens het opstarten.</para>
+	  &man.procfs.5; automatisch te koppelen tijdens het opstarten.</para>
 
 	<para>Zodra <application>GNOME</application> ge&iuml;nstalleerd
 	  is, moet de X server verteld worden dat in plaats van de

==== //depot/projects/docproj_nl/www/en/gnome/news.xml#8 (text+ko) ====

@@ -19,7 +19,7 @@
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
   version="1.0">
-    <cvs:keyword name="freebsd">$FreeBSD: www/en/gnome/news.xml,v 1.154 2010/11/20 23:23:37 ryusuke Exp $</cvs:keyword>
+    <cvs:keyword name="freebsd">$FreeBSD: www/en/gnome/news.xml,v 1.155 2011/02/16 13:04:43 bland Exp $</cvs:keyword>
   </cvs:keywords>
 
   <year>
@@ -34,7 +34,7 @@
         <event>
         <title>Announcing GNOME 2.32.1 for FreeBSD!</title>
 
-        <p>Presenting GNOME 2.32.1 for FreeBSD. The offical release
+        <p>Presenting GNOME 2.32.1 for FreeBSD. The official release
           notes for this release can be found at
           <a href="http://library.gnome.org/misc/release-notes/2.32/">
           http://library.gnome.org/misc/release-notes/2.32/</a></p>
@@ -82,7 +82,7 @@
         <event>
         <title>Announcing GNOME 2.30.1. for FreeBSD!</title>
 
-        <p>Presenting GNOME 2.30.1 for FreeBSD. The offical release
+        <p>Presenting GNOME 2.30.1 for FreeBSD. The official release
         notes for this release can be found at 
         <a href="http://library.gnome.org/misc/release-notes/2.30/">
         http://library.gnome.org/misc/release-notes/2.30/</a></p>
@@ -107,7 +107,7 @@
         and myself.</p>
 
         <p>The FreeBSD GNOME Team would like to thank Anders F Bjorklund for
-        doing the initual packagekit porting.</p>
+        doing the initial packagekit porting.</p>
 
         <p>And the following contributors and testers for there help with this 
         release:</p>
@@ -548,7 +548,7 @@
           and ports and
           <a href="&base;/gnome/docs/faq2.html#q21">packages</a>
 
-          are available for everyone's faorite operating system. This
+          are available for everyone's favorite operating system. This
           release is a polishing of 2.18.0, so expect a more stable,
           nicer looking desktop experience. On top of that, some of our
           users have also submitted


More information about the p4-projects mailing list