diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 5686c179..9c0f275f 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -52,7 +52,7 @@ and squashed into a minimal set of commits. Each commit should include the necessary code, test, and documentation changes for a single "piece" of functionality. -To be mergable, patches must: +To be mergeable, patches must: - be rebased onto the latest master, - be automatically mergeable, diff --git a/docs/about/contributing.rst b/docs/about/contributing.rst index d1e674dd..c1963af3 100644 --- a/docs/about/contributing.rst +++ b/docs/about/contributing.rst @@ -52,7 +52,7 @@ and squashed into a minimal set of commits. Each commit should include the necessary code, test, and documentation changes for a single "piece" of functionality. -To be mergable, patches must: +To be mergeable, patches must: - be rebased onto the latest master, - be automatically mergeable, diff --git a/docs/usage/json.rst b/docs/usage/json.rst index 90c2ea96..469343ad 100644 --- a/docs/usage/json.rst +++ b/docs/usage/json.rst @@ -9,7 +9,7 @@ Although :doc:`WaffleJS` returns the status of all :ref:`samples `, it does so by exposing a Javascript object, rather than returning the data in a directly consumable format. -In cases where a directly consumable format is preferrable, +In cases where a directly consumable format is preferable, Waffle also exposes this data as JSON via the ``waffle_status`` view.