2 files changed, 30 insertions, 5 deletions

diff --git a/documentation/ref-manual/ref-features.xml b/documentation/ref-manual/ref-features.xml
index 230cabd155..e1a8cde464 100644
--- a/documentation/ref-manual/ref-features.xml
+++ b/documentation/ref-manual/ref-features.xml
@@ -222,13 +222,23 @@
         <para>
             The following image features are available for all images:
             <itemizedlist>
+                <listitem><para><emphasis>allow-empty-password:</emphasis>
+                    When 'debug-tweaks' is in
+                    <link linkend='var-IMAGE_FEATURES'><filename>IMAGE_FEATURES</filename></link>,
+                    runs <filename>ssh_allow_empty_password</filename>,
+                    which allows Dropbear and OpenSSH to accept root logins
+                    and logins from accounts having an empty password string.
+                    </para></listitem>
                 <listitem><para><emphasis>dbg-pkgs:</emphasis>
                     Installs debug symbol packages for all packages installed
                     in a given image.
                     </para></listitem>
                 <listitem><para><emphasis>debug-tweaks:</emphasis>
                     Makes an image suitable for development (e.g.
-                    allows root logins without passwords).
+                    allows root logins without passwords and enables
+                    post-installation logging).
+                    See the 'allow-empty-password' and 'post-install-logging'
+                    features in this list for additional information.
                     </para></listitem>
                 <listitem><para><emphasis>dev-pkgs:</emphasis>
                     Installs development packages (headers and extra library
@@ -238,10 +248,22 @@
                     documentation packages for all packages installed in a
                     given image.
                     </para></listitem>
+                <listitem><para><emphasis>empty-root-password:</emphasis>
+                    When 'debug-tweaks' is not in
+                    <link linkend='var-IMAGE_FEATURES'><filename>IMAGE_FEATURES</filename></link>,
+                    runs <filename>zap_empty_root_password</filename>,
+                    which disallows an empty root password.
+                    </para></listitem>
                 <listitem><para><emphasis>package-management:</emphasis>
                     Installs package management tools and preserves the package
                     manager database.
                     </para></listitem>
+                <listitem><para><emphasis>post-install-logging:</emphasis>
+                    When 'debug-tweaks' is in
+                    <link linkend='var-IMAGE_FEATURES'><filename>IMAGE_FEATURES</filename></link>,
+                    runs <filename>postinst_enable_logging</filename>, which
+                    enables post-installation logging.
+                    </para></listitem>
                 <listitem><para><emphasis>ptest-pkgs:</emphasis>
                     Installs ptest packages for all ptest-enabled recipes.
                     </para></listitem>
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 6ecfaf8f63..8f0d8917b5 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -3238,10 +3238,13 @@ meta/conf/machine/include/<architecture>/arch-<architecture>.inc
              including symbol information for debugging and
              profiling.
 
-"debug-tweaks" - Makes an image suitable for development.
-                 For example, ssh root access has a blank
-                 password.  You should remove this feature
-                 before you produce a production image.
+"debug-tweaks" - Makes an image suitable for debugging.
+                 For example, allows root logins without
+                 passwords and enables post-installation
+                 logging. See the 'allow-empty-password'
+                 and 'post-install-logging' features in
+                 the "<link linkend='ref-features-image'>Image Features</link>" section for
+                 more information.
 
 "dev-pkgs" - Adds -dev packages for all installed packages.
              This is useful if you want to develop against