--- a/contrib/wix/help.wxs	Mon May 14 23:00:30 2018 -0400
+++ b/contrib/wix/help.wxs	Mon May 14 13:11:04 2018 +0200
@@ -19,6 +19,7 @@
           <File Name="color.txt" />
           <File Name="config.txt" KeyPath="yes" />
           <File Name="dates.txt" />
+          <File Name="deprecated.txt" />
           <File Name="diffs.txt" />
           <File Name="environment.txt" />
           <File Name="extensions.txt" />

--- a/mercurial/help.py	Mon May 14 23:00:30 2018 -0400
+++ b/mercurial/help.py	Mon May 14 13:11:04 2018 +0200
@@ -232,6 +232,7 @@
     (['bundlespec'], _("Bundle File Formats"), loaddoc('bundlespec')),
     (['color'], _("Colorizing Outputs"), loaddoc('color')),
     (["config", "hgrc"], _("Configuration Files"), loaddoc('config')),
+    (['deprecated'], _("Deprecated Features"), loaddoc('deprecated')),
     (["dates"], _("Date Formats"), loaddoc('dates')),
     (["flags"], _("Command-line flags"), loaddoc('flags')),
     (["patterns"], _("File Name Patterns"), loaddoc('patterns')),

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial/help/deprecated.txt	Mon May 14 13:11:04 2018 +0200
@@ -0,0 +1,30 @@
+Mercurial evolves over time, some features, options, commands may be replaced by
+better and more secure alternatives. This topic will help you migrating your
+existing usage and/or configuration to newer features.
+
+Commands
+========
+
+The following commands are still available but their use are not recommended:
+
+``locate``
+
+This command has been replaced by `hg files`.
+
+``parents``
+
+This command can be replaced by `hg summary` or `hg log` with appropriate
+revsets. See `hg help revsets` for more information.
+
+``tip``
+
+The recommended alternative is `hg heads`.
+
+Options
+=======
+
+``web.allowpull``
+    Renamed to `allow-pull`.
+
+``web.allow_push``
+    Renamed to `allow-push`.

--- a/tests/test-globalopts.t	Mon May 14 23:00:30 2018 -0400
+++ b/tests/test-globalopts.t	Mon May 14 13:11:04 2018 +0200
@@ -353,6 +353,7 @@
    color         Colorizing Outputs
    config        Configuration Files
    dates         Date Formats
+   deprecated    Deprecated Features
    diffs         Diff Formats
    environment   Environment Variables
    extensions    Using Additional Features
@@ -436,6 +437,7 @@
    color         Colorizing Outputs
    config        Configuration Files
    dates         Date Formats
+   deprecated    Deprecated Features
    diffs         Diff Formats
    environment   Environment Variables
    extensions    Using Additional Features

--- a/tests/test-help.t	Mon May 14 23:00:30 2018 -0400
+++ b/tests/test-help.t	Mon May 14 13:11:04 2018 +0200
@@ -110,6 +110,7 @@
    color         Colorizing Outputs
    config        Configuration Files
    dates         Date Formats
+   deprecated    Deprecated Features
    diffs         Diff Formats
    environment   Environment Variables
    extensions    Using Additional Features
@@ -189,6 +190,7 @@
    color         Colorizing Outputs
    config        Configuration Files
    dates         Date Formats
+   deprecated    Deprecated Features
    diffs         Diff Formats
    environment   Environment Variables
    extensions    Using Additional Features
@@ -889,6 +891,7 @@
    color         Colorizing Outputs
    config        Configuration Files
    dates         Date Formats
+   deprecated    Deprecated Features
    diffs         Diff Formats
    environment   Environment Variables
    extensions    Using Additional Features
@@ -2032,6 +2035,13 @@
   Date Formats
   </td></tr>
   <tr><td>
+  <a href="/help/deprecated">
+  deprecated
+  </a>
+  </td><td>
+  Deprecated Features
+  </td></tr>
+  <tr><td>
   <a href="/help/diffs">
   diffs
   </a>

--- a/tests/test-hgweb-json.t	Mon May 14 23:00:30 2018 -0400
+++ b/tests/test-hgweb-json.t	Mon May 14 13:11:04 2018 +0200
@@ -1914,6 +1914,10 @@
         "topic": "dates"
       },
       {
+        "summary": "Deprecated Features",
+        "topic": "deprecated"
+      },
+      {
         "summary": "Diff Formats",
         "topic": "diffs"
       },