Merge branch '44103-27' of git://github.com/samhemelryk/moodle

diff --git a/mod/wiki/comments.php b/mod/wiki/comments.php
index a1a38ac..9ede1a0 100644 (file)
--- a/mod/wiki/comments.php
+++ b/mod/wiki/comments.php
@@ -19,8 +19,8 @@
  * This file contains all necessary code to view a discussion page
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/db/upgrade.php b/mod/wiki/db/upgrade.php
index f05a5ae..0020d11 100644 (file)
--- a/mod/wiki/db/upgrade.php
+++ b/mod/wiki/db/upgrade.php
@@ -27,8 +27,8 @@
  * your older installation to the current version.
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  *

diff --git a/mod/wiki/diff.php b/mod/wiki/diff.php
index 70c6de3..f4df25f 100644 (file)
--- a/mod/wiki/diff.php
+++ b/mod/wiki/diff.php
@@ -19,8 +19,8 @@
  * This file contains all necessary code to view a diff page
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/edit.php b/mod/wiki/edit.php
index 9afdd78..e721653 100644 (file)
--- a/mod/wiki/edit.php
+++ b/mod/wiki/edit.php
@@ -19,8 +19,8 @@
  * This file contains all necessary code to edit a wiki page
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/edit_form.php b/mod/wiki/edit_form.php
index 088b7fb..a847466 100644 (file)
--- a/mod/wiki/edit_form.php
+++ b/mod/wiki/edit_form.php
@@ -19,8 +19,8 @@
  * This file contains all necessary code to define and process an edit form
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Josep Arus
  *

diff --git a/mod/wiki/editcomments.php b/mod/wiki/editcomments.php
index 13c9ebc..fae14a2 100644 (file)
--- a/mod/wiki/editcomments.php
+++ b/mod/wiki/editcomments.php
@@ -18,8 +18,8 @@
 /**
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/editors/wikieditor.php b/mod/wiki/editors/wikieditor.php
index 4865a7c..5326f23 100644 (file)
--- a/mod/wiki/editors/wikieditor.php
+++ b/mod/wiki/editors/wikieditor.php
@@ -18,8 +18,8 @@
  * This file contains all necessary code to define a wiki editor
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Josep Arus
  *

diff --git a/mod/wiki/editors/wikifiletable.php b/mod/wiki/editors/wikifiletable.php
index 01c1849..c8dc376 100644 (file)
--- a/mod/wiki/editors/wikifiletable.php
+++ b/mod/wiki/editors/wikifiletable.php
@@ -18,8 +18,8 @@
  * This file contains all necessary code to define a wiki file table form element
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Josep Arus
  *

diff --git a/mod/wiki/files.php b/mod/wiki/files.php
index e02f6fd..6c8c9ab 100644 (file)
--- a/mod/wiki/files.php
+++ b/mod/wiki/files.php
@@ -18,7 +18,7 @@
  * Wiki files management
  *
  * @package mod-wiki-2.0
- * @copyrigth 2011 Dongsheng Cai <dongsheng@moodle.com>
+ * @copyright 2011 Dongsheng Cai <dongsheng@moodle.com>
  *
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */

