diff options
| author | VirtualTam <virtualtam+github@flibidi.net> | 2017-08-27 13:12:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-27 13:12:58 +0200 |
| commit | e8cef3ac43d5a50485c72ea2e8267e92b00be609 (patch) | |
| tree | e45ad82f528afd1b8a126efb8d50bb4a01dda779 /application | |
| parent | 5941c4216d804da5dfec9eeafa676105576bd0d1 (diff) | |
| parent | cc8f572bc063aa1e9d0368c8a8361f15efe04c9b (diff) | |
| download | Shaarli-e8cef3ac43d5a50485c72ea2e8267e92b00be609.tar.gz Shaarli-e8cef3ac43d5a50485c72ea2e8267e92b00be609.tar.zst Shaarli-e8cef3ac43d5a50485c72ea2e8267e92b00be609.zip | |
Merge pull request #942 from thewilli/fix-wiki-links
migrated Github wiki links to readthedocs
Diffstat (limited to 'application')
| -rw-r--r-- | application/LinkDB.php | 2 | ||||
| -rw-r--r-- | application/config/ConfigManager.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/application/LinkDB.php b/application/LinkDB.php index 9308164a..22c1f0ab 100644 --- a/application/LinkDB.php +++ b/application/LinkDB.php | |||
| @@ -249,7 +249,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess | |||
| 249 | $link = array( | 249 | $link = array( |
| 250 | 'id' => 1, | 250 | 'id' => 1, |
| 251 | 'title'=>' Shaarli: the personal, minimalist, super-fast, no-database delicious clone', | 251 | 'title'=>' Shaarli: the personal, minimalist, super-fast, no-database delicious clone', |
| 252 | 'url'=>'https://github.com/shaarli/Shaarli/wiki', | 252 | 'url'=>'https://shaarli.readthedocs.io', |
| 253 | 'description'=>'Welcome to Shaarli! This is your first public bookmark. To edit or delete me, you must first login. | 253 | 'description'=>'Welcome to Shaarli! This is your first public bookmark. To edit or delete me, you must first login. |
| 254 | 254 | ||
| 255 | To learn how to use Shaarli, consult the link "Help/documentation" at the bottom of this page. | 255 | To learn how to use Shaarli, consult the link "Help/documentation" at the bottom of this page. |
diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php index 8eab26f1..0fc5a5c7 100644 --- a/application/config/ConfigManager.php +++ b/application/config/ConfigManager.php | |||
| @@ -9,8 +9,8 @@ use Shaarli\Config\Exception\UnauthorizedConfigException; | |||
| 9 | * | 9 | * |
| 10 | * Manages all Shaarli's settings. | 10 | * Manages all Shaarli's settings. |
| 11 | * See the documentation for more information on settings: | 11 | * See the documentation for more information on settings: |
| 12 | * - doc/Shaarli-configuration.html | 12 | * - doc/md/Shaarli-configuration.md |
| 13 | * - https://github.com/shaarli/Shaarli/wiki/Shaarli-configuration | 13 | * - https://shaarli.readthedocs.io/en/master/Shaarli-configuration/#configuration |
| 14 | */ | 14 | */ |
| 15 | class ConfigManager | 15 | class ConfigManager |
| 16 | { | 16 | { |