Merge branch 'main' into patch-1

WordPress · Feb 20, 2024 · 02810a8 · 02810a8
2 parents 08fb844 + e8dd2ee
commit 02810a8
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 76 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/README.md b/README.md
@@ -27,7 +27,6 @@ Based on [WordPress Advanced Administration Handbook](https://docs.google.com/do
 
 - [README](README.md)
 - [LICENSE](LICENSE)
-- [CODE_OF_CONDUCT](CODE_OF_CONDUCT.md)
 - [WordPress Advanced Administration Handbook](index.md) ([🔗](https://developer.wordpress.org/advanced-administration/))
   - [Before You Install](before-install/index.md) ([🔗](https://developer.wordpress.org/advanced-administration/before-install/))
     - [Creating Database for WordPress](before-install/creating-database.md) ([🔗](https://developer.wordpress.org/advanced-administration/before-install/creating-database/))

diff --git a/server/httpd.md b/server/httpd.md
@@ -14,12 +14,12 @@ This page may be used to restore a corrupted `.htaccess` file (e.g. a misbehavin
 # BEGIN WordPress
 
 RewriteEngine On
-RewriteRule .\* - \[E=HTTP\_AUTHORIZATION:%{HTTP:Authorization}\]
+RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
 RewriteBase /
-RewriteRule ^index\\.php$ - \[L\]
-RewriteCond %{REQUEST\_FILENAME} !-f
-RewriteCond %{REQUEST\_FILENAME} !-d
-RewriteRule . /index.php \[L\]
+RewriteRule ^index\.php$ - [L]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule . /index.php [L]
 
 # END WordPress
 ```
@@ -37,19 +37,19 @@ If you activated Multisite on WordPress 3.5 or later, use one of these.
 # Using subfolder network type: https://wordpress.org/documentation/article/htaccess/#multisite
 
 RewriteEngine On
-RewriteRule .\* - \[E=HTTP\_AUTHORIZATION:%{HTTP:Authorization}\]
+RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
 RewriteBase /
-RewriteRule ^index\\.php$ - \[L\]
+RewriteRule ^index\.php$ - [L]
 
 # add a trailing slash to /wp-admin
-RewriteRule ^(\[\_0-9a-zA-Z-\]+/)?wp-admin$ $1wp-admin/ \[R=301,L\]
+RewriteRule ^([_0-9a-zA-Z-]+/)?wp-admin$ $1wp-admin/ [R=301,L]
 
-RewriteCond %{REQUEST\_FILENAME} -f \[OR\]
-RewriteCond %{REQUEST\_FILENAME} -d
-RewriteRule ^ - \[L\]
-RewriteRule ^(\[\_0-9a-zA-Z-\]+/)?(wp-(content|admin|includes).\*) $2 \[L\]
-RewriteRule ^(\[\_0-9a-zA-Z-\]+/)?(.\*\\.php)$ $2 \[L\]
-RewriteRule . index.php \[L\]
+RewriteCond %{REQUEST_FILENAME} -f [OR]
+RewriteCond %{REQUEST_FILENAME} -d
+RewriteRule ^ - [L]
+RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]
+RewriteRule . index.php [L]
 
 # END WordPress Multisite
 ```
@@ -61,19 +61,19 @@ RewriteRule . index.php \[L\]
 # Using subdomain network type: https://wordpress.org/documentation/article/htaccess/#multisite
 
 RewriteEngine On
-RewriteRule .\* - \[E=HTTP\_AUTHORIZATION:%{HTTP:Authorization}\]
+RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
 RewriteBase /
-RewriteRule ^index\\.php$ - \[L\]
+RewriteRule ^index\.php$ - [L]
 
 # add a trailing slash to /wp-admin
-RewriteRule ^wp-admin$ wp-admin/ \[R=301,L\]
+RewriteRule ^wp-admin$ wp-admin/ [R=301,L]
 
-RewriteCond %{REQUEST\_FILENAME} -f \[OR\]
-RewriteCond %{REQUEST\_FILENAME} -d
-RewriteRule ^ - \[L\]
-RewriteRule ^(wp-(content|admin|includes).\*) $1 \[L\]
-RewriteRule ^(.\*\\.php)$ $1 \[L\]
-RewriteRule . index.php \[L\]
+RewriteCond %{REQUEST_FILENAME} -f [OR]
+RewriteCond %{REQUEST_FILENAME} -d
+RewriteRule ^ - [L]
+RewriteRule ^(wp-(content|admin|includes).*) $1 [L]
+RewriteRule ^(.*\.php)$ $1 [L]
+RewriteRule . index.php [L]
 
 # END WordPress Multisite
 ```
@@ -92,20 +92,20 @@ WordPress 3.0 through 3.4.2
 
 RewriteEngine On
 RewriteBase /
-RewriteRule ^index\\.php$ - \[L\]
+RewriteRule ^index\.php$ - [L]
 
 # uploaded files
-RewriteRule ^(\[\_0-9a-zA-Z-\]+/)?files/(.+) wp-includes/ms-files.php?file=$2 \[L\]
+RewriteRule ^([_0-9a-zA-Z-]+/)?files/(.+) wp-includes/ms-files.php?file=$2 [L]
 
 # add a trailing slash to /wp-admin
-RewriteRule ^(\[\_0-9a-zA-Z-\]+/)?wp-admin$ $1wp-admin/ \[R=301,L\]
+RewriteRule ^([_0-9a-zA-Z-]+/)?wp-admin$ $1wp-admin/ [R=301,L]
 
-RewriteCond %{REQUEST\_FILENAME} -f \[OR\]
-RewriteCond %{REQUEST\_FILENAME} -d
-RewriteRule ^ - \[L\]
-RewriteRule ^\[\_0-9a-zA-Z-\]+/(wp-(content|admin|includes).\*) $1 \[L\]
-RewriteRule ^\[\_0-9a-zA-Z-\]+/(.\*\\.php)$ $1 \[L\]
-RewriteRule . index.php \[L\]
+RewriteCond %{REQUEST_FILENAME} -f [OR]
+RewriteCond %{REQUEST_FILENAME} -d
+RewriteRule ^ - [L]
+RewriteRule ^[_0-9a-zA-Z-]+/(wp-(content|admin|includes).*) $1 [L]
+RewriteRule ^[_0-9a-zA-Z-]+/(.*\.php)$ $1 [L]
+RewriteRule . index.php [L]
 
 # END WordPress Multisite
 ```
@@ -118,15 +118,15 @@ RewriteRule . index.php \[L\]
 
 RewriteEngine On
 RewriteBase /
-RewriteRule ^index\\.php$ - \[L\]
+RewriteRule ^index\.php$ - [L]
 
 # uploaded files
-RewriteRule ^files/(.+) wp-includes/ms-files.php?file=$1 \[L\]
+RewriteRule ^files/(.+) wp-includes/ms-files.php?file=$1 [L]
 
-RewriteCond %{REQUEST\_FILENAME} -f \[OR\]
-RewriteCond %{REQUEST\_FILENAME} -d
-RewriteRule ^ - \[L\]
-RewriteRule . index.php \[L\]
+RewriteCond %{REQUEST_FILENAME} -f [OR]
+RewriteCond %{REQUEST_FILENAME} -d
+RewriteRule ^ - [L]
+RewriteRule . index.php [L]
 
 # END WordPress Multisite
 ```
@@ -149,15 +149,15 @@ All options except for MultiViews. This is the default setting.
 
 **ExecCGI**
 
-Execution of CGI scripts using mod\_cgi is permitted.
+Execution of CGI scripts using mod_cgi is permitted.
 
 **FollowSymLinks**
 
 The server will follow symbolic links in this directory.
 
 **Includes**
 
-Server-side includes provided by mod\_include are permitted.
+Server-side includes provided by mod_include are permitted.
 
 **IncludesNOEXEC**
 
@@ -169,7 +169,7 @@ URL maps to a directory, and no DirectoryIndex, a formatted listing of the direc
 
 **MultiViews**
 
-Content negotiated “MultiViews” are allowed using mod\_negotiation.
+Content negotiated “MultiViews” are allowed using mod_negotiation.
 
 **SymLinksIfOwnerMatch**
 
@@ -258,8 +258,8 @@ See also [Enable Compression](https://developers.google.com/speed/docs/insights/
 ```
 AddOutputFilterByType DEFLATE text/html text/plain text/xml application/xml application/xhtml+xml text/javascript text/css application/x-javascript
 BrowserMatch ^Mozilla/4 gzip-only-text/html
-BrowserMatch ^Mozilla/4\\.0\[678\] no-gzip
-BrowserMatch \\bMSIE !no-gzip !gzip-only-text/html
+BrowserMatch ^Mozilla/4\.0[678] no-gzip
+BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
 ```
 
 **Force Compression for certain files**

diff --git a/wordpress/import.md b/wordpress/import.md
@@ -34,16 +34,6 @@ You can import posts, comments, categories and authors from Blogger. WordPress i
 5. Click "Choose File" and navigate to your Blogger XML file.
 6. Click "Upload file and import".
 
-## Blogroll
-
-WordPress includes an import tool designed specifically for importing content from Blogroll.
-
-1. In your WordPress site, select Tools -> Import on the left nav of the admin screen.
-2. Under "Blogroll", if you haven't already installed the importer, click "Install Now".
-3. Click the "Run Importer" link.
-4. Click "Choose File" and navigate to your Blogroll OPML file.
-5. Click "Upload file and import".
-
 ## Drupal
 
 Many resources are available to help you migrate content from Drupal to WordPress. A few are highlighted here, and you're likely to find many others by searching the web.
@@ -58,15 +48,6 @@ Here are some resources that can help guide you in importing XML or CSV content
 
 * The [WP All Import](https://wordpress.org/plugins/wp-all-import/) plugin can import any XML or CSV file. It integrates with the [WP All Export](https://wordpress.org/plugins/wp-all-export/) plugin.
 
-## HTML
-
-WordPress includes an import tool designed specifically for importing content from static HTML pages.
-
-1. In your WordPress site, select Tools -> Import on the left nav of the admin screen.
-2. Under "HTML", click the "Run Importer" link.
-3. Click "Choose File" and navigate to your HTML file.
-4. Click "Upload file and import".
-
 ## Joomla
 
 For Joomla you can use [FG Joomla to WordPress](https://wordpress.org/plugins/fg-joomla-to-wordpress/). This plugin has been tested with Joomla versions 1.5 through 4.0 on huge databases. It is compatible with multisite installations.
@@ -207,4 +188,5 @@ You will first be asked to map the authors in this export file to users on the b
 
 ## Changelog
 
+- 2024-01-25: Removed HTML and Blogroll sections as they are no longer accurate
 - 2023-04-25: Added content from [Importing Content](https://wordpress.org/documentation/article/importing-content/).