More changes

Author: coorasse

configure_git_repository.md

@@ -7,9 +7,9 @@ Please stick to it unless you have special needs.
   * Features: Remove *Wikis*, *Issues* and *Projects*
   * Pull Requests
     * Disable *Allow merge commits* and *Allow rebase merging*
+    * Always suggest updating pull request branches
     * Allow auto-merge
     * Automatically delete head branches
-    * Always suggest updating pull request branches
 * Manage access
   * Add *staff* team as a collaborator with Admin access
   * Add *security* team as collaborator with Write access
@@ -18,13 +18,13 @@ Please stick to it unless you have special needs.
 * Rules/Rulesets
   * `develop`
     * Enforcement status: `Active`
-    * Branch targeting criteria: `develop`
     * Bypass list: add `Repository Admin` Role with *allow for pull requests only* option
+    * Branch targeting criteria: `develop`
     * Restrict deletions
     * Require linear history
     * Require a pull request before merging
     * Require status checks to pass
-      * Select `ci/semaphore/push`
+      * Select `ci/semaphore/push` (WRONG. NOT AVAILABLE NOW)
     * Block force pushes
   * `main` (same as develop but...)
     * Branch targeting criteria: `main`

ruby_on_rails/app_initialisation.md

@@ -74,8 +74,8 @@ Check existing projects for an example of the usage.
 * Update `config/application.rb` and set the default language and timezone
 
   ```ruby
-  config.time_zone = 'Zurich' # may vary
-  config.i18n.default_locale = :de # may vary
+  config.time_zone = 'Zurich'
+  config.i18n.default_locale = :de
   ```
 
 * Update your `config/environments/production.rb` settings:
@@ -91,9 +91,7 @@ Check existing projects for an example of the usage.
   config.action_controller.action_on_unpermitted_parameters = :raise
   config.i18n.raise_on_missing_translations = :strict
 
-  config.generators do |g|
-    g.apply_rubocop_autocorrect_after_generate!
-  end
+  config.generators.apply_rubocop_autocorrect_after_generate!
   ```
 
 * Update `config/environments/test.rb` settings: