3 files changed, 19 insertions, 13 deletions

diff --git a/MANIFEST.MF b/MANIFEST.MF
new file mode 100644
index 0000000..8a0822f
--- /dev/null
+++ b/MANIFEST.MF
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0

+Ant-Version: Apache Ant 1.7.0

+Created-By: 11.2-b01 (Sun Microsystems Inc.)

+Built-By: Dipl.-Inform. (FH) Paul C. Buetow

+Main-Class: shared/Main

+

diff --git a/README.txt b/README.txt
index aedf8bf..1730753 100644
--- a/README.txt
+++ b/README.txt
@@ -33,12 +33,12 @@ computer.
 
 3. Start the server with 
 
-	java -jar NetCalendar --server-only
+	java -jar NetCalendar-$VERSION.jar --server-only
 
 4. Start the server with 
 
-	java -jar NetCalendar --client-only \
-	--server-address=HOSTORIPOFTHESERVER"
+	java -jar NetCalendar-$VERSION.jar --client-only \
+	--server-address=$SERVERHOST
 
 In order to stop the server, select "Server -> Shutdown server" in the GUI of
 the client. 
@@ -56,21 +56,21 @@ use_ssl to true.
 discribed in http://www.ibm.com/developerworks/java/library/j-customssl/ and
 save them for example into ./SSL. 
 
-3. Start the server with (replacing $(PASSWORD) by your passwords)
+3. Start the server with
 	java \
 	-Djavax.net.ssl.keyStore=./SSL/serverKeys \
-	-Djavax.net.ssl.keyStorePassword=$(PASSWORD) \
+	-Djavax.net.ssl.keyStorePassword=$PASSWORD \
 	-Djavax.net.ssl.trustStore=./SSL/serverTrust \
-	-Djavax.net.ssl.trustStorePassword=$(PASSWORD) \
-	-jar NetCalendar.jar --server-only
+	-Djavax.net.ssl.trustStorePassword=$PASSWORD \
+	-jar NetCalendar-$VERSION.jar --server-only
 
 4. Start the server with 
 	java \
 	-Djavax.net.ssl.keyStore=./SSL/clientKeys \
-	-Djavax.net.ssl.keyStorePassword=$(PASSWORD) \
+	-Djavax.net.ssl.keyStorePassword=$PASSWORD \
 	-Djavax.net.ssl.trustStore=./SSL/clientTrust \
-	-Djavax.net.ssl.trustStorePassword=$(PASSWORD) \
-	-jar NetCalendar.jar --client-only --server-address=SERVERHOST
+	-Djavax.net.ssl.trustStorePassword=$PASSWORD \
+	-jar NetCalendar-$VERSION.jar --client-only --server-address=$SERVERHOST
 
 
 IV. MORE OPTIONS
@@ -80,7 +80,7 @@ without any explicit options given.
 
 If you want to see more available parameters, then run the command
 
-	java -jar NetCalendar --help
+	java -jar NetCalendar-$VERSION.jar --help
 
 It is possible to configure the NetCalendar by editing the configuration file
 which is "config.txt". However, the preferred way is using the client GUI via
diff --git a/config.txt b/config.txt
index 589b593..a0f486a 100644
--- a/config.txt
+++ b/config.txt
@@ -1,12 +1,12 @@
 client_max_events=100;
-client_run=true;
+client_run=false;
 logfile=netcalendar.log;
 passphrase=dsfiu6786sdfsdhf;
 regexp_case_insensitive=true;
 server_address=localhost;
 server_database_dir=calendardb;
 server_port=4321;
-server_run=false;
+server_run=true;
 server_startup_command=none;
 server_updatedb_command=none;
 use_ssl=false;