diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-11-18 20:59:05 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-11-18 20:59:05 +0100 |
| commit | c56cc74a41f81daf222bbb2a5a8a3000023724c6 (patch) | |
| tree | 630f824de1430afc110d9dff4f7d820fc0facbc8 /inc/lang/en | |
| parent | fea16134dac4e09977d36c902f692379d07a3e96 (diff) | |
| parent | 2c2ee174e46096ce890518061ca8e2e0866cf67c (diff) | |
| download | rpg-c56cc74a41f81daf222bbb2a5a8a3000023724c6.tar.gz rpg-c56cc74a41f81daf222bbb2a5a8a3000023724c6.tar.bz2 | |
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
Diffstat (limited to 'inc/lang/en')
| -rw-r--r-- | inc/lang/en/lang.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 0e5a9ac3c..996f98266 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -302,9 +302,9 @@ $lang['i_writeerr'] = 'Unable to create <code>%s</code>. You will nee $lang['i_badhash'] = 'unrecognised or modified dokuwiki.php (hash=<code>%s</code>)'; $lang['i_badval'] = '<code>%s</code> - illegal or empty value'; $lang['i_success'] = 'The configuration was finished successfully. You may delete the install.php file now. Continue to - <a href="doku.php">your new DokuWiki</a>.'; + <a href="doku.php?id=wiki:welcome">your new DokuWiki</a>.'; $lang['i_failure'] = 'Some errors occurred while writing the configuration files. You may need to fix them manually before - you can use <a href="doku.php">your new DokuWiki</a>.'; + you can use <a href="doku.php?id=wiki:welcome">your new DokuWiki</a>.'; $lang['i_policy'] = 'Initial ACL policy'; $lang['i_pol0'] = 'Open Wiki (read, write, upload for everyone)'; $lang['i_pol1'] = 'Public Wiki (read for everyone, write and upload for registered users)'; |