From 7b30d4991ab23f56120a9536e1ddab73695a2333 Mon Sep 17 00:00:00 2001
From: Taras Korenko <taras@FreeBSD.org>
Date: Mon, 5 Jul 2010 08:45:41 +0000
Subject: [PATCH] MFen: Makefile 1.5 --> 1.8
article.sgml 1.18 --> 1.23 PR: docs/145354
Approved by: maxim (mentor), marck (mentor)
---
ru_RU.KOI8-R/articles/checkpoint/Makefile | 7 +-
ru_RU.KOI8-R/articles/checkpoint/article.sgml | 112 +++++++++---------
2 files changed, 56 insertions(+), 63 deletions(-)
diff --git a/ru_RU.KOI8-R/articles/checkpoint/Makefile b/ru_RU.KOI8-R/articles/checkpoint/Makefile
index 1a9ae2c82e..b778051fd7 100644
--- a/ru_RU.KOI8-R/articles/checkpoint/Makefile
+++ b/ru_RU.KOI8-R/articles/checkpoint/Makefile
@@ -4,7 +4,7 @@
# $FreeBSD$
# $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/checkpoint/Makefile,v 1.1 2004/01/10 08:43:19 andy Exp $
#
-# Original revision: 1.5
+# Original revision: 1.8
#
DOC?= article
@@ -14,10 +14,9 @@ FORMATS?= html
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-SRCS= article.sgml
-
+SRCS= article.sgml
IMAGES_EN= networks.pic
+URL_RELPREFIX?= ../../../..
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ru_RU.KOI8-R/articles/checkpoint/article.sgml b/ru_RU.KOI8-R/articles/checkpoint/article.sgml
index 91a2e4ff08..d13c508a7b 100644
--- a/ru_RU.KOI8-R/articles/checkpoint/article.sgml
+++ b/ru_RU.KOI8-R/articles/checkpoint/article.sgml
@@ -3,7 +3,7 @@
$FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/checkpoint/article.sgml,v 1.5 2004/07/16 12:05:55 den Exp $
- Original revision: 1.18
+ Original revision: 1.23
-->
<!-- Copyright (c) 2001 The FreeBSD Documentation Project
@@ -37,12 +37,10 @@
-->
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
<!ENTITY legalnotice SYSTEM "../../share/sgml/legalnotice.sgml">
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//RU">
-%trademarks;
]>
<article lang="ru">
@@ -76,7 +74,9 @@
<pubdate>$FreeBSD$</pubdate>
<copyright>
- <year>2001, 2002, 2003</year>
+ <year>2001</year>
+ <year>2002</year>
+ <year>2003</year>
<holder role="mailto:jono@securityreports.com">Jon Orbeton</holder>
</copyright>
@@ -139,8 +139,7 @@ options IPSEC_ESP
options IPSEC_DEBUG</programlisting>
<para>��� ��������� ���������� �� ���������� �������������� ����,
- ���������� � <ulink
- url="http://www.FreeBSD.org/doc/ru_RU.KOI8-R/books/handbook/kernelconfig.html">
+ ���������� � <ulink url="&url.books.handbook;/kernelconfig.html">
����������� �� FreeBSD</ulink>. ����������, ��������, ��� ����� �������
<trademark class='registered'>Firewall-1</trademark> �
<acronym>GW</acronym> � FreeBSD ������ ���� ��������� ����������
@@ -296,77 +295,77 @@ END
#
# search this file for pre_shared_key with various ID key.
#
- path pre_shared_key "/usr/local/etc/racoon/psk.txt" ;
- log debug;
+ path pre_shared_key "/usr/local/etc/racoon/psk.txt" ;
+ log debug;
#
# "padding" defines some parameter of padding. You should not touch these.
#
- padding
+ padding
{
- maximum_length 20; # maximum padding length.
- randomize off; # enable randomize length.
- strict_check off; # enable strict check.
- exclusive_tail off; # extract last one octet.
+ maximum_length 20; # maximum padding length.
+ randomize off; # enable randomize length.
+ strict_check off; # enable strict check.
+ exclusive_tail off; # extract last one octet.
}
- listen
+ listen
{
- #isakmp ::1 [7000];
- #isakmp 0.0.0.0 [500];
- #admin [7002]; # administrative port by kmpstat.
- #strict_address; # required all addresses must be bound.
+ #isakmp ::1 [7000];
+ #isakmp 0.0.0.0 [500];
+ #admin [7002]; # administrative port by kmpstat.
+ #strict_address; # required all addresses must be bound.
}
#
# Specification of default various timers.
#
- timer
+ timer
{
#
# These values can be changed per remote node.
#
- counter 5; # maximum trying count to send.
- interval 20 sec; # maximum interval to resend.
- persend 1; # the number of packets per a send.
+ counter 5; # maximum trying count to send.
+ interval 20 sec; # maximum interval to resend.
+ persend 1; # the number of packets per a send.
#
# timer for waiting to complete each phase.
#
- phase1 30 sec;
- phase2 15 sec;
+ phase1 30 sec;
+ phase2 15 sec;
}
- remote anonymous
+ remote anonymous
{
- exchange_mode aggressive,main; # For Firewall-1 Aggressive mode
+ exchange_mode aggressive,main; # For Firewall-1 Aggressive mode
- #my_identifier address;
- #my_identifier user_fqdn "";
- #my_identifier address "";
- #peers_identifier address "";
- #certificate_type x509 "" "";
+ #my_identifier address;
+ #my_identifier user_fqdn "";
+ #my_identifier address "";
+ #peers_identifier address "";
+ #certificate_type x509 "" "";
- nonce_size 16;
- lifetime time 10 min; # sec,min,hour
- lifetime byte 5 MB; # B,KB,GB
- initial_contact on;
- support_mip6 on;
- proposal_check obey; # obey, strict or claim
+ nonce_size 16;
+ lifetime time 10 min; # sec,min,hour
+ lifetime byte 5 MB; # B,KB,GB
+ initial_contact on;
+ support_mip6 on;
+ proposal_check obey; # obey, strict or claim
- proposal {
- encryption_algorithm 3des;
- hash_algorithm md5;
- authentication_method pre_shared_key;
- dh_group 2 ;
+ proposal {
+ encryption_algorithm 3des;
+ hash_algorithm md5;
+ authentication_method pre_shared_key;
+ dh_group 2 ;
}
}
- sainfo anonymous
+ sainfo anonymous
{
- pfs_group 1;
- lifetime time 10 min;
- lifetime byte 50000 KB;
- encryption_algorithm 3des;
- authentication_algorithm hmac_md5;
- compression_algorithm deflate ;
+ pfs_group 1;
+ lifetime time 10 min;
+ lifetime byte 50000 KB;
+ encryption_algorithm 3des;
+ authentication_algorithm hmac_md5;
+ compression_algorithm deflate ;
}</programlisting>
<para>���������, ��� ����
@@ -437,17 +436,12 @@ scheme: IKE methods: Combined ESP: 3DES + MD5 + PFS (phase 2 completion) for hos
<itemizedlist>
<listitem>
- <para><ulink url="http://www.FreeBSD.org/handbook/ipsec.html">
- ����������� FreeBSD: IPsec</ulink></para>
+ <para>����������� FreeBSD: VPN ����� IPsec <ulink
+ url="&url.books.handbook;/ipsec.html"></ulink></para>
</listitem>
<listitem>
- <para><ulink url="http://www.kame.net">������ KAME</ulink></para>
- </listitem>
-
- <listitem>
- <para><ulink url="http://www.x-itec.de/projects/tuts/ipsec-howto.txt">
- ������� HOWTO �� FreeBSD IPsec </ulink></para>
+ <para>������ KAME <ulink url="http://www.kame.net"></ulink></para>
</listitem>
</itemizedlist>
</sect1>