summaryrefslogtreecommitdiff
path: root/docs/configuration/system
diff options
context:
space:
mode:
Diffstat (limited to 'docs/configuration/system')
-rw-r--r--docs/configuration/system/ipv6.rst3
-rw-r--r--docs/configuration/system/login.rst4
2 files changed, 7 insertions, 0 deletions
diff --git a/docs/configuration/system/ipv6.rst b/docs/configuration/system/ipv6.rst
index cba5c0e0..763b834c 100644
--- a/docs/configuration/system/ipv6.rst
+++ b/docs/configuration/system/ipv6.rst
@@ -10,6 +10,9 @@ System configuration commands
Use this command to disable assignment of IPv6 addresses on all
interfaces.
+ .. note:: This command is deprecated in VyOS 1.3 (equuleus) and removed in
+ VyOS 1.4 (sagitta). IPv6 address family can no longer be disabled.
+
.. cfgcmd:: set system ipv6 disable-forwarding
Use this command to disable IPv6 forwarding on all interfaces.
diff --git a/docs/configuration/system/login.rst b/docs/configuration/system/login.rst
index 61201de7..08746201 100644
--- a/docs/configuration/system/login.rst
+++ b/docs/configuration/system/login.rst
@@ -84,6 +84,10 @@ The third part is simply an identifier, and is for your own reference.
.. cfgcmd:: loadkey <username> <location>
+ **Deprecation notice:** ``loadkey`` has been deprecated in favour of
+ :opcmd:`generate public-key-commands` and will be removed in a future
+ version. See :ref:`ssh`.
+
SSH keys can not only be specified on the command-line but also loaded for
a given user with `<username>` from a file pointed to by `<location>.` Keys
can be either loaded from local filesystem or any given remote location