Merge pull request #1 from linode/master

pulling in from head

Author: RainbowHackerHorse

docs/applications/ansible/getting-started-with-ansible.md

@@ -4,7 +4,7 @@ author:
     email: [email protected]
 description: 'A quick getting started guide to Ansible, with a demo of how to provision a basic web server with Ansible'
 keywords: 'ansible,ansible configuration,ansible provisioning,ansible infrastructure,ansible automation,ansible configuration,ansible configuration change management,ansible server automation'
-license: '[CC BY-ND 3.0](http://creativecommons.org/licenses/by-nd/3.0/us/)'
+license: '[CC BY-ND 4.0](https://creativecommons.org/licenses/by-nd/4.0)'
 published: 'Monday, September 8, 2015'
 modified: Monday, September 8, 2015
 modified_by:

docs/applications/chef/beginners-guide-chef.md

@@ -4,7 +4,7 @@ author:
   email: [email protected]
 description: 'A look into Chef''s primary components, features, and configurations for the new Chef user'
 keywords: 'chef,automation,chefdk,chef server,chef development kit,cookbooks,beginners,server automation,configuration management'
-license: '[CC BY-ND 3.0](http://creativecommons.org/licenses/by-nd/3.0/us/)'
+license: '[CC BY-ND 4.0](https://creativecommons.org/licenses/by-nd/4.0)'
 modified: Wednesday, June 10th, 2015
 modified_by:
   name: Elle Krout

docs/applications/chef/creating-your-first-chef-cookbook.md

@@ -4,7 +4,7 @@ author:
   email: [email protected]
 description: 'Learn how to create Chef cookbooks by creating a LAMP stack in Chef'
 keywords: 'chef,automation,cookbooks,opscode,lamp,lamp stack,beginner,server automation'
-license: '[CC BY-ND 3.0](http://creativecommons.org/licenses/by-nd/3.0/us/)'
+license: '[CC BY-ND 4.0](https://creativecommons.org/licenses/by-nd/4.0)'
 modified: Wednesday, June 10th, 2015
 modified_by:
   name: Elle Krout
@@ -545,7 +545,7 @@ With the MySQL library downloaded and an encrypted root password prepared, you c
      - Add the PHP recipe, run the chef-client, and copy the file from a node (located in `/etc/php5/apache2/php.ini`), or:
      - Copy it from [here](/docs/assets/chef_php.ini). The file should be moved to the `chef-repo/cookbooks/lamp-stack/files/default/` directory. This can also be turned into a template, if that better suits your configuration.
 
-3.  `php.ini` is a large file. Search and edit the following values to best suit your Linodes. The values suggested below are for 1GB Linodes:
+3.  `php.ini` is a large file. Search and edit the following values to best suit your Linodes. The values suggested below are for 2GB Linodes:
 
     {: .file-excerpt}
     ~/chef-repo/cookbooks/lamp-stack/files/default/php.ini

docs/applications/chef/deploy-a-chef-server-workstation-and-node-on-ubuntu-14-04.md

@@ -4,7 +4,7 @@ author:
   email: [email protected]
 description: Deploy a Chef Server, Workstation and Node
 keywords: 'chef,chef installation,configuration change management,server automation,chef server,chef workstation,chef-client,knife.rb,version control'
-license: '[CC BY-ND 3.0](http://creativecommons.org/licenses/by-nd/3.0/us/)'
+license: '[CC BY-ND 4.0](https://creativecommons.org/licenses/by-nd/4.0)'
 modified: Wednesday, June 10th, 2015
 modified_by:
   name: Elle Krout

docs/applications/cloud-storage/access-google-drive-linode.md

@@ -4,7 +4,7 @@ author:
     email: [email protected]
 description: 'Access Google Drive from your Linode console'
 keywords: 'google,drive,console,fuse,apt,ubuntu'
-license: '[CC BY-ND 3.0](http://creativecommons.org/licenses/by-nd/3.0/us/)'
+license: '[CC BY-ND 4.0](https://creativecommons.org/licenses/by-nd/4.0)'
 published: 'Monday, September 28th, 2015'
 modified: Monday, September 28th, 2015
 modified_by:

docs/applications/cloud-storage/access-your-box-account-from-your-linode.md

