Commit 0c1a5774 authored by 127.0.0.1's avatar 127.0.0.1 Committed by IkiWiki
Browse files

This reverts commit 5caaf6f3

parent c00c33d2
......@@ -174,8 +174,7 @@ 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,8 +214,7 @@ 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,
......@@ -247,8 +245,7 @@ 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
......@@ -267,8 +264,7 @@ 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:
......@@ -322,7 +318,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