diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9dcb45a8b..3c68127ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 ## 8.0.0 and beyond
 
 From 8.0.0 release and beyond, release notes are published on
-[docs.openstack.org](http://docs.openstack.org/releasenotes/puppet-nova/).
+[docs.openstack.org](https://docs.openstack.org/releasenotes/puppet-nova/).
 
 ##2015-11-25 - 7.0.0
 ###Summary
diff --git a/README.md b/README.md
index 1ddbad2a0..955b6c70a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Team and repository tags
 ========================
 
-[![Team and repository tags](http://governance.openstack.org/badges/puppet-nova.svg)](http://governance.openstack.org/reference/tags/index.html)
+[![Team and repository tags](https://governance.openstack.org/tc/badges/puppet-nova.svg)](https://governance.openstack.org/tc/reference/tags/index.html)
 
 <!-- Change things from this point on -->
 
@@ -43,7 +43,7 @@ Setup
 
 ### Beginning with nova
 
-To utilize the nova module's functionality you will need to declare multiple resources. This is not an exhaustive list of all the components needed, we recommend you consult and understand the [core openstack](http://docs.openstack.org) documentation.
+To utilize the nova module's functionality you will need to declare multiple resources. This is not an exhaustive list of all the components needed, we recommend you consult and understand the [core openstack](https://docs.openstack.org) documentation.
 
 ```puppet
 class { 'nova':
diff --git a/bindep.txt b/bindep.txt
index 7cdd58e59..245e54add 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1,5 +1,5 @@
 # This is a cross-platform list tracking distribution packages needed by tests;
-# see http://docs.openstack.org/infra/bindep/ for additional information.
+# see https://docs.openstack.org/infra/bindep/ for additional information.
 
 libxml2-devel [test platform:rpm]
 libxml2-dev [test platform:dpkg]
diff --git a/lib/puppet/provider/nova_aggregate/openstack.rb b/lib/puppet/provider/nova_aggregate/openstack.rb
index ac0ba8a9f..c2ef1f6fd 100644
--- a/lib/puppet/provider/nova_aggregate/openstack.rb
+++ b/lib/puppet/provider/nova_aggregate/openstack.rb
@@ -77,7 +77,7 @@ Puppet::Type.type(:nova_aggregate).provide(
 
   def metadata=(value)
     # clear obsolete keys
-    # wip untill #1559866
+    # wip until #1559866
 #   if @property_hash[:metadata].keys.length > 0
 #     properties = [@resource[:name] ]
 #     (@property_hash[:metadata].keys - @resource[:metadata].keys).each do |key|
diff --git a/lib/puppet/type/nova_aggregate.rb b/lib/puppet/type/nova_aggregate.rb
index d39f8fab7..437a53c9b 100644
--- a/lib/puppet/type/nova_aggregate.rb
+++ b/lib/puppet/type/nova_aggregate.rb
@@ -32,7 +32,7 @@
 #    Optional
 #
 #  [*hosts*]
-#    A comma seperated list with hosts or a single host. ie "host1,host2"
+#    A comma separated list with hosts or a single host. ie "host1,host2"
 #    Optional
 #
 
@@ -102,7 +102,7 @@ Puppet::Type.newtype(:nova_aggregate) do
   end
 
   newproperty(:hosts) do
-    desc 'Single host or comma seperated list of hosts'
+    desc 'Single host or comma separated list of hosts'
     #convert DSL/string form to internal form
     munge do |value|
       if value.is_a?(Array)
diff --git a/manifests/compute/rbd.pp b/manifests/compute/rbd.pp
index 6ad99075c..19dc7fbef 100644
--- a/manifests/compute/rbd.pp
+++ b/manifests/compute/rbd.pp
@@ -100,7 +100,7 @@ class nova::compute::rbd (
       require => Anchor['nova::config::begin'],
     }
 
-    #Variable name shrinked in favor of removing
+    #Variable name shrunk in favor of removing
     #the more than 140 chars puppet-lint warning.
     #variable used in the get-or-set virsh secret
     #resource.
diff --git a/manifests/deps.pp b/manifests/deps.pp
index 694fd7b9f..34cf10e5d 100644
--- a/manifests/deps.pp
+++ b/manifests/deps.pp
@@ -64,7 +64,7 @@ class nova::deps {
   Anchor['nova::install::end'] ~> Anchor['nova::service::begin']
   Anchor['nova::config::end']  ~> Anchor['nova::service::begin']
 
-  # This is here for backwards compatability for any external users of the
+  # This is here for backwards compatibility for any external users of the
   # nova-start anchor.  This should be considered deprecated and removed in the
   # N cycle
   anchor { 'nova-start':
diff --git a/releasenotes/notes/libvirt-enabled-perf-events-fix-79be68140b4e9a81.yaml b/releasenotes/notes/libvirt-enabled-perf-events-fix-79be68140b4e9a81.yaml
index 1d50c2483..42389087a 100644
--- a/releasenotes/notes/libvirt-enabled-perf-events-fix-79be68140b4e9a81.yaml
+++ b/releasenotes/notes/libvirt-enabled-perf-events-fix-79be68140b4e9a81.yaml
@@ -2,5 +2,5 @@
 fixes:
   - |
     The configuration for libvirt/enabled_perf_events requires a comma
-    seperated string for the value. The libvirt_enabled_perf_events parameter
+    separated string for the value. The libvirt_enabled_perf_events parameter
     will now properly convert arrays being passed in to a string. LP#1690946