linode · nmelehan · Oct 17, 2018 · Oct 4, 2018 · Oct 4, 2018 · Oct 8, 2018
diff --git a/ci/vale/dictionary.txt b/ci/vale/dictionary.txt
@@ -888,6 +888,8 @@ ossec
 ostemplate
 osx
 otomen
+outputter
+outputters
 overcommit
 overwatch
 ovpn
@@ -985,6 +987,7 @@ psql
 psudo
 psycop2
 pty
+pubkey
 publickey
 puppetd
 puppetmaster
@@ -1178,6 +1181,7 @@ sparklines
 spectre
 speedtest
 spf1
+spm
 spork
 sql
 sqlplus

diff --git a/docs/applications/configuration-management/salt-command-line-reference/index.md b/docs/applications/configuration-management/salt-command-line-reference/index.md
diff --git a/...e-postfix-to-send-mail-using-gmail-and-google-apps-on-debian-or-ubuntu/index.md b/...e-postfix-to-send-mail-using-gmail-and-google-apps-on-debian-or-ubuntu/index.md
@@ -5,9 +5,9 @@ author:
 description: 'Install and configure Postfix on Debian and Ubuntu to send email through Gmail and Google Apps.'
 keywords: ["Postfix", " Ubuntu", " Debian", " SMTP", " Gmail"]
 license: '[CC BY-ND 4.0](https://creativecommons.org/licenses/by-nd/4.0)'
-modified: 2017-09-05
+modified: 2018-09-27
 modified_by:
-  name: Edward Angert
+  name: Linode
 published: 2016-12-13
 title: Configure Postfix to Send Mail Using Gmail and Google Apps on Debian or Ubuntu
 ---
@@ -84,6 +84,9 @@ Usernames and passwords are stored in `sasl_passwd` in the `/etc/postfix/sasl/`
 
 {{< /file >}}
 
