Fixed link references and Putty section moved

SUMMARY.md

@@ -6,7 +6,6 @@
 * [Command Line Interface](/cli/README.md)
 * [Openstack Networking](/network/README.md)
 * [Windows OS in cloud](/windows/README.md)
-* [PuTTY on Windows](/putty/README.md)
 * [FAQ](/faq/README.md)
 * [Contribute](/contribute/README.md)
 * [About MetaCentrum Cloud](/about/README.md)

faq/README.md

@@ -47,3 +47,75 @@ To access internet from an instance, or access instance from the internet, you c
  * **I need to serve content (e.g. webservice) to other users** - public and private clouds provide LBaaS (Load-Balancer-as-a-Service) service, which proxies users traffic to instances. MetaCentrum Cloud provides this service in experimental mode - [documentation](/gui/README.md/#lbaas)
 
 In case, that these options are not suitable for you usecase, you can still request multiple floating IPs.
+
+## PuTTY
+[PuTTY](https://www.chiark.greenend.org.uk/~sgtatham/putty/faq.html#faq-what) is a client program for the SSH on Windows OS.
+
+#### Windows PuTTY Installer
+We recommend to download [Windows Installer](https://www.chiark.greenend.org.uk/~sgtatham/putty/latest.html) with PuTTY utilities as:
+* Pageant (SSH authentication agent) - store private key in memory without need to retype a passphrase on every login
+* PuTTYgen (PuTTY key generator) - convert OpenSSH format of id_rsa to PuTTY ppk private key and so on and so forth
+
+#### PuTTY - Connect to the Instance
+
+* Run PuTTY and enter Host name in format "login@Floating IP address" where [login](/quick-start#create-virtual-machine-instance) is for example debian for Debian OS and Floating IP is [IP address](/quick-start/#associate-floating-ip) to access instance from internet.
+* In Category -> Connection -> SSH -> Auth:
+  *  Select **Attempt authentication using Pageant**
+  *  Select **Allow agent forwarding**
+  *  Browse and select your private key file (if needed [convert OpenSSH format id_rsa to Putty ppk](#convert-openssh-format-to-putty-ppk-format))
+* Return to *Session page* and Save selected configuration with **Save** button
+* Now you can log in using **Open** button
+* Enter passphrase for selected private key file if [Pageant SSH authentication agent](#pageant-ssh-agent) is not used
+  *  We recomend using Pageant SSH Agent to store private key in memory without need to retype a passphrase on every login
+
+![](/faq/images/putty-connect2instance.png)
+
+#### Pageant SSH Agent
+
+* Run Pageant from Windows menu
+* Locate Pageant icon in the Notification Area and double click on it
+* Use **Add Key** button
+* Browse files and select your PuTTY Private Key File in format ppk
+* Use **Open** buton
+* Eter passphrase and confirm **OK** button
+* Your private key is now located in the memory without need to retype a passphrase on every login
+
+![](/faq/images/pageant-add-key.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 or convert to/from OpenSSH/PuTTY ppk formats.
+
+#### Convert OpenSSH format to PuTTY ppk format
+
+* Run PuTTYgen, in the menu Conversion -> Import key browse and load your OpenSSH format id_rsa private key using your passphrase
+* Save PuTTY ppk private key using button **Save private key**, browse destination for PuTTY format id_rsa.ppk and save file
+
+![](/faq/images/puttygen-openssh2ppk.png)
+
+#### Convert PuTTY ppk private key to OpenSSH format
+
+* Run PuTTYgen, in the menu File -> Load private key browse and open your private key in format PuTTY ppk using your passphrase
+* In the menu Conversion -> Export OpenSSH key browse destination for OpenSSH format id_rsa and save file
+
+![](/faq/images/puttygen-ppk2openssh.png)
+
+#### Change Password for Existing Private Key Pair
+
+* Load your existing private key using button **Load**, confirm opening using your passphrase
+* Enter new passphrase in field *Key passphrase* and confirm again in field *Confirm passphrase*
+* Save changes using button **Save private key**
+
+![](/faq/images/puttygen-passphrase.png)
+
+#### Generate a New Key Pair
+
+* Start with **Generate button**
+* Generate some randomness by moving your mouse over dialog
+* Wait while the key is generated
+* Enter a comment for your key using "your-email@address"
+* Enter key passphrase, confirm key passphrase
+* Save your new private key in the "id_rsa.ppk" format using the **Save private key** button
+* Save the public key with the **Save public key** button
+
+![](/faq/images/puttygen_new_key.png)

putty/README.md

-# PuTTY
-[PuTTY](https://www.chiark.greenend.org.uk/~sgtatham/putty/faq.html#faq-what) is a client program for the SSH on Windows OS.
-
-## Windows PuTTY Installer
-We recommend to download [Windows Installer](https://www.chiark.greenend.org.uk/~sgtatham/putty/latest.html) with PuTTY utilities as:
-* Pageant (SSH authentication agent) - store private key in memory without need to retype a passphrase on every login
-* PuTTYgen (PuTTY key generator) - convert OpenSSH format of id_rsa to PuTTY ppk private key and so on and so forth
-
-## PuTTY - Connect to the Instance
-
-* Run PuTTY and enter Host name in format "login@Floating IP address" where [login](/quick-start#create-virtual-machine-instance) is for example debian for Debian OS and Floating IP is [IP address](/quick-start/#associate-floating-ip) to access instance from internet.
-* In Category -> Connection -> SSH -> Auth:
-  *  Select **Attempt authentication using Pageant**
-  *  Select **Allow agent forwarding**
-  *  Browse and select your private key file (if needed [convert OpenSSH format id_rsa to Putty ppk](#convert-openssh-format-to-putty-ppk-format))
-* Return to *Session page* and Save selected configuration with **Save** button
-* Now you can log in using **Open** button
-* Enter passphrase for selected private key file if [Pageant SSH authentication agent](#pageant-ssh-agent) is not used
-  *  We recomend using Pageant SSH Agent to store private key in memory without need to retype a passphrase on every login
-
-![](/putty/images/putty-connect2instance.png)
-
-## Pageant SSH Agent
-
-* Run Pageant from Windows menu
-* Locate Pageant icon in the Notification Area and double click on it
-* Use **Add Key** button
-* Browse files and select your PuTTY Private Key File in format ppk
-* Use **Open** buton
-* Eter passphrase and confirm **OK** button
-* Your private key is now located in the memory without need to retype a passphrase on every login
-
-![](/putty/images/pageant-add-key.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 or convert to/from OpenSSH/PuTTY ppk formats.
-
-## Convert OpenSSH format to PuTTY ppk format
-
-* Run PuTTYgen, in the menu Conversion -> Import key browse and load your OpenSSH format id_rsa private key using your passphrase
-* Save PuTTY ppk private key using button **Save private key**, browse destination for PuTTY format id_rsa.ppk and save file
-
-![](/putty/images/puttygen-openssh2ppk.png)
-
-## Convert PuTTY ppk private key to OpenSSH format
-
-* Run PuTTYgen, in the menu File -> Load private key browse and open your private key in format PuTTY ppk using your passphrase
-* In the menu Conversion -> Export OpenSSH key browse destination for OpenSSH format id_rsa and save file
-
-![](/putty/images/puttygen-ppk2openssh.png)
-
-## Change Password for Existing Private Key Pair
-
-* Load your existing private key using button **Load**, confirm opening using your passphrase
-* Enter new passphrase in field *Key passphrase* and confirm again in field *Confirm passphrase*
-* Save changes using button **Save private key**
-
-![](/putty/images/puttygen-passphrase.png)
-
-## Generate a New Key Pair
-
-* Start with **Generate button**
-* Generate some randomness by moving your mouse over dialog
-* Wait while the key is generated
-* Enter a comment for your key using "your-email@address"
-* Enter key passphrase, confirm key passphrase
-* Save your new private key in the "id_rsa.ppk" format using the **Save private key** button
-* Save the public key with the **Save public key** button
-
-![](/putty/images/puttygen_new_key.png)

quick-start/README.md

@@ -125,9 +125,10 @@ For details, refer to [the official documentation](https://docs.openstack.org/ho
   ![](/quick-start/images/flavor_detail.png)
 
 5. Select Network
+
       * For personal project select personal-project-network-subnet from network 78-128-250-pers-proj-net
         ![](/quick-start/images/instance_launch_network-user.png)
-      * For group project select group-project-network-subnet from network group-project-network (check if [Router gateway](#setup-router-gateway-required-for-group-projects) is set)
+      * For group project select group-project-network-subnet from network group-project-network (check if [Router gateway](/network#associate-floating-ip") is set)
         ![](/quick-start/images/instance_launch_network-group.png)
 6. Key pair
       * **If public key was imported already**, add existing key to the instance and continue using button **Next**
@@ -146,11 +147,11 @@ For details, refer to [the official documentation](https://docs.openstack.org/ho
 
 8. Use button Launch Instance to initialize new instance
 
-9. Wait until instance initialization finishes and [Associate Floating IP](#associate-floating-ip). For group project always select the same network as used in [Router gateway](#setup-router-gateway-required-for-group-projects)
+9. Wait until instance initialization finishes and [Associate Floating IP](/network/#associate-floating-ip). For group project always select the same network as used in [Router gateway](/network/#setup-router-gateway-required-for-group-projects)
     ![](/quick-start/images/instance_associate_ip.png)
 
 10. Login using your SSH key as selected in Key pair above
-Connect to the instance using **ssh image login**, [id_rsa key registered in Openstack](#create-key-pair) and [Floating IP](#associate-floating-ip). On Windows you may use [PuTTY SSH client](/putty) to connect to the instance
+Connect to the instance using **ssh image login**, [id_rsa key registered in Openstack](#create-key-pair) and [Floating IP](/network/#associate-floating-ip). On Windows you may use [PuTTY SSH client](/faq/#putty) to connect to the instance
 
 To get **ssh image login** of corresponding image  go to **Project >  Compute > Images**. There you will have list of all available images and then you have to click on name of one you want.
   ![](/quick-start/images/ssh_login1.png)
@@ -184,18 +185,13 @@ ssh -A -X -i ~/.ssh/id_rsa debian@192.168.18.15
 
 For details, refer to [the official documentation](https://docs.openstack.org/horizon/rocky/user/launch-instances.html).
 
-  <div style="border-width:0;border-left:5px solid #b8d6f4;background-color:rgba(255,0,0,0.3);margin:20px 0;padding:10px 20px;font-size:15px;">
-     <strong>WARNING:</strong><br/><br/>
-     If you have <a href="https://cloud.gitlab-pages.ics.muni.cz/documentation/register/#group-project">GROUP</a> project, you need to configure
-     Router gateway for your network. <a href="https://cloud.gitlab-pages.ics.muni.cz/documentation/network/#setup-router-gateway">Here</a> you can find the manual.
-  </div>
 
-## Setup Router gateway (Required for Group projects)
+## Setup Router gateway (Required only for GROUP projects!!)
 
   <div style="border-width:0;border-left:5px solid #b8d6f4;background-color:rgba(255,0,0,0.3);margin:20px 0;padding:10px 20px;font-size:15px;">
      <strong>WARNING:</strong><br/><br/>
      If you have <a href="https://cloud.gitlab-pages.ics.muni.cz/documentation/register/#group-project">GROUP</a> project, you need to configure
-     Router gateway for your network. <a href="https://cloud.gitlab-pages.ics.muni.cz/documentation/network/#setup-router-gateway">Here</a> you can find the manual.
+     Router gateway for your network. <a href="https://cloud.gitlab-pages.ics.muni.cz/documentation/network/#setup-router-gateway-required-for-group-projects">Here</a> you can find the manual.
   </div>
 
 
@@ -221,4 +217,4 @@ attached and detached from instances at any time, their creation and deletion ar
    given instance.
 5. __(optional)__ Select **Volume ID** from the drop-down list and click **Attach Volume**.
 
-For details, refer to [the official documentation](https://docs.openstack.org/horizon/rocky/user/manage-volumes.html).
+For details, refer to [the official documentation](https://docs.openstack.org/horizon/rocky/user/manage-volumes.html).
\ No newline at end of file