Mv info about login from account.rst to login.rst

uit-no · Oct 1, 2015 · 793b33c · 793b33c
1 parent d8cbf2f
commit 793b33c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 30 deletions.
diff --git a/guides/user/account.rst b/guides/user/account.rst
@@ -38,28 +38,4 @@ at the same time!
 Before you start using Stallo, please read the `University of
 Tromsø's guidelines <guidelines>`_.
 
-Information about how to log in on Stallo with ssh, and how to learn more about ssh.
-====================================================================================
-
-An SSH client (Secure SHell) is the required tool to connect to
-Stallo. To learn more about this, check out the `Metasenter page on SSH 
-<http://docs.notur.no/metacenter/metacenter-documentation/metacenter_user_guide/log-in-with-ssh>`_.
-
-.. FIXME: fix link to docs.notur.no 
-
-Obtain a new password
-=====================
-
-When you have been granted an account on stallo.uit.no, your username and password is sent to you separat. 
-the username by email and the password by SMS.  The password you receive by SMS is temporally and only valid for 7 days.  
-
-The passwd command does not seem to work. My password is reset back to the old one after a while. Why is this happening?
-------------------------------------------------------------------------------------------------------------------------
-
-The Stallo system is using a centralised database for user management.
-This will override the password changes done locally on Stallo.
-
-The password can be changed `here <https://www.metacenter.no/user/password/>`_, log in using your
-username on stallo and the NOTUR domain.
-
 .. vim:ft=rst
diff --git a/guides/user/login.rst b/guides/user/login.rst
@@ -1,4 +1,4 @@
-
+==========
 Logging in
 ==========
 
@@ -8,17 +8,25 @@ learn more about this, check out the `Metasenter page on SSH. <http://docs.notur
 .. FIXME: fix link to docs.notur.no 
 
 Obtain a new password
-----------------------
+=====================
+When you have been granted an account on stallo.uit.no, your username and password is sent to you separately.
+The username by email and the password by SMS. The password you receive by SMS is temporally and only valid for 7 days. 
+
 
-When you have been granted an account on stallo.uit.no, your username and
-password will be sent to you.
+The passwd command does not seem to work. My password is reset back to the old one after a while. Why is this happening?
+------------------------------------------------------------------------------------------------------------------------
 
-The password can be changed `here <https://www.metacenter.no/user/password/>`_ , log in using your username on stallo and the NOTUR domain.
+The Stallo system is using a centralised database for user management.
+This will override the password changes done locally on Stallo.
+
+The password can be changed `here <https://www.metacenter.no/user/password/>`_, log in using your
+username on stallo and the NOTUR domain.
 
 .. FIXME: **Something about keys here?**
 
+
 Logging on the compute nodes
-----------------------------
+============================
 
 Information on how to log in on a compute node.