3 files changed, 9 insertions, 54 deletions

diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 611b407429..767b72a18f 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -2097,12 +2097,7 @@
                         located in your
                         <link linkend='source-directory'>Source Directory</link>.
                         section for more information.
-                        <note>For Systemd-based images, include the following
-                        in your <filename>local.conf</filename> file:
-                        <literallayout class='monospaced'>
-     VIRTUAL-RUNTIME_initscripts = ""
-                        </literallayout>
-                        </note></para></listitem>
+                        </para></listitem>
                 </itemizedlist>
             </para>
         </section>
@@ -5362,14 +5357,6 @@
             <title>Using Systemd Exclusively</title>
 
             <para>
-                Set this variable in your <filename>local.conf</filename>
-                file:
-                <literallayout class='monospaced'>
-     VIRTUAL-RUNTIME_initscripts = ""
-                </literallayout>
-            </para>
-
-            <para>
                 Set the these variables in your distribution configuration
                 file as follows:
                 <literallayout class='monospaced'>
@@ -5386,6 +5373,14 @@
             </para>
 
             <para>
+                To remove  initscripts from your image altogether,
+                set this variable also:
+                <literallayout class='monospaced'>
+     VIRTUAL-RUNTIME_initscripts = ""
+                </literallayout>
+            </para>
+
+            <para>
                 For information on the backfill variable, see
                 <ulink url='&YOCTO_DOCS_REF_URL;#var-DISTRO_FEATURES_BACKFILL_CONSIDERED'><filename>DISTRO_FEATURES_BACKFILL_CONSIDERED</filename></ulink>.
             </para>
@@ -5395,14 +5390,6 @@
             <title>Using Systemd for the Main Image and Using SysVinit for the Rescue Image</title>
 
             <para>
-                Set this variable in your <filename>local.conf</filename>
-                file:
-                <literallayout class='monospaced'>
-     VIRTUAL-RUNTIME_initscripts = ""
-                </literallayout>
-            </para>
-
-            <para>
                 Set the these variables in your distribution configuration
                 file as follows:
                 <literallayout class='monospaced'>
diff --git a/documentation/ref-manual/ref-classes.xml b/documentation/ref-manual/ref-classes.xml
index 22a0bce218..964193f9e2 100644
--- a/documentation/ref-manual/ref-classes.xml
+++ b/documentation/ref-manual/ref-classes.xml
@@ -2896,14 +2896,6 @@
         to "disable".
     </para>
 
-    <note>
-        For Systemd-based images, include the following
-        in your <filename>local.conf</filename> file:
-        <literallayout class='monospaced'>
-     VIRTUAL-RUNTIME_initscripts = ""
-        </literallayout>
-    </note>
-
     <para>
         For more information on <filename>systemd</filename>, see the
         "<ulink url='&YOCTO_DOCS_DEV_URL;#selecting-an-initialization-manager'>Selecting an Initialization Manager</ulink>"
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index fbf0a43dee..b3febc8c85 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -7364,14 +7364,6 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     You can disable the service by setting the variable to
                     "disable."
                 </para>
-
-                <note>
-                    For Systemd-based images, include the following
-                    in your <filename>local.conf</filename> file:
-                    <literallayout class='monospaced'>
-     VIRTUAL-RUNTIME_initscripts = ""
-                    </literallayout>
-                </note>
             </glossdef>
         </glossentry>
 
@@ -7395,14 +7387,6 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     or packages in which the build system can find the systemd
                     unit files.
                 </para>
-
-                <note>
-                    For Systemd-based images, include the following
-                    in your <filename>local.conf</filename> file:
-                    <literallayout class='monospaced'>
-     VIRTUAL-RUNTIME_initscripts = ""
-                    </literallayout>
-                </note>
             </glossdef>
         </glossentry>
 
@@ -7424,14 +7408,6 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
      SYSTEMD_SERVICE_${PN} = "connman.service"
                     </literallayout>
                 </para>
-
-                <note>
-                    For Systemd-based images, include the following
-                    in your <filename>local.conf</filename> file:
-                    <literallayout class='monospaced'>
-     VIRTUAL-RUNTIME_initscripts = ""
-                    </literallayout>
-                </note>
             </glossdef>
         </glossentry>