Skip to content

Commit b4ae5c2

Browse files
davidjharderEbonJaeger
authored andcommitted
Run prettier, tidy spelling warnings
The troubleshooting pages don't format cleanly without losing function, but let's format everything else
1 parent 900feec commit b4ae5c2

File tree

17 files changed

+70
-63
lines changed

17 files changed

+70
-63
lines changed

.cspell-allowed-words.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,8 @@ nopatch
269269
noprefixroute
270270
nproc
271271
nuitka
272+
numlock
273+
numlockx
272274
nvme
273275
ocen
274276
ocenaudio

docs/packaging/appstream-metainfo.md

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ There are a few scenarios that Packagers might encounter:
3232
| 1 | An application already provides appstream metainfo | Nothing to do |
3333
| 2 | An application contains appstream metainfo in the source package but we do not install it | Install the appstream metainfo to `/usr/share/metainfo`. _Example_: [here](https://github.com/getsolus/packages/commit/0a726a53454e7c8a6b0e66de69d59bcc66f0fc19) |
3434
| 3 | An application doesn't contain appstream metainfo in the source package but it exists on Flathub | Borrow and tweak the appstream metainfo from the Flathub repo. Encourage upstream project to add it to their source. _Example_: [here](https://github.com/getsolus/packages/commit/da2f65b93f412da43d1db9edbcb08bb90517a0eb) |
35-
| 4 | An application doesn't provide appstream metainfo and it doesn't exist on flathub | See [here](#writing-appstream-metainfo). _Example_: [here](https://github.com/getsolus/packages/commit/414219d8b2ceeabe85178d3a467f81b9131016f4) |
36-
| 5 | Appstream metainfo is provided but composition of it is failing | See [here](#testing-appstream-metainfo). _Example_: [here](https://github.com/getsolus/packages/commit/583b7c742caf50e2f66a70e9b62e9b91566c03f5). |
35+
| 4 | An application doesn't provide appstream metainfo and it doesn't exist on flathub | See [here](#writing-appstream-metainfo). _Example_: [here](https://github.com/getsolus/packages/commit/414219d8b2ceeabe85178d3a467f81b9131016f4) |
36+
| 5 | Appstream metainfo is provided but composition of it is failing | See [here](#testing-appstream-metainfo). _Example_: [here](https://github.com/getsolus/packages/commit/583b7c742caf50e2f66a70e9b62e9b91566c03f5). |
3737

3838
AppStream metainfo is to be installed in the `/usr/share/metainfo/` directory. It must be placed in the package which should be installed in order to get the software described by the respective metadata. This means that you might need to move the _.metainfo.xml or _.appdata.xml to the right (sub)package.
3939

@@ -55,15 +55,14 @@ In case your AppStream metainfo is describing a desktop application (you can tel
5555

5656
- Run a report against the extracted install directory.
5757

58-
5958
For general testing, the following command should be sufficient:
6059

6160
```bash
6261
appstreamcli compose install/ --hints-dir=hints --verbose
6362
```
6463

6564
For more advanced testing, such as media generation, e.g. to test font screenshots get auto-generated, run:
66-
65+
6766
```bash
6867
appstreamcli compose install/ --hints-dir=hints --media-dir=media --media-baseurl=localhost:8000 --verbose
6968
```
@@ -80,7 +79,7 @@ The `appstreamcli compose` tool will normally give good hints about failures but
8079

8180
- A `.desktop` file cannot be matched to the metainfo file.
8281
- By default, the `.desktop` file name must match the `<id>` provided in `.xml` file in `/usr/share/metainfo/`. For example, the if you have `<id>org.foobar.my_package</id>` the `.desktop` file should be called `org.foobar.my_package.desktop`. However, there is an exception to this if the metainfo provides a launchable tag. For example, if the metainfo contains `<launchable type="desktop-id">my_package.desktop</launchable>` then the `.desktop` file can be just called `my_package.desktop`. For more information view the upstream documentation [here](https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html#spec-appdata-introduction).
83-
- No metainfo file is provided.
82+
- No metainfo file is provided.
8483
- No appstream metainfo was found in `/usr/share/metainfo/`.
8584
- Appstream metainfo may exist in `/usr/share/appdata/` but that path is now obsolete and is no longer read from.
8685
- No icon found.
@@ -111,19 +110,20 @@ It is not necessary to pass all pedantic warnings, but all errors must be rectif
111110
To generate a catalog with appstream generator, a `asgen-config.json` file must be provided.
112111

113112
Here is a example configuration file for running against local repositories.
113+
114114
```json
115115
{
116-
"ProjectName": "Solus",
117-
"ArchiveRoot": "/var/lib/solbuild",
118-
"MediaBaseUrl": "http://localhost:8000/export/media",
119-
"HtmlBaseUrl": "http://localhost:8000/export/html",
120-
"Backend": "solus",
121-
"Suites": {
122-
"local": {
123-
"sections": ["main"],
124-
"architectures": ["x86_64"]
125-
}
116+
"ProjectName": "Solus",
117+
"ArchiveRoot": "/var/lib/solbuild",
118+
"MediaBaseUrl": "http://localhost:8000/export/media",
119+
"HtmlBaseUrl": "http://localhost:8000/export/html",
120+
"Backend": "solus",
121+
"Suites": {
122+
"local": {
123+
"sections": ["main"],
124+
"architectures": ["x86_64"]
126125
}
126+
}
127127
}
128128
```
129129

@@ -134,25 +134,26 @@ To generate the catalog run `appstream-generator run local --verbose`. Depending
134134
To view the HTML report, you can start a http server with `python3 -m http.server 8000`, enter `http://localhost:8000/` in your web browser, then navigate to `export/html/`.
135135

136136
It can also be ran against a remote repository, here is a sample configuration.
137+
137138
```json
138139
{
139-
"ProjectName": "Solus",
140-
"ArchiveRoot": "https://fastly.getsol.us/repo",
141-
"MediaBaseUrl": "https://appstream.getsol.us/media",
142-
"HtmlBaseUrl": "https://appstream.getsol.us",
143-
"Backend": "solus",
144-
"Suites": {
145-
"gwendraeth": {
146-
"sections": ["main"],
147-
"architectures": ["x86_64"]
148-
},
149-
"gwendraeth-updates": {
150-
"sections": ["main"],
151-
"architectures": ["x86_64"],
152-
"dataPriority": 10,
153-
"baseSuite": "gwendraeth"
154-
}
140+
"ProjectName": "Solus",
141+
"ArchiveRoot": "https://fastly.getsol.us/repo",
142+
"MediaBaseUrl": "https://appstream.getsol.us/media",
143+
"HtmlBaseUrl": "https://appstream.getsol.us",
144+
"Backend": "solus",
145+
"Suites": {
146+
"gwendraeth": {
147+
"sections": ["main"],
148+
"architectures": ["x86_64"]
149+
},
150+
"gwendraeth-updates": {
151+
"sections": ["main"],
152+
"architectures": ["x86_64"],
153+
"dataPriority": 10,
154+
"baseSuite": "gwendraeth"
155155
}
156+
}
156157
}
157158
```
158159

docs/packaging/monitoring.yaml.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ To add a `monitoring.yaml` file to an existing package you can use the following
2525
`go-task add-monitoring` will automatically fill all the fields if a match is found on [release-monitoring.org](https://release-monitoring.org) and [cpe-guesser.cve-search.org](https://cpe-guesser.cve-search.org).
2626

2727
:::
28+
2829
```bash
2930
go-task add-monitoring
3031
```

docs/packaging/package.yml.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ Macros are prefixed with `%`, and are substituted before your script is executed
165165
| **%apply_patches** | Applies all patches listed in the `series` file in `./files` folder. |
166166
| **%reconfigure** | Updates build scripts such as `./configure` and proceeds to run `%configure`. |
167167
| **%symlink_check** | Checks for broken symlinks in the install directory and aborts the build if any are found. Must run after install macros. |
168-
| **%install_license** | Installs any files after the macro to `$installdir/usr/share/licenses/$package/`. |
168+
| **%install_license** | Installs any files after the macro to `$installdir/usr/share/licenses/$package/`. |
169169

170170
### Haskell actionable macros
171171

docs/packaging/packaging-changes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ This page is meant to serve as a changelog of sorts for the Solus packaging envi
1919

2020
- Packages must now have license files installed so we are compliant.
2121
- License files can be easily installed with the new `%install_license` macro.
22+
<!-- prettier-ignore -->
2223
```yaml
2324
install : |
2425
%ninja_install

docs/packaging/packaging-practices.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ All new packages or updates to packages should abide by the [SPDX 3.x](https://s
9292

9393
License files that are present in an upstream project must also be installed with the package. This can be easily done with the `%install_license` macro. The macro will install any files passed to it to the system licenses directory, `$installdir/usr/share/licenses/$package/`. The files passed to the macro are expected to be relative to the project's source root.
9494

95+
<!-- prettier-ignore -->
9596
```yaml
9697
install : |
9798
%ninja_install

docs/packaging/updating-an-existing-package.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This PR resolves software update request https://github.com/getsolus/packages/is
1818
```
1919

2020
**Also check to see if there's already an active maintainer**
21-
If there's a MAINTAINER.md file, see [this](https://help.getsol.us/docs/packaging/procedures/maintainership).
21+
If there's a MAINTAINER.md file, see [this](https://help.getsol.us/docs/packaging/procedures/maintainership).
2222
Please contact the maintainer listed in that file, or [create a package update request](https://github.com/getsolus/packages/labels/Package%3A%20Update%20Request) before attempting to update the package.
2323

2424
:::

docs/user/editions/budgie/tips-and-tricks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ Numlock can then be enabled or disabled via a toggle switch on the _Settings_ ta
4747

4848
**Note:** in the Budgie Menu, you can find `lightdm-settings` as System Tools > Login Window.
4949

50-
----------
50+
---
5151

5252
> TODO: There's got to be more that we can add here

docs/user/quick-start/boot-management.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ To make the boot menu appear automatically with a five-second timeout:
2828

2929
## Add kernel parameters
3030

31-
You can add kernel parameters by creating configuration files that `clr-boot-manager` uses when updating kernels.
31+
You can add kernel parameters by creating configuration files that `clr-boot-manager` uses when updating kernels.
3232

3333
To add kernel parameters, do the following:
3434

@@ -50,7 +50,7 @@ To add kernel parameters, do the following:
5050
echo 'nomodeset' | sudo tee /etc/kernel/cmdline.d/40_nomodeset.conf
5151
```
5252

53-
1. If you want to add multiple parameters, put them on one line with spaces between them in the configuration file.
53+
1. If you want to add multiple parameters, put them on one line with spaces between them in the configuration file.
5454

5555
For example:
5656

docs/user/quick-start/kernel-management/add-new-kernels.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,17 @@ By default, Solus uses the `linux-current` kernel. You can switch between kernel
1010
To install and switch to a different kernel branch, follow these steps:
1111

1212
1. Install the desired kernel branch:
13-
1413
- Current kernel
1514

1615
```
17-
sudo eopkg install linux-current
18-
```
16+
sudo eopkg install linux-current
17+
```
1918
2019
- LTS kernel
21-
22-
```
23-
sudo eopkg install linux-lts
24-
```
20+
21+
```
22+
sudo eopkg install linux-lts
23+
```
2524
2625
1. Install the necessary kernel modules of the kernel branch you want to try.
2726
@@ -52,7 +51,7 @@ To install and switch to a different kernel branch, follow these steps:
5251
:::warning Important
5352
5453
On systems with UEFI installations, the boot menu doesn't appear by default.
55-
54+
5655
To display the boot menu, press the <kbd>Space bar</kbd> key repeatedly as your computer starts.
5756
5857
:::

0 commit comments

Comments
 (0)