@@ -4,7 +4,7 @@ author:
   email: [email protected]
 description: 'Box is a popular cloud storage and file sharing service. This article will show you how to access your Box account from your Linode using WebDAV.'
 keywords: 'box,box.com,cloud,cloud storage,file storage,file,webdav,davfs,davfs2'
-license: '[CC BY-ND 3.0](http://creativecommons.org/licenses/by-nd/3.0/us/)'
+license: '[CC BY-ND 4.0](https://creativecommons.org/licenses/by-nd/4.0)'
 modified: Friday, November 6th 2015
 modified_by:
   name: Tyler Nelson

docs/applications/cloud-storage/dropbox.md

@@ -4,7 +4,7 @@ author:
     email: [email protected]
 description: 'Installing and configuration Dropbox on a Linode'
 keywords: 'Dropbox,debian,centos,fedora,ubuntu,headless,storage,cloud storage'
-license: '[CC BY-ND 3.0](http://creativecommons.org/licenses/by-nd/3.0/us/)'
+license: '[CC BY-ND 4.0](https://creativecommons.org/licenses/by-nd/4.0)'
 alias: [ 'web-applications/cloud-storage/dropbox/debian-7.4' ]
 modified: Monday, June 29th, 2015
 modified_by:

docs/applications/cloud-storage/owncloud-debian-7.md

@@ -4,7 +4,7 @@ author:
     email: [email protected]
 description: 'Installing and Configuring ownCloud on Debian 7.4'
 keywords: 'ownCloud,Debian,MySQL,cloud storage'
-license: '[CC BY-ND 3.0](http://creativecommons.org/licenses/by-nd/3.0/us/)'
+license: '[CC BY-ND 4.0](https://creativecommons.org/licenses/by-nd/4.0)'
 modified: Thursday, July 17th, 2014 
 modified_by:
     name: Alex Fornuto

docs/applications/configuration-management/vagrant-linode-environments.md

@@ -4,7 +4,7 @@ author:
     email: [email protected]
 description: 'Use Vagrant to manage development environments and content on Linode.'
 keywords: 'linode,vagrant,content management,management,automation,development,ruby,vagrantfile,api,apache'
-license: '[CC BY-ND 3.0](http://creativecommons.org/licenses/by-nd/3.0/us/)'
+license: '[CC BY-ND 4.0](https://creativecommons.org/licenses/by-nd/4.0)'
 alias: [ 'web-applications/cloud-storage/dropbox/debian-7.4' ]
 modified: Thursday, June 25th, 2015 
 modified_by:
@@ -22,7 +22,7 @@ Vagrant can be paired with Linode through the use of the *vagrant-linode* plugin
 
 ## Prerequisites
 
-1.  [Install Vagrant](http://www.vagrantup.com/downloads) on your local computer or other workspace.
+1.  [Install Vagrant](https://www.vagrantup.com/downloads.html) on your local computer or other workspace.
 
 2.  Generate an API Key. This will be used to create Linodes based upon your Vagrant profile:
 
@@ -128,15 +128,15 @@ Vagrant can be paired with Linode through the use of the *vagrant-linode* plugin
             #Linode Settings
             provider.distribution = 'Ubuntu 14.04 LTS'
             provider.datacenter = 'newark'
-            provider.plan = '1024'
+            provider.plan = '2048'
             provider.label = 'vagrant-ubuntu-lts'
 
           end
 
         end
         ~~~
 
-    In this instance, a 1GB Ubuntu 14.04 LTS Linode is being created in the Newark data center. The `provider.label` is the name that the Linode will show up as in the Linode Manager.
+    In this instance, a 2GB Ubuntu 14.04 LTS Linode is being created in the Newark data center. The `provider.label` is the name that the Linode will show up as in the Linode Manager.
 
     To see more options regarding the vagrant-linode plugin see the documentation on the plugin's [GitHub repository](https://github.com/displague/vagrant-linode).
 

docs/applications/containers/docker-quick-reference-cheat-sheet.md

@@ -4,7 +4,7 @@ author:
   email: [email protected]
 description: 'A docker quick reference guide or cheat sheet.'
 keywords: 'docker,quick reference,cheat sheet,commands'
-license: '[CC BY-ND 3.0](http://creativecommons.org/licenses/by-nd/3.0/us/)'
+license: '[CC BY-ND 4.0](https://creativecommons.org/licenses/by-nd/4.0)'
 modified: Monday, March 30th, 2015
 modified_by:
   name: Linode