diff --git a/README.md b/README.md
index 53f5e95fc..287e9fa70 100644
--- a/README.md
+++ b/README.md
@@ -8,4 +8,3 @@ how to contribute to the documentation and translations can be found in
 
 If you just want to read the documentation for PHP, look at:
 https://www.php.net/docs.php
-
diff --git a/docs/README.md b/docs/README.md
index 87655d286..b8e23447b 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -32,5 +32,5 @@ This guide uses some terminology that you have to know. Don't worry, it's easy:
 
 You can report problems or make contributions to this guide by using the
 "Edit this page" or "Report a problem" links in the sidebar of each page
-at [the online version of this documentation](https://doc.php.net/guide/),
+of [the online version of this documentation](https://doc.php.net/guide/),
 or through [the GitHub repository](https://www.github.com/php/doc-base/).
diff --git a/docs/cs-for-examples.md b/docs/cs-for-examples.md
index 8e1300eb3..bdcd77220 100644
--- a/docs/cs-for-examples.md
+++ b/docs/cs-for-examples.md
@@ -15,8 +15,9 @@ Examples should generally conform to the [PEAR coding standards][pear-cs].
 
 ## Program listing roles  (`<programlisting role="xxx">`)
    
-PHP examples should always be in `<programlisting role="php">`. Only
-PHP examples should have this role.  Other possible roles are:
+PHP examples should always be in `<programlisting role="php">`.
+Only PHP examples should have this role.
+Other possible roles are:
    
  - c           (C code) 
  - html        (100% XHTML)
@@ -41,7 +42,8 @@ means your example's content will be flush against the `<![CDATA[` tag.
 
 ## PHP tags
 
-Always use long PHP tags (`<?php`) and never short tags (`<?` or `<?=`).
+The old short and alternative tags (`<?` and `<%`) are obsolete and
+should no longer be used in the documentation.
 
 ## CDATA
 
@@ -56,12 +58,21 @@ Do not use aliases or deprecated syntax.
    
 ## Use of newer PHP features
 
-If an example uses features, such as arguments specific to a newer
-version of PHP, add a comment that mentions this.  For example:
+If an example uses features specific to a newer version of PHP, such
+as new arguments that has been added, this should be made clear in the
+title of the example.
 
 ```php   
-   // Second argument was added in PHP 4.1.0
-   foo('bar', 'baz');
+<example>
+ <title><function>foo</function> with second argument added as of PHP 8.1.0<title>
+ <programlisting role="php">
+<![CDATA[
+<?php
+foo('bar', 'baz');
+?>
+]]>
+ </programlisting>
+</example>
 ```
    
 If appropriate, show examples that work in older versions of PHP but
@@ -71,11 +82,11 @@ of `file_get_contents()` should not be named `file_get_contents()`.
 ## Use of booleans in examples
 
 Do not use entities such as `&true;` in examples but instead write them
-out as `TRUE`, `FALSE`, and/or `NULL`.
+out as `true`, `false`, and/or `null`.
 
 ## Spacing
 
-Never use tabs, only use spaces.  Intention levels are four spaces 
+Never use tabs, only use spaces.  Indentation levels are four spaces 
 and do not indent the first level of code.  For example:
    
 ### Good:
@@ -195,10 +206,11 @@ See PEAR coding standards
 #### Function naming
 
 Procedural function names should be lowercase.  If multiple words are
-needed in the function name, use a `_`.  Example: `foo_function();`
+needed in the function name, use a `_` (also known as snake\_case).
+Example: `foo_function();`
 
-OOP function names should follow the PEAR Coding Standards which
-would be `fooFunction()`.
+OOP method names should follow the standard coding style which uses
+camelCase, such as `fooFunction()`.
 
 #### Function calls
 #### Function definitions
@@ -226,16 +238,18 @@ itself through use of `/* comments */`, for example:
 ```php
 <?php
 $arr = foo();
-print_r($arr);
+var_dump($arr);
 
 /* Outputs:
 
-Array 
-(
-    [0] => 'bread'
-    [1] => 'peanut butter'
-    [2] => 'jam'
-)
+array(3) {
+  [0]=>
+  string(5) "bread"
+  [1]=>
+  string(13) "peanut butter"
+  [2]=>
+  string(3) "jam"
+}
 */
 ?>
 ```
@@ -251,21 +265,22 @@ with `<![CDATA[...]]>`
    <programlisting role="php">
 <![CDATA[
 <?php
-$arr = bar();
-print_r($arr);
+$arr = foo();
+var_dump($arr);
 ?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-Array
-(
-    [0] => 'a';
-    [1] => 'b';
-    [2] => 'c';
-    ...
-)
+array(3) {
+  [0]=>
+  string(1) "a"
+  [1]=>
+  string(1) "b"
+  [2]=>
+  string(1) "c"
+}
 ]]>
    </screen>
   </example>
diff --git a/docs/local-web-setup.md b/docs/local-web-setup.md
index 94c82f99e..cf0b021b4 100644
--- a/docs/local-web-setup.md
+++ b/docs/local-web-setup.md
@@ -12,7 +12,7 @@ $ rm -rf en
 $ ln -s ../../output/php-web en
 ```
 
-Symlinking can also be done on Windows. Just make sure you run `cmd` *as Administrator*.
+Symlinking can also be done on Windows. Just make sure you run `cmd` as an *Administrator*.
 
 ```
 $ cd \your\path\to\web-php\manual\