From b57999120609ac1b69ef8c0786efe11408550e43 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sat, 1 Jun 2019 21:22:34 -0500 Subject: [PATCH] Update docs - Remove Ubuntu 14.04 (now EOL) --- README-zh.md | 4 ++-- README.md | 4 ++-- docs/clients-zh.md | 2 +- docs/clients.md | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README-zh.md b/README-zh.md index cbab6f7..7563edf 100644 --- a/README-zh.md +++ b/README-zh.md @@ -53,12 +53,12 @@ wget https://git.io/vpnsetup -O vpnsetup.sh && sudo sh vpnsetup.sh - 封装所有的 VPN 流量在 UDP 协议，不需要 ESP 协议支持 - 可直接作为 Amazon EC2 实例创建时的用户数据使用 - 包含 `sysctl.conf` 优化设置，以达到更佳的传输性能 -- 已测试： Ubuntu 18.04/16.04/14.04, Debian 9/8 和 CentOS 7/6 +- 已测试： Ubuntu 18.04/16.04, Debian 9/8 和 CentOS 7/6 ## 系统要求 一个新创建的 Amazon EC2 实例，使用这些映像之一： -- Ubuntu 18.04 (Bionic), 16.04 (Xenial) or 14.04 (Trusty) +- Ubuntu 18.04 (Bionic) or 16.04 (Xenial) - Debian 9 (Stretch) or 8 (Jessie) - CentOS 7 (x86_64) with Updates - CentOS 6 (x86_64) with Updates diff --git a/README.md b/README.md index 8cabc72..b0cae9b 100644 --- a/README.md +++ b/README.md @@ -53,12 +53,12 @@ For other installation options and how to set up VPN clients, read the sections - Encapsulates all VPN traffic in UDP - does not need ESP protocol - Can be directly used as "user-data" for a new Amazon EC2 instance - Includes `sysctl.conf` optimizations for improved performance -- Tested with Ubuntu 18.04/16.04/14.04, Debian 9/8 and CentOS 7/6 +- Tested with Ubuntu 18.04/16.04, Debian 9/8 and CentOS 7/6 ## Requirements A newly created Amazon EC2 instance, from one of these images: -- Ubuntu 18.04 (Bionic), 16.04 (Xenial) or 14.04 (Trusty) +- Ubuntu 18.04 (Bionic) or 16.04 (Xenial) - Debian 9 (Stretch) or 8 (Jessie) - CentOS 7 (x86_64) with Updates - CentOS 6 (x86_64) with Updates diff --git a/docs/clients-zh.md b/docs/clients-zh.md index f75d0ac..2647825 100644 --- a/docs/clients-zh.md +++ b/docs/clients-zh.md @@ -167,7 +167,7 @@ VPN 连接成功后，网络状态图标上会出现 VPN 指示。最后你可 ### Ubuntu Linux -Ubuntu 18.04 （和更新版本）用户可以安装 network-manager-l2tp-gnome 软件包，然后通过 GUI 配置 IPsec/L2TP VPN 客户端。Ubuntu 16.04 和 14.04 用户可能需要添加 `nm-l2tp` PPA，参见 这里。 +Ubuntu 18.04 （和更新版本）用户可以安装 network-manager-l2tp-gnome 软件包，然后通过 GUI 配置 IPsec/L2TP VPN 客户端。Ubuntu 16.04 用户可能需要添加 `nm-l2tp` PPA，参见 这里。 1. 进入 Settings -> Network -> VPN。单击 **+** 按钮。 1. 选择 **Layer 2 Tunneling Protocol (L2TP)**。 diff --git a/docs/clients.md b/docs/clients.md index b0e6b92..65bc6da 100644 --- a/docs/clients.md +++ b/docs/clients.md @@ -167,7 +167,7 @@ If you get an error when trying to connect, see Troub ### Ubuntu Linux -Ubuntu 18.04 (and newer) users can install the network-manager-l2tp-gnome package, then configure the IPsec/L2TP VPN client using the GUI. Ubuntu 16.04 and 14.04 users may need to add the `nm-l2tp` PPA, read more here. +Ubuntu 18.04 (and newer) users can install the network-manager-l2tp-gnome package, then configure the IPsec/L2TP VPN client using the GUI. Ubuntu 16.04 users may need to add the `nm-l2tp` PPA, read more here. 1. Go to Settings -> Network -> VPN. Click the **+** button. 1. Select **Layer 2 Tunneling Protocol (L2TP)**.