From b726ccf955b1d3d56bf4a5cfcdc8bab2ef5f3831 Mon Sep 17 00:00:00 2001 From: William Robinet Date: Wed, 10 Feb 2016 16:38:44 +0100 Subject: [PATCH] Fix typos --- AUTHORS | 2 +- INSTALL/UPGRADE.txt | 4 ++-- INSTALL/build/technical_design/TD-ACL.txt | 2 +- INSTALL/build/technical_design/TD-Audit.txt | 6 +++--- app/Plugin/Assets/models/behaviors/LogableBehavior.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AUTHORS b/AUTHORS index ca50b91f8..db0185004 100644 --- a/AUTHORS +++ b/AUTHORS @@ -48,7 +48,7 @@ Christophe was then allowed to spend some time on CyDefSIG during his work-hours At some point NATO heard about this project. On January 2012 a first presentation was done to introduce them in more depth to the project. They looked at other products that the marked offered, but it seemed they deemed the openness of CyDefSIG to be of a great advantage. Andrzej Dereszowski was the first part-time developer from NATO side. One thing led to another and some months later NATO hired a full-time developer to improve the code and add more features. A collaborative development started from that date. -As with many personal projects the license was not explicitely written yet, it was collaboratively decided that the project would be released publicly as Affero GPL. This to share the code with as many people as possible and to protect it from any harm. +As with many personal projects the license was not explicitly written yet, it was collaboratively decided that the project would be released publicly as Affero GPL. This to share the code with as many people as possible and to protect it from any harm. The project was then renamed to MISP: Malware Information Sharing Project, a name invented by Alex Vandurme from NATO. diff --git a/INSTALL/UPGRADE.txt b/INSTALL/UPGRADE.txt index c4595c4e4..3d01bb727 100755 --- a/INSTALL/UPGRADE.txt +++ b/INSTALL/UPGRADE.txt @@ -1,5 +1,5 @@ # 1. Upgrade procedure from v2.3 to v2.4 -# it is assumed that a the upgrade happens from an up-to-date 2.3 instance +# it is assumed that the upgrade happens from an up-to-date 2.3 instance # It is a good idea to back up your MISP installation and data before upgrading to a new release. # - git pull the latest version of MISP from https://github.com/MISP/MISP.git @@ -24,7 +24,7 @@ mysql -u [misp_mysql_user] -p [misp_database] < upgrade_2.4.sql # After this run the upgrade script from within the application # simply navigate to Administration -> Administrative Tools -> "Upgrade to 2.4" # Once that has completed successfully run the 2.3->2.4 cleanup script -# simply navigate to ADministration -> Administrative Tools -> "2.3->2.4 cleanup script" +# simply navigate to Administration -> Administrative Tools -> "2.3->2.4 cleanup script" # If everything went fine, switch the system to live: # Administration -> Server Settings -> MISP Settings -> MISP.live -> True diff --git a/INSTALL/build/technical_design/TD-ACL.txt b/INSTALL/build/technical_design/TD-ACL.txt index 8fa4a6f9a..99e9525e2 100755 --- a/INSTALL/build/technical_design/TD-ACL.txt +++ b/INSTALL/build/technical_design/TD-ACL.txt @@ -1,6 +1,6 @@ ACL Technical Design (TD) -To use Access Control in CakePHP we use itś own AclComponent. +To use Access Control in CakePHP we use its own AclComponent. http://book.cakephp.org/2.0/en/tutorials-and-examples/simple-acl-controlled-application/simple-acl-controlled-application.html http://book.cakephp.org/2.0/en/tutorials-and-examples/simple-acl-controlled-application/part-two.html diff --git a/INSTALL/build/technical_design/TD-Audit.txt b/INSTALL/build/technical_design/TD-Audit.txt index c4dd3e108..ce19ea4b4 100755 --- a/INSTALL/build/technical_design/TD-Audit.txt +++ b/INSTALL/build/technical_design/TD-Audit.txt @@ -9,12 +9,12 @@ https://github.com/eskil-saatvedt/CakePHP-Assets/blob/master/models/behaviors/Lo http://bakery.cakephp.org/articles/rikdc/2010/06/07/syslog-component - Ads the syslog capability. + Adds the syslog capability. http://bakery.cakephp.org/articles/alkemann/2008/10/21/logablebehavior http://www.bitsntricks.com/cakephp-logable-behaviour/ - Short explaination itś use. + Short explanation about its use. http://stackoverflow.com/questions/9791633/check-if-cakephp-update-changes-a-variable-in-update @@ -25,4 +25,4 @@ so the change checks are done manual coded in the UsersController. https://github.com/joebeeson/referee#readme - Can be handy lateron for log to db or syslog? \ No newline at end of file + Can be handy later on for log to db or syslog? diff --git a/app/Plugin/Assets/models/behaviors/LogableBehavior.php b/app/Plugin/Assets/models/behaviors/LogableBehavior.php index 0c7171ff5..b961ac9fe 100644 --- a/app/Plugin/Assets/models/behaviors/LogableBehavior.php +++ b/app/Plugin/Assets/models/behaviors/LogableBehavior.php @@ -27,7 +27,7 @@ * - "change" [string] : depending on setting either : * [name (alek) => (Alek), age (28) => (29)] or [name, age] * - * - "version_id" [int] : cooperates with RevisionBehavior to link the the shadow table (thus linking to old data) + * - "version_id" [int] : cooperates with RevisionBehavior to link the shadow table (thus linking to old data) * * Remember that Logable behavior needs to be added after RevisionBehavior. In fact, just put it last to be safe. *