Fixed instructions

git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@288 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414

1 files changed, 23 insertions, 17 deletions

diff --git a/kpov_judge/tasks/set_motd/task.py b/kpov_judge/tasks/set_motd/task.py
index cfea848..b5d1b3c 100644
--- a/kpov_judge/tasks/set_motd/task.py
+++ b/kpov_judge/tasks/set_motd/task.py
@@ -5,35 +5,41 @@
 # kpov_random_helpers should be imported by add_assignment.py
 # OrderedDict = SON
 
-
 instructions = {
     "si":u"""
-Ustvari dva navidezna računalnika - imenujmo ju SimpleArbiterDhcpGW in Student. Za računalnik SimpleArbiterDhcpGW uporabite
-sliko diska, poimenovano SimpleArbiterDhcpGW. Na računalniku SimpleArbiterDhcpGW dobite kratek niz. Poskrbite, da se bo ta
-kratki niz pojavil v sporočilu, ki se ob prijavi izpiše na računalniku Student. Temu sporočilu v
-angleščini rečemo "message of the day" - MOTD.
+Ustvari dva navidezna računalnika - imenujmo ju SimpleArbiterDhcpGW in
+Student. Za računalnik SimpleArbiterDhcpGW uporabite sliko diska, poimenovano
+SimpleArbiterDhcpGW. 
+
+Na računalniku Student ustvarite uporabnika z uporabniškim imenom {peer_user}.
 
-Poskrbite, da se bo ob prijavi uporabnika (v Message Of The Day, MOTD) prek ssh izpisal nek niz.
-Računalnik nastavite tako, da bo dostopen s testnega računalnika (SimpleArbiterDhcpGW). Najpreprosteje bo,
-da SimpleArbiterDhcpGW priklopite na omrežje, ki ima dostop do Interneta (npr. prek NAT) in na navidezno omrežje med
-navideznimi računalniki (npr. intnet); računalnik Student priklopite le na navidezno omrežje (npr. intnet).
+Poskrbite, da se bo v sporočilu, ki se ob prijavi izpiše na računalniku 
+Student, pojavil niz "{niz}". Temu sporočilu v angleščini rečemo 
+"message of the day" - MOTD.
 
-Uporabniško ime in niz dobite kot parametre ob zagonu run_test.py. Pri nizu pazite, saj utegne biti dovolj dolg, da brez premikanja kurzorja ne bo takoj viden.
+IP navideznega računalnika Student ter geslo za {peer_user} nastavite sami.
 
-IP navideznega računalnika ter geslo nastavite sami.
+Ocenjevalni program pričakuje, da se bo ob koncu prijave pojavila ukazna 
+vrstica oblike uporabnisko_ime@ime_racunalnika:~$ . 
 
-Ocenjevalni program pričakuje, da se bo ob koncu prijave pojavila ukazna vrstica oblike uporabnisko_ime@ime_racunalnika:~$ . Pazite, da se bo takšna vrstica pojavila šele po nizu, ki ste ga dobili v navodilih.
+Pazite, da se bo takšna vrstica pojavila šele po nizu, ki ste ga dobili v
+teh navodilih.
     """,
     'en':u"""
-Create two virtual machines - named SimpleArbiterDhcpGW and Student. For the 'SimpleArbiterDhcpGW' use disc image named SimpleArbiterDhcpGW. You receive short string on machine 'SimpleArbiterDhcpGW'. Make sure that this string appears in the message which is displayed after you login to machine 'Student'. This is so called 'message of the day'MOTD.
+Create two virtual machines - named SimpleArbiterDhcpGW and Student. 
+For the 'SimpleArbiterDhcpGW', use disc image named SimpleArbiterDhcpGW.
 
-Make sure that when the user logins via ssh some string is displayed. Set the machine, so that you can reach it from test computer (SimpleArbiterDhcpGW)
+On Student, create a user with the username {peer_user}.
 
-You get username and string as parameters when you run run_test.py. Pay attention to the string length, it might not be visible right away without moving the cursor.
+Set the message of the day (MOTD) on Student to "{niz}". This is the message
+which is displayed when you log in.
 
-Set up IP and password of virtual machine yourself.
+Set the IP of Student and the password for {peer_user} yourself.
 
-Grading system expects, that at the end of login, a command line similar to uporabnisko_ime@ime_racunalnika:~$ appears. Make sure that this line shows up after the string you got in the instructions.
+The grading system expects that at the end of login, 
+a prompt similar to username@name_of_computer:~$ appears. 
+Make sure that this line shows up only after the 
+string you got in these instructions.
 """
 }