diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ac63d982b..7fe59019c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -82,14 +82,14 @@ jobs: uses: actions/cache@v4 with: path: bin - key: ${{ runner.os }}-bin-shfmt@v3.7.0-hadolint@v2.12.0-typos@v1.17.0 + key: ${{ runner.os }}-bin-shfmt@v3.8.0-hadolint@v2.12.0-typos@v1.23.1 - name: Add ./bin/ to $PATH run: mkdir -p bin/ && echo "${PWD}/bin" >> $GITHUB_PATH - name: Install shfmt if: steps.shell-cache.outputs.cache-hit != 'true' - run: GOBIN=${PWD}/bin/ go install mvdan.cc/sh/v3/cmd/shfmt@v3.7.0 + run: GOBIN=${PWD}/bin/ go install mvdan.cc/sh/v3/cmd/shfmt@v3.8.0 - name: Check shell script syntax # shellcheck is pre-installed https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2204-Readme.md @@ -106,7 +106,7 @@ jobs: if: steps.shell-cache.outputs.cache-hit != 'true' run: | cd bin ; - wget -q 'https://github.com/crate-ci/typos/releases/download/v1.17.0/typos-v1.17.0-x86_64-unknown-linux-musl.tar.gz' && + wget -q 'https://github.com/crate-ci/typos/releases/download/v1.23.1/typos-v1.23.1-x86_64-unknown-linux-musl.tar.gz' && tar -xvf *.tar.gz './typos' && chmod +x typos && rm *.tar.gz ; diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 76db326a6..66b28bb7e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ You found a bug? Don’t panic, here are some steps to report it easily: 2. If you find a similar bug, don’t hesitate to post a comment to add more importance to the related ticket. 3. If you didn’t find it, [open a new ticket](https://github.com/FreshRSS/FreshRSS/issues/new). -If you have to create a new ticket, try to apply the following advices: +If you have to create a new ticket, try to apply the following advice: - Give an explicit title to the ticket so it will be easier to find it later. - Be as exhaustive as possible in the description: what did you do? What is the bug? What are the steps to reproduce the bug? diff --git a/Makefile b/Makefile index 1222ef3ee..15f259bf4 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ lint-fix: vendor/bin/phpcbf ## Fix the errors detected by the linter bin/composer: mkdir -p bin/ - wget 'https://raw.githubusercontent.com/composer/getcomposer.org/8af47a6fd4910073ea7580378d6252c708f83a06/web/installer' -O - -q | php -- --quiet --install-dir='./bin/' --filename='composer' + wget 'https://raw.githubusercontent.com/composer/getcomposer.org/163a517dbb7eba0eb25633061c76e648392c6738/web/installer' -O - -q | php -- --quiet --install-dir='./bin/' --filename='composer' vendor/bin/phpunit: bin/composer bin/composer install --prefer-dist --no-progress @@ -89,7 +89,7 @@ vendor/bin/phpcbf: bin/composer bin/typos: mkdir -p bin/ cd bin ; \ - wget -q 'https://github.com/crate-ci/typos/releases/download/v1.17.0/typos-v1.17.0-x86_64-unknown-linux-musl.tar.gz' && \ + wget -q 'https://github.com/crate-ci/typos/releases/download/v1.23.1/typos-v1.23.1-x86_64-unknown-linux-musl.tar.gz' && \ tar -xvf *.tar.gz './typos' && \ chmod +x typos && \ rm *.tar.gz ; \ diff --git a/cli/manipulate.translation.php b/cli/manipulate.translation.php index 740f3c4b7..c0bfd1e36 100755 --- a/cli/manipulate.translation.php +++ b/cli/manipulate.translation.php @@ -166,7 +166,7 @@ Example 8: ignore all unmodified keys. Adds IGNORE comments to all unmodified ke php $file -a ignore_unmodified -l my_lang Example 9: revert ignore on all unmodified keys. Removes IGNORE comments from all unmodified keys in the selected language. - Warning: will also revert individually added IGNOREs on unmodified keys. + Warning: will also revert individually added IGNORE(s) on unmodified keys. php $file -a ignore_unmodified -r -l my_lang Example 10: check if a key exist. diff --git a/docs/en/admins/07_LinuxUpdate.md b/docs/en/admins/07_LinuxUpdate.md index 47b84e5ef..9c1ec8cef 100644 --- a/docs/en/admins/07_LinuxUpdate.md +++ b/docs/en/admins/07_LinuxUpdate.md @@ -4,7 +4,7 @@ This tutorial demonstrates commands for updating FreshRSS. It assumes that your **Note that FreshRSS contains a built-in update system.** It’s easier to use if you don’t understand the commands that follow. It’s available through the web interface of your FreshRSS installation, Administration → Update. -Please read the general advices from “[Backing Up and Updating FreshRSS](04_Updating.md)” before applying any command from this guide. +Please read the general advice from “[Backing Up and Updating FreshRSS](04_Updating.md)” before applying any command from this guide. ## Pausing automatic feed updates