Skip to content

Commit a06dc18

Browse files
authored
Update docs (#485)
1 parent 3d8f858 commit a06dc18

3 files changed

Lines changed: 9 additions & 7 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ The purposes and features of this repository are:
66
- Update the references to code you want to build MediaWiki from
77
- Download the code you want to build MediaWiki from
88
- Store and then copy in the custom WBStack code
9-
- Adjust some MediawWiki code to load custom WBStack code
9+
- Adjust some MediaWiki code to load custom WBStack code
1010
- Build the Docker image from the code in the `dist` directory
1111
- Test the image
12-
- Build the image automatically on Github Actions platform then push it.
12+
- Build the image automatically on Github Actions platform then push it
1313

1414
This ultimately repackages MediaWiki together with its extensions, skins, and the WBStack code into `dist` and `dist-persist` folders, then creates a new "application" with a much tighter external interface (particularly around configuration).
1515

docs/build-scripts.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This script will resync the `dist` directory.
1414
This is made up of a series of steps:
1515

1616
- Empty the `dist` directory entirely
17-
- `pacman`: Retrieive and build MediaWiki code, remove any bloat files that are not needed
17+
- `pacman`: Retrieve and build MediaWiki code, remove any bloat files that are not needed
1818
- `sync_dist-persist.sh`: Sync the `dist-persist` directory into `dist` (Custom & extra wbstack hooks, config, and files)
1919
- `04-docker-compose`: Perform a composer install
2020
- `05-docker-entrypoint-overrides`: Add the WBStack shims to MediaWiki entrypoints
@@ -30,9 +30,10 @@ There is a GitHub Action [Workflow](../.github/workflows/wbstack.sync.check.yml)
3030
`wikiman` is a MediaWiki specific yaml generator for pacman.
3131
This needs to be run by developers when updating component versions in `wikiman.yaml`
3232

33+
> [!NOTE]
3334
> In order to be able to run wikiman you need to create a GitHub token in a file called `/sync/.github`.
3435
> The token does not require any special permissions, and it does not matter if it's a `classic` or `fine-grained token (beta)` token.
35-
> You can generate a new token [here](https://github.com/settings/tokens/1118022750).
36+
> You can generate a new token [here](https://github.com/settings/personal-access-tokens).
3637
3738
#### pacman
3839
`pacman` is a generic tool using yaml to fetch a series of codebases and place them on disk.
@@ -48,4 +49,5 @@ Example:
4849
- https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibase~833742/revisions/15/patch?download
4950
```
5051

51-
**please note**: currently these will get overridden if `wikiman` is used to generate the file!
52+
> [!WARNING]
53+
> Currently patches will get overridden if `wikiman` is used to generate the `pacman.yaml` file!

docs/dev-environment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ These are currently not using the real api but rather gets their settings from t
66

77
The fake api is served by the [server.php](test/server.php) script and reads the corresponding [subdomain](data/WikiInfo-site1.json) from each request.
88

9-
109
### Start the dev environment
1110

1211
```sh
1312
docker compose up --build
1413
```
1514

16-
> **_Note:_** It's important to include the `--build` flag after making any significant changes to `dist`. The `Dockerfile` contains important maintenance scripts (e.g., `rebuildLocalisationCache.php`) that will only run when the container image is rebuilt.
15+
> [!NOTE]
16+
> It's important to include the `--build` flag after making any significant changes to `dist`. The `Dockerfile` contains important maintenance scripts (e.g., `rebuildLocalisationCache.php`) that will only run when the container image is rebuilt.
1717
1818
Wait until both sites are accessible:
1919

0 commit comments

Comments
 (0)