aboutsummaryrefslogtreecommitdiff
path: root/ru_RU.KOI8-R/books/faq
diff options
context:
space:
mode:
authorVitaly Bogdanov <bvs@FreeBSD.org>2006-03-28 16:55:15 +0000
committerVitaly Bogdanov <bvs@FreeBSD.org>2006-03-28 16:55:15 +0000
commit38c9e6f68b5be81b671fa3b1e672a238731f24a2 (patch)
treeaa4decf5078972133103022d52364fc3b87b5111 /ru_RU.KOI8-R/books/faq
parent95639a653967fb43f4d26ca8ba7ff63008823488 (diff)
downloaddoc-38c9e6f68b5be81b671fa3b1e672a238731f24a2.tar.gz
doc-38c9e6f68b5be81b671fa3b1e672a238731f24a2.zip
MFen:
freebsd.dsl 1.21 --> 1.22 contributing/article.sgml 1.506 --> 1.508 solid-state/article.sgml 1.1 --> 1.13 solid-state/Makefile 1.1 --> 1.5 faq/book.sgml 1.776 --> 1.778 transtable.xml: Add more countries Obtained from: The FreeBSD Russian Documentation Project
Notes
Notes: svn path=/head/; revision=27433
Diffstat (limited to 'ru_RU.KOI8-R/books/faq')
-rw-r--r--ru_RU.KOI8-R/books/faq/book.sgml32
1 files changed, 16 insertions, 16 deletions
diff --git a/ru_RU.KOI8-R/books/faq/book.sgml b/ru_RU.KOI8-R/books/faq/book.sgml
index 5b5dd4a902..b2d1c96dcb 100644
--- a/ru_RU.KOI8-R/books/faq/book.sgml
+++ b/ru_RU.KOI8-R/books/faq/book.sgml
@@ -1,9 +1,9 @@
<!--
The FreeBSD Russian Documentation Project
- $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/faq/book.sgml,v 1.209 2006/03/24 20:31:04 gad Exp $
+ $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/faq/book.sgml,v 1.210 2006/03/27 18:34:06 gad Exp $
- Original revision: 1.776
+ Original revision: 1.778
-->
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -540,7 +540,7 @@
<itemizedlist>
<listitem>
- <para>Последний релиз 5-STABLE, &rel.current;-RELEASE, можно
+ <para>Последний релиз 6-STABLE, &rel.current;-RELEASE, можно
найти в <ulink
url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE">
каталоге с &rel.current;-RELEASE</ulink>.</para>
@@ -555,7 +555,7 @@
</listitem>
<listitem>
- <para>Последний релиз 4-STABLE, &rel2.current;-RELEASE, можно
+ <para>Последний релиз 5-STABLE, &rel2.current;-RELEASE, можно
найти в <ulink
url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/">
каталоге с &rel2.current;-RELEASE</ulink>.</para>
@@ -4523,11 +4523,11 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
</varlistentry>
<varlistentry>
- <term>для 6-CURRENT</term>
+ <term>для 6.X-RELEASE/6-STABLE</term>
<listitem>
<para><ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-6-current/">
- ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-6-current</ulink></para>
+ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-6-stable/">
+ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-6-stable</ulink></para>
</listitem>
</varlistentry>
@@ -11521,18 +11521,18 @@ raisechar=^^</programlisting>
<itemizedlist>
<listitem>
- <para><literal>RELENG_4</literal>
- AKA <emphasis>4-STABLE</emphasis></para>
+ <para><literal>RELENG_5</literal>
+ AKA <emphasis>5-STABLE</emphasis></para>
</listitem>
<listitem>
- <para><literal>RELENG_5</literal>
- AKA <emphasis>5-STABLE</emphasis></para>
+ <para><literal>RELENG_6</literal>
+ AKA <emphasis>6-STABLE</emphasis></para>
</listitem>
<listitem>
<para><literal>HEAD</literal> AKA <emphasis>-CURRENT</emphasis>
- AKA <emphasis>6.X-CURRENT</emphasis></para>
+ AKA <emphasis>7.X-CURRENT</emphasis></para>
</listitem>
</itemizedlist>
@@ -11543,11 +11543,11 @@ raisechar=^^</programlisting>
<quote>-CURRENT</quote>.</para>
<para>На данный момент <quote>-CURRENT</quote> является находящимся в
- разработке деревом 6.X, ветка <literal>4-STABLE</literal>,
- <symbol>RELENG_4</symbol>, отделилась от <quote>-CURRENT</quote> в
- марте 2000 года, а ветка <literal>5-STABLE</literal>,
+ разработке деревом 7.X, ветка <literal>5-STABLE</literal>,
<symbol>RELENG_5</symbol>, отделилась от <quote>-CURRENT</quote> в
- октябре 2004 года.</para>
+ октябре 2004 года, а ветка <literal>6-STABLE</literal>,
+ <symbol>RELENG_6</symbol>, отделилась от <quote>-CURRENT</quote> в
+ ноябре 2005 года.</para>
</answer>
</qandaentry>