Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4A905DC31 for ; Sat, 2 Mar 2013 01:01:30 +0000 (UTC) Received: (qmail 66196 invoked by uid 500); 2 Mar 2013 01:01:28 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 66069 invoked by uid 500); 2 Mar 2013 01:01:28 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 65759 invoked by uid 99); 2 Mar 2013 01:01:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Mar 2013 01:01:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 81BF13BB98; Sat, 2 Mar 2013 01:01:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [45/50] [abbrv] git commit: refs/heads/vim51_win8 - the last remnants of CLOUDSTACK-427 Message-Id: <20130302010127.81BF13BB98@tyr.zones.apache.org> Date: Sat, 2 Mar 2013 01:01:27 +0000 (UTC) the last remnants of CLOUDSTACK-427 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1cbbc855 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1cbbc855 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1cbbc855 Branch: refs/heads/vim51_win8 Commit: 1cbbc855622a125ff8a72c0336b89253abbb6696 Parents: 14791a9 Author: Joe Brockmeier Authored: Fri Mar 1 11:49:27 2013 -0600 Committer: Joe Brockmeier Committed: Fri Mar 1 11:49:27 2013 -0600 ---------------------------------------------------------------------- docs/en-US/upload-existing-volume-to-vm.xml | 2 +- docs/en-US/using-vpn-with-windows.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1cbbc855/docs/en-US/upload-existing-volume-to-vm.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/upload-existing-volume-to-vm.xml b/docs/en-US/upload-existing-volume-to-vm.xml index 604cb7f..d2b6571 100644 --- a/docs/en-US/upload-existing-volume-to-vm.xml +++ b/docs/en-US/upload-existing-volume-to-vm.xml @@ -71,6 +71,6 @@ MD5 checksum. (Optional) Use the hash that you created in step . - Wait until the status of the volume shows that the upload is complete. Click Instances - Volumes, find the name you specified in step 5, and make sure the status is Uploaded. + Wait until the status of the volume shows that the upload is complete. Click Instances - Volumes, find the name you specified in step , and make sure the status is Uploaded. http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1cbbc855/docs/en-US/using-vpn-with-windows.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/using-vpn-with-windows.xml b/docs/en-US/using-vpn-with-windows.xml index e0e1569..c5d95dd 100644 --- a/docs/en-US/using-vpn-with-windows.xml +++ b/docs/en-US/using-vpn-with-windows.xml @@ -26,17 +26,17 @@ Using VPN with Windows The procedure to use VPN varies by Windows version. Generally, the user must edit the VPN properties and make sure that the default route is not the VPN. The following steps are for Windows L2TP clients on Windows Vista. The commands should be similar for other Windows versions. - Log in to the &PRODUCT; UI and click on the source NAT IP for the account. The VPN tab should display the IPsec preshared key. Make a note of this and the source NAT IP. The UI also lists one or more users and their passwords. Choose one of these users, or, if none exists, add a user and password. + Log in to the &PRODUCT; UI and click on the source NAT IP for the account. The VPN tab should display the IPsec preshared key. Make a note of this and the source NAT IP. The UI also lists one or more users and their passwords. Choose one of these users, or, if none exists, add a user and password. On the Windows box, go to Control Panel, then select Network and Sharing center. Click Setup a connection or network. In the next dialog, select No, create a new connection. In the next dialog, select Use my Internet Connection (VPN). - In the next dialog, enter the source NAT IP from step 1 and give the connection a name. Check Don't connect now. - In the next dialog, enter the user name and password selected in step 1. + In the next dialog, enter the source NAT IP from step and give the connection a name. Check Don't connect now. + In the next dialog, enter the user name and password selected in step . Click Create. Go back to the Control Panel and click Network Connections to see the new connection. The connection is not active yet. Right-click the new connection and select Properties. In the Properties dialog, select the Networking tab. - In Type of VPN, choose L2TP IPsec VPN, then click IPsec settings. Select Use preshared key. Enter the preshared key from Step 1. + In Type of VPN, choose L2TP IPsec VPN, then click IPsec settings. Select Use preshared key. Enter the preshared key from step . The connection is ready for activation. Go back to Control Panel -> Network Connections and double-click the created connection. - Enter the user name and password from Step 1. + Enter the user name and password from step .