diff --git a/config-templates/config.php b/config-templates/config.php
index b11a67825ce5616c7d949c60248ad1602cc28a4f..af726301cf5561e89d1ffbacbaa9ed049675125f 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -16,7 +16,6 @@ $config = array(
      *
      * Valid format for 'baseurlpath' is:
      * [(http|https)://(hostname|fqdn)[:port]]/[path/to/simplesaml/]
-     * (note that it must end with a '/')
      *
      * The full url format is useful if your SimpleSAMLphp setup is hosted behind
      * a reverse proxy. In that case you can specify the external url here.
diff --git a/docs/simplesamlphp-install.txt b/docs/simplesamlphp-install.txt
index 47eab75c22d42fd6256b5372f397254147cdfcd8..5e3c8c33900cda98269a7e8919f85b5c937c8c2c 100644
--- a/docs/simplesamlphp-install.txt
+++ b/docs/simplesamlphp-install.txt
@@ -160,8 +160,8 @@ file, `config.php`, right away:
     be used for receiving error reports sent automatically by
     SimpleSAMLphp. Here is an example:
 
-		'technicalcontact_name'     => 'Andreas Ă…kre Solberg',
-		'technicalcontact_email'    => 'andreas.solberg@uninett.no',
+		'technicalcontact_name'     => 'John Smith',
+		'technicalcontact_email'    => 'john.smith@example.com',
 
 -  
     If you use SimpleSAMLphp in a country where English is not
@@ -291,11 +291,11 @@ Next, you need to update the configuration of paths in `simplesamlphp/config/con
 
 And, then we need to set the `baseurlpath` parameter to match the base path of the URLs to the content of your `www` folder:
 
-    'baseurlpath' => '~andreas/simplesaml/',
+    'baseurlpath' => '/simplesaml/',
 
 Now, you can go to the URL of your installation and check if things work:
 
-    http://yourcompany.com/~andreas/simplesaml/
+    http://yourcompany.com/simplesaml/
 
 
 ### Tip
@@ -324,7 +324,7 @@ Change the two lines from:
 
 to something like:
 
-    require_once('/home/andreas/simplesamlphp/lib/_autoload.php');
+    require_once('/var/www/simplesamlphp/lib/_autoload.php');
 
 And then at the end of the file, you need to change another line
 from:
@@ -333,7 +333,7 @@ from:
 
 to:
 
-    $configdir = '/home/andreas/simplesamlphp/config';
+    $configdir = '/var/www/simplesamlphp/config';