Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 4 Jan 2009 19:41:42 GMT
From:      Rene Ladan <rene@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 155615 for review
Message-ID:  <200901041941.n04Jfg0C048899@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=155615

Change 155615 by rene@rene_self on 2009/01/04 19:41:28

	committers-guide: process trhodes' and pgj's comments.

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#11 edit

Differences ...

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

@@ -186,9 +186,9 @@
     <para>Commit bits allocated prior to the development of the notion of
       areas of authority may be appropriate for use in many parts of the
       tree.  However, common sense dictates that a committer who has not
-      previously worked in an area of the tree seeks review prior to
-      committing, seeks approval from the appropriate responsible party,
-      and/or works with a mentor.  Since the rules regarding code
+      previously worked in an area of the tree seek review prior to
+      committing, seek approval from the appropriate responsible party,
+      and/or work with a mentor.  Since the rules regarding code
       maintenance differ by area of the tree, this is as much for the
       benefit of the committer working in an area of less familiarity as
       it is for others working on the tree.</para>
@@ -1214,7 +1214,7 @@
 	  check in place but that may change.  Some people blame these
 	  checks for bouncing valid email.  If you want these checks
 	  turned off for your email you can place a file named
-	  <filename>~/.spam_lover</filename>
+	  <filename>.spam_lover</filename> in your home directory
 	  on <hostid role="fqdn">freefall.FreeBSD.org</hostid> to
 	  disable the checks for your email.</para>
       </listitem>
@@ -1410,7 +1410,7 @@
     </itemizedlist>
 
     <para>You can run a local copy of GNATS, and then integrate the FreeBSD
-      GNATS tree in to it using CVSup.  Then you can run the GNATS commands
+      GNATS tree in to it using CVSup.  Then you can run GNATS commands
       locally.
       This lets you query the PR database without needing to be connected to
       the Internet.</para>
@@ -1680,7 +1680,7 @@
 
     <procedure>
       <step>
-	<para>If you do not wish to type in your password every
+	<para>If you do not wish to type your password in every
 	  time you use &man.ssh.1;, and you use RSA or DSA keys to
 	  authenticate, &man.ssh-agent.1; is there for your
 	  convenience.  If you want to use &man.ssh-agent.1;, make
@@ -1703,7 +1703,7 @@
 	  (<filename><envar>$HOME</envar>/.ssh/id_dsa.pub</filename>
 	  or <filename><envar>$HOME</envar>/.ssh/id_rsa.pub</filename>)
 	  to the person setting you up as a committer so it can be put
-	  into <filename><replaceable>yourlogin</replaceable></filename> in
+	  into the <filename><replaceable>yourlogin</replaceable></filename> file in
 	  <filename class="directory">/etc/ssh-keys/</filename> on
 	  <hostid>freefall</hostid>.
 	</para>
@@ -1859,7 +1859,7 @@
       <listitem>
 	<para>Do not commit to anything under the
 	  <filename>src/contrib</filename>,
-	  <filename>src/crypto</filename>, or 
+	  <filename>src/crypto</filename>, or
 	  <filename>src/sys/contrib</filename> trees without
 	  <emphasis>explicit</emphasis> approval from the respective
 	  maintainer(s).</para>
@@ -2112,7 +2112,7 @@
 	    flame-o-gram at least had the grace to send it privately,
 	    then have the grace to keep it private yourself.  If you
 	    feel you are being unfairly treated by another developer,
-	    and it is causing you anguish, bring up the matter with
+	    and it is causing you anguish, bring the matter up with
 	    core rather than taking it public.  Core will do its best to
 	    play peace makers and get things back to sanity.  In cases
 	    where the dispute involves a change to the codebase and
@@ -2209,17 +2209,17 @@
     <sect2>
       <title>Policy on Multiple Architectures</title>
 
-      <para>&os; has added several new architecture ports during recent
+      <para>FreeBSD has added several new architecture ports during recent
 	release cycles and is truly no longer an &i386; centric operating
 	system.  In an effort to make it easier to keep FreeBSD portable
 	across the platforms we support, core has developed the following
 	mandate:</para>
 
 	<blockquote>
-	  <para>Our 32 bit reference platform is i386, and our 64 bit
+	  <para>Our 32-bit reference platform is i386, and our 64-bit
 	    reference platform is Sparc64.  Major design work (including
 	    major API and ABI changes) must prove itself on at least one
-	    32 bit and at least one 64 bit platform, preferably the
+	    32-bit and at least one 64-bit platform, preferably the
 	    primary reference platforms, before it may be committed
 	    to the source tree.</para>
 	</blockquote>
@@ -2236,7 +2236,7 @@
 	developers.</para>
 
       <para>We will continue to re-evaluate this policy as cost and
-	availability of the 64 bit platforms change.</para>
+	availability of the 64-bit platforms change.</para>
 
       <para>Developers should also be aware of our Tier Policy for
 	the long term support of hardware architectures.  The rules
@@ -2334,7 +2334,7 @@
 	security officer, and release engineering teams.  Diversity in
 	hardware support broadens the options for FreeBSD consumers by
 	offering new features and usage opportunities (such as support
-	for 64 bit CPUs, use in embedded environments, etc.), but these
+	for 64-bit CPUs, use in embedded environments, etc.), but these
 	benefits must always be carefully considered in terms of the real-world
 	maintenance cost associated with additional platform support.
 	</para>
@@ -3310,6 +3310,18 @@
 	    a busy machine.</para>
 	</listitem>
       </varlistentry>
+
+      <varlistentry>
+	<term>Free 4-CD and DVD sets</term>
+
+	<listitem>
+	  <para>&os; committers can get a free 4-CD or DVD set at
+	    conferences from <ulink url="http://www.freebsdmall.com">;
+	      &os; Mall, Inc.</ulink>.  The sets are no longer available
+	    as a subscription due to the high shipment costs to
+	    countries outside the USA.</para>
+	</listitem>
+      </varlistentry>
     </variablelist>
   </sect1>
 
@@ -3393,7 +3405,7 @@
 	    well.</para>
 
 	  <para>This information consists of one or more lines containing the
-	    key word or phrase, a colon, tabs and/or spaces for formatting, and then the
+	    key word or phrase, a colon, tabs for formatting, and then the
 	    additional information.</para>
 
 	  <para>The key words or phrases are:</para>



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