Merge branch 'spelling' of git://github.com/cgar/ansible into devel

Conflicts:
	docsite/rst/guide_rax.rst
	plugins/callbacks/mail.py
This commit is contained in:
Michael DeHaan 2014-08-08 13:28:45 -04:00
commit 3bead39c75
36 changed files with 54 additions and 54 deletions

View file

@ -13,7 +13,7 @@
* helper function to return a node containing the
* search summary for a given text. keywords is a list
* of stemmed words, hlwords is the list of normal, unstemmed
* words. the first one is used to find the occurance, the
* words. the first one is used to find the occurrence, the
* latter for highlighting it.
*/
@ -557,4 +557,4 @@ var Search = {
$(document).ready(function() {
Search.init();
});
});