diff --git a/mod/wiki/history.php b/mod/wiki/history.php
index 8380d4e..8ad7610 100644 (file)
--- a/mod/wiki/history.php
+++ b/mod/wiki/history.php
@@ -19,8 +19,8 @@
  * This file contains all necessary code to view the history page
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/index.php b/mod/wiki/index.php
index 366d853..18afb5e 100644 (file)
--- a/mod/wiki/index.php
+++ b/mod/wiki/index.php
@@ -19,8 +19,8 @@
  * This page lists all the instances of wiki in a particular course
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/instancecomments.php b/mod/wiki/instancecomments.php
index 56898c6..3bfb2ce 100644 (file)
--- a/mod/wiki/instancecomments.php
+++ b/mod/wiki/instancecomments.php
@@ -19,8 +19,8 @@
  * @TODO: Doc this file
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php
index 52dd598..87bf857 100644 (file)
--- a/mod/wiki/lib.php
+++ b/mod/wiki/lib.php
@@ -22,8 +22,8 @@
  * that are mandatory to develop a module.
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/locallib.php b/mod/wiki/locallib.php
index 366c1dd..09550a2 100644 (file)
--- a/mod/wiki/locallib.php
+++ b/mod/wiki/locallib.php
@@ -19,8 +19,8 @@
  * This contains functions and classes that will be used by scripts in wiki module
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/lock.php b/mod/wiki/lock.php
index 97cd63c..b24c453 100644 (file)
--- a/mod/wiki/lock.php
+++ b/mod/wiki/lock.php
@@ -19,8 +19,8 @@
  * This file contains all necessary code to execute a lock renewal based on an ajax call
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/map.php b/mod/wiki/map.php
index 8e43a77..03769c1 100644 (file)
--- a/mod/wiki/map.php
+++ b/mod/wiki/map.php
@@ -19,8 +19,8 @@
  * This file contains all necessary code to view the navigation tab
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/mod_form.php b/mod/wiki/mod_form.php
index 774527f..e8a0c67 100644 (file)
--- a/mod/wiki/mod_form.php
+++ b/mod/wiki/mod_form.php
@@ -19,8 +19,8 @@
  * This file defines de main wiki configuration form
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/overridelocks.php b/mod/wiki/overridelocks.php
index c43b7dc..9a74c2c 100644 (file)
--- a/mod/wiki/overridelocks.php
+++ b/mod/wiki/overridelocks.php
@@ -19,8 +19,8 @@
  * This file contains all necessary code to edit a wiki page
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/pagelib.php b/mod/wiki/pagelib.php
index de49ea6..c815398 100644 (file)
--- a/mod/wiki/pagelib.php
+++ b/mod/wiki/pagelib.php
@@ -20,8 +20,8 @@
  * of the wiki module
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/prettyview.php b/mod/wiki/prettyview.php
index ac2a080..4e6f27a 100644 (file)
--- a/mod/wiki/prettyview.php
+++ b/mod/wiki/prettyview.php
@@ -18,8 +18,8 @@
  * This file contains all necessary code to get a printable version of a wiki page
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/restoreversion.php b/mod/wiki/restoreversion.php
index 21305b8..cf97897 100644 (file)
--- a/mod/wiki/restoreversion.php
+++ b/mod/wiki/restoreversion.php
@@ -19,8 +19,8 @@
  * This file renders the restoring wikipage HTML
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/styles.css b/mod/wiki/styles.css
index 7c4dbc3..c752d3f 100644 (file)
--- a/mod/wiki/styles.css
+++ b/mod/wiki/styles.css
@@ -17,8 +17,8 @@
  * Wiki module style sheet
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/tests/wikiparser_test.php b/mod/wiki/tests/wikiparser_test.php
index b647654..a7418e0 100644 (file)
--- a/mod/wiki/tests/wikiparser_test.php
+++ b/mod/wiki/tests/wikiparser_test.php
@@ -19,8 +19,8 @@
  *
  * @package   mod_wiki
  * @category  phpunit
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/version.php b/mod/wiki/version.php
index 31c56e2..735307c 100644 (file)
--- a/mod/wiki/version.php
+++ b/mod/wiki/version.php
@@ -19,8 +19,8 @@
  * This fragment is called by moodle_needs_upgrading() and /admin/index.php
  *
  * @package    mod-wiki-2.0
- * @copyrigth  2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth  2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright  2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright  2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index 537d7b7..8c02f27 100644 (file)
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -19,8 +19,8 @@
  * This file contains all necessary code to view a wiki page
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier

diff --git a/mod/wiki/viewversion.php b/mod/wiki/viewversion.php
index bc2af38..2deab37 100644 (file)
--- a/mod/wiki/viewversion.php
+++ b/mod/wiki/viewversion.php
@@ -19,8 +19,8 @@
  * This file contains all necessary code to view an old version of a page
  *
  * @package mod-wiki-2.0
- * @copyrigth 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
- * @copyrigth 2009 Universitat Politecnica de Catalunya http://www.upc.edu
+ * @copyright 2009 Marc Alier, Jordi Piguillem marc.alier@upc.edu
+ * @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
  *
  * @author Jordi Piguillem
  * @author Marc Alier