Skip to content

Commit

Permalink
Change Github to GitHub
Browse files Browse the repository at this point in the history
  • Loading branch information
dnshl committed Feb 15, 2015
1 parent 5f8f0a5 commit 478f42d
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,6 @@ contributors please check ohloh, this file can sometimes be out of date:

https://www.ohloh.net/p/salt/contributors

To see current statistics check out the Github Pulse page:
To see current statistics check out the GitHub Pulse page:

https://github.com/saltstack/salt/pulse
4 changes: 2 additions & 2 deletions HACKING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ welcome!

To assist in Salt development, you can help in a number of ways.

Setting a Github pull request
Setting a GitHub pull request
-----------------------------

This is the preferred method for contributions, simply create a Github
This is the preferred method for contributions, simply create a GitHub
fork, commit your changes to the fork, and then open up a pull request.

Posting patches to the mailing list
Expand Down
2 changes: 1 addition & 1 deletion doc/_themes/saltstack/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ <h4>Community</h4>
<a href="http://twitter.com/SaltStackInc"><img src="{{ pathto('_static/images/socialTW.png', 1) }}" alt="SaltStack on Twitter" /></a>
<a href="http://www.linkedin.com/company/salt-stack-inc"><img src="{{ pathto('_static/images/socialLI.png', 1) }}" alt="SaltStack on LinkedIn" /></a>
<!-- <a href="http://plus.google.com/114449193225626631691"><img src="images/socialG+.png" alt="SaltStack on Google+" /></a> -->
<a href="https://github.com/saltstack"><img src="{{ pathto('_static/images/socialGitHub.png', 1) }}" alt="SaltStack on Github" />
<a href="https://github.com/saltstack"><img src="{{ pathto('_static/images/socialGitHub.png', 1) }}" alt="SaltStack on GitHub" />
</div>
</div>
</footer>
Expand Down
14 changes: 7 additions & 7 deletions doc/man/salt.7
Original file line number Diff line number Diff line change
Expand Up @@ -6050,7 +6050,7 @@ Ubuntu 10.x/11.x/12.x/13.04
.INDENT 0.0
.INDENT 3.5
In the event you do not see your distribution or version available please
review the develop branch on Github as it main contain updates that are
review the develop branch on GitHub as it main contain updates that are
not present in the stable release:
\fI\%https://github.com/saltstack/salt\-bootstrap/tree/develop\fP
.UNINDENT
Expand Down Expand Up @@ -8333,7 +8333,7 @@ to within \fB/srv/salt/prod\fP, they are still available from the same
The best way to continue learning about Salt States is to read through the
\fBreference documentation\fP and to look through examples
of existing \fIstate trees\fP\&. Many pre\-configured state trees
can be found on Github in the \fI\%saltstack\-formulas\fP collection of repositories.
can be found on GitHub in the \fI\%saltstack\-formulas\fP collection of repositories.
.sp
If you have any questions, suggestions, or just want to chat with other people
who are using Salt, we have a very \fBactive community\fP
Expand Down Expand Up @@ -11552,9 +11552,9 @@ can use the \fI\%Freenode webchat client\fP right from your browser.
.sp
If you wish to discuss the development of Salt itself join us in
\fB#salt\-devel\fP\&.
.SS Follow on Github
.SS Follow on GitHub
.sp
The Salt code is developed via Github. Follow Salt for constant updates on what
The Salt code is developed via GitHub. Follow Salt for constant updates on what
is happening in Salt development:
.sp
\fI\%https://github.com/saltstack/salt\fP
Expand Down Expand Up @@ -28788,7 +28788,7 @@ salt \(aq*\(aq pkg.install <package name>
.UNINDENT
.TP
.B taps
Unofficial Github repos to use when updating and installing formulas.
Unofficial GitHub repos to use when updating and installing formulas.
.sp
CLI Example:
.INDENT 7.0
Expand Down Expand Up @@ -97016,7 +97016,7 @@ winrepo.genrepo\fP
.SS Git Hosted Repo
.sp
Windows software package definitions can also be hosted in one or more git
repositories. The default repo is one hosted on Github.com by SaltStack,Inc., which
repositories. The default repo is one hosted on GitHub.com by SaltStack,Inc., which
includes package definitions for open source software. This repo points to the
HTTP or ftp locations of the installer files. Anyone is welcome to send a pull
request to this repo to add new package definitions. Browse the repo
Expand Down Expand Up @@ -102690,7 +102690,7 @@ This makes 21 new developers since 0.9.4 was released!
.sp
To keep up with the growing community follow Salt on Ohloh
(\fI\%http://www.ohloh.net/p/salt\fP), to join the Salt development community, fork
Salt on Github, and get coding (\fI\%https://github.com/saltstack/salt\fP)!
Salt on GitHub, and get coding (\fI\%https://github.com/saltstack/salt\fP)!
.SS Major Features
.SS SPEED! Pickle to msgpack
.sp
Expand Down
2 changes: 1 addition & 1 deletion doc/spelling_wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ gid
gids
gitfs
github
Github
GitHub
glanceclient
Glazner
glibc
Expand Down
4 changes: 2 additions & 2 deletions doc/topics/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,10 @@ If you wish to discuss the development of Salt itself join us in
``#salt-devel``.


Follow on Github
Follow on GitHub
================

The Salt code is developed via Github. Follow Salt for constant updates on what
The Salt code is developed via GitHub. Follow Salt for constant updates on what
is happening in Salt development:

|saltrepo|
Expand Down
2 changes: 1 addition & 1 deletion doc/topics/releases/0.9.5.rst
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ This makes 21 new developers since 0.9.4 was released!

To keep up with the growing community follow Salt on Ohloh
(http://www.ohloh.net/p/salt), to join the Salt development community, fork
Salt on Github, and get coding (https://github.com/saltstack/salt)!
Salt on GitHub, and get coding (https://github.com/saltstack/salt)!

Major Features
==============
Expand Down
2 changes: 1 addition & 1 deletion doc/topics/releases/releasecandidate.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Installing/Testing a Salt Release Candidate
It's time for a new feature release of Salt! Follow the instructions below to
install the latest release candidate of Salt, and try :doc:`all the shiny new
features </topics/releases/2015.2.0>`! Be sure to report any bugs you find on
`Github <http://www.github.com/saltstack/salt>`_
`GitHub <http://www.github.com/saltstack/salt>`_

Installing Using Bootstrap
==========================
Expand Down
2 changes: 1 addition & 1 deletion doc/topics/tutorials/salt_bootstrap.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Supported Operating Systems
.. note::

In the event you do not see your distribution or version available please
review the develop branch on Github as it main contain updates that are
review the develop branch on GitHub as it main contain updates that are
not present in the stable release:
https://github.com/saltstack/salt-bootstrap/tree/develop

Expand Down
2 changes: 1 addition & 1 deletion doc/topics/tutorials/states_pt4.rst
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ Continue Learning
The best way to continue learning about Salt States is to read through the
:doc:`reference documentation </ref/states/index>` and to look through examples
of existing state trees. Many pre-configured state trees
can be found on Github in the `saltstack-formulas`_ collection of repositories.
can be found on GitHub in the `saltstack-formulas`_ collection of repositories.

.. _`saltstack-formulas`: https://github.com/saltstack-formulas

Expand Down
2 changes: 1 addition & 1 deletion doc/topics/windows/windows-package-manager.rst
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ Git Hosted Repo
===============

Windows software package definitions can also be hosted in one or more git
repositories. The default repo is one hosted on Github.com by SaltStack,Inc., which
repositories. The default repo is one hosted on GitHub.com by SaltStack,Inc., which
includes package definitions for open source software. This repo points to the
HTTP or ftp locations of the installer files. Anyone is welcome to send a pull
request to this repo to add new package definitions. Browse the repo
Expand Down
4 changes: 2 additions & 2 deletions salt/modules/brew.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def _list_taps():

def _tap(tap, runas=None):
'''
Add unofficial Github repos to the list of formulas that brew tracks,
Add unofficial GitHub repos to the list of formulas that brew tracks,
updates, and installs from.
'''
if tap in _list_taps():
Expand Down Expand Up @@ -244,7 +244,7 @@ def install(name=None, pkgs=None, taps=None, options=None, **kwargs):
salt '*' pkg.install <package name>
taps
Unofficial Github repos to use when updating and installing formulas.
Unofficial GitHub repos to use when updating and installing formulas.
CLI Example:
Expand Down
2 changes: 1 addition & 1 deletion salt/pillar/foreman.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
An alternative would be to use the Foreman modules integrating Salt features
in the Smart Proxy and the webinterface.
Further information can be found on `Github <https://github.com/theforeman/foreman_salt>`_.
Further information can be found on `GitHub <https://github.com/theforeman/foreman_salt>`_.
Module Documentation
====================
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/states/git.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def test_latest_failure(self):
try:
ret = self.run_state(
'git.latest',
name='https://youSpelledGithubWrong.com/saltstack/salt-test-repo.git',
name='https://youSpelledGitHubWrong.com/saltstack/salt-test-repo.git',
rev='develop',
target=name,
submodules=True
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/modules/brew_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def test_tap_failure(self):
@patch('salt.modules.brew._list_taps', MagicMock(return_value=TAPS_LIST))
def test_tap(self):
'''
Tests adding unofficial Github repos to the list of brew taps
Tests adding unofficial GitHub repos to the list of brew taps
'''
with patch.dict(brew.__salt__, {'cmd.retcode': MagicMock(return_value=0)}):
self.assertTrue(brew._tap('homebrew/test'))
Expand Down

0 comments on commit 478f42d

Please sign in to comment.