Merge branch 'content_revision5' into 'master'

Content revision5

See merge request !60

docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/pageant.md

-Pageant SSH agent
-=================
-
-Pageant holds your private key in memory without needing to retype a passphrase on every login.
-
--   Run Pageant.
--   On Pageant Key List press *Add key* and select your private key (id_rsa.ppk).
--   Enter your passphrase.
--   Now you have your private key in memory without needing to retype a passphrase on every login.
-
-![](../../../img/PageantV.png)
-

docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/putty.md

@@ -18,16 +18,6 @@ We recommned you to download "**A Windows installer for everything except PuTTYt
 
     "Pageant" is optional.
 
-PuTTYgen
---------
-
-PuTTYgen is the PuTTY key generator. Read more how to load in an existing private key and change your passphrase or generate a new public/private key pair using [PuTTYgen](puttygen) if needed.
-
-Pageant SSH agent
------------------
-
-[Pageant](pageant) holds your private key in memory without needing to retype a passphrase on every login. We recommend its usage.
-
 PuTTY - how to connect to the IT4Innovations cluster
 ----------------------------------------------------
 
@@ -60,3 +50,67 @@ Another PuTTY Settings
 -   Category -> Windows -> Translation -> Remote character set and select **UTF-8**.
 -   Category -> Terminal -> Features and select **Disable application keypad mode** (enable numpad)
 -   Save your configuration on Session page in to Default Settings with *Save* button.
+
+Pageant SSH agent
+-----------------
+
+Pageant holds your private key in memory without needing to retype a passphrase on every login.
+
+-   Run Pageant.
+-   On Pageant Key List press *Add key* and select your private key (id_rsa.ppk).
+-   Enter your passphrase.
+-   Now you have your private key in memory without needing to retype a passphrase on every login.
+
+![](../../../img/PageantV.png)
+
+PuTTY key generator
+-------------------
+
+PuTTYgen is the PuTTY key generator. You can load in an existing private key and change your passphrase or generate a new public/private key pair.
+
+### Change Password for Existing Private Key
+
+You can change the password of your SSH key with "PuTTY Key Generator". Make sure to backup the key.
+
+-   Load your [private key](../shell-access-and-data-transfer/ssh-keys/) file with *Load* button.
+-   Enter your current passphrase.
+-   Change key passphrase.
+-   Confirm key passphrase.
+-   Save your private key with *Save private key* button.
+
+![](../../../img/PuttyKeygeneratorV.png)
+
+### Generate a New Public/Private key
+
+You can generate an additional public/private key pair and insert public key into authorized_keys file for authentication with your own private key.
+
+-   Start with *Generate* button.
+
+![](../../../img/PuttyKeygenerator_001V.png)
+
+-   Generate some randomness.
+
+![](../../../img/PuttyKeygenerator_002V.png)
+
+-   Wait.
+
+![](../../../img/PuttyKeygenerator_003V.png)
+
+-   Enter a *comment* for your key using format 'username@organization.example.com'.
+    Enter key passphrase.
+    Confirm key passphrase.
+    Save your new private key `in "*.ppk" `format with *Save private key* button.
+
+![](../../../img/PuttyKeygenerator_004V.png)
+
+-   Save the public key with *Save public key* button.
+    You can copy public key out of the ‘Public key for pasting into authorized_keys file’ box.
+
+![](../../../img/PuttyKeygenerator_005V.png)
+
+-   Export private key in OpenSSH format "id_rsa" using Conversion -> Export OpenSSH key
+
+![](../../../img/PuttyKeygenerator_006V.png)
+
+-   Now you can insert additional public key into authorized_keys file for authentication with your own private key.
+    You must log in using ssh key received after registration. Then proceed to [How to add your own key](../shell-access-and-data-transfer/ssh-keys/).

docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/puttygen.md

-PuTTY key generator
-===================
-
-PuTTYgen is the PuTTY key generator. You can load in an existing private key and change your passphrase or generate a new public/private key pair.
-
-### Change Password for Existing Private Key
-
-You can change the password of your SSH key with "PuTTY Key Generator". Make sure to backup the key.
-
--   Load your [private key](../shell-access-and-data-transfer/ssh-keys/) file with *Load* button.
--   Enter your current passphrase.
--   Change key passphrase.
--   Confirm key passphrase.
--   Save your private key with *Save private key* button.
-
-![](../../../img/PuttyKeygeneratorV.png)
-
-Generate a New Public/Private key
----------------------------------
-
-You can generate an additional public/private key pair and insert public key into authorized_keys file for authentication with your own private key.
-
--   Start with *Generate* button.
-
-![](../../../img/PuttyKeygenerator_001V.png)
-
--   Generate some randomness.
-
-![](../../../img/PuttyKeygenerator_002V.png)
-
--   Wait.
-
-![](../../../img/PuttyKeygenerator_003V.png)
-
--   Enter a *comment* for your key using format 'username@organization.example.com'.
-    Enter key passphrase.
-    Confirm key passphrase.
-    Save your new private key `in "*.ppk" `format with *Save private key* button.
-
-![](../../../img/PuttyKeygenerator_004V.png)
-
--   Save the public key with *Save public key* button.
-    You can copy public key out of the ‘Public key for pasting into authorized_keys file’ box.
-
-![](../../../img/PuttyKeygenerator_005V.png)
-
--   Export private key in OpenSSH format "id_rsa" using Conversion -> Export OpenSSH key
-
-![](../../../img/PuttyKeygenerator_006V.png)
-
--   Now you can insert additional public key into authorized_keys file for authentication with your own private key.
-    You must log in using ssh key received after registration. Then proceed to [How to add your own key](../shell-access-and-data-transfer/ssh-keys/).

docs.it4i/get-started-with-it4innovations/obtaining-login-credentials/obtaining-login-credentials.md

@@ -114,7 +114,7 @@ On Linux, use
 local $ ssh-keygen -f id_rsa -p
 ```
 
-On Windows, use [PuTTY Key Generator](../accessing-the-clusters/shell-access-and-data-transfer/puttygen/).
+On Windows, use [PuTTY Key Generator](../accessing-the-clusters/shell-access-and-data-transfer/putty/#putty-key-generator).
 
 Change Password
 ---------------

mkdocs.yml

@@ -24,8 +24,6 @@ pages:
 #    - VPN-Connection-Fail-in-Win-8.1: get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/vpn-connection-fail-in-win-8.1.md
     - SSH Keys: get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/ssh-keys.md
     - PuTTY: get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/putty.md
-    - PuTTY Pageant SSH Agent: get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/pageant.md
-    - PuTTY Key Generator: get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/puttygen.md
     - X Window System: get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system.md
     - X Window System Using Cygwin: get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/cygwin-and-x11-forwarding.md
     - VNC: get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/vnc.md