Merge branch 'guide' of git://github.com/splitbrain/dokuwiki into pull-request-118

* 'guide' of git://github.com/splitbrain/dokuwiki:
  changed semicolon to colon in link to welcome page to make it less confusing
  added initial pages to not be ignored by git
  improved welcome text
  added welcome page
  changed the link in the installer to point to wiki:welcome

Conflicts:
	inc/lang/fr/lang.php