diff --git a/refdoc/chapters/autodoc.xml b/refdoc/chapters/autodoc.xml
index d02f4c2b58cf7cdfd867d4e3373bd59ac4a19eed..fff2e2e3cbc53a3cc5ee6006af052c135565cd5d 100644
--- a/refdoc/chapters/autodoc.xml
+++ b/refdoc/chapters/autodoc.xml
@@ -366,7 +366,7 @@ the code, without intervening blank lines. Examples:</p>
     return 4711;
   }
 
-  static int undocumented;
+  protected int undocumented;
 
   //! Error! This doc block has no destination!
 
@@ -866,7 +866,7 @@ The names speak for themselves, except: &lt;modifier&gt; which is used for modif
 ranges: 
 
   //! Some variables:
-  static nomask { 
+  protected final {
     int x, y; 
 
     string n;  
@@ -880,7 +880,7 @@ A Pike entity may also have the following properties:
   Modifiers - Given as a child element &lt;modifiers&gt;:
     &lt;variable name="i"&gt;
       &lt;modifiers&gt;
-        &lt;optional/&gt;&lt;static/&gt;&lt;private/&gt;
+        &lt;optional/&gt;&lt;protected/&gt;&lt;private/&gt;
       &lt;/modifiers&gt;
       ...
     &lt;/variable&gt;
@@ -891,7 +891,7 @@ A Pike entity may also have the following properties:
     &lt;variable name="i"&gt;
       &lt;source-position file="/home/rolf/hejhopp.pike" first-line="12"/&gt;
       &lt;modifiers&gt;
-        &lt;optional/&gt;&lt;static/&gt;&lt;private/&gt;
+        &lt;optional/&gt;&lt;protected/&gt;&lt;private/&gt;
       &lt;/modifiers&gt;
       ...
     &lt;/variable&gt;
diff --git a/refdoc/chapters/compatibility.xml b/refdoc/chapters/compatibility.xml
index fa85c43b5cf8961824c0373b272a931856a76a68..1f989b91ed56c5d32d916ef7efc68ec009286acf 100644
--- a/refdoc/chapters/compatibility.xml
+++ b/refdoc/chapters/compatibility.xml
@@ -118,7 +118,7 @@
         <r><c><ref>7.2::Gmp.pow</ref></c><c><ref>pow</ref></c></r>
         <r><c><ref>7.2::LR</ref></c><c><ref>Parser.LR</ref></c></r>
         <r><c><ref>7.2::LR.item</ref></c>
-           <c><ref>Parser.LR.Parser.Item</ref> (static)</c></r>
+           <c><ref>Parser.LR.Parser.Item</ref> (protected)</c></r>
         <r><c><ref>7.2::LR.parser</ref></c>
            <c><ref>Parser.LR.Parser</ref></c></r>
         <r><c><ref>7.2::LR.priority</ref></c>
diff --git a/refdoc/chapters/data_types.xml b/refdoc/chapters/data_types.xml
index 713c589cc21885f70c63852d159b1e97160c9ba3..b2439873ccb2632d8c7fe5e899f4020ffb417947 100644
--- a/refdoc/chapters/data_types.xml
+++ b/refdoc/chapters/data_types.xml
@@ -763,11 +763,11 @@ program <ref>compile_string</ref>(string p, string filename);
 <dd> Retreives the value of the named constant from a program.</dd>
 
 <dt> <tt>array(string) <ref>indices</ref>(program <i>p</i>)</tt></dt>
-<dd> Returns an array with the names of all non-static constants in the
+<dd> Returns an array with the names of all non-protected constants in the
      program.</dd>
 
 <dt> <tt>array(mixed) <ref>values</ref>(program <i>p</i>)</tt></dt>
-<dd> Returns an array with the values of all non-static constants in the
+<dd> Returns an array with the values of all non-protected constants in the
      program.</dd>
 </dl>
 
diff --git a/refdoc/inlining.txt b/refdoc/inlining.txt
index ae92729b974dec23fcb1578d32e30a8a71ee0c00..9fe6f11fa21b821ce6e96b32775fc5bb1ce05ce0 100644
--- a/refdoc/inlining.txt
+++ b/refdoc/inlining.txt
@@ -99,7 +99,7 @@ the code, without intervening blank lines. Examples:
     return 4711;
   }
 
-  static int undocumented;
+  protected int undocumented;
 
   //! Error! This doc block has no destination!
 
diff --git a/refdoc/xml.txt b/refdoc/xml.txt
index abbb3cde5f82d3bf905c628c11d2dd0dbe6ce5ca..409c12cb587f95ef5fbd665ae384581e64dc0c86 100644
--- a/refdoc/xml.txt
+++ b/refdoc/xml.txt
@@ -132,7 +132,7 @@ The names speak for themselves, except: <modifier> which is used for modifier
 ranges: 
 
   //! Some variables:
-  static nomask { 
+  protected final {
     int x, y; 
 
     string n;