Merge branch 'Windows7YourTimeHasCome' into 'master'

Windows 7 your time has come

See merge request !285

content/anvil/connecting_to_linux_instances_from_windows.md

@@ -27,44 +27,44 @@ In this example, the private key file is assumed to be
 named `anvil_key.ppk` and saved on the desktop.  In PuTTY window, click
 the '+' icon next to *SSH* under *Connection* to expand the menu.
 
-{{< figure src="/images/13599229.png" width="450" >}}
+{{< figure src="/images/AnvilLinux-Win10.png" width="450" >}}
 
 Next, click the *Auth* menu item.
 
-{{< figure src="/images/13599231.png" width="450" >}}
+{{< figure src="/images/AnvilLinux-Win10Auth.png" width="450" >}}
 
 Click the *Browse* button and the select the `anvil_key.ppk `file.
 
-{{< figure src="/images/13599236.png" width="450" >}}
+{{< figure src="/images/AnvilLinux-Win10Key.png" width="450" >}}
 
 With the private key selected, click the *Session* menu option at the
 top to return to the original PuTTY window.
 
-{{< figure src="/images/13599239.png" width="450" >}}
+{{< figure src="/images/AnvilLinux-Win10Session.png" width="450" >}}
 
 Fill in the *Host Name (or IP address)* field with the IP address of you
 instance.  Choose a name to save the settings for your instance with and
 enter it in the *Saved Sessions* field.
 
-{{< figure src="/images/13599242.png" width="450" >}}
+{{< figure src="/images/AnvilLinux-Win10SessionSaved.png" width="450" >}}
 
 Click the *Save* button to save everything.
 
-{{< figure src="/images/13599246.png" width="450" >}}
+{{< figure src="/images/AnvilLinux-Win10SessionSavedButton.png" width="450" >}}
 
 Next, click *Open* to connect to your instance.
 
-{{< figure src="/images/13599248.png" width="450" >}}
+{{< figure src="/images/AnvilLinux-Win10SessionOpen.png" width="450" >}}
 
 Since this is the first time connecting to the instance, a warning box
-will appear.  Click *Yes* to continue and save the instance's key.  This
+will appear.  Click *Accept* to continue and save the instance's key.  This
 warning box will not appear on subsequent connections.
 
-{{< figure src="/images/13599251.png" >}}
+{{< figure src="/images/AnvilLinux-Win10SessionSecurity.png" >}}
 
 You should then see a terminal window prompting for a username.
 
-{{< figure src="/images/13599255.png" >}}
+{{< figure src="/images/AnvilLinux-Win10Terminal.png" >}}
 
 Depending on which Linux OS you're using for your instance, the
 username will be different.  See the 

content/anvil/connecting_to_windows_instances.md

@@ -69,15 +69,12 @@ column entry on the *Instances* page:
 Start your Remote Desktop client, enter the IP address in the name (or
 address) field, and click "Connect":
 
-{{< figure src="/images/13042879.png" >}}
+{{< figure src="/images/Anvil-win10RDPClient.png" >}}
 
-When prompted, enter **cloud-user** for the username if connecting to a
-Windows 7 instance; **.\\cloud-user** if connecting to a Windows 10
+When prompted, enter **.\\cloud-user** for the username when connecting to a Windows 10
 instance, and the previously recovered password.
 
 {{% notice info %}}
-For Windows 7, the username used to connect is always `cloud-user`
-
 For Windows 10, the username used to connect is always `.\cloud-user`
 {{% /notice %}}
 
@@ -85,7 +82,7 @@ You may see a warning box about the certificate of the remote computer.
 To avoid this warning in the future, check the box that says "Don't ask
 me again for connections to this computer".
 
-{{< figure src="/images/13042885.png" height="400" >}}
+{{< figure src="/images/Anvil-win10RDPCert.png" height="400" >}}
 
 Click "Yes" to continue connecting.  The Remote Desktop session should
 then start and you will be connected to your instance.

content/anvil/creating_ssh_key_pairs_on_windows.md

-+++
+p+++
 title = "Creating SSH key pairs on Windows"
 description = "How to create key pairs for use with Anvil on Windows"
 +++
@@ -12,7 +12,7 @@ generate the key pair.
 Once installed, start PuTTYgen.  Click the *Generate* key to create the
 key pair.
 
-{{< figure src="/images/13598846.png" height="450" >}}
+{{< figure src="/images/PuttyGen-Generate.png" height="450" >}}
 
 You will be promoted to move the mouse in a random fashion within the
 window for several seconds to create the key.  Once the key is
