1 files changed, 27 insertions, 38 deletions
diff --git a/kpov_judge/tasks/edit_find_grep_compile_convert/task.py b/kpov_judge/tasks/edit_find_grep_compile_convert/task.py
index 7a96a0b..48b713b 100644
--- a/kpov_judge/tasks/edit_find_grep_compile_convert/task.py
+++ b/kpov_judge/tasks/edit_find_grep_compile_convert/task.py
@@ -5,54 +5,43 @@
 # - switch to a real SSH/SFTP client to properly handle filenames
 
 instructions = {
-    'si':"""
-Ustvari dva navidezna računalnika s slikama diskov 
-- SimpleArbiter s sliko diska simpleArbiterDhcp in 
-SmallStudent s sliko diska student-entrance2.
+    'si': '''\
+<p>
+Ustvari dva navidezna računalnika: <em>SimpleArbiter</em> <em>SmallStudent</em>.
 
-Na SimpleArbiter se lahko prijaviš z uporabniškim imenom tester in geslom tester.
-Na SmallStudent se lahko prijaviš kot root z geslom kaboom.
+<p>
+Poskrbi, da bo <em>SmallStudent</em> s <em>SimpleArbiter</em> dostopen na naslovu <code>{{testip}}</code>.
 
-Poskrbi, da bo SmallStudent s SimpleArbiter dostopen na naslovu {testip}.
+<p>
+Na <em>SmallStudent</em> ustvari uporabnika <code>{{testuser}}</code> z geslom <code>{{passwd}}</code>.
 
-Na SmallStudent ustvari uporabnika {testuser} z geslom {passwd}.
+<p>
+Na <em>SmallStudent</em> je nekje v domačem imeniku uporabnika <code>bilbo</code> skrita datoteka, ki vsebuje niz <code>{{magicstr}}</code>. Skopiraj jo v domači imenik uporabnika <code>{{testuser}}</code> in jo poimenuj <code>{{dstfile}}</code>. Poskrbi, da bo lastnik <code>{{testuser}}</code>, skupina pa naj bo enaka kot pri izvorni datoteki. Brati naj jo ima pravico samo lastnik, pisati lastnik in skupina, poganjati nihče.
 
-Na SmallStudent je nekje v domačem imeniku uporabnika "bilbo" skrita datoteka, ki vsebuje niz {magicstr}.
-Skopiraj jo v domači imenik {testuser} in poimenuj {dstfile}.
-Poskrbi, da bo lastnik {testuser}, skupina pa naj ostane nespremenjena.
-Brati naj jo ima pravico samo lastnik, pisati lastnik in skupina, poganjati nihče.
-V {dstfile} zamenjaj vse vrstice oblike poXYZlz, kjer so XYZ poljubni znaki, tako, da bo namesto XYZ niz "kaka".
+<p>
+V <code>{{dstfile}}</code> zamenjaj vse vrstice oblike <code>poXYZlz</code>, kjer je <code>XYZ</code> poljubno zaporedje znakov, tako, da bo namesto <code>XYZ</code> niz <code>kaka</code>.
 
-Napiši program v poljubnem programskem jeziku, ki kot argument sprejme število B med 0 in 7.
-Program naj prebere znak s standardnega vhoda. 
-Če je B-ti bit v znaku nastavljen na 1, naj izpiše "ta".
-Če je B-ti bit nastavljen na 0, naj program izpiše "ti".
-Program poimenuj {progname} in ga spravi v domači imenik {testuser}.
-""",
-    'en': '''
-Create two virtual machines
-- SimpleArbiter using simpleArbiterDhcp as the disk image and
-SmallStudent using student-entrance2 as its disk.
+<p>
+Napiši program v poljubnem programskem jeziku, ki kot argument sprejme število B med 0 in 7. Program naj prebere znak s standardnega vhoda  Če je B-ti bit v znaku nastavljen na 1, naj izpiše <code>ta</code>. Če je B-ti bit nastavljen na 0, naj program izpiše <code>ti</code>. Program poimenuj <code>{{progname}}</code> in ga spravi v domači imenik uporabnika <code>{{testuser}}</code>.
+''',
+    'en': '''\
+<p>
+Create two virtual machines: <em>SimpleArbiter</em> and <em>SmallStudent</em>.
 
-You can log in as tester on SimpleArbiter with the password tester.
-You can log in as root on SimpleStudent with the password kaboom.
+<p>
+Make sure that <em>SmallStudent</em> is accessible from <em>SimpleArbiter</em> on IP <code>{{testip}}</code>.
 
-Make sure that SmallStudent is accessible from SimpleArbiter on IP {testip}.
+<p>
+Create a user <code>{{testuser}}</code> with the password <code>{{passwd}}</code> on <em>SmallStudent</em>.
 
-Create a user {testuser} with the password {passwd} on SmallStudent.
+<p>
+There is a file containing <code>{{magicstr}}</code> hidden somewhere in the home directory of user <code>bilbo</code>. Copy it into <code>{{testuser}}</code>’s home directory and name it <code>{{dstfile}}</code>. Change the owner to <code>{{testuser}}</code> and ensure the group is the same as for the original file. Make sure only the owner has the right to read it, only the owner and group members have the right to write to it and nobody has the right to execute it.
 
-There is a file containing {magicstr} hidden somewhere in the home directory of
-user "bilbo".
-Copy the into the home directory of user {testuser} and name it {dstfile}.
-Change the owner to {testuser} and leave the group unchanged.
-Make sure only the owner has the right to read it, only the owner and group members have the right to write to it and noone has the right to execute it.
-In {dstfile}, replace all lines of the form poXYZlz where XYZ are arbitrary characters so that XYZ is replaced by "kaka".
+<p>
+In <code>{{dstfile}}</code>, replace all lines of the form <code>poXYZlz</code> where <code>XYZ</code> are arbitrary characters so that <code>XYZ</code> is replaced by <code>kaka</code>.
 
-Write a program in any programming language.
-The program should accept a single argument, B, which is a number between 0 and 7.
-It should read a character from standard input and output "ta" if B-th bit in this character is
-set to 1. If B-th bit is not set, the program should output "ti".
-Name the program {progname} and place it in the home directory of {testuser}.
+<p>
+Write a program in any programming language. The program should accept a single argument B, which is a number between 0 and 7. It should read a character from standard input and output <code>ta</code> if B-th bit in this character is set to 1, and <code>ti</code>. If B-th bit is set to 0. Name the program <code>{{progname}}</code> and place it in the home directory of <code>{{testuser}}</code>.
 ''',
 }