PERFORCE change 165945 for review

Rene Ladan rene at FreeBSD.org
Sat Jul 11 23:16:58 UTC 2009


http://perforce.freebsd.org/chv.cgi?CH=165945

Change 165945 by rene at rene_self on 2009/07/11 23:16:19

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#28 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#13 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#4 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#17 integrate
.. //depot/projects/docproj_nl/www/en/cgi/cgi-style.pl#4 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.864 2009/07/02 23:19:59 avl Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.865 2009/07/08 21:07:45 itetcu Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -8363,6 +8363,11 @@
     </listitem>
 
     <listitem>
+      <para>Sahil Tandon
+	<email>sahil at tandon.net</email></para>
+    </listitem>
+
+    <listitem>
       <para>SANETO Takanori
 	<email>sanewo at strg.sony.co.jp</email></para>
     </listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#13 (text+ko) ====

@@ -11,7 +11,7 @@
       <corpauthor>The &os; Ports Management Team</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.40 2009/07/04 08:16:26 linimon Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.41 2009/07/09 19:27:21 linimon Exp $</pubdate>
 
     <copyright>
       <year>2003</year>
@@ -1400,7 +1400,7 @@
 
 	    <listitem>
 	      <para>We run the cluster on UTC:
-		<screen>cp ../../../usr/share/zoneinfo/Etc/UCT localtime</screen>
+		<screen>cp ../../../usr/share/zoneinfo/Etc/UTC localtime</screen>
 	      </para>
 	    </listitem>
 
@@ -1415,12 +1415,15 @@
 inetd_enable="YES"
 linux_enable="YES"
 nfs_client_enable="YES"
+ntpd_enable="YES"
+ntpdate_enable="YES"
+ntpdate_flags="north-america.pool.ntp.org"
 sendmail_enable="NONE"
 sshd_enable="YES"
 sshd_program="/usr/local/sbin/sshd"
 
+gmond_enable="YES"
 squid_enable="YES"
-gmond_enable="YES"
 </screen>
 	      </para>
 	    </listitem>
@@ -1480,7 +1483,7 @@
 security/openssh-portable
 security/sudo
 sysutils/ganglia-monitor-core (with GMETAD off)
-www/squid</screen>
+www/squid (with SQUID_AUFS on)</screen>
 	  </para>
 
 	  <para>There is a WIP to create a meta-port, but it is not yet
@@ -1584,6 +1587,11 @@
 		<literal>netdb_filename</literal>,
 		<literal>coredump_dir</literal>.
 	      </para>
+
+	      <para>Finally, change the <literal>cache_dir</literal>
+		storage scheme from <literal>ufs</literal> to
+		<literal>aufs</literal> (offers better performance).
+	      </para>
 	    </listitem>
 
 	    <!-- XXX MCL adapted literally from krismail; I do not understand it -->

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#4 (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.77 2008/12/07 22:03:48 pgj Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.78 2009/07/08 12:16:32 blackend Exp $
 -->
 
 <chapter id="sgml-markup">
@@ -670,8 +670,8 @@
     <para>DocBook was originally developed by HaL Computer Systems and O'Reilly
       &amp; Associates to be a DTD for writing technical documentation
       <footnote><para>A short history can be found under <ulink
-      url="http://www.oasis-open.org/committees/docbook/intro.shtml">
-      http://www.oasis-open.org/committees/docbook/intro.shtml</ulink>.
+      url="http://www.oasis-open.org/docbook/intro.shtml#d0e41">
+      http://www.oasis-open.org/docbook/intro.shtml#d0e41</ulink>.
       </para></footnote>. Since 1998 it is maintained by the <ulink
       url="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=docbook">
       DocBook Technical Committee</ulink>.   As such, and unlike LinuxDoc

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.423 2009/04/12 20:46:55 trhodes Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.424 2009/07/11 07:23:05 keramida Exp $
 -->
 
 <chapter id="advanced-networking">
@@ -4440,22 +4440,63 @@
         machine.</para>
     </sect2>
 
+    <sect2 id="network-natdloaderconfiguration">
+      <indexterm>
+	<primary>boot loader</primary>
+	<secondary>configuration</secondary>
+      </indexterm>
+
+      <title>Boot Loader Configuration</title>
+
+      <para>The kernel features for network address translation with
+	&man.natd.8; are not enabled in the <filename>GENERIC</filename>
+	kernel, but they can be preloaded at boot time, by adding a couple of
+	options to <filename>/boot/loader.conf</filename>:</para>
+
+      <programlisting>ipfw_load="YES"
+ipdivert_load="YES"</programlisting>
+
+      <para>Additionally,
+	the <literal>net.inet.ip.fw.default_to_accept</literal> tunable
+	option may be set to <literal>1</literal>:</para>
+
+      <programlisting>net.inet.ip.fw.default_to_accept="1"</programlisting>
+
+      <note>
+	<para>It is a very good idea to set this option during the first
+	  attempts to setup a firewall and NAT gateway.  This way the default
+	  policy of &man.ipfw.8; will be <literal>allow ip from any to
+	  any</literal> instead of the less permissive <literal>deny ip from
+	  any to any</literal>, and it will be slightly more difficult to get
+	  locked out of the system right after a reboot.</para>
+      </note>
+    </sect2>
+
     <sect2 id="network-natdkernconfiguration">
+      <title>Kernel Configuration</title>
+
       <indexterm>
         <primary>kernel</primary>
 	<secondary>configuration</secondary>
       </indexterm>
-      <title>Configuration</title>
-      <para>The following options must be in the kernel configuration
+      <para>When modules are not an option or if it is preferrable to
+        build all the required features into the running kernel, the
+        following options must be in the kernel configuration
         file:</para>
+
       <programlisting>options IPFIREWALL
 options IPDIVERT</programlisting>
 
       <para>Additionally, at choice, the following may also be suitable:</para>
       <programlisting>options IPFIREWALL_DEFAULT_TO_ACCEPT
 options IPFIREWALL_VERBOSE</programlisting>
+    </sect2>
 
-      <para>The following must be in <filename>/etc/rc.conf</filename>:</para>
+    <sect2 id="network-natdsystemconfiguration">
+      <title>System Startup Configuration</title>
+
+      <para>To enable firewall and NAT support at boot time, the
+	following must be in <filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>gateway_enable="YES" <co id="co-natd-gateway-enable">
 firewall_enable="YES" <co id="co-natd-firewall-enable">

==== //depot/projects/docproj_nl/www/en/cgi/cgi-style.pl#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/cgi/cgi-style.pl,v 1.38 2009/02/14 21:14:27 miwi Exp $
+# $FreeBSD: www/en/cgi/cgi-style.pl,v 1.39 2009/07/08 08:22:51 danger Exp $
 #
 # Perl routines to encapsulate various elements of HTML page style.
 
@@ -100,29 +100,77 @@
 
           <h2 class="blockhide">Site Navigation</h2>
 
-          <div id="topnav">
-            <ul id="topnavlist">
-              <li><a href="$hsty_base/" title="Home">Home</a></li>
-
-              <li><a href="$hsty_base/about.html"
-              title="About">About</a></li>
-
-              <li><a href="$hsty_base/where.html" title="Get FreeBSD">Get
-              FreeBSD</a></li>
-
-              <li><a href="$hsty_base/docs.html"
-              title="Documentation">Documentation</a></li>
-
-              <li><a href="$hsty_base/community.html"
-              title="Community">Community</a></li>
-
-              <li><a href="$hsty_base/projects/index.html"
-              title="Developers">Developers</a></li>
-
-              <li><a href="$hsty_base/support.html"
-              title="Support">Support</a></li>
-            </ul>
-          </div>
+	  <div id="MENU">
+	    <ul class="first">
+	      <li><a href="$hsty_base/">Home</a></li>
+	    </ul>
+	    <ul>
+	      <li><a href="$hsty_base/about.html">About</a>
+		<ul>
+		  <li><a href="$hsty_base/projects/newbies.html">Introduction</a></li>
+		  <li><a href="$hsty_base/features.html">Features</a></li>
+		  <li><a href="$hsty_base/advocacy/">Advocacy</a></li>
+		  <li><a href="$hsty_base/marketing/">Marketing</a></li>
+		</ul>
+	      </li>
+	    </ul>
+	    <ul>
+	      <li><a href="$hsty_base/where.html">Get FreeBSD</a>
+		<ul>
+		  <li><a href="$hsty_base/releases/">Release Information</a></li>
+		  <li><a href="$hsty_base/releng/">Release Engineering</a></li>
+		</ul>
+	      </li>
+	    </ul>
+	    <ul>
+	      <li><a href="$hsty_base/docs.html">Documentation</a>
+		<ul>
+		  <li><a href="$hsty_base/doc/en_US.ISO8859-1/books/faq/">FAQ</a></li>
+		  <li><a href="$hsty_base/doc/en_US.ISO8859-1/books/handbook/">Handbook</a></li>
+		  <li><a href="$hsty_base/doc/en_US.ISO8859-1/books/porters-handbook">Porter's Handbook</a></li>
+		  <li><a href="$hsty_base/doc/en_US.ISO8859-1/books/developers-handbook">Developer's Handbook</a></li>
+		  <li><a href="$hsty_base/cgi/man.cgi">Manual Pages</a></li>
+		</ul>
+	      </li>
+	    </ul>
+	    <ul>
+	      <li><a href="$hsty_base/community.html">Community</a>
+		<ul>
+		  <li><a href="$hsty_base/community/mailinglists.html">Mailing Lists</a></li>
+		  <li><a href="http://forums.freebsd.org">Forums</a></li>
+		  <li><a href="$hsty_base/usergroups.html">User Groups</a></li>
+		  <li><a href="$hsty_base/events/events.html">Events</a></li>
+		</ul>
+	      </li>
+	    </ul>
+	    <ul>
+	      <li><a href="$hsty_base/projects/index.html">Developers</a>
+		<ul>
+		  <li><a href="$hsty_base/projects/ideas/ideas.html">Project Ideas</a></li>
+		  <li><a href="http://svn.FreeBSD.org/viewvc/base/">SVN Repository</a></li>
+		  <li><a href="http://cvsweb.FreeBSD.org">CVS Repository</a></li>
+		  <li><a href="http://p4web.FreeBSD.org">Perforce Repository</a></li>
+		</ul>
+	      </li>
+	    </ul>
+	    <ul>
+	      <li><a href="$hsty_base/support.html">Support</a>
+		<ul>
+		  <li><a href="$hsty_base/commercial/commercial.html">Vendors</a></li>
+		  <li><a href="http://security.FreeBSD.org/">Security Information</a></li>
+		  <li><a href="$hsty_base/cgi/query-pr-summary.cgi">Bug Reports</a></li>
+		  <li><a href="$hsty_base/send-pr.html">Submit Bug-report</a></li>
+		</ul>
+	      </li>
+	    </ul>
+	    <ul>
+	      <li><a href="http://www.freebsdfoundation.org/">Foundation</a>
+		<ul>
+		  <li><a href="http://www.freebsdfoundation.org/donate/">Donate</a></li>
+		</ul>
+	      </li>
+	    </ul>
+	  </div> <!-- MENU -->
         </div>
 
 	<div id="content">


More information about the p4-projects mailing list