summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2019-09-20 03:40:16 +0700
committerGitHub <noreply@github.com>2019-09-20 03:40:16 +0700
commit7e7c06b0ee7b62ac28bb155a1f1a9fd65ed547d7 (patch)
tree93dfaf73e487f83e016dc5bea4e795c0ecd26766 /docs
parentd076bcb40da2107533b1a83cf143ef3b309e8027 (diff)
parentbff0db0f6027ceb51232bb22582af6c473cacc8a (diff)
downloadvyos-documentation-7e7c06b0ee7b62ac28bb155a1f1a9fd65ed547d7.tar.gz
vyos-documentation-7e7c06b0ee7b62ac28bb155a1f1a9fd65ed547d7.zip
Merge pull request #115 from kroy-the-rabbit/config-overview-fixes
Slight cleanup and spelling
Diffstat (limited to 'docs')
-rw-r--r--docs/configuration-overview.rst23
1 files changed, 15 insertions, 8 deletions
diff --git a/docs/configuration-overview.rst b/docs/configuration-overview.rst
index fcaefa5e..5bd80028 100644
--- a/docs/configuration-overview.rst
+++ b/docs/configuration-overview.rst
@@ -117,7 +117,7 @@ to enter configuration mode enter the command `configure` when in operational mo
vyos@vyos$ configure
[edit]
- cyos@vyos#
+ vyos@vyos#
.. note:: When going into configuration mode, prompt changes from *$* to *#*. To exit configuration mode, type `exit`.
@@ -292,8 +292,8 @@ configuration revisions in configuration mode, use the compare command:
[edit]
vyos@vyos#
-You can rollback configuration using the rollback command, however this
-command will currently trigger a system reboot.
+You can rollback configuration using the rollback command. This
+command will apply the selected revision and trigger a system reboot.
.. code-block:: sh
@@ -328,8 +328,9 @@ or TFTP.
Operational info from config mode
---------------------------------
-When inside configuration mode you are not directly able to execute operational commands,
-access to these commands are possible trough the use of the `run [command]` command.
+When inside configuration mode you are not directly able to execute operational commands.
+
+Access to these commands are possible through the use of the `run [command]` command.
From this command you will have access to everything accessible from operational mode.
Command completion and syntax help with `?` and `[tab]` will also work.
@@ -353,7 +354,8 @@ This feature was available in Vyatta Core since 6.3
Local archive and revisions
---------------------------
-Revisions are stored on disk, you can view them, compare them, and rollback to previous revisions if anything goes wrong.
+Revisions are stored on disk. You can view them, compare them, and rollback to previous revisions if anything goes wrong.
+
To view existing revisions, use `show system commit` operational mode command.
.. code-block:: sh
@@ -398,8 +400,14 @@ Remote archive
VyOS can copy the config to a remote location after each commit. TFTP, FTP, and SFTP servers are supported.
-You can specify the location with `set system config-management commit-archive location URL` command, e.g. `set system config-management commit-archive location tftp://10.0.0.1/vyos`.
+You can specify the location with:
+
+* `set system config-management commit-archive location URL`
+
+For example, `set system config-management commit-archive location tftp://10.0.0.1/vyos`.
+
+You can specify the location with `set system config-management commit-archive location URL` command, e.g. `set system config-management commit-archive location tftp://10.0.0.1/vyos`.
Wipe config and restore default
-------------------------------
@@ -411,4 +419,3 @@ In the case you want to completely delete your configuration and restore the def
load /opt/vyatta/etc/config.boot.default
.. note:: If you are remotely connected, you will lose your connection. You may want to copy first the config, edit it to ensure connectivity, and load the edited config.
-