aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2014-07-01 09:52:15 +0200
committerLoïc Hoguin <[email protected]>2014-07-01 09:52:15 +0200
commit15da836d2ad34fcae36dd9e89f4ce3c754031a86 (patch)
tree9fa9cf9c10836ee2bca594dc7bdd6356aa100194
parentfdf815bfce89ea0e27e44cbdb781f5e20bd235ef (diff)
parent531e7f9d7b6bfd22cdcba3defbf3a511303b89a2 (diff)
downloadcowboy-15da836d2ad34fcae36dd9e89f4ce3c754031a86.tar.gz
cowboy-15da836d2ad34fcae36dd9e89f4ce3c754031a86.tar.bz2
cowboy-15da836d2ad34fcae36dd9e89f4ce3c754031a86.zip
Merge branch 'fix/rest_principles_typo' of git://github.com/paulo-ferraz-oliveira/cowboy
-rw-r--r--guide/rest_principles.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guide/rest_principles.md b/guide/rest_principles.md
index 29198ee..922f158 100644
--- a/guide/rest_principles.md
+++ b/guide/rest_principles.md
@@ -22,7 +22,7 @@ REST is a *client-server* architecture. The client and the server
both have a different set of concerns. The server stores and/or
manipulates information and makes it available to the user in
an efficient manner. The client takes that information and
-displays it to the user and/or use it to perform subsequent
+displays it to the user and/or uses it to perform subsequent
requests for information. This separation of concerns allows both
the client and the server to evolve independently as it only
requires that the interface stays the same.