@@ -20,7 +20,7 @@ generated, the public and private keys need to be saved to different
 files.  The public key is in the text box near the top of the PuTTYgen
 window.  Right click within the box and choose *Select All*.   
 
-{{< figure src="/images/13598847.png" height="450" >}}
+{{< figure src="/images/PuttyGen-Select.png" height="450" >}}
 
 Either right-click again and choose *Copy* or use *Ctrl-C* to copy the
 key text.  Paste the key into a text editor of your choice.  Save the
@@ -44,22 +44,22 @@ file.
 To save the private key for use with the `ssh `command, choose *Export
 OpenSSH key* under the *Conversions* menu.
 
-{{< figure src="/images/13598856.png" height="450" >}}
+{{< figure src="/images/PuttyGen-Export.png" height="450" >}}
 
 A pop-up box will appear warning about saving the key without a
 passphrase; select *Yes* to continue.
 
-{{< figure src="/images/13598859.png" >}}
+{{< figure src="/images/PuttyGen-Password.png" >}}
 
 Save the OpenSSH private key somewhere convenient.  
 
 To save the PuTTY format file, click the *Save private key* button.
 
-{{< figure src="/images/13599219.png" height="450" >}}
+{{< figure src="/images/PuttyGen-PrivateKey.png" height="450" >}}
 
 An identical warning box to before will appear; click *Yes* to continue.
 
-{{< figure src="/images/13598859.png" >}}
+{{< figure src="/images/PuttyGen-Password.png" >}}
 
 You may need to change the filename slightly to avoid overwriting the
 OpenSSH key file.  Save the `.ppk` file somewhere convenient.

content/connecting/how_to_setup_x11_forwarding.md

@@ -11,12 +11,12 @@ weight = "35"
 2.  Download PuTTY to your local PC and install.  Download link: http://the.earth.li/~sgtatham/putty/latest/x86/putty.exe
 3.  Open Xming and keep it running in the background.
 4.  Configure PuTTY as below:  
-    {{< figure src="/images/11637370.png" height="400" >}}
-    {{< figure src="/images/11637371.jpg" height="400" >}}
+    {{< figure src="/images/Putty-win10.png" height="400" >}}
+    {{< figure src="/images/Putty-win10X11.png" height="400" >}}
 
 5.  To test your X11 setup, after login, type command `xeyes` and press
     enter.  
-    {{< figure src="/images/11637372.png" height="400" >}}
+    {{< figure src="/images/Putty-win10XEYES.png" height="400" >}}
 
 6.  Close the xeyes application by "Ctrl + c" from the terminal or click
     the close button on the up-right corner of the graphical window.

content/connecting/putty.md

@@ -9,7 +9,7 @@ weight = "20"
 
 - [Connecting to HCC Clusters](#connecting-to-hcc-clusters)
 - [Windows 10](#windows-10)
-- [Windows 7 and 8.1](#windows-7-and-8-1)
+- [Windows 8.1](#windows-8-1)
 - [Next Steps:](#next-steps)
 
 ## Connecting to HCC Clusters
@@ -27,7 +27,7 @@ Windows 10 users, can connect using the
 Command Prompt. Please see [Connecting with the Terminal]({{< relref "/connecting/terminal" >}})
 for more details.
 
-## Windows 7 and 8.1
+## Windows 8.1
 --------------
 
 For users with older Windows versions, you will need to install an SSH client to connect.

content/handling_data/data_transfer/scp.md

@@ -6,7 +6,7 @@ weight = "10"
 
 ## Using the SCP command
 
-For MacOS, Linux, and later Windows users, file transferring between your personal computer
+For MacOS, Linux, and Windows 10 users, file transferring between your personal computer
 and the HCC supercomputers can be achieved through the command `scp` which stands for secure copy.
 This method is ideal for quick transfer of smaller files. For large volume transfers,
 we recommend the using [Globus] or an SCP client such as [WinSCP for Windows]({{< relref "winscp">}}) or 

content/handling_data/data_transfer/winscp.md

@@ -45,7 +45,7 @@ with `rhino.unl.edu`.
 
 6.  Now you can drop and drag the files between your personal computer
     and the HCC supercomputers.   
-    {{< figure src="/images/3178539.png" height="450" >}}
+    {{< figure src="/images/WinSCPUploadDownload.png" height="450" >}}