+    {{< note >}}
+The SMTP server address configuration `smtp.gmail.com` supports message submission over port 587 ([StartTLS](https://en.wikipedia.org/wiki/Opportunistic_TLS)) and port 465 ([SSL](https://en.wikipedia.org/wiki/Transport_Layer_Security)). Whichever protocol you choose, be sure the port number is the same in `/etc/postfix/sasl/sasl\\_passwd` and `/etc/postfix/main.cf` files. See Google's [G Suite Administrator Help](https://support.google.com/a/answer/176600?hl=en) for more information.
+{{< /note >}}
 
 2.  Create the hash db file for Postfix by running the `postmap` command:
 
@@ -104,7 +107,7 @@ To restrict access to these files, change their permissions so that only the **r
 
 In this section, you will configure the `/etc/postfix/main.cf` file to use Gmail's SMTP server.
 
-1.  Find and modify `relayhost` in `/etc/postfix/main.cf` to match the following example:
+1.  Find and modify `relayhost` in `/etc/postfix/main.cf` to match the following example. Be sure the port number matches what you specified in `/etc/postfix/sasl/sasl\\_passwd` above.
 
     {{< file "/etc/postfix/main.cf" >}}
 relayhost = [smtp.gmail.com]:587

diff --git a/docs/getting-started/index.md b/docs/getting-started/index.md
@@ -142,26 +142,26 @@ Once you have the IP address and an SSH client, you can log in via SSH. The foll
 
 1.  Enter the following into your terminal window or application. Replace the example IP address with your Linode's IP address:
 
-        ssh root@123.456.78.90
+        ssh root@198.51.100.4
 
 2.  If this is the first time connecting to your Linode, you'll see the authenticity warning below. This is because your SSH client has never encountered the server's key fingerprint before. Type `yes` and press **Enter** to continue connecting.
 
     {{< output >}}
-The authenticity of host '123.456.78.90 (123.456.78.90)' can't be established.
+The authenticity of host '198.51.100.4 (198.51.100.4)' can't be established.
 RSA key fingerprint is 11:eb:57:f3:a5:c3:e0:77:47:c4:15:3a:3c:df:6c:d2.
 Are you sure you want to continue connecting (yes/no)?
 {{< /output >}}
 
     After you enter `yes`, the client confirms the addition:
 
     {{< output >}}
-Warning: Permanently added '123.456.78.90' (RSA) to the list of known hosts.
+Warning: Permanently added '198.51.100.4' (RSA) to the list of known hosts.
 {{< /output >}}
 
 3.  The login prompt appears for you to enter the password you created for the `root` user above.
 
     {{< output >}}
-root@123.456.78.90's password:
+root@198.51.100.4's password:
 {{< /output >}}
 
 4.  The SSH client initiates the connection. When the connection is completed the following prompt appears:
@@ -178,7 +178,7 @@ To reconnect via SSH, revoke the key for that IP address.
 
 For Linux and Mac OS X:
 
-    ssh-keygen -R 123.45.67.89
+    ssh-keygen -R 198.51.100.4
 
 For Windows, PuTTY users must remove the old host IP addresses manually. PuTTY's known hosts are in the registry entry:
 

diff --git a/docs/networking/dns/update-dns-at-common-name-server-authorities/index.md b/docs/networking/dns/update-dns-at-common-name-server-authorities/index.md
@@ -0,0 +1,29 @@
+---
+author:
+  name: Nathan Melehan
+  email: docs@linode.com
+description: "Shortguide list of support documentation for updating DNS records at common name server authorities"
+license: '[CC BY-ND 4.0](https://creativecommons.org/licenses/by-nd/4.0)'
+keywords: ["nameserver", "authoritative nameserver", "DNS", "DNS Manager"]
+modified: 2018-09-27
+modified_by:
+  name: Nathan Melehan
+title: "Update DNS Records at Common Name Server Authorities"
+published: 2018-09-27
+headless: true
+---
+
+{{< disclosure-note "Updating DNS records at common nameserver authorities" >}}
+The following support documents describe how to update DNS records at common nameserver authorities:
+
+-   [CloudFlare](https://support.cloudflare.com/hc/en-us/articles/200168686-What-do-I-do-if-I-changed-my-server-IP-address-or-hosting-provider-)
+-   [GoDaddy](https://www.godaddy.com/help/manage-dns-zone-files-680)
+-   [DreamHost](https://help.dreamhost.com/hc/en-us/articles/215414867-How-do-I-add-custom-DNS-records)
+-   [Gandi](https://doc.gandi.net/en/dns/zone)
+-   [1&1](https://www.1and1.com/help/domains/configuring-your-ip-address/connecting-a-domain-to-a-static-ip-address/)
+-   [Network Solutions](http://www.networksolutions.com/support/how-to-manage-advanced-dns-records/)
+-   [Bluehost](https://my.bluehost.com/hosting/help/559)
+-   [HostGator](https://support.hostgator.com/articles/manage-dns-records-with-hostgatorenom)
+-   [Namecheap](https://www.namecheap.com/support/knowledgebase/article.aspx/319/2237/how-can-i-set-up-an-a-address-record-for-my-domain)
+-   [Hover](https://help.hover.com/hc/en-us/articles/217282457-How-to-Edit-DNS-records-A-AAAA-CNAME-MX-TXT-SRV-)
+{{< /disclosure-note >}}
diff --git a/docs/platform/block-storage/how-to-use-block-storage-with-your-linode/index.md b/docs/platform/block-storage/how-to-use-block-storage-with-your-linode/index.md
@@ -18,7 +18,7 @@ cloud_manager_link: platform/block-storage/how-to-use-block-storage-with-your-li
 
 Linode’s Block Storage service allows you to attach additional storage volumes to your Linode. A single volume can range from 10 GiB to 10,000 GiB in size and costs $0.10/GiB per month. They can be partitioned however you like and can accommodate any filesystem type you choose. Up to eight volumes can be attached to a single Linode, be it new or already existing, so you do not need to recreate your server to add a Block Storage Volume.
 
-The Block Storage service is currently available in the Dallas, Fremont, Frankfurt, London, Newark, and Singapore data centers.
+The Block Storage service is currently available in the Dallas, Fremont, Frankfurt, London, Newark, Singapore, and Tokyo 2 data centers.
 
 {{< caution >}}
 -  Linode's backup services do not cover Block Storage Volumes. You must execute [your own backups](/docs/security/backups/backing-up-your-data/) for this data.

diff --git a/docs/platform/disk-images/resizing-a-linode/resizing-a-linode-small.png b/docs/platform/disk-images/resizing-a-linode/resizing-a-linode-small.png
diff --git a/docs/platform/disk-images/resizing-a-linode/resizing-a-linode.png b/docs/platform/disk-images/resizing-a-linode/resizing-a-linode.png
diff --git a/docs/platform/manager/dns-manager-new-manager/index.md b/docs/platform/manager/dns-manager-new-manager/index.md
@@ -16,7 +16,7 @@ hiddenguide: true
 
 <!-- ![DNS Manager Overview](dns-manager-overview.png) -->
 
-The *Domains* section of the Linode Manger is a comprehensive DNS management interface that allows you to add DNS records for all of your domain names. This guide covers the use of the Domains section and basic domain zone setup. For an introduction to DNS in general, see our [Introduction to DNS Records](/docs/networking/dns/dns-records-an-introduction/) guide.
+The *Domains* section of the Linode Manager is a comprehensive DNS management interface that allows you to add DNS records for all of your domain names. This guide covers the use of the Domains section and basic domain zone setup. For an introduction to DNS in general, see our [Introduction to DNS Records](/docs/networking/dns/dns-records-an-introduction/) guide.
 
 ## Getting Started
 

diff --git a/docs/platform/manager/dns-manager/index.md b/docs/platform/manager/dns-manager/index.md
@@ -105,7 +105,7 @@ In order for Linode's DNS servers to function as slaves, your DNS master server
     2a01:7e00::a
 {{< /note >}}
 
-If you selected the option to have the DNS Manager insert basic DNS records, those records will be visible, as shown above. If you elected to keep the zone empty, you can start adding DNS records now. Skip to the [Adding DNS Records](/docs/networking/dns/dns-manager-overview/#add-records) section for instructions.
+If you selected the option to have the DNS Manager insert basic DNS records, those records will be visible, as shown above. If you elected to keep the zone empty, you can start adding DNS records now.
 
 ### Add Records
 

diff --git a/docs/platform/migrate-to-linode/best-practices-when-migrating-to-linode/index.md b/docs/platform/migrate-to-linode/best-practices-when-migrating-to-linode/index.md
@@ -116,19 +116,7 @@ To direct your visitors to your Linode, associate your domain with [your new Lin
 
 If you'd like to continue with your current nameservers, update all of the DNS records that are assigned to your old host's IP address to use your new Linode's IP. Contact your nameserver authority for instructions on how to update your DNS records.
 
-{{< disclosure-note "Updating DNS records at common nameserver authorities" >}}
-The following support documents describe how to update DNS records at common nameserver authorities:
-
--   [GoDaddy](https://www.godaddy.com/help/manage-dns-zone-files-680)
--   [DreamHost](https://help.dreamhost.com/hc/en-us/articles/215414867-How-do-I-add-custom-DNS-records)
--   [Gandi](https://doc.gandi.net/en/dns/zone)
--   [1&1](https://www.1and1.com/help/domains/configuring-your-ip-address/connecting-a-domain-to-a-static-ip-address/)
--   [Network Solutions](http://www.networksolutions.com/support/how-to-manage-advanced-dns-records/)
--   [Bluehost](https://my.bluehost.com/hosting/help/559)
--   [HostGator](https://support.hostgator.com/articles/manage-dns-records-with-hostgatorenom)
--   [Namecheap](https://www.namecheap.com/support/knowledgebase/article.aspx/319/2237/how-can-i-set-up-an-a-address-record-for-my-domain)
--   [Hover](https://help.hover.com/hc/en-us/articles/217282457-How-to-Edit-DNS-records-A-AAAA-CNAME-MX-TXT-SRV-)
-{{< /disclosure-note >}}
+{{< content "update-dns-at-common-name-server-authorities" >}}
 
 After DNS propagation has finished, [set reverse DNS](/docs/networking/dns/configure-your-linode-for-reverse-dns/) for your domain. This is especially important if you are running a mail server.
 

diff --git a/docs/platform/tokyo2-migration/index.md b/docs/platform/tokyo2-migration/index.md
@@ -0,0 +1,129 @@
+---
+author:
+  name: Linode
+  email: docs@linode.com
+description: Linode is retiring our Tokyo 1 data center, and this guide shows how to migrate to our new Tokyo 2 location.
+keywords: ["tokyo 1", "tokyo 2", "migrate", "migration", "migrating", "data center"]
+license: '[CC BY-ND 4.0](https://creativecommons.org/licenses/by-nd/4.0)'
+modified: 2018-09-27
+modified_by:
+  name: Linode
+published: 2018-09-27
+title: Migrating from Tokyo 1 to Tokyo 2
+hiddenguide: true
+---
+
+In November 2016, Linode [announced and opened](https://blog.linode.com/2016/11/21/new-linode-datacenter-tokyo-2/) the Tokyo 2 data center. This is the second facility operated by Linode in the Tokyo region. Linode is now making preparations to retire the original Tokyo 1 facility. All Linodes hosted in this data center will be migrated to Tokyo 2. This guide is written to prepare customers for this migration and to make migrating easier.
+
+## Benefits of Tokyo 2
+
+The Tokyo 2 data center provides access to features that are not available in Tokyo 1. These features are:
+
+-  The [Block Storage Service](https://www.linode.com/blockstorage) (available starting Q3 2018).
+-  The [newest Linode plans](https://blog.linode.com/2018/05/17/updated-linode-plans-new-larger-linodes/).
+-  Future features on Linode's product roadmap.
+
+## When will My Linodes be Migrated?
+
+You will receive a support ticket from Linode that lists the scheduled dates and times for the migration of your Tokyo 1 Linodes. This ticket will be sent to you at least three months in advance of the start of your first migration.
+
+Different Linodes will be scheduled to migrate on different dates and times. The support ticket you receive will list the migration schedule for all of your Tokyo 1 Linodes. **Linode will not be able to adjust this schedule of migrations.**
+
+You are able to move your servers to Tokyo 2 before the scheduled migration dates. We recommend that all customers move their servers early. Moving early will help you better control the uptime of your services.
+
+{{< note >}}
+You will receive a credit on your account equal to three months of service for each of your Tokyo 1 Linodes. This credit will cover the cost of creating new servers in Tokyo 2 if you choose to [clone your Linodes](#option-2-clone-your-linodes).
+{{< /note >}}
+
+## What are My Options for Migrating?
+
+There are three different options for moving your servers to the Tokyo 2 data center. The first two of these methods can be followed before the scheduled migration deadlines for your Linodes.
+
+Regardless of which option you choose, **all of your Tokyo 1 Linodes' IP addresses will change** when moving to the new location. This includes all public and private IPv4 addresses, as well as public and link-local IPv6 addresses.
+
+Later sections in this guide describe how to update your [network interface configuration](#update-your-network-configuration) and [DNS records](#update-dns-records) to use the new IPs.
+
+{{< note >}}
+If your Tokyo 1 Linode is enrolled in the [Linode Backup Service](https://www.linode.com/backups), it will remain enrolled in the service after the migration. However, the saved backups and snapshots that have been created for your Linode prior to the migration **will not move** to the new Tokyo 2 facility. Instead, your Linode will start creating new scheduled backups after it is migrated to the Tokyo 2 date center (according to its [backup schedule](/docs/platform/disk-images/linode-backup-service/#schedule-backups)).
+{{</ note >}}
+
+### Option 1: Migrate Early
+
+When you receive the support ticket which lists your migration times, you will also see a new banner appear in the dashboard of each of your Tokyo 1 Linodes. This banner will give you the option to initiate an early migration of your Linode to Tokyo 2.
+
+Clicking on the banner will take you to a new page which shows the estimated duration for the migration. This page will let you initiate the migration.
+
+The following sequence executes when you start the migration:
+
+1.  If your Linode is running, your Linode is gracefully powered down.
+
+1.  At the same time, your Linode will be assigned new IP addresses. You will be able to view these new IPs from the [Remote Access tab](/docs/platform/manager/remote-access/) of your Linode's dashboard.
+
+1.  The migration of your Linode is started immediately after the shutdown completes.
+
+1.  If the Linode was running before the migration started, it will be automatically booted after the migration completes. If the Linode was not running, it will remain offline after the migration.
+
+You will be able to monitor the progress of your Linode's migration from its dashboard. While waiting on the migration to complete, [update your DNS records](#update-dns-records) to use your new IP addresses. DNS changes can take time to propagate, so we recommend doing this quickly after the migration is initiated.
+
+When the migration finishes, you may need to update your Linode's [network configuration](#update-your-network-configuration) to use the new IPs.
+
+
+### Option 2: Clone your Linodes
+
+Because migrating a Linode will power it down during the migration, your Linode's services will be offline during that time. In addition, if you run a cluster of multiple Linodes for a service, then migrating one or more of them may cause problems for the cluster.
+
+To avoid these issues, you can instead create new Linodes in Tokyo 2 and then **clone** your Tokyo 1 Linode's disks to them. Performing a clone will create exact copies of your disks on the new Linode.
+
+{{< note >}}
+You can perform a clone of a Linode when it is running. However, this can sometimes result in filesystem inconsistencies on the target Linode (your source Linode will never be negatively affected, even if the clone fails). You may need to power your source Linode down to perform a successful clone.
+{{< /note >}}
+
+Cloning your Linodes offers these benefits:
+
+-   You will be able to set up your new Linodes in Tokyo 2 and verify that they run normally before you remove your Tokyo 1 Linodes.
+
+-   When you have verified that your Tokyo 2 Linodes work, you can update your DNS records. Updating your DNS records will gracefully direct your users to your new servers without downtime.
+
+To clone a Linode, follow these steps:
+
+1.  Create a new Linode in Tokyo 2. Make sure that you [select a plan](https://www.linode.com/pricing) that has as much disk space as the size of your disks on your source Tokyo 1 Linode.
+
+1.  Follow the [cloning guide](/docs/platform/disk-images/clone-your-linode/) to complete the clone operation. When following these steps, enable all of the configuration profile options for your Linode.
+
+After you have created your new Linode and completed the clone, you may need to update your new Linode's [network configuration](#update-your-network-configuration). After making sure that your new Tokyo 2 servers all work as expected, [update your DNS records](#update-dns-records).
+
+{{< note >}}
+If you clone your Tokyo 1 Linodes to Tokyo 2, your Tokyo 1 Linodes will remain running and active on your account by default. To prevent double-billing, [remove](/docs/platform/billing-and-support/billing-and-payments/#removing-services) the original Tokyo 1 Linodes after you have finished your clones. The three-month credit that will be applied to your account will cover the costs for your extra servers during this transition period. This credit will not cover future costs if you do not delete your Tokyo 1 Linodes.
+{{< /note >}}
+
+### Option 3: Migrate when Scheduled
+
+If you do not choose to migrate or clone early, Linode will automatically start your migrations at the time listed in your support ticket.
+
+{{< caution >}}
+If Linode initiates your migration when it is scheduled, **your Linode will not be powered on automatically when the migration finishes**. Your Linode is not powered on in order to minimize potential security issues that could result from booting under a new IP assignment.
+{{< /caution >}}
+
+After the scheduled migration completes, you can log into the Linode's dashboard and power it on. You may need to update your new Linode's [network configuration](#update-your-network-configuration). Then, [update your DNS records](#update-dns-records). You can also choose to update your DNS records as soon as the migration starts.
+
+## Update your Network Configuration
+
+In order for your new IP address assignment to work, your Linux deployment's network interface configuration needs to use the new IPs. If Linode's [Network Helper](/docs/platform/network-helper/) tool is enabled for your configuration profile, your network interface should automatically adopt the new IPs without any extra action needed from you.
+
+If Network Helper is not enabled, but you use DHCP for your network assignments, then your networking should also work automatically.
+
+If you do not use Network Helper or DHCP, then you will need to update your static interface configuration files. Follow the [Linux Static IP Configuration](/docs/networking/linux-static-ip-configuration/) guide to enter your new IP addresses. Your new IPs are listed in the [Remote Access tab](/docs/platform/manager/remote-access/) of your Linode's dashboard. These new IPs will only appear **after you start its migration** (if you choose to migrate instead of cloning).
+
+You may also need to update the configuration of your applications if they explicitly bind to your public or private IP addresses. Review Linode's [web server](/docs/web-servers/) and [application](/docs/applications/) guides for more information on this topic.
+
+## Update DNS Records
+
+To direct your users to your new Tokyo 2 servers' IPs, you need to update your DNS records to use the new IPs. If you are using Linode's DNS Manager, follow the DNS Manager guide to [update your records](/docs/platform/manager/dns-manager/#edit-records).
+
+If you use a different DNS provider, you will need to visit that provider's website to update your records.
+
+{{< content "update-dns-at-common-name-server-authorities" >}}
+
+## Contact Linode Support
+
+If you have any issues when migrating or cloning to Tokyo 2, or if you have any questions about this process, please [contact Linode Support](/docs/platform/billing-and-support/support/#contacting-linode-support). Technical questions about your Linux deployment's configuration are often outside the scope of support. For any out-of-scope issues, we also recommend searching and asking technical questions in the [Linode Community Site](/community/questions/).