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, 9 deletions

diff --git a/kpov_judge/tasks/openvpn_simple_smb/task.py b/kpov_judge/tasks/openvpn_simple_smb/task.py
index 3304fb3..e530bf0 100644
--- a/kpov_judge/tasks/openvpn_simple_smb/task.py
+++ b/kpov_judge/tasks/openvpn_simple_smb/task.py
@@ -5,22 +5,36 @@
 
 instructions = {
     'si':u"""
-Postavi dva navidezna racunalnika - SimpleArbiter z diska SimpleArbiterVPN ter
-VPNClient1. Nastavite jima nastavite pravilne mrežne nastavitve (medsebojna povezava in povezava na splet).
-Na VPNClient1 namestite OpenVPN in program za nadzor nad virtualnimi napravami (s katerim kreirate napravo tap).
+Postavi dva navidezna računalnika - SimpleArbiter z diska SimpleArbiterVPN ter
+VPNClient1. Poskrbite, da bosta povezana med seboj in v Internet.
+Na VPNClient1 namestite OpenVPN in program za nadzor nad virtualnimi napravami
+(s katerim kreirate napravo tap).
 
-Na strežniku SimpleArbiterVPN že teče VPN strežnik, ki uporablja skrivnost, ki jo najdete tudi na VPNClient1 v domačem imeniku uporabnika student.
-Na VPNClient1 vzpostavite VPN tako, da napišete primerno datoteko z nastavitvami.
+Na strežniku SimpleArbiterVPN že teče VPN strežnik in uporablja skrivnost, 
+ki jo najdete tudi na VPNClient1 v domačem imeniku uporabnika student.
+Na VPNClient1 vzpostavite VPN tako, da napišete primerno datoteko z 
+nastavitvami.
 
 Nato poskrbite, da bo na VPNClient1 na navideznem omrežju prek NFS omogočen
-dostop do imenika /home/tester/DIRNAME, pri čemer DIRNAME preberite na SimpleArbiter.
+dostop do imenika /home/tester/{DIRNAME}.
 V ta imenik skopirajte datoteke, ki so prek SMB dostopne na SimpleArbiter.
 """,
 	'en':u"""
 Setup two virtual machines - SimpleArbiterVPN and a VPN client (VPNClient1). 
-Set the client's network up so that it has access to the internal network and internet. On VPNClient1, install OpenVPN and a program for supervising virtual devices (which you will use to create device tap).
-An OpenVPN server is already running on SimpleArbiterVPN. Use the secret available on VPNClient1 in the home directory of user student to connect to the VPN server on SimpleArbiterVPN. To do that, you will have to write your own OpenVPN configuration file. After you have set up the VPN, make the directory
-/home/test/DIRNAME on VPNClient1 available over NFS from SimpleArbiter over your VPN. Copy files that are available from SimpleArbiter over SMB to DIRNAME.
+Set the client's network up so that it has access to the internal network and
+the internet.
+On VPNClient1, install OpenVPN and a program for supervising virtual devices 
+(which you will use to create a tap device).
+
+An OpenVPN server is already running on SimpleArbiterVPN. Use the secret 
+available on VPNClient1 in the home directory of user student to connect to 
+the VPN server on SimpleArbiterVPN. To do that, you will have to write your
+own OpenVPN configuration file. 
+
+After you have set up the VPN, make the directory
+/home/test/{DIRNAME} on VPNClient1 available over NFS from SimpleArbiter over
+your VPN. Copy files that are available from SimpleArbiter over SMB to
+/home/test/{DIRNAME}.
 """
 }