Merge remote-tracking branch 'origin/main' into fix-16600-fix-access-logger

Author: zeripath

docs/content/doc/advanced/config-cheat-sheet.en-us.md

@@ -300,7 +300,7 @@ The following configuration set `Content-Type: application/vnd.android.package-a
 - `LANDING_PAGE`: **home**: Landing page for unauthenticated users \[home, explore, organizations, login\].
 
 - `LFS_START_SERVER`: **false**: Enables git-lfs support.
-- `LFS_CONTENT_PATH`: **%(APP_DATA_PATH)/lfs**:  DEPRECATED: Default LFS content path. (if it is on local storage.)
+- `LFS_CONTENT_PATH`: **%(APP_DATA_PATH)/lfs**: Default LFS content path. (if it is on local storage.) **DEPRECATED** use settings in `[lfs]`.
 - `LFS_JWT_SECRET`: **\<empty\>**: LFS authentication secret, change this a unique string.
 - `LFS_HTTP_AUTH_EXPIRY`: **20m**: LFS authentication validity period in time.Duration, pushes taking longer than this may fail.
 - `LFS_MAX_FILE_SIZE`: **0**: Maximum allowed LFS file size in bytes (Set to 0 for no limit).

options/locale/locale_en-US.ini

@@ -1437,10 +1437,10 @@ pulls.no_merge_helper = Enable merge options in the repository settings or merge
 pulls.no_merge_wip = This pull request can not be merged because it is marked as being a work in progress.
 pulls.no_merge_not_ready = This pull request is not ready to be merged, check review status and status checks.
 pulls.no_merge_access = You are not authorized to merge this pull request.
-pulls.merge_pull_request = Merge Pull Request
-pulls.rebase_merge_pull_request = Rebase and Merge
-pulls.rebase_merge_commit_pull_request = Rebase and Merge (--no-ff)
-pulls.squash_merge_pull_request = Squash and Merge
+pulls.merge_pull_request = Create merge commit
+pulls.rebase_merge_pull_request = Rebase then fast-forward
+pulls.rebase_merge_commit_pull_request = Rebase then create merge commit
+pulls.squash_merge_pull_request = Create squash commit
 pulls.merge_manually = Manually merged
 pulls.merge_commit_id = The merge commit ID
 pulls.require_signed_wont_sign = The branch requires signed commits but this merge will not be signed