summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDries Buytaert2008-11-23 16:54:49 (GMT)
committerDries Buytaert2008-11-23 16:54:49 (GMT)
commita7b2b9dfd1d17c75afb2f64812d5384efdffb7e4 (patch)
tree87033ec419e702a2999fdc128429be03260007ab
parentf91cfba34f045c6dd2ca7a2fc48b9df1496f4e74 (diff)
- Patch #332980 by scor and keith.smith: documentation improvements + typo fixed.
-rw-r--r--includes/common.inc3
-rw-r--r--includes/theme.inc2
-rw-r--r--modules/system/system.install13
-rw-r--r--modules/system/system.module2
-rw-r--r--themes/chameleon/chameleon.theme2
5 files changed, 18 insertions, 4 deletions
diff --git a/includes/common.inc b/includes/common.inc
index ad04138..0256ac9 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -113,7 +113,8 @@ function drupal_get_breadcrumb() {
}
/**
- * Returns a string containing RDF namespaces for the html tag of a XHTML page.
+ * Return a string containing RDF namespaces for the <html> tag of an XHTML
+ * page.
*/
function drupal_get_rdf_namespaces() {
// Serialize the RDF namespaces used in RDFa annotation.
diff --git a/includes/theme.inc b/includes/theme.inc
index 00b8b50..b3c9425 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -1881,7 +1881,7 @@ function template_preprocess_page(&$variables) {
$variables['scripts'] = drupal_get_js();
$variables['tabs'] = theme('menu_local_tasks');
$variables['title'] = drupal_get_title();
- // RDFa annotatates XHTML with RDF data, while GRDDL provides
+ // RDFa allows annotation of XHTML pages with RDF data, while GRDDL provides
// mechanisms for extraction of this RDF content via XSLT transformation
// using an associated GRDDL profile.
$variables['rdf_namespaces'] = drupal_get_rdf_namespaces();
diff --git a/modules/system/system.install b/modules/system/system.install
index bcde1b9..f6601b9 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -3090,6 +3090,18 @@ function system_update_7012() {
}
/**
+<<<<<<< system.install
+ * Change the user logout path.
+ */
+function system_update_7014() {
+ $ret = array();
+ $ret[] = update_sql("UPDATE {menu_links} SET link_path = 'user/login' WHERE link_path = 'login'");
+ $ret[] = update_sql("UPDATE {menu_links} SET router_path = 'user/login' WHERE router_path = 'login'");
+ return $ret;
+}
+
+/**
+=======
* Convert default time zone offset to default time zone name.
*/
function system_update_7013() {
@@ -3131,6 +3143,7 @@ function system_update_7013() {
}
/**
+>>>>>>> 1.282
* @} End of "defgroup updates-6.x-to-7.x"
* The next series of updates should start at 8000.
*/
diff --git a/modules/system/system.module b/modules/system/system.module
index a85e3fa..151c269 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -209,7 +209,7 @@ function system_perm() {
}
/**
- * Implementation of hook_rdf_namespace().
+ * Implementation of hook_rdf_namespaces().
*/
function system_rdf_namespaces() {
return array(
diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme
index 8a34019..fbf3b5e 100644
--- a/themes/chameleon/chameleon.theme
+++ b/themes/chameleon/chameleon.theme
@@ -30,7 +30,7 @@ function chameleon_page($content, $show_blocks = TRUE, $show_messages = TRUE) {
$output = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML+RDFa 1.0//EN\" \"http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd\">\n";
$output .= "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"$language\" xml:lang=\"$language\" dir=\"$direction\"\n";
- $putput .= " $rdf_namespaces>\n";
+ $output .= " $rdf_namespaces>\n";
$output .= "<head profile=\"http://ns.inria.fr/grddl/rdfa/\">\n";
$output .= " <title>" . ($title ? strip_tags($title) . " | " . variable_get("site_name", "Drupal") : variable_get("site_name", "Drupal") . " | " . variable_get("site_slogan", "")) . "</title>\n";
$output .= drupal_get_html_head();