Migration: Vyatta: adjust to 80 character line-break

1 files changed, 30 insertions, 20 deletions

diff --git a/docs/appendix/migrate-from-vyatta.rst b/docs/appendix/migrate-from-vyatta.rst
index 9c76d363..75d53282 100644
--- a/docs/appendix/migrate-from-vyatta.rst
+++ b/docs/appendix/migrate-from-vyatta.rst
@@ -3,34 +3,43 @@
 Migrate from Vyatta Core
 ========================
 
-VyOS 1.x.x line aims to preserve backward compatibility and provide a safe upgrade path for existing Vyatta Core users. You may think of 1.0.0 as VC7.0.
+VyOS 1.x.x line aims to preserve backward compatibility and provide a safe upgrade
+ath for existing Vyatta Core users. You may think of 1.0.0 as VC7.0.
 
 Vyatta release compatiblity
 ---------------------------
 Vyatta Core releases from **6.5** to **6.6** should be 100% compatible.
 
-Vyatta Core **6.4** and earlier may have incompatibilities. In **6.5** the "modify" firewall was removed and replaced with "set policy route" command family, and old config cannot be automatically converted. You will have to adapt it to post-6.5 syntax manually.
+Vyatta Core **6.4** and earlier may have incompatibilities. In **6.5** the "modify"
+firewall was removed and replaced with ``set policy route`` command family, and
+old config cannot be automatically converted. You will have to adapt it to
+post-6.5 syntax manually.
 
-.. NOTE::
-  Also, in **6.5** remote access VPN interfaces were renamed from pppX to l2tpX and pptpX, so if you are using zone-policy in pre-6.5 versions, make sure to change interface names in rules for remote access VPN.
+.. note:: Also, in **6.5** remote access VPN interfaces were renamed from pppX
+   to l2tpX and pptpX, so if you are using zone-policy in pre-6.5 versions, make
+   sure to change interface names in rules for remote access VPN.
 
 Upgrade procedure
 -----------------
-You just use "add system image", as if it was a new VC release. The only thing is that is you want to verify image digital signature, you will have to add the public key.
+You just use ``add system image``, as if it was a new VC release. The only thing
+is that is you want to verify image digital signature, you will have to add the
+public key.
 
 .. code-block:: sh
 
   vyatta@vyatta:~$ '''wget http://vyos.net/so3group_maintainers.key'''
-  Connecting to vyos.net (85.159.113.32:80)
-  so3group_maintainers 100% |***************************************************************************
-  ********************************************************************|  3125  --:--:-- ETA
+  Connecting to vyos.net (x.x.x.x:80)
+  so3group_maintainers 100% |******************************|  3125  --:--:-- ETA
   vyatta@vyatta:~$ '''sudo apt-key add so3group_maintainers.key'''
   OK
   vyatta@vyatta:~$
 
 Next, we can add the VyOS image.
 
-Note that Vyatta doesn't support HTTP redirects for **add system image** and the http://mirror.vyos.net HTTP load-balancer links will not work. Instead, choose one of the `mirrors <https://wiki.vyos.net/wiki/Mirrors>`_ and get a direct link.
+
+.. note:: Vyatta doesn't support HTTP redirects for ``add system image`` and
+http://mirror.vyos.net HTTP load-balancer links will not work. Instead, choose
+one of the `mirrors <https://wiki.vyos.net/wiki/Mirrors>`_ and get a direct link.
 
 This example uses 1.0.0 image, however, it's better to install the latest release.
 
@@ -38,9 +47,8 @@ This example uses 1.0.0 image, however, it's better to install the latest releas
 
   vyatta@vyatta:~$ show system image
   The system currently has the following image(s) installed:
-   
-     1: VC6.6R1 (default boot) (running image)
-   
+    1: VC6.6R1 (default boot) (running image)
+
   vyatta@vyatta:~$ add system image http://0.uk.mirrors.vyos.net/iso/release/1.0.0/vyos-1.0.0-amd64.iso
    Trying to fetch ISO file from http://0.uk.mirrors.vyos.net/iso/release/1.0.0/vyos-1.0.0-amd64.iso
      % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
@@ -69,26 +77,28 @@ This example uses 1.0.0 image, however, it's better to install the latest releas
    OK.  This image will be named: 1.0.0
    Installing "1.0.0" image.
    Copying new release files...
-   Would you like to save the current configuration 
+   Would you like to save the current configuration
    directory and config file? (Yes/No) [Yes]: '''[return]'''
    Copying current configuration...
-   Would you like to save the SSH host keys from your 
+   Would you like to save the SSH host keys from your
    current configuration? (Yes/No) [Yes]: '''[return]'''
    Copying SSH keys...
    Setting up grub configuration...
    Done.
-   vyatta@vyatta:~$ '''show system image''' 
+   vyatta@vyatta:~$ '''show system image'''
    The system currently has the following image(s) installed:
-   
+
       1: 1.0.0 (default boot)
       2: VC6.6R1 (running image)
-   
-   vyatta@vyatta:~$ 
+
+   vyatta@vyatta:~$
 
 Upon reboot, you should have a working installation of VyOS.
 
-You can go back to your Vyatta install using the **set system image default-boot** command and selecting the your previous Vyatta image.
+You can go back to your Vyatta install using the ``set system image default-boot``
+command and selecting the your previous Vyatta image.
 
-Note that future releases of VyOS may break compatibility with Vyatta.
+.. note:: Future releases of VyOS will break the direct upgrade path from Vyatta
+   core. Please upgrade through an intermediate VyOS version e.g. VyOS 1.2.x.