Skip to content

Commit

Permalink
[contrib] merge: pull request MLstate#5 from git://github.com/yawaram…
Browse files Browse the repository at this point in the history
…in/opalang

Note: the patches did no longer apply cleanly and have been rebased and edited
  • Loading branch information
François-Régis Sinot committed Sep 12, 2011
2 parents b5ff225 + f624ada commit 6156a8c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion doc/book/GUIDELINES
Expand Up @@ -16,7 +16,7 @@ Convention for source code:
* keywords are between ++

Typography:
* don't forget semi-columns;
* don't forget semi-colons;
* in lists, they are compulsory.

Git commits:
Expand Down
2 changes: 1 addition & 1 deletion doc/book/about.adoc
Expand Up @@ -139,7 +139,7 @@ seasons or ongoing ad campaigns, but also a base of orders that needs
to be kept secure from would-be intruders, and safe from accidents,
including hardware failures.

Opa is also great for this kind of applications. Its content
Opa is also great for these kinds of applications. Its content
management engine is second to none, whether in flexibility, power or
security. Opa's built-in security checks guarantee that the
application will resist most attacks, while the replicated and
Expand Down

0 comments on commit 6156a8c

Please sign in to comment.