From f7961242e400b48651e8ea473ecba98c8f9f0a29 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Fri, 10 Feb 2017 10:32:24 -0600 Subject: [PATCH] Update docs --- README-zh.md | 6 +++--- README.md | 6 +++--- docs/clients-xauth-zh.md | 2 +- docs/clients-xauth.md | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README-zh.md b/README-zh.md index bfb1bb7..4f81c50 100644 --- a/README-zh.md +++ b/README-zh.md @@ -57,7 +57,7 @@ wget https://git.io/vpnsetup -O vpnsetup.sh && sudo sh vpnsetup.sh ## 系统要求 -一个新创建的 Amazon EC2 实例，使用这些 AMI 之一： +一个新创建的 Amazon EC2 实例，使用这些映像 (AMI): - Ubuntu 16.04 (Xenial), 14.04 (Trusty) or 12.04 (Precise) - Debian 8 (Jessie) EC2 Images - CentOS 7 (x86_64) with Updates @@ -75,7 +75,7 @@ wget https://git.io/vpnsetup -O vpnsetup.sh && sudo sh vpnsetup.sh **» 我想建立并使用自己的 VPN ，但是没有可用的服务器** -高级用户可以尝试在 树莓派 3 上搭建 VPN 服务器。更多信息请见 Justin 的博客。 +高级用户可以在 $35 Raspberry Pi 3 上搭建 VPN 服务器。 :warning: **不要** 在你的 PC 或者 Mac 上运行这些脚本！它们只能用在服务器上！ @@ -156,7 +156,7 @@ VPN_PASSWORD='你的VPN密码' sh vpnsetup.sh ## 升级Libreswan -提供两个额外的脚本 vpnupgrade.sh 和 vpnupgrade_centos.sh，可用于升级 Libreswan （更改日志 | 通知列表）。请在运行前根据需要修改 `swan_ver` 变量。检查已安装版本： `ipsec --version`. +提供两个额外的脚本 vpnupgrade.sh 和 vpnupgrade_centos.sh，可用于升级 Libreswan （更新日志 | 通知列表）。请在运行前根据需要修改 `swan_ver` 变量。检查已安装版本： `ipsec --version`. ```bash # Ubuntu & Debian diff --git a/README.md b/README.md index 2e8f4e1..3b32d3b 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ For other installation options and how to set up VPN clients, read the sections ## Requirements -A newly created Amazon EC2 instance, using one of these AMIs: +A newly created Amazon EC2 instance, from these images (AMI): - Ubuntu 16.04 (Xenial), 14.04 (Trusty) or 12.04 (Precise) - Debian 8 (Jessie) EC2 Images - CentOS 7 (x86_64) with Updates @@ -69,13 +69,13 @@ Please see this workaround. OpenVZ VPS is NOT supported, users could instead try OpenVPN. -These also include Linux VMs in public clouds, such as DigitalOcean, Vultr, Linode, Google Compute Engine, Amazon Lightsail, Microsoft Azure, IBM SoftLayer and Rackspace. +This also includes Linux VMs in public clouds, such as DigitalOcean, Vultr, Linode, Google Compute Engine, Amazon Lightsail, Microsoft Azure, IBM SoftLayer and Rackspace. Deploy to Azure Install on DigitalOcean Deploy to Linode **» I want to run my own VPN but don't have a server for that** -Advanced users can set up the VPN server on a $35 Raspberry Pi 3. Read more at Justin's blog. +Advanced users can set up the VPN server on a $35 Raspberry Pi 3. :warning: **DO NOT** run these scripts on your PC or Mac! They should only be used on a server! diff --git a/docs/clients-xauth-zh.md b/docs/clients-xauth-zh.md index b7f7818..7a98904 100644 --- a/docs/clients-xauth-zh.md +++ b/docs/clients-xauth-zh.md @@ -20,7 +20,7 @@ IPsec/XAuth 模式也称为 "Cisco IPsec"。该模式通常能够比 IPsec/L2TP **注:** 你也可以使用 [IPsec/L2TP 模式](clients-zh.md) 连接，无需安装额外的软件。 1. 下载并安装免费的 Shrew Soft VPN 客户端。 - **注:** 该客户端**不支持** Windows 10。 + **注：** 该 VPN 客户端支持 Windows 2K/XP/Vista/7/8 系统。 1. 单击开始菜单 -> 所有程序 -> ShrewSoft VPN Client -> VPN Access Manager 1. 单击工具栏中的 **Add (+)** 按钮。 1. 在 **Host Name or IP Address** 字段中输入`你的 VPN 服务器 IP`。 diff --git a/docs/clients-xauth.md b/docs/clients-xauth.md index 4198b78..874f4f3 100644 --- a/docs/clients-xauth.md +++ b/docs/clients-xauth.md @@ -20,7 +20,7 @@ IPsec/XAuth mode is also called "Cisco IPsec". This mode is generally faster tha **Note:** You may also connect using [IPsec/L2TP mode](clients.md). No additional software is required. 1. Download and install the free Shrew Soft VPN client. - **Note:** This VPN client does NOT support Windows 10. + **Note:** This VPN client supports Windows 2K/XP/Vista/7/8. 1. Click Start Menu -> All Programs -> ShrewSoft VPN Client -> VPN Access Manager 1. Click the **Add (+)** button on toolbar. 1. Enter `Your VPN Server IP` in the **Host Name or IP Address** field.