Commit 5caaf6f3 authored by Ulrike Uhlig's avatar Ulrike Uhlig
Browse files

Improve formatting

parent af0ada93
......@@ -175,7 +175,8 @@ modified English strings in those files, in all languages.
### Step 1: Canonical → Integration
### Update the integration repository with changes made on the canonical repository
**Update the integration repository with changes made on the canonical
repository**
The script fetches from the canonical (remote) repository and tries to
merge changes into the (local) integration repository. The merge
......@@ -215,7 +216,8 @@ please clarify on what this is performed).
### Step 4: Weblate → Integration
### Integrating the changes made in the canonical Git repository into Weblate repository and database
**Integrating the changes made in the canonical Git repository into
Weblate repository and database**
After having merged changes from the canonical Git repository into the
integration Git repository, and integrated changes from Weblate there,
......@@ -246,7 +248,8 @@ be scanned (XXX: scanned, really?) for Weblate component changes.
### Step 6: Weblate → Integration
### Merging changes from Weblate's Git repository into the integration repository
**Merging changes from Weblate's Git repository into the integration
repository**
Weblate's Git repository is not bare. Hence we need to pull changes
committed to Weblate's Git repository and merge them into the
......@@ -265,7 +268,8 @@ that exists in canonical.
### Step 9: Integration → Canonical
### Pushing from the integration repository to our canonical repository, aka "production"
**Pushing from the integration repository to our canonical repository,
aka "production"**
As a last step, a push from the VM hosting Weblate (XXX: to where?) is done, using
the integration repository that has all changes:
......@@ -319,7 +323,7 @@ database and applies them to a local clone of Weblate's Git repository,
after having updated the clone with newer data from Weblate's VCS.
[`save-suggestions.py`](https://git-tails.immerda.ch/puppet-tails/tree/files/weblate/scripts/save-suggestions.py)
After that we run ikiwiki --refresh using an dedicated `ikiwiki.setup`
After that we run `ikiwiki --refresh` using an dedicated `ikiwiki.setup`
file for the staging website.
None of the changes on this repository clone are fed back anywhere and they
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment