Fix some Nitrogen references still present in develop

doc/topics/network_automation/index.rst

@@ -40,7 +40,7 @@ and the interaction with the network device does not rely on a particular vendor
 
 .. image:: /_static/napalm_logo.png
 
-Beginning with Nitrogen, the NAPALM modules have been transformed so they can
+Beginning with 2017.7.0, the NAPALM modules have been transformed so they can
 run in both proxy and regular minions. That means, if the operating system
 allows, the salt-minion package can be installed directly on the network gear.
 The interface between the network operating system and Salt in that case would
@@ -50,7 +50,7 @@ For example, if the user installs the
 salt-minion on a Arista switch, the only requirement is
 `napalm-eos <https://github.com/napalm-automation/napalm-eos>`_.
 
-The following modules are available in Nitrogen:
+The following modules are available in 2017.7.0:
 
 - :mod:`NAPALM grains <salt.grains.napalm>`
 - :mod:`NET execution module <salt.modules.napalm_network>` - Networking basic

salt/modules/boto_ec2.py

@@ -1858,7 +1858,7 @@ def get_all_tags(filters=None, region=None, key=None, keyid=None, profile=None):
     '''
     Describe all tags matching the filter criteria, or all tags in the account otherwise.
 
-    .. versionadded:: Nitrogen
+    .. versionadded:: Oxygen
 
     filters
         (dict) - Additional constraints on which volumes to return.  Note that valid filters vary

salt/modules/cmdmod.py

@@ -1638,7 +1638,7 @@ def run_all(cmd,
     :param bool encoded_cmd: Specify if the supplied command is encoded.
       Only applies to shell 'powershell'.
 
-      .. versionadded:: Nitrogen
+      .. versionadded:: Oxygen
 
     :param bool redirect_stderr: If set to ``True``, then stderr will be
       redirected to stdout. This is helpful for cases where obtaining both the
@@ -3199,7 +3199,7 @@ def powershell_all(cmd,
         salt '*' cmd.run_all '$PSVersionTable.CLRVersion' shell=powershell
         salt '*' cmd.run_all 'Get-NetTCPConnection' shell=powershell
 
-    .. versionadded:: Nitrogen
+    .. versionadded:: Oxygen
 
     .. warning::
 

salt/modules/logadm.py

@@ -153,7 +153,7 @@ def show_conf(conf_file=default_conf, name=None):
     '''
     Show configuration
 
-    .. versionchanged:: Nitrogen
+    .. versionchanged:: Oxygen
 
     conf_file : string
         path to logadm.conf, defaults to /etc/logadm.conf
@@ -182,7 +182,7 @@ def list_conf(conf_file=default_conf, log_file=None, include_unset=False):
     '''
     Show parsed configuration
 
-    .. versionadded:: Nitrogen
+    .. versionadded:: Oxygen
 
     conf_file : string
         path to logadm.conf, defaults to /etc/logadm.conf
@@ -221,7 +221,7 @@ def show_args():
     '''
     Show which arguments map to which flags and options.
 
-    .. versionadded:: Nitrogen
+    .. versionadded:: Oxygen
 
     CLI Example:
 
@@ -242,7 +242,7 @@ def rotate(name, pattern=None, conf_file=default_conf, **kwargs):
     '''
     Set up pattern for logging.
 
-    .. versionchanged:: Nitrogen
+    .. versionchanged:: Oxygen
 
     name : string
         alias for entryname

salt/modules/reg.py

@@ -753,7 +753,7 @@ def import_file(source, use_32bit_registry=False):
     '''
     Import registry settings from a Windows ``REG`` file by invoking ``REG.EXE``.
 
-    .. versionadded:: Nitrogen
+    .. versionadded:: Oxygen
 
     Usage: