Merge pull request #30548 from jacobhammons/doc-fixes

Added placeholder release notes for 2015.5.10

doc/conf.py

@@ -395,7 +395,7 @@ epub_publisher = epub_author
 epub_copyright = copyright
 
 epub_scheme = 'URL'
-epub_identifier = 'http://saltstack.org/'
+epub_identifier = 'http://saltstack.com/'
 
 #epub_tocdepth = 3
 

doc/topics/releases/2015.5.10.rst

@@ -0,0 +1,5 @@
+==========================================
+Salt 2015.5.10 Release Notes (In Progress)
+==========================================
+
+In progress, not yet released.

doc/topics/tutorials/quickstart.rst

@@ -69,7 +69,7 @@ ensures that the server has the Apache webserver installed.
 
 .. note::
     For a complete explanation on Salt States, see the `tutorial
-    <http://docs.saltstack.org/en/latest/topics/tutorials/states_pt1.html>`_.
+    <http://docs.saltstack.com/en/latest/topics/tutorials/states_pt1.html>`_.
 
 1. Create the ``top.sls`` file:
 

pkg/smartos/esky/salt-master.xml

@@ -56,7 +56,7 @@
 
         <documentation>
           <doc_link name="SaltStack Documentation"
-                    uri="http://docs.saltstack.org"/>
+                    uri="http://docs.saltstack.com"/>
         </documentation>
       </template>
     </service>

pkg/smartos/esky/salt-minion.xml

@@ -56,7 +56,7 @@
 
         <documentation>
           <doc_link name="SaltStack Documentation"
-                    uri="http://docs.saltstack.org"/>
+                    uri="http://docs.saltstack.com"/>
         </documentation>
       </template>
     </service>

pkg/smartos/esky/salt-syndic.xml

@@ -56,7 +56,7 @@
 
         <documentation>
           <doc_link name="SaltStack Documentation"
-                    uri="http://docs.saltstack.org"/>
+                    uri="http://docs.saltstack.com"/>
         </documentation>
       </template>
     </service>

pkg/smartos/salt-master.xml

@@ -62,7 +62,7 @@
 
         <documentation>
           <doc_link name="SaltStack Documentation"
-                    uri="http://docs.saltstack.org"/>
+                    uri="http://docs.saltstack.com"/>
         </documentation>
       </template>
     </service>

pkg/smartos/salt-minion.xml

@@ -67,7 +67,7 @@
 
         <documentation>
           <doc_link name="SaltStack Documentation"
-                    uri="http://docs.saltstack.org"/>
+                    uri="http://docs.saltstack.com"/>
         </documentation>
       </template>
     </service>

pkg/smartos/salt-syndic.xml

@@ -62,7 +62,7 @@
 
         <documentation>
           <doc_link name="SaltStack Documentation"
-                    uri="http://docs.saltstack.org"/>
+                    uri="http://docs.saltstack.com"/>
         </documentation>
       </template>
     </service>

pkg/solaris/salt-master.xml

@@ -61,7 +61,7 @@
 
         <documentation>
           <doc_link name="SaltStack Documentation"
-                    uri="http://docs.saltstack.org"/>
+                    uri="http://docs.saltstack.com"/>
         </documentation>
       </template>
     </service>

pkg/solaris/salt-minion.xml

@@ -61,7 +61,7 @@
 
         <documentation>
           <doc_link name="SaltStack Documentation"
-                    uri="http://docs.saltstack.org"/>
+                    uri="http://docs.saltstack.com"/>
         </documentation>
       </template>
     </service>

pkg/solaris/salt-syndic.xml

@@ -61,7 +61,7 @@
 
         <documentation>
           <doc_link name="SaltStack Documentation"
-                    uri="http://docs.saltstack.org"/>
+                    uri="http://docs.saltstack.com"/>
         </documentation>
       </template>
     </service>

salt/renderers/stateconf.py

@@ -7,7 +7,7 @@ A flexible renderer that takes a templating engine and a data format
 :platform: all
 '''
 from __future__ import absolute_import
-# See http://docs.saltstack.org/en/latest/ref/renderers/all/salt.renderers.stateconf.html
+# See http://docs.saltstack.com/en/latest/ref/renderers/all/salt.renderers.stateconf.html
 # for a guide to using this module.
 #
 # FIXME: I really need to review and simplify this renderer, it's getting out of hand!

salt/utils/parsers.py

@@ -107,7 +107,7 @@ class OptionParser(optparse.OptionParser):
     usage = '%prog'
 
     epilog = ('You can find additional help about %prog issuing "man %prog" '
-              'or on http://docs.saltstack.org')
+              'or on http://docs.saltstack.com')
     description = None
 
     # Private attributes