diff --git a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
index 3f9ca3f985..bb2e94ec57 100644
--- a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.235
+     Original revision: 1.236
      $FreeBSD$
 -->
 
@@ -77,6 +77,12 @@
 	<para>���󥹥ȡ��뤵��Ƥ��륷���ƥ�ȡ��ѹ����Ԥ��Ƥ��ʤ����֤Ȥ������ˡ��</para>
       </listitem>
 
+      <listitem>
+	<para><application>CVSup</application><!-- and
+	  <application>Docsnap</application>--> ��Ȥäơ�
+	  �ɥ�����ơ�������ǿ��Τ�Τ˥��åץǡ��Ȥ�����ˡ��</para>
+      </listitem>
+
       <listitem>
 	<para>2 �Ĥγ�ȯ�֥�����&os.stable; �� &os.current; �ΰ㤤</para>
       </listitem>
@@ -706,6 +712,331 @@ Fetching 133 new ports or files... done.</screen>
     <screen>&prompt.root; <userinput>portsnap fetch update</userinput></screen>
   </sect1>
 
+  <sect1 id="updating-upgrading-documentation">
+    <title>�ɥ�����ȤΥ��åץǡ���</title>
+
+    <indexterm><primary>Updating and Upgrading</primary></indexterm>
+
+    <indexterm>
+      <primary>Documentation</primary>
+      <see>Updating and Upgrading</see>
+    </indexterm>
+
+    <para>�١��������ƥࡢPorts Collection �˲ä����ɥ�����Ȥϡ�&os; ���ڥ졼�ƥ��󥰥����ƥ�ι������ǤǤ���
+      &os; �ɥ�����ȥ��åȤκǿ��С������ϡ�<ulink
+	url="http://www.freebsd.org/doc/">&os; �����֥�����</ulink>
+      ��������Ǥ��ޤ�����
+      �ͥåȥ����³���٤����⤷���Ϥޤä�����³�Ǥ��ʤ��桼���⤤�ޤ���
+      �����ˤ⡢�ƥ�꡼�����󶡤����ɥ�����Ȥ򥢥åץǡ��Ȥ��ơ�
+      �ǿ��� &os;
+      �ɥ�����ȥ��åȤ��������ǰݻ�������ˡ���Ѱդ���Ƥ��ޤ���</para>
+
+    <sect2 id="csup-doc">
+      <title>CVSup ���Ѥ����ɥ�����ȤΥ��åץǡ�����ˡ</title>
+
+      <para>&os; �Υɥ�����ȤΥ������䥤�󥹥ȡ��뤵�줿�ɥ�����Ȥϡ�
+	�١��������ƥ�Υ������Υ��åץǡ���
+	(<xref linkend="makeworld"> �򻲾�) ��Ʊ�͡�
+        <application>CVSup</application> ���Ѥ��ƥ��åץǡ��ȤǤ��ޤ���
+	������Ǥϰʲ��ˤĤ����������ޤ���</para>
+
+      <itemizedlist>
+	<listitem>
+	  <para>�ɥ�����ȥġ����������Υ��󥹥ȡ�����ˡ��
+	    ���Υġ���ϡ�&os;
+	    �Υɥ�����Ȥ򥽡�������ƹ��ۤ���Τ�ɬ�פǤ���</para>
+	</listitem>
+
+	<listitem>
+	  <para><application>CVSup</application> ���Ѥ���
+	    <filename class="directory">/usr/doc</filename>
+	    �˥ɥ�����ȤΥ����������������ɤ�����ˡ��</para>
+	</listitem>
+
+	<listitem>
+	  <para>&os; �ɥ�����Ȥ򥽡�������ƹ��ۤ���
+	    <filename class="directory">/usr/share/doc</filename>
+	    �ʲ��˥��󥹥ȡ��뤹����ˡ��</para>
+	</listitem>
+
+	<listitem>
+	  <para>�ɥ�����ȤΥӥ�ɥ����ƥ�ˤ����ƥ��ݡ��Ȥ���Ƥ���ӥ�ɥ��ץ�����������
+	    ���Ȥ��С��������줿�ɥ�����ơ������Τߤ��ۤ��륪�ץ����䡢
+	    ��������ν��ϥե����ޥåȤ���ꤹ��褦�ʥ��ץ����ˤĤ����������ޤ���</para>
+	</listitem>
+      </itemizedlist>
+    </sect2>
+
+    <sect2 id="installing-documentation-toolchain">
+      <title>CVSup ����ӥɥ�����ȥġ����������Υ��󥹥ȡ���</title>
+
+      <para>&os; �Υɥ�����Ȥ򥽡�������ƹ��ۤ���ˤϡ�
+	���ʤ��礭�ʥġ���Υ��쥯�����ɬ�פǤ���
+	�����Υġ����¿���Υǥ��������̤�ɬ�פȤ����ޤ���
+	���٤Ƥ� &os; �桼���ˤȤä�ͭ�ѤȤ����櫓�ǤϤʤ����ᡢ
+	&os; �١��������ƥ�ΰ����ǤϤ���ޤ���
+	�����Υġ���ϡ�&os;
+	�Τ���˿������ɥ�����Ȥ��ȯ�˼�ɮ���Ƥ������䡢
+	���ˤ˥ɥ�����Ȥ򥽡������饢�åץǡ��Ȥ������˸�������ΤǤ���</para>
+
+      <para>ɬ�פʥġ���ϡ����٤� Ports Collection ������Ǥ��ޤ���<filename
+	  role="package">textproc/docproj</filename> �ϡ�
+	&os; �ɥ�����ơ������ץ��������Ȥˤ�곫ȯ����Ƥ���ޥ����� port �ǡ�
+	�����Υġ���Υ��󥹥ȡ���䥢�åץǡ��Ȥ��ưפˤ��ޤ���</para>
+
+      <note>
+	<para>�ɥ�����Ȥ� &postscript; �� PDF �Ǥ�ɬ�פʤ���С�������
+	  <filename
+	    role="package">textproc/docproj-nojadetex</filename>
+	  �򥤥󥹥ȡ��뤹�뤳�Ȥ�ͤ��Ƥ褤�Ǥ��礦��
+	  ���Υɥ�����ơ������Υġ����������ϡ�
+	  <application>teTeX</application>
+	  �ȸƤФ�����ǥ��󥸥����������٤Ƥ򥤥󥹥ȡ��뤷�ޤ���
+	  <application>teTeX</application> ���礭�ʥġ���Υ��쥯�����Ǥ���
+	  ���Τ��ᡢ�⤷ PDF ���Ϥ�������ɬ�פȤ��ʤ���С�
+	  ���Υġ���򥤥󥹥ȡ��뤷�ʤ����ȤϤȤƤ⸭���Ǥ���</para>
+      </note>
+
+      <para><application>CVSup</application>
+	�Υ��󥹥ȡ��뤪������Ѥ˴ؤ��뤵��ʤ����ϡ�<link
+	  linkend="cvsup">CVSup ��Ȥ�</link> �ξϤ�������������</para>
+    </sect2>
+
+    <sect2 id="updating-documentation-sources">
+      <title>�ɥ�����ȤΥ������򥢥åץǡ��Ȥ���</title>
+
+      <para><application>CVSup</application> �桼�ƥ���ƥ���Ȥäơ�
+	�ɥ�����ȤΥ����������������ɤǤ��ޤ���
+	������ <filename>/usr/share/examples/cvsup/doc-supfile</filename>
+	�ե����뤬����Υƥ�ץ졼�ȤǤ���
+	�ǥե���ȤΥ��åץǡ��ȥۥ��Ȥ� <filename>doc-supfile</filename>
+	�Υץ졼���ۥ�����ͤ����ꤵ��Ƥ��ޤ�����
+	&man.cvsup.1; �˥��ޥ�ɥ饤��ǥۥ���̾����ꤹ�뤳�Ȥ�Ǥ��ޤ���
+	<application>CVSup</application> ������
+	1 �Ĥ���ɥ�����ȤΥ����������������ɤ���ˤϰʲ��Τ褦�����Ϥ��Ƥ���������</para>
+
+      <screen>&prompt.root; <userinput>cvsup -h <replaceable>cvsup.FreeBSD.org</replaceable> -g -L 2 <filename>/usr/share/examples/cvsup/doc-supfile</filename></userinput></screen>
+
+      <para>������ <replaceable>cvsup.FreeBSD.org</replaceable> ��Ǥ�᤯��
+	<application>CVSup</application> �����Ф��֤������Ƥ���������
+	�ߥ顼�����Ȥδ����ʰ����ˤĤ��Ƥϡ�<xref
+	  linkend="cvsup-mirrors"> ��������������</para>
+
+      <para>�ǽ�˥ɥ�����ȤΥ����������������ɤ���ˤϾ������֤�������ޤ���
+	����������ɤ������ޤǤ��Ԥ�����������</para>
+
+      <para>����ɥ�����ȤΥ������򥢥åץǡ��Ȥ���ˤϡ�
+	Ʊ�����ޥ�ɤ�¹Ԥ��Ƥ���������<application>CVSup</application>
+	�桼�ƥ���ƥ��ϺǸ�˼¹Ԥ���������Υ��åץǡ��ȤΤߤ����������ɤ���Τǡ�
+	�ǽ�� <application>CVSup</application> ��¹Ԥ�����Ǥϡ�
+	���ޥ�ɤμ¹Ի��֤Ϥ��ʤ�û���ʤ�ޤ�</para>
+
+      <para>�����������ꤷ���顢�ɥ�����ȤΥ��åץǡ��Ȥˡ�<filename
+	  class="directory">/usr/doc</filename> �ǥ��쥯�ȥ��
+	<filename>Makefile</filename> ��Ȥ����Ȥ�Ǥ��ޤ���
+	<filename>/etc/make.conf</filename> �ե������
+	<makevar>SUP_UPDATE</makevar>, <makevar>SUPHOST</makevar> �����
+	<makevar>DOCSUPFILE</makevar> �����ꤹ��ȡ�
+	�ʲ���¹ԤǤ���褦�ˤʤ�ޤ���</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/doc</userinput>
+&prompt.root; <userinput>make update</userinput></screen>
+
+      <para>�ʲ��ϡ�<filename>/etc/make.conf</filename> �� &man.make.1;
+	���ץ�����ŵ��Ū����Ǥ���</para>
+
+      <programlisting>SUP_UPDATE= yes
+SUPHOST?= cvsup.freebsd.org
+DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
+
+      <note>
+	<para><makevar>SUPHOST</makevar> �����
+	  <makevar>DOCSUPFILE</makevar> ���ͤ�
+	  <literal>?=</literal> �ˤ���ȡ�
+	  make �Υ��ޥ�ɥ饤�󤫤�ξ�񤭤���Ĥ��ޤ���
+	  ����ϡ����ޤ��ޤʥ��ץ������ͤ�ƥ��Ȥ�����ˡ�
+	  �ͤ��Ȥ˥ե�������Խ����뤳�Ȥ��򤱤��뤿�ᡢ
+	  <filename>make.conf</filename>
+	  �˥��ץ������ɲä�����ˡ�Ȥ��ƿ侩����Ƥ��ޤ���</para>
+      </note>
+    </sect2>
+
+    <sect2 id="updating-documentation-options">
+      <title>�ɥ�����ȤΥ�������Ĵ����ǽ�ʥ��ץ����</title>
+
+      <para>&os; �Υɥ�����ȤΥ��åץǡ��Ȥȥӥ�ɥ����ƥ�ϡ�
+	�ɥ�����ơ������ΰ����Υ��åץǡ��Ȥ��ñ�ˤ��륪�ץ����䡢
+	����������Υӥ�ɤ��б����Ƥ��ޤ���
+ 	�����Υ��ץ����ϡ������ƥ����̤Υ��ץ����Ǥ���
+	<filename>/etc/make.conf</filename> �ե�����䡢&man.make.1;
+	�桼�ƥ���ƥ���Ϳ���륳�ޥ�ɥ饤�󥪥ץ���������Ǥ��ޤ���</para>
+
+      <para>�ʲ��������Υ��ץ����ΰ����Ǥ���</para>
+
+      <variablelist>
+	<varlistentry>
+	  <term><makevar>DOC_LANG</makevar></term>
+
+	  <listitem>
+	    <para>�ӥ�ɤ���ӥ��󥹥ȡ���θ��줪��ӥ��󥳡��ǥ��󥰤ΰ�����
+	      ���Ȥ��С�<literal>en_US.ISO8859-1</literal> �ϡ�
+	      �Ѹ�Υɥ�����ȤΤߤ���ꤷ�ޤ���</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term><makevar>FORMATS</makevar></term>
+
+	  <listitem>
+	    <para>�ӥ�ɤ�Ԥ��ե����ޥåȡ��ޤ��Ͻ��ϥե����ޥåȤΰ�����
+	      ���ߤ� <literal>html</literal>,
+	      <literal>html-split</literal>, <literal>txt</literal>,
+	      <literal>ps</literal>, <literal>pdf</literal>,
+	      ������ <literal>rtf</literal> ���б����Ƥ��ޤ���</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term><makevar>SUPHOST</makevar></term>
+
+	  <listitem>
+	    <para>���åץǡ��Ȼ��˻Ȥ� <application>CVSup</application>
+	      �����ФΥۥ��ȥ͡��ࡣ</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term><makevar>DOCDIR</makevar></term>
+
+	  <listitem>
+	    <para>�ɥ�����Ȥ򥤥󥹥ȡ��뤹���ꡣ�ǥե���Ȥ�
+	      <filename
+		class="directory">/usr/share/doc</filename> �Ǥ���</para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+
+      <para>&os; �Υ����ƥ����̤Υ��ץ����˴�Ϣ�����ä�¿���� make �ѿ��ˤĤ��Ƥϡ�
+	&man.make.conf.5; ��������������</para>
+
+      <para>&os; �ɥ�����ȤΥӥ�ɥ����ƥ���б����Ƥ��뤵��ʤ� make ���ѿ��˴ؤ��Ƥϡ�
+	
+	<ulink url="&url.doc.langbase.en;/books/fdp-primer">�������׸��ԤΤ���� &os; �ɥ�����ơ������ץ������������� </ulink> �򻲾Ȥ��Ƥ���������</para>
+    </sect2>
+
+    <sect2 id="updating-installed-documentation">
+      <title>���������� &os; �ɥ�����Ȥ򥤥󥹥ȡ��뤹��</title>
+
+      <para>�ɥ�����ȤΥ������κǿ����ʥåץ���åȤ�
+	<filename class="directory">/usr/doc</filename> �˥���������ɤ�����ä��顢
+	���󥹥ȡ��뤵��Ƥ���ɥ�����Ȥ򥢥åץǡ��Ȥ�����������٤������ޤ�����</para>
+
+      <para>makefile �� <makevar>DOC_LANG</makevar>
+	���ץ������������Ƥ��뤹�٤Ƥθ�������˥��åץǡ��Ȥ���ˤϡ�
+	�ʲ��Τ褦�����Ϥ��Ƥ���������</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/doc</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+      <para>�⤷��<filename>make.conf</filename> ��
+	<makevar>DOCSUPFILE</makevar>, <makevar>SUPHOST</makevar> �����
+	<makevar>SUP_UPDATE</makevar> ���ץ�����Ŭ�ڤ����ꤷ�Ƥ���ΤǤ���С�
+	���󥹥ȡ���Υ��ƥåפϡ�
+	�ʲ��Τ褦�˥ɥ�����ȤΥ��åץǡ��Ⱥ�Ȥ�����Ǥ��ޤ���</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/doc</userinput>
+&prompt.root; <userinput>make update install clean</userinput></screen>
+
+      <para>�⤷����������θ���Τߤ򥢥åץǡ��Ȥ������ΤǤ���С�
+	<filename class="directory">/usr/doc</filename>
+	���֥ǥ��쥯�ȥ�ǰʲ��Τ褦�� &man.make.1; ��¹Ԥ��Ƥ���������</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/doc/en_US.ISO8859-1</userinput>
+&prompt.root; <userinput>make update install clean</userinput></screen>
+
+      <para>make �� <makevar>FORMATS</makevar> �ѿ������ꤷ�ơ�
+	�ʲ��Τ褦�˥��󥹥ȡ��뤹����Ϸ��������Ǥ��ޤ���</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/doc</userinput>
+&prompt.root; <userinput>make FORMATS='html html-split' install clean</userinput></screen>
+    </sect2>
+
+<!-- FIXME: Waiting for a working docsnap server... -->
+<![ IGNORE [
+    <sect2 id="docsnap">
+      <sect2info>
+	<authorgroup>
+	  <author>
+	    <firstname>Pav</firstname>
+	    <surname>Lucistnik</surname>
+	    <contrib>Based on information provided by </contrib>
+	  </author>
+	</authorgroup>
+      </sect2info>
+
+      <title>Using Docsnap</title>
+
+      <indexterm><primary>Updating and Upgrading</primary></indexterm>
+
+      <indexterm>
+	<primary>Docsnap</primary>
+	<see>Updating and Upgrading</see>
+      </indexterm>
+
+      <para><application>Docsnap</application> is an &man.rsync.1;
+	repository for updating installed &os; Documentation in a
+	relatively easy and fast way.  A
+	<quote><application>Docsnap</application> server</quote> tracks
+	the documentation sources, and builds them in HTML format every
+	hour.  The <filename role="package">textproc/docproj</filename>
+	is unneeded with <application>Docsnap</application> as only
+	patches to the built documentation exist.</para>
+
+      <para>The only requirement for using this technique is
+	the <filename role="package">net/rsync</filename> port or
+	package.  To add it, use the following command:</para>
+
+      <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
+
+      <note>
+	<para><application>Docsnap</application> has been originally
+	  developed for updating documentation installed
+	  to <filename class="directory">/usr/share/doc</filename>, but
+	  the following examples could be adapted for other directories
+	  as well.  For user directories, it does not require
+	  <username>root</username> privileges.</para>
+      </note>
+
+      <para>To update the documentation set, issue the following
+	command:</para>
+
+      <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap <replaceable>/usr/share/doc</replaceable></userinput></screen>
+
+      <note>
+	<para>There is only one <application>Docsnap</application>
+	  server at the moment;
+	  the <hostid>docsnap.sk.FreeBSD.org</hostid> shown
+	  above.</para>
+      </note>
+
+      <para>Do not use the <option>--delete</option> flag here as there
+	are some items installed
+	into <filename class="directory">/usr/share/doc</filename>
+	during <command>make installworld</command>, which would
+	accidentally be removed.  To clean up, use this command
+	instead:</para>
+
+      <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
+
+      <para>If a subset of documentation needs to be updated, for
+	example, the English documentation only, the following command
+	should be used:</para>
+
+      <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
+    </sect2>
+]]>
+  </sect1>
+
   <sect1 id="current-stable">
     <title>��ȯ�֥������ɤ�������</title>
     <indexterm><primary>-CURRENT</primary></indexterm>