Merge branch '4.0' into 'main'

.editorconfig

@@ -6,11 +6,8 @@ root = true
 end_of_line = LF
 insert_final_newline = true
 indent_style = space
+indent_size = 4
 
 # HTML, SCSS, JS, YAML and JSON files
 [{*.html,*.twig,*.scss,*.js,*.json,*.yml}]
-indent_size = 2
-
-# PHP files
-[*.php]
-indent_size = 4
+indent_size = 2

.prettierignore

@@ -2,8 +2,9 @@
 phpmyfaq/admin/assets/js/editor/
 phpmyfaq/src/libs/
 
-# Ignore all PHP files
+# Ignore all PHP and Markdown files
 *.php
+*.md
 
 # Ignore code for build
 .github

docs/update.md

@@ -26,12 +26,12 @@ Please make a full backup before you run the upgrade!
 First, log in as admin into the admin section and enable the maintenance mode.
 Second, you have to delete all files **except**:
 
-- in the directory config/
-  - keep the file **database.php**
-  - only if using LDAP/ActiveDirectory support also keep the file **ldap.php**
-- the directory attachments/
-- the directory data/
-- the directory images/
+- in the directory **config/**
+    - keep the file **database.php**
+    - only if using LDAP/ActiveDirectory support also keep the file **ldap.php**
+- the directory **attachments/**
+- the directory **data/**
+- the directory **images/**
 
 Download the latest phpMyFAQ package and copy the contents into your existing FAQ directory, then open the following
 URL in your browser:
@@ -49,7 +49,9 @@ First, log in as admin into the admin section and enable the maintenance mode.
 (Configuration >> Edit Configuration >> Set FAQ in maintenance mode)
 Second, you have to delete all files **except**:
 
-- all files in the directory **config/**
+- in the directory **config/**
+    - keep the file **database.php**
+    - only if using LDAP/ActiveDirectory support also keep the file **ldap.php**
 - the directory **attachments/**
 - the directory **data/**
 - the directory **images/**
@@ -70,7 +72,10 @@ First, log in as admin into the admin section and enable the maintenance mode.
 (Configuration >> Edit Configuration >> Set FAQ in maintenance mode)
 Second, you have to delete all files **except**:
 
-- all files in the directory **config/**
+- in the directory **config/**
+    - keep the file **database.php**
+    - only if using LDAP/ActiveDirectory support also keep the file **ldap.php**
+    - only if using EntraID support also keep the file **azure.php**
 - the directory **attachments/**
 - the directory **data/**
 - the directory **images/**