diff options
| author | Michael DeHaan <michael.dehaan@gmail.com> | 2014-08-08 13:28:45 -0400 |
|---|---|---|
| committer | Michael DeHaan <michael.dehaan@gmail.com> | 2014-08-08 13:28:45 -0400 |
| commit | 3bead39c752fdea8922814a93df5bb66c0a852dd (patch) | |
| tree | 2ac194cb6129e3cc0e20465c5e5a3893d7abae70 /docsite | |
| parent | 7806c5095d05d8108fac47997ec24cb2d1f655fd (diff) | |
| parent | 4e0c01bcbfc05f496c889ab649686aa40bc95af9 (diff) | |
| download | ansible-3bead39c752fdea8922814a93df5bb66c0a852dd.tar.gz | |
Merge branch 'spelling' of git://github.com/cgar/ansible into devel
Conflicts:
docsite/rst/guide_rax.rst
plugins/callbacks/mail.py
Diffstat (limited to 'docsite')
| -rw-r--r-- | docsite/_static/searchtools.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docsite/_static/searchtools.js b/docsite/_static/searchtools.js index 663be4c909..945b7a93e6 100644 --- a/docsite/_static/searchtools.js +++ b/docsite/_static/searchtools.js @@ -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(); -});
\ No newline at end of file +}); |