Fix double escaping and decode HTML entities in backticks for command documentation

bin/Handbook_Command.php

@@ -645,6 +645,15 @@ private static function gen_cmd_pages( $cmd, $parent = [], $verbose = false ) {
 			}
 			$docs = implode( "\n", $bits );
 
+			// Decode HTML entities inside backticks.
+			$docs = preg_replace_callback(
+				'/`([^`]*)`/',
+				function ( $matches ) {
+					return '`' . html_entity_decode( $matches[1], ENT_QUOTES | ENT_HTML401 ) . '`';
+				},
+				$docs
+			);
+
 			// Hack to prevent double encoding in code blocks.
 			$docs = preg_replace( '/ &lt; /', ' < ', $docs );
 			$docs = preg_replace( '/ &gt; /', ' > ', $docs );

commands/config/list.md

@@ -61,8 +61,8 @@ options:
     +------------------+------------------------------------------------------------------+----------+
     | key              | value                                                            | type     |
     +------------------+------------------------------------------------------------------+----------+
-    | AUTH_SALT        | n:]Xditk+_7>Qi=>BmtZHiH-6/Ecrvl(V5ceeGP:{>?;BT^=[B3-0>,~F5z$(+Q$ | constant |
-    | SECURE_AUTH_SALT | ?Z/p|XhDw3w}?c.z%|+BAr|(Iv*H%%U+Du&kKR y?cJOYyRVRBeB[2zF-`(>+LCC | constant |
+    | AUTH_SALT        | n:]Xditk+_7>Qi=>BmtZHiH-6/Ecrvl(V5ceeGP:{>?;BT^=[B3-0>,~F5z$(+Q$ | constant |
+    | SECURE_AUTH_SALT | ?Z/p|XhDw3w}?c.z%|+BAr|(Iv*H%%U+Du&kKR y?cJOYyRVRBeB[2zF-`(>+LCC | constant |
     | LOGGED_IN_SALT   | +$@(1{b~Z~s}Cs>8Y]6[m6~TnoCDpE>O%e75u}&6kUH!>q:7uM4lxbB6[1pa_X,q | constant |
     | NONCE_SALT       | _x+F li|QL?0OSQns1_JZ{|Ix3Jleox-71km/gifnyz8kmo=w-;@AE8W,(fP<N}2 | constant |
     +------------------+------------------------------------------------------------------+----------+

commands/core/verify-checksums.md

@@ -8,7 +8,7 @@ Downloads md5 checksums for the current version from WordPress.org, and compares
 
 For security, avoids loading WordPress when verifying checksums.
 
-If you experience issues verifying from this command, ensure you are passing the relevant `--locale` and `--version` arguments according to the values from the `Dashboard->Updates` menu in the admin area of the site.
+If you experience issues verifying from this command, ensure you are passing the relevant `--locale` and `--version` arguments according to the values from the `Dashboard->Updates` menu in the admin area of the site.
 
 ### OPTIONS
 

commands/find.md

@@ -58,7 +58,7 @@ These fields will be displayed by default for each installation:
 
 These fields are optionally available:
 
-* wp_path - Path that can be passed to `--path=<path>` global parameter.
+* wp_path - Path that can be passed to `--path=<path>` global parameter.
 * db_host - Host name for the database.
 * db_user - User name for the database.
 * db_name - Database name for the database.

commands/package/install.md

@@ -15,7 +15,7 @@ Packages are installed to `~/.wp-cli/packages/` by default. Use the `WP_CLI_PACK
 
 When installing a local directory, WP-CLI simply registers a reference to the directory. If you move or delete the directory, WP-CLI's reference breaks.
 
-When installing a .zip file, WP-CLI extracts the package to `~/.wp-cli/packages/local/<package-name>`.
+When installing a .zip file, WP-CLI extracts the package to `~/.wp-cli/packages/local/<package-name>`.
 
 If Github token authorization is required, a GitHub Personal Access Token (https://github.com/settings/tokens) can be used. The following command will add a GitHub Personal Access Token to Composer's global configuration:
 composer config -g github-oauth.github.com &lt;GITHUB_TOKEN&gt; Once this has been added, the value used for &lt;GITHUB_TOKEN&gt; will be used for future authorization requests.

commands/profile/eval-file.md

@@ -42,7 +42,7 @@ options:
 
 ### EXAMPLES
 
-    # Profile from a file `request.php` containing `<?php wp_remote_get( "https://www.apple.com/" );`.
+    # Profile from a file `request.php` containing `<?php wp_remote_get( "https://www.apple.com/" );`.
     $ wp profile eval-file request.php --fields=time,cache_ratio,request_count
     +---------+-------------+---------------+
     | time    | cache_ratio | request_count |

commands/scaffold/block.md

@@ -34,7 +34,7 @@ options:
 \---
 
 [\--theme]
-: Create files in the active theme directory. Specify a theme with `--theme=<theme>` to have the file placed in that theme.
+: Create files in the active theme directory. Specify a theme with `--theme=<theme>` to have the file placed in that theme.
 
 [\--plugin=&lt;plugin&gt;]
 : Create files in the given plugin's directory.

commands/scaffold/cpt.md

@@ -21,7 +21,7 @@ See the [argument syntax](https://make.wordpress.org/cli/handbook/references/arg
 : The dashicon to use in the menu.
 
 [\--theme]
-: Create a file in the active theme directory, instead of sending to STDOUT. Specify a theme with `--theme=<theme>` to have the file placed in that theme.
+: Create a file in the active theme directory, instead of sending to STDOUT. Specify a theme with `--theme=<theme>` to have the file placed in that theme.
 
 [\--plugin=&lt;plugin&gt;]
 : Create a file in the given plugin's directory, instead of sending to STDOUT.

commands/scaffold/plugin-tests.md

@@ -5,7 +5,7 @@ Generates files needed for running PHPUnit tests in a plugin.
 The following files are generated by default:
 
 * `phpunit.xml.dist` is the configuration file for PHPUnit.
-* `.circleci/config.yml` is the configuration file for CircleCI. Use `--ci=<provider>` to select a different service.
+* `.circleci/config.yml` is the configuration file for CircleCI. Use `--ci=<provider>` to select a different service.
 * `bin/install-wp-tests.sh` configures the WordPress test suite and a test database.
 * `tests/bootstrap.php` is the file that makes the current plugin active when running the test suite.
 * `tests/test-sample.php` is a sample file containing the actual tests.

commands/scaffold/plugin.md

@@ -15,7 +15,7 @@ The following files are always generated:
 The following files are also included unless the `--skip-tests` is used:
 
 * `phpunit.xml.dist` is the configuration file for PHPUnit.
-* `.circleci/config.yml` is the configuration file for CircleCI. Use `--ci=<provider>` to select a different service.
+* `.circleci/config.yml` is the configuration file for CircleCI. Use `--ci=<provider>` to select a different service.
 * `bin/install-wp-tests.sh` configures the WordPress test suite and a test database.
 * `tests/bootstrap.php` is the file that makes the current plugin active when running the test suite.
 * `tests/test-sample.php` is a sample file containing test cases.

commands/scaffold/post-type.md

@@ -21,7 +21,7 @@ See the [argument syntax](https://make.wordpress.org/cli/handbook/references/arg
 : The dashicon to use in the menu.
 
 [\--theme]
-: Create a file in the active theme directory, instead of sending to STDOUT. Specify a theme with `--theme=<theme>` to have the file placed in that theme.
+: Create a file in the active theme directory, instead of sending to STDOUT. Specify a theme with `--theme=<theme>` to have the file placed in that theme.
 
 [\--plugin=&lt;plugin&gt;]
 : Create a file in the given plugin's directory, instead of sending to STDOUT.

commands/scaffold/tax.md

@@ -21,7 +21,7 @@ See the [argument syntax](https://make.wordpress.org/cli/handbook/references/arg
 : The textdomain to use for the labels.
 
 [\--theme]
-: Create a file in the active theme directory, instead of sending to STDOUT. Specify a theme with `--theme=<theme>` to have the file placed in that theme.
+: Create a file in the active theme directory, instead of sending to STDOUT. Specify a theme with `--theme=<theme>` to have the file placed in that theme.
 
 [\--plugin=&lt;plugin&gt;]
 : Create a file in the given plugin's directory, instead of sending to STDOUT.

commands/scaffold/taxonomy.md

@@ -21,7 +21,7 @@ See the [argument syntax](https://make.wordpress.org/cli/handbook/references/arg
 : The textdomain to use for the labels.
 
 [\--theme]
-: Create a file in the active theme directory, instead of sending to STDOUT. Specify a theme with `--theme=<theme>` to have the file placed in that theme.
+: Create a file in the active theme directory, instead of sending to STDOUT. Specify a theme with `--theme=<theme>` to have the file placed in that theme.
 
 [\--plugin=&lt;plugin&gt;]
 : Create a file in the given plugin's directory, instead of sending to STDOUT.

commands/scaffold/theme-tests.md

@@ -5,7 +5,7 @@ Generates files needed for running PHPUnit tests in a theme.
 The following files are generated by default:
 
 * `phpunit.xml.dist` is the configuration file for PHPUnit.
-* `.circleci/config.yml` is the configuration file for CircleCI. Use `--ci=<provider>` to select a different service.
+* `.circleci/config.yml` is the configuration file for CircleCI. Use `--ci=<provider>` to select a different service.
 * `bin/install-wp-tests.sh` configures the WordPress test suite and a test database.
 * `tests/bootstrap.php` is the file that makes the current theme active when running the test suite.
 * `tests/test-sample.php` is a sample file containing the actual tests.

commands/site/empty.md

@@ -12,8 +12,8 @@ To also empty custom database tables, you'll need to hook into command execution
 WP_CLI::add_hook( 'after_invoke:site empty', function(){
     global $wpdb;
     foreach( array( 'p2p', 'p2pmeta' ) as $table ) {
-        $table = $wpdb->$table;
-        $wpdb->query( "TRUNCATE $table" );
+        $table = $wpdb->$table;
+        $wpdb->query( "TRUNCATE $table" );
     }
 });
 ```

commands/transient/set.md

@@ -2,7 +2,7 @@
 
 Sets a transient value.
 
-`<expiration>` is the time until expiration, in seconds.
+`<expiration>` is the time until expiration, in seconds.
 
 For a more complete explanation of the transient cache, including the network|site cache, please see docs for `wp transient`.