saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed occurances of "Salt Stack" to SaltStack

Browse source
This commit is contained in:
Seth House 2013-11-07 10:44:01 -07:00
parent cf3df20aad
commit 4f00fa256b
10 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
README.rst
View file

@ -1,6 +1,6 @@
===================
What is Salt Stack?
===================
==================
What is SaltStack?
==================
Salt is a new approach to infrastructure management. Easy enough to get
running in minutes, scalable enough to manage tens of thousands of servers,
@ -20,7 +20,7 @@ http://docs.saltstack.com
IRC Chat
========
Join the vibrant, helpful and positive Salt Stack chat room in Freenode at
Join the vibrant, helpful and positive SaltStack chat room in Freenode at
#salt. There is no need to introduce yourself, or ask permission to join in,
just help and be helped! Make sure to wait for an answer, sometimes it may take
a few moments for someone to reply.
@ -30,7 +30,7 @@ http://webchat.freenode.net/?channels=salt&uio=Mj10cnVlJjk9dHJ1ZSYxMD10cnVl83
Salt Air
========
The Salt Stack YouTube channel is filled with Salt videos and presentations.
The SaltStack YouTube channel is filled with Salt videos and presentations.
Watch the latest Salt Air episodes for updates from Thomas on development,
catch tutorials, and stay on the cutting edge of Salt.
@ -39,8 +39,8 @@ http://www.youtube.com/user/saltstack
Mailing List
============
The Salt Stack community users mailing list is hosted by Google groups. Anyone
can post to ask questions about Salt Stack products and anyone can help answer.
The SaltStack community users mailing list is hosted by Google groups. Anyone
can post to ask questions about SaltStack products and anyone can help answer.
Join the conversation!
https://groups.google.com/forum/#!forum/salt-users
@ -53,7 +53,7 @@ Developing Salt
===============
The Salt development team is welcoming, positive, and dedicated to helping
people get new code and fixes into Salt Stack projects. Log into GitHub and get
people get new code and fixes into SaltStack projects. Log into GitHub and get
started with one of the largest developer communities in the world.
https://github.com/saltstack

6
doc/index.rst
View file

@ -5,8 +5,8 @@
.. image:: _static/saltconf.jpg
:target: http://saltconf.com/
What is Salt Stack?
===================
What is SaltStack?
==================
Salt is a new approach to infrastructure management. Easy enough to get
running in minutes, scalable enough to manage tens of thousands of servers,
@ -246,7 +246,7 @@ More information about the project
==================================
:doc:`Release notes </topics/releases/index>`
Living history of Salt Stack.
Living history of SaltStack.
:doc:`Community </topics/community>`
How to get involved.

18
doc/topics/git/index.rst
View file

@ -1,21 +1,21 @@
=====================
Salt Stack Git Policy
=====================
====================
SaltStack Git Policy
====================
The Salt Stack team follows a git policy to maintain stability and consistency
The SaltStack team follows a git policy to maintain stability and consistency
with the repository. The git policy has been developed to encourage
contributions and make contributing to Salt as easy as possible. Code
contributors to Salt Stack projects DO NOT NEED TO READ THIS DOCUMENT, because
all contributions come into Salt Stack via a single gateway to make it as
contributors to SaltStack projects DO NOT NEED TO READ THIS DOCUMENT, because
all contributions come into SaltStack via a single gateway to make it as
easy as possible for contributors to give us code.
The primary rule of git management in Salt Stack is to make life easy on
The primary rule of git management in SaltStack is to make life easy on
contributors and developers to send in code. Simplicity is always a goal!
New Code Entry
==============
All new Salt Stack code is posted to the `develop` branch, this is the single
All new SaltStack code is posted to the `develop` branch, this is the single
point of entry. The only exception here is when a bugfix to develop cannot be
cleanly merged into a release branch and the bugfix needs to be rewritten for
the release branch.
@ -23,7 +23,7 @@ the release branch.
Release Branching
=================
Salt Stack maintains two types of releases, `Feature Releases` and
SaltStack maintains two types of releases, `Feature Releases` and
`Point Releases`. A feature release is managed by incrementing the first or
second release point number, so 0.10.5 -> 0.11.0 signifies a feature release
and 0.11.0 -> 0.11.1 signifies a point release, also a hypothetical

2
doc/topics/releases/0.13.0.rst
View file

@ -89,5 +89,5 @@ incompatible change with salt-cloud, and salt-cloud will need to be updated
to the latest git to work with Salt 0.13.0. Salt Cloud 0.8.5 will also require
Salt 0.13.0 or later to function.
The Salt Stack team is sorry for the inconvenience here, we work hard to make
The SaltStack team is sorry for the inconvenience here, we work hard to make
sure these sorts of things do not happen, but sometimes hard changes get in.

2
doc/topics/releases/0.9.8.rst
View file

@ -79,7 +79,7 @@ And on any Syndics:
# apt-get install salt-syndic
The official salt stack ppa for Ubuntu is located at:
The official Salt PPA for Ubuntu is located at:
https://launchpad.net/~saltstack/+archive/salt

4
doc/topics/tutorials/pillar.rst
View file

@ -5,7 +5,7 @@ Pillar Walkthrough
.. note::
This walkthrough assumes that the reader has already completed the initial
Salt Stack :doc:`walkthrough </topics/tutorials/walkthrough>`.
Salt :doc:`walkthrough </topics/tutorials/walkthrough>`.
The pillar interface inside of Salt is one of the most important components
of a Salt deployment. Pillar is the interface used to generate arbitrary data
@ -291,6 +291,6 @@ pillar but can retrieve data from external sources. This can be useful when
information about an infrastructure is stored in a separate location.
Reference information on pillar and the external pillar interface can be found
in the Salt Stack documentation:
in the Salt documentation:
:doc:`Pillar </topics/pillar/index>`

12
doc/topics/tutorials/walkthrough.rst
View file

@ -1,11 +1,11 @@
======================
Salt Stack Walkthrough
======================
=====================
SaltStack Walkthrough
=====================
Welcome!
========
Welcome to Salt Stack! I am excited that you are interested in Salt and
Welcome to SaltStack! I am excited that you are interested in Salt and
starting down the path to better infrastructure management. I developed
(and am continuing to develop) Salt with the goal of making the best
software available to manage computers of almost any kind. I hope you enjoy
@ -13,7 +13,7 @@ working with Salt and that the software can solve your real world needs!
- Thomas S Hatch
- Salt creator and chief developer
- CTO of Salt Stack, Inc.
- CTO of SaltStack, Inc.
.. note::
@ -56,7 +56,7 @@ infrastructures as small as just a few systems.
Installing Salt
---------------
Salt Stack has been made to be very easy to install and get started. Setting up
SaltStack has been made to be very easy to install and get started. Setting up
Salt should be as easy as installing Salt via distribution packages on Linux or
via the Windows installer. The :doc:`installation documents
</topics/installation/index>` cover specific platform installation in depth.

6
doc/topics/virt/index.rst
View file

@ -1,6 +1,6 @@
===========================================
Salt Virt - The Salt Stack Cloud Controller
===========================================
==========================================
Salt Virt - The SaltStack Cloud Controller
==========================================
The Salt Virt cloud controller capability was initial added to Salt in version
0.14.0 as an alpha technology.

6
pkg/suse/salt.SuSEfirewall2
View file

@ -1,5 +1,5 @@
## Name: Salt Stack
## Description: Open ports for Salt Stack
## Name: SaltStack
## Description: Open ports for SaltStack
# space separated list of allowed TCP ports
TCP="4505 4506"
TCP="4505 4506"

14
salt/modules/tls.py
View file

@ -141,7 +141,7 @@ def create_ca(
C='US',
ST='Utah',
L='Salt Lake City',
O='Salt Stack',
O='SaltStack',
OU=None,
emailAddress='xyz@pdq.net'):
'''
@ -162,7 +162,7 @@ def create_ca(
L
locality, default is "Centerville", the city where SaltStack originated
O
organization, default is "Salt Stack"
organization, default is "SaltStack"
OU
organizational unit, default is None
emailAddress
@ -284,7 +284,7 @@ def create_csr(
C='US',
ST='Utah',
L='Salt Lake City',
O='Salt Stack',
O='SaltStack',
OU=None,
emailAddress='xyz@pdq.net'):
'''
@ -304,7 +304,7 @@ def create_csr(
L
locality, default is "Centerville", the city where SaltStack originated
O
organization, default is "Salt Stack"
organization, default is "SaltStack"
NOTE: Must the same as CA certificate or an error will be raised
OU
organizational unit, default is None
@ -408,7 +408,7 @@ def create_self_signed_cert(
C='US',
ST='Utah',
L='Salt Lake City',
O='Salt Stack',
O='SaltStack',
OU=None,
emailAddress='xyz@pdq.net'):
@ -428,7 +428,7 @@ def create_self_signed_cert(
L
locality, default is "Centerville", the city where SaltStack originated
O
organization, default is "Salt Stack"
organization, default is "SaltStack"
NOTE: Must the same as CA certificate or an error will be raised
OU
organizational unit, default is None
@ -729,7 +729,7 @@ if __name__ == '__main__':
C="US",
ST="Utah",
L="Centerville",
O="Salt Stack",
O="SaltStack",
OU=None,
emailAddress='test_system@saltstack.org'
)