From 1839943b0e26dd57bfb428b9d2095b01da2e5fe4 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sun, 3 May 2020 22:12:17 -0500 Subject: [PATCH] Update docs --- README-zh.md | 2 +- README.md | 2 +- azure/README-zh.md | 4 ++-- azure/README.md | 4 ++-- docs/clients-xauth-zh.md | 2 +- docs/clients-xauth.md | 2 +- docs/clients-zh.md | 4 ++-- docs/clients.md | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README-zh.md b/README-zh.md index 9e30d7d..d98a675 100644 --- a/README-zh.md +++ b/README-zh.md @@ -77,7 +77,7 @@ wget https://git.io/vpnsetup -O vpnsetup.sh && sudo sh vpnsetup.sh **» 我想建立并使用自己的 VPN ，但是没有可用的服务器** -高级用户可以在一个 $35 的 Raspberry Pi 上搭建 VPN 服务器。参见 [1] [2]。 +高级用户可以在一个 $35 的 Raspberry Pi 上搭建 VPN 服务器。参见 [1] [2]。 \* Debian 10 用户需要使用标准的 Linux 内核（而不是 "cloud" 版本）。更多信息请看 这里。 diff --git a/README.md b/README.md index b6477af..4f4df86 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ This also includes Linux VMs in public clouds, such as **» 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. See [1] [2]. +Advanced users can set up the VPN server on a $35 Raspberry Pi. See [1] [2]. \* Debian 10 users should use the standard Linux kernel (not the "cloud" version). Read more here. diff --git a/azure/README-zh.md b/azure/README-zh.md index 7abb8e0..d2b6e14 100644 --- a/azure/README-zh.md +++ b/azure/README-zh.md @@ -6,8 +6,8 @@ 可根据偏好设置以下选项： - - Username for VPN and SSH （用户名） - - Password for VPN and SSH （密码） + - Username for VPN **and** SSH （用户名） + - Password for VPN **and** SSH （密码） - IPsec Pre-Shared Key for VPN （IPsec 预共享密钥） - Operating System Image （操作系统镜像，Debian 9 或 Ubuntu 18.04/16.04 LTS） - Virtual Machine Size （虚拟机大小，默认值： Standard_B1s） diff --git a/azure/README.md b/azure/README.md index 6ada507..f590665 100644 --- a/azure/README.md +++ b/azure/README.md @@ -6,8 +6,8 @@ This template will create a fully working VPN server on the Microsoft Azure Clou Customizable with the following options: - - Username for VPN and SSH - - Password for VPN and SSH + - Username for VPN **and** SSH + - Password for VPN **and** SSH - IPsec Pre-Shared Key for VPN - Operating System Image (Debian 9 or Ubuntu 18.04/16.04 LTS) - Virtual Machine Size (Default: Standard_B1s) diff --git a/docs/clients-xauth-zh.md b/docs/clients-xauth-zh.md index b15080e..78b0cbb 100644 --- a/docs/clients-xauth-zh.md +++ b/docs/clients-xauth-zh.md @@ -106,7 +106,7 @@ VPN 连接成功后，会在通知栏显示图标。最后你可以到 NetworkManager-libreswan-gnome 软件包，然后通过 GUI 配置 IPsec/XAuth VPN 客户端。 +Fedora 28 （和更新版本）和 CentOS 8/7 用户可以使用 `yum` 安装 `NetworkManager-libreswan-gnome` 软件包，然后通过 GUI 配置 IPsec/XAuth VPN 客户端。 1. 进入 Settings -> Network -> VPN。单击 **+** 按钮。 1. 选择 **IPsec based VPN**。 diff --git a/docs/clients-xauth.md b/docs/clients-xauth.md index a9fb446..d7c9803 100644 --- a/docs/clients-xauth.md +++ b/docs/clients-xauth.md @@ -106,7 +106,7 @@ If you get an error when trying to connect, see NetworkManager-libreswan-gnome package, then configure the IPsec/XAuth VPN client using the GUI. +Fedora 28 (and newer) and CentOS 8/7 users can install the `NetworkManager-libreswan-gnome` package using `yum`, then configure the IPsec/XAuth VPN client using the GUI. 1. Go to Settings -> Network -> VPN. Click the **+** button. 1. Select **IPsec based VPN**. diff --git a/docs/clients-zh.md b/docs/clients-zh.md index 49a6a65..58ae845 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 用户可能需要添加 `nm-l2tp` PPA，参见 这里。 +Ubuntu 18.04 （和更新版本）用户可以使用 `apt` 安装 network-manager-l2tp-gnome 软件包，然后通过 GUI 配置 IPsec/L2TP VPN 客户端。Ubuntu 16.04 用户可能需要添加 `nm-l2tp` PPA，参见 这里。 1. 进入 Settings -> Network -> VPN。单击 **+** 按钮。 1. 选择 **Layer 2 Tunneling Protocol (L2TP)**。 @@ -193,7 +193,7 @@ VPN 连接成功后，你可以到 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 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 using `apt`, 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)**. @@ -193,7 +193,7 @@ If you get an error when trying to connect, try