Merge branch 'master' into readme

.gitlab-ci.yml

@@ -24,6 +24,7 @@ capitalize:
   image: davidhrbac/docker-mkdocscheck:latest
   allow_failure: true
   script:
+  - scripts/titlemd_test.py mkdocs.yml
   - find docs.it4i/ -name '*.md' -print0 | xargs -0 -n1 scripts/titlemd_test.py
 
 spell check:

docs.it4i/general/obtaining-login-credentials/obtaining-login-credentials.md

@@ -118,6 +118,9 @@ Certificate generation process for academic purposes, utilizing the CESNET certi
 
 * [How to generate a personal TCS certificate in Mozilla Firefox web browser (in Czech)](http://idoc.vsb.cz/xwiki/wiki/infra/view/uzivatel/moz-cert-gen)
 
+!!! note
+    Certificate file can be installed into your email client. Web-based email interfaces cannot be used for secure communication, external application, such as Thunderbird or Outlook must be used. This way, your new credentials will be visible only in applications, that have access to your certificate.
+
 If you are not able to obtain certificate from any of the respected certification authorities, please follow the Alternative Way bellow.
 
 A FAQ about certificates can be found here: [Certificates FAQ](certificates-faq/).
@@ -131,18 +134,18 @@ Follow these steps **only** if you can not obtain your certificate in a standard
 
 * Go to [COMODO Application for Secure Email Certificate](https://secure.comodo.com/products/frontpage?area=SecureEmailCertificate).
 * Fill in the form, accept the Subscriber Agreement and submit it by the _Next_ button.
-  * Type in the e-mail address, which you intend to use for communication with us.
-  * Don't forget your chosen _Revocation password_.
+    * Type in the e-mail address, which you intend to use for communication with us.
+    * Don't forget your chosen _Revocation password_.
 * You will receive an e-mail with link to collect your certificate. Be sure to open the link in the same browser, in which you submited the application.
 * Your browser should notify you, that the certificate has been correctly installed in it. Now you will need to save it as a file.
 * In Firefox navigate to _Options > Advanced > Certificates > View Certificates_.
 * Choose the _Your Certificates_ tab and find the fresh certificate with today's date.
 * Select it and hit the _Backup..._ button
-* Standard save dialog should appear, where you can choose tha name of your certificate file for your easy identification in the future.
-* You will be prompted to choose a passphrase for yor new certificate. This passphrase will be needed for installation into your favourite email client.
+* Standard save dialog should appear, where you can choose a name for the certificate file for easy identification in the future.
+* You will be prompted to choose a passphrase for your new certificate. This passphrase will be needed for installation into your favourite email client.
 
 !!! note
-    Certificate file now can be installed into your email client. Web-based email interfaces cannot be used for secure communication, externall application, such as Thunderbird or Outlook must be used (instructions bellow). This way, your new credentials will be visible only in applications, that have access to your certificate.
+    Certificate file now can be installed into your email client. Web-based email interfaces cannot be used for secure communication, external application, such as Thunderbird or Outlook must be used (instructions bellow). This way, your new credentials will be visible only in applications, that have access to your certificate.
 
 ## Installation of the Certificate Into Your Mail Client
 

docs.it4i/salomon/shell-and-data-access.md

@@ -11,9 +11,9 @@ The Salomon cluster is accessed by SSH protocol via login nodes login1, login2,
 | ---------------------- | ---- | -------- | ------------------------------------- |
 | salomon.it4i.cz        | 22   | ssh      | round-robin DNS record for login[1-4] |
 | login1.salomon.it4i.cz | 22   | ssh      | login1                                |
-| login1.salomon.it4i.cz | 22   | ssh      | login1                                |
-| login1.salomon.it4i.cz | 22   | ssh      | login1                                |
-| login1.salomon.it4i.cz | 22   | ssh      | login1                                |
+| login2.salomon.it4i.cz | 22   | ssh      | login2                                |
+| login3.salomon.it4i.cz | 22   | ssh      | login3                                |
+| login4.salomon.it4i.cz | 22   | ssh      | login4                                |
 
 The authentication is by the [private key](../general/accessing-the-clusters/shell-access-and-data-transfer/ssh-keys/)
 

scripts/titlemd_test.py

@@ -26,16 +26,18 @@ def main(location):
       # Loop through the list of lines and titlecase
       # any line beginning with '#'.
       return_value = 0
-      prev_line = lines.pop(0)
+      prev_line = lines[0]
       disabled = 0
       echo_filename = False
+      if location.find("mkdocs.yml") != -1:
+          disabled = 1
       for line in lines:
-          if line.startswith("``") and disabled == 0:
+          if (line.startswith("``") or line.startswith("extra:")) and disabled == 0:
               disabled = 1
           else:
-              if line.startswith("``") and disabled == 1:
+              if (line.startswith("``") or prev_line.startswith("pages:")) and disabled == 1:
                   disabled = 0
-          if line.startswith('#') and disabled == 0:
+          if line.startswith('#') and (disabled == 0) and (location.find("mkdocs.yml") == -1):
             if line != titlecase(line[:(line.find("]"))], callback=abbreviations)+line[(line.find("]")):]:
               if return_value == 0 and echo_filename == False:
                 print("%s" % location)
@@ -53,6 +55,15 @@ def main(location):
               print("+"+titlecase(prev_line[:(prev_line.find("]"))], callback=abbreviations)+prev_line[(prev_line.find("]")):],end="")
               print()
               return_value = 1
+          if ((location.find("mkdocs.yml") != -1) and not line.startswith('#') and disabled == 0):
+            if line != titlecase(line[:(line.find(":"))], callback=abbreviations)+line[(line.find(":")):]:
+              if return_value == 0 and echo_filename == False:
+                print("%s" % location)
+                echo_filename = True
+              print("-"+line,end="")
+              print("+"+titlecase(line[:(line.find(":"))], callback=abbreviations)+line[(line.find(":")):],end="")
+              print()
+              return_value = 1
           prev_line = line
       exit(return_value)
 if __name__ == "__main__":