diff options
| author | VirtualTam <virtualtam+github@flibidi.net> | 2017-10-08 16:35:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-08 16:35:33 +0200 |
| commit | 0a496258af71ab77eacb9e7ccd27471a65b61fa0 (patch) | |
| tree | b2fc8cc0363919b7ba56ceddbd86c60e2c6ba6f0 /doc | |
| parent | 78865393a687a4c057109fa51f22934ad078d482 (diff) | |
| parent | ba6245670d071abcc6e90c0f277222ec5e55b413 (diff) | |
| download | Shaarli-0a496258af71ab77eacb9e7ccd27471a65b61fa0.tar.gz Shaarli-0a496258af71ab77eacb9e7ccd27471a65b61fa0.tar.zst Shaarli-0a496258af71ab77eacb9e7ccd27471a65b61fa0.zip | |
Merge pull request #990 from danieljakots/master
Fix link in Upgrade-and-migration.md
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/md/Upgrade-and-migration.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/md/Upgrade-and-migration.md b/doc/md/Upgrade-and-migration.md index b3a08764..7033cd41 100644 --- a/doc/md/Upgrade-and-migration.md +++ b/doc/md/Upgrade-and-migration.md | |||
| @@ -14,7 +14,7 @@ Shaarli stores all user data under the `data` directory: | |||
| 14 | - `data/ipbans.php` - banned IP addresses | 14 | - `data/ipbans.php` - banned IP addresses |
| 15 | - `data/updates.txt` - contains all automatic update to the configuration and datastore files already run | 15 | - `data/updates.txt` - contains all automatic update to the configuration and datastore files already run |
| 16 | 16 | ||
| 17 | See [Shaarli configuration](Shaarli configuration) for more information about Shaarli resources. | 17 | See [Shaarli configuration](Shaarli-configuration) for more information about Shaarli resources. |
| 18 | 18 | ||
| 19 | It is recommended to backup this repository _before_ starting updating/upgrading Shaarli: | 19 | It is recommended to backup this repository _before_ starting updating/upgrading Shaarli: |
| 20 | 20 | ||
| @@ -27,7 +27,7 @@ As all user data is kept under `data`, this is the only directory you need to wo | |||
| 27 | 27 | ||
| 28 | - backup the `data` directory | 28 | - backup the `data` directory |
| 29 | - install or update Shaarli: | 29 | - install or update Shaarli: |
| 30 | - fresh installation - see [Download and installation](Download and installation) | 30 | - fresh installation - see [Download and installation](Download-and-installation) |
| 31 | - update - see the following sections | 31 | - update - see the following sections |
| 32 | - check or restore the `data` directory | 32 | - check or restore the `data` directory |
| 33 | 33 | ||
| @@ -35,11 +35,11 @@ As all user data is kept under `data`, this is the only directory you need to wo | |||
| 35 | 35 | ||
| 36 | All tagged revisions can be downloaded as tarballs or ZIP archives from the [releases](https://github.com/shaarli/Shaarli/releases) page. | 36 | All tagged revisions can be downloaded as tarballs or ZIP archives from the [releases](https://github.com/shaarli/Shaarli/releases) page. |
| 37 | 37 | ||
| 38 | We recommend that you use the latest release tarball with the `-full` suffix. It contains the dependencies, please read [Download and installation](Download and installation) for `git` complete instructions. | 38 | We recommend that you use the latest release tarball with the `-full` suffix. It contains the dependencies, please read [Download and installation](Download-and-installation) for `git` complete instructions. |
| 39 | 39 | ||
| 40 | Once downloaded, extract the archive locally and update your remote installation (e.g. via FTP) -be sure you keep the content of the `data` directory! | 40 | Once downloaded, extract the archive locally and update your remote installation (e.g. via FTP) -be sure you keep the content of the `data` directory! |
| 41 | 41 | ||
| 42 | After upgrading, access your fresh Shaarli installation from a web browser; the configuration and data store will then be automatically updated, and new settings added to `data/config.json.php` (see [Shaarli configuration](Shaarli configuration) for more details). | 42 | After upgrading, access your fresh Shaarli installation from a web browser; the configuration and data store will then be automatically updated, and new settings added to `data/config.json.php` (see [Shaarli configuration](Shaarli-configuration) for more details). |
| 43 | 43 | ||
| 44 | ## Upgrading with Git | 44 | ## Upgrading with Git |
| 45 | 45 | ||
| @@ -173,7 +173,7 @@ Total 3317 (delta 2050), reused 3301 (delta 2034)to | |||
| 173 | 173 | ||
| 174 | #### Step 3: configuration | 174 | #### Step 3: configuration |
| 175 | 175 | ||
| 176 | After migrating, access your fresh Shaarli installation from a web browser; the configuration will then be automatically updated, and new settings added to `data/config.php` (see [Shaarli configuration](Shaarli configuration) for more details). | 176 | After migrating, access your fresh Shaarli installation from a web browser; the configuration will then be automatically updated, and new settings added to `data/config.php` (see [Shaarli configuration](Shaarli-configuration) for more details). |
| 177 | 177 | ||
| 178 | ## Troubleshooting | 178 | ## Troubleshooting |
| 179 | 179 | ||