Skip to content

Commit b63e2e0

Browse files
deorentechknowlogick
authored andcommitted
Update en-us and fr-fr versions of the "Upgrade from Gogs" doc (#4618)
* Update "Upgrade from Gogs" en-us doc - Move "Change gogs specific information" FROM/TO steps up to just beneath matching section header, adjust indention and explicitly specify syntax of code sample to provide highlighting - Adjust header levels to match what appears to be the intended level, remove trailing decoration (see below) - Move "Upgrading to most recent ..." section down, remove decoration (section header formatting likely covers this well enough already) refs #4286, #3558 * Update "Upgrade from Gogs" fr-fr doc - Adjust indention and explicitly specify syntax of code sample to provide highlighting - Adjust header levels to match what appears to be the intended level, remove trailing decoration since section header formatting likely covers this well enough already refs #4286, #3558
1 parent 0a24f5c commit b63e2e0

File tree

2 files changed

+62
-57
lines changed

2 files changed

+62
-57
lines changed

docs/content/doc/upgrade/from-gogs.en-us.md

+33-30
Original file line numberDiff line numberDiff line change
@@ -33,50 +33,53 @@ There are some basic steps to follow. On a Linux system run as the Gogs user:
3333
* Enter Gitea admin panel on the UI, run `Rewrite '.ssh/authorized_keys' file`.
3434
* If custom or config path was changed, run `Rewrite all update hook of repositories`.
3535

36-
### Change gogs specific information:
36+
## Change gogs specific information
3737

3838
* Rename `gogs-repositories/` to `gitea-repositories/`
3939
* Rename `gogs-data/` to `gitea-data/`
4040
* In `gitea/custom/conf/app.ini` change:
4141

42-
### Upgrading to most recent `gitea` version:
42+
FROM:
43+
44+
```ini
45+
[database]
46+
PATH = /home/:USER/gogs/data/:DATABASE.db
47+
[attachment]
48+
PATH = /home/:USER/gogs-data/attachments
49+
[picture]
50+
AVATAR_UPLOAD_PATH = /home/:USER/gogs-data/avatars
51+
[log]
52+
ROOT_PATH = /home/:USER/gogs/log
53+
```
54+
55+
TO:
56+
57+
```ini
58+
[database]
59+
PATH = /home/:USER/gitea/data/:DATABASE.db
60+
[attachment]
61+
PATH = /home/:USER/gitea-data/attachments
62+
[picture]
63+
AVATAR_UPLOAD_PATH = /home/:USER/gitea-data/avatars
64+
[log]
65+
ROOT_PATH = /home/:USER/gitea/log
66+
```
67+
68+
* Verify by starting Gitea with `gitea web`
69+
70+
## Upgrading to most recent `gitea` version
71+
4372
After successful migration from `gogs` to `gitea 1.0.x` it is possible to upgrade to the recent `gitea` version.
4473
Simply download the file matching the destination platform from the [downloads page](https://dl.gitea.io/gitea)
4574
and replace the binary.
4675

47-
FROM:
48-
```
49-
[database]
50-
PATH = /home/:USER/gogs/data/:DATABASE.db
51-
[attachment]
52-
PATH = /home/:USER/gogs-data/attachments
53-
[picture]
54-
AVATAR_UPLOAD_PATH = /home/:USER/gogs-data/avatars
55-
[log]
56-
ROOT_PATH = /home/:USER/gogs/log
57-
```
58-
59-
TO:
60-
```
61-
[database]
62-
PATH = /home/:USER/gitea/data/:DATABASE.db
63-
[attachment]
64-
PATH = /home/:USER/gitea-data/attachments
65-
[picture]
66-
AVATAR_UPLOAD_PATH = /home/:USER/gitea-data/avatars
67-
[log]
68-
ROOT_PATH = /home/:USER/gitea/log
69-
```
70-
71-
* Verify by starting Gitea with `gitea web`
72-
73-
### Troubleshooting
76+
## Troubleshooting
7477

7578
* If errors are encountered relating to custom templates in the `gitea/custom/templates`
7679
folder, try moving the templates causing the errors away one by one. They may not be
7780
compatible with Gitea or an update.
7881

79-
### Add Gitea to startup on Unix
82+
## Add Gitea to startup on Unix
8083

8184
Update the appropriate file from [gitea/contrib](https://github.com/go-gitea/gitea/tree/master/contrib)
8285
with the right environment variables.

docs/content/doc/upgrade/from-gogs.fr-fr.md

+29-27
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ menu:
1919

2020
Veuillez suivre les étapes ci-dessous. Sur Unix, toute les commandes s'exécutent en tant que l'utilisateur utilisé pour votre installation de Gogs :
2121

22-
* Crééer une sauvegarde de Gogs avec la commande `gogs dump`. Le fichier nouvellement créé `gogs-dump-[timestamp].zip` contient toutes les données de votre instance de Gogs.
22+
* Crééer une sauvegarde de Gogs avec la commande `gogs dump`. Le fichier nouvellement créé `gogs-dump-[timestamp].zip` contient toutes les données de votre instance de Gogs.
2323
* Téléchargez le fichier correspondant à votre plateforme à partir de la [page de téléchargements](https://dl.gitea.io/gitea).
2424
* Mettez la binaire dans le répertoire d'installation souhaité.
2525
* Copiez le fichier `gogs/custom/conf/app.ini` vers `gitea/custom/conf/app.ini`.
@@ -29,43 +29,45 @@ Veuillez suivre les étapes ci-dessous. Sur Unix, toute les commandes s'exécute
2929
* Vérifiez votre installation en exécutant Gitea avec la commande `gitea web`.
3030
* Connectez vous au panel d'administration de Gitea et exécutez l'action `Rewrite '.ssh/authorized_keys' file`, puis l'action `Rewrite all update hook of repositories` (obligatoire si le chemin menant à votre configuration personnalisée à changé).
3131

32-
### Modifier les informations spécifiques de gogs
32+
## Modifier les informations spécifiques de gogs
3333

3434
* Renommez `gogs-repositories/` vers `gitea-repositories/`
3535
* Renommez `gogs-data/` to `gitea-data/`
3636
* Dans votre fichier `gitea/custom/conf/app.ini`, modifiez les éléments suivants:
3737

38-
DE :
39-
```
40-
[database]
41-
PATH = /home/:USER/gogs/data/:DATABASE.db
42-
[attachment]
43-
PATH = /home/:USER/gogs-data/attachments
44-
[picture]
45-
AVATAR_UPLOAD_PATH = /home/:USER/gogs-data/avatars
46-
[log]
47-
ROOT_PATH = /home/:USER/gogs/log
48-
```
49-
50-
VERS :
51-
```
52-
[database]
53-
PATH = /home/:USER/gitea/data/:DATABASE.db
54-
[attachment]
55-
PATH = /home/:USER/gitea-data/attachments
56-
[picture]
57-
AVATAR_UPLOAD_PATH = /home/:USER/gitea-data/avatars
58-
[log]
59-
ROOT_PATH = /home/:USER/gitea/log
60-
```
38+
DE :
39+
40+
```ini
41+
[database]
42+
PATH = /home/:USER/gogs/data/:DATABASE.db
43+
[attachment]
44+
PATH = /home/:USER/gogs-data/attachments
45+
[picture]
46+
AVATAR_UPLOAD_PATH = /home/:USER/gogs-data/avatars
47+
[log]
48+
ROOT_PATH = /home/:USER/gogs/log
49+
```
50+
51+
VERS :
52+
53+
```ini
54+
[database]
55+
PATH = /home/:USER/gitea/data/:DATABASE.db
56+
[attachment]
57+
PATH = /home/:USER/gitea-data/attachments
58+
[picture]
59+
AVATAR_UPLOAD_PATH = /home/:USER/gitea-data/avatars
60+
[log]
61+
ROOT_PATH = /home/:USER/gitea/log
62+
```
6163

6264
* Vérifiez votre installation en exécutant Gitea avec la commande `gitea web`.
6365

64-
### Dépannage
66+
## Dépannage
6567

6668
* Si vous rencontrez des erreurs relatives à des modèles personnalisés dans le dossier `gitea/custom/templates`, essayez de déplacer un par un les modèles provoquant les erreurs. Il est possible qu'ils ne soient pas compatibles avec Gitea.
6769

68-
### Démarrer automatiquement Gitea (Unix)
70+
## Démarrer automatiquement Gitea (Unix)
6971

7072
Distributions utilisant systemd:
7173

0 commit comments

Comments
 (0)