diff options
| author | Dries Buytaert <dries@buytaert.net> | 2006-02-21 18:46:54 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2006-02-21 18:46:54 +0000 |
| commit | 3603fe1bd8e3370c0ae86b557f2a08c77fd48efb (patch) | |
| tree | 5029d29617b7f6be051df5a7b4b2f46d6a0bf1ec | |
| parent | e172910dd350f94522a85beb3fefe925b92e10e3 (diff) | |
| download | brdo-3603fe1bd8e3370c0ae86b557f2a08c77fd48efb.tar.gz brdo-3603fe1bd8e3370c0ae86b557f2a08c77fd48efb.tar.bz2 | |
- Patch #49912: www.drupal.org -> drupal.org. (Today's critical bugfix #5.)
64 files changed, 78 insertions, 78 deletions
diff --git a/includes/common.inc b/includes/common.inc index 567d93262..cd3bb6aae 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -346,7 +346,7 @@ function drupal_http_request($url, $headers = array(), $method = 'GET', $data = // We don't add the port to prevent from breaking rewrite rules checking // the host that do not take into account the port number. 'Host' => "Host: $host", - 'User-Agent' => 'User-Agent: Drupal (+http://www.drupal.org/)', + 'User-Agent' => 'User-Agent: Drupal (+http://drupal.org/)', 'Content-Length' => 'Content-Length: '. strlen($data) ); diff --git a/modules/aggregator.module b/modules/aggregator.module index 0556c4104..e598b403e 100644 --- a/modules/aggregator.module +++ b/modules/aggregator.module @@ -25,7 +25,7 @@ function aggregator_help($section) { <li>view the <a href="%aggregator">aggregator page</a>.</li> </ul> ', array('%admin-aggregator' => url('admin/aggregator'), '%admin-aggregator-add-feed' => url('admin/aggregator/add/feed'), '%admin-aggregator-add-category' => url('admin/aggregator/add/category'), '%admin-settings-aggregator' => url('admin/settings/aggregator'), '%admin-access' => url('admin/access'), '%aggregator' => url('aggregator'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%aggregator">Aggregator page</a>.', array('%aggregator' => 'http://www.drupal.org/handbook/modules/aggregator/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%aggregator">Aggregator page</a>.', array('%aggregator' => 'http://drupal.org/handbook/modules/aggregator/')) .'</p>'; return $output; case 'admin/modules#description': return t('Aggregates syndicated content (RSS and RDF feeds).'); diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 0556c4104..e598b403e 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -25,7 +25,7 @@ function aggregator_help($section) { <li>view the <a href="%aggregator">aggregator page</a>.</li> </ul> ', array('%admin-aggregator' => url('admin/aggregator'), '%admin-aggregator-add-feed' => url('admin/aggregator/add/feed'), '%admin-aggregator-add-category' => url('admin/aggregator/add/category'), '%admin-settings-aggregator' => url('admin/settings/aggregator'), '%admin-access' => url('admin/access'), '%aggregator' => url('aggregator'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%aggregator">Aggregator page</a>.', array('%aggregator' => 'http://www.drupal.org/handbook/modules/aggregator/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%aggregator">Aggregator page</a>.', array('%aggregator' => 'http://drupal.org/handbook/modules/aggregator/')) .'</p>'; return $output; case 'admin/modules#description': return t('Aggregates syndicated content (RSS and RDF feeds).'); diff --git a/modules/archive.module b/modules/archive.module index 6bcf8abf7..c613be7bd 100644 --- a/modules/archive.module +++ b/modules/archive.module @@ -20,7 +20,7 @@ function archive_help($section) { <li>enable the <em>browse archives</em> block at <a href="%admin-block">administer >> block</a>.</li> </ul> ', array('%archive' => url('archive'), '%admin-block' => url('admin/block'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%archive">Archive page</a>.', array('%archive' => 'http://www.drupal.org/handbook/modules/archive/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%archive">Archive page</a>.', array('%archive' => 'http://drupal.org/handbook/modules/archive/')) .'</p>'; return $output; case 'admin/modules#description': return t('Displays a calendar for navigating older content.'); diff --git a/modules/archive/archive.module b/modules/archive/archive.module index 6bcf8abf7..c613be7bd 100644 --- a/modules/archive/archive.module +++ b/modules/archive/archive.module @@ -20,7 +20,7 @@ function archive_help($section) { <li>enable the <em>browse archives</em> block at <a href="%admin-block">administer >> block</a>.</li> </ul> ', array('%archive' => url('archive'), '%admin-block' => url('admin/block'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%archive">Archive page</a>.', array('%archive' => 'http://www.drupal.org/handbook/modules/archive/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%archive">Archive page</a>.', array('%archive' => 'http://drupal.org/handbook/modules/archive/')) .'</p>'; return $output; case 'admin/modules#description': return t('Displays a calendar for navigating older content.'); diff --git a/modules/block.module b/modules/block.module index 449c46910..548be120e 100644 --- a/modules/block.module +++ b/modules/block.module @@ -34,7 +34,7 @@ function block_help($section) { <li>add a block at <a href="%admin-block-add">administer >> blocks >> add block</a>.</li> </ul> ', array('%admin-block' => url('admin/block'), '%admin-block-add' => url('admin/block/add'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%block">Block page</a>.', array('%block' => 'http://www.drupal.org/handbook/modules/block/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%block">Block page</a>.', array('%block' => 'http://drupal.org/handbook/modules/block/')) .'</p>'; return $output; case 'admin/modules#description': return t('Controls the boxes that are displayed around the main content.'); diff --git a/modules/block/block.module b/modules/block/block.module index 449c46910..548be120e 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -34,7 +34,7 @@ function block_help($section) { <li>add a block at <a href="%admin-block-add">administer >> blocks >> add block</a>.</li> </ul> ', array('%admin-block' => url('admin/block'), '%admin-block-add' => url('admin/block/add'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%block">Block page</a>.', array('%block' => 'http://www.drupal.org/handbook/modules/block/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%block">Block page</a>.', array('%block' => 'http://drupal.org/handbook/modules/block/')) .'</p>'; return $output; case 'admin/modules#description': return t('Controls the boxes that are displayed around the main content.'); diff --git a/modules/blog.module b/modules/blog.module index d561c6a9a..a1366f7d7 100644 --- a/modules/blog.module +++ b/modules/blog.module @@ -68,7 +68,7 @@ function blog_help($section) { <li>enable the "recent blog posts" block at <a href="%admin-block">administer >> blocks</a> to show the 10 most recent blog posts.</li> </ul> ', array('%user' => url('user'), '%node-add-blog' => url('node/add/blog'), '%admin-node-configure-types-blog' => url('admin/node/configure/types/blog'), '%admin-settings-blogapi' => url('admin/settings/blogapi'), '%admin-block' => url('admin/block'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%blog">Blog page</a>.', array('%blog' => 'http://www.drupal.org/handbook/modules/blog/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%blog">Blog page</a>.', array('%blog' => 'http://drupal.org/handbook/modules/blog/')) .'</p>'; return $output; case 'admin/modules#description': return t('Enables keeping an easily and regularly updated web page or a blog.'); diff --git a/modules/blog/blog.module b/modules/blog/blog.module index d561c6a9a..a1366f7d7 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -68,7 +68,7 @@ function blog_help($section) { <li>enable the "recent blog posts" block at <a href="%admin-block">administer >> blocks</a> to show the 10 most recent blog posts.</li> </ul> ', array('%user' => url('user'), '%node-add-blog' => url('node/add/blog'), '%admin-node-configure-types-blog' => url('admin/node/configure/types/blog'), '%admin-settings-blogapi' => url('admin/settings/blogapi'), '%admin-block' => url('admin/block'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%blog">Blog page</a>.', array('%blog' => 'http://www.drupal.org/handbook/modules/blog/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%blog">Blog page</a>.', array('%blog' => 'http://drupal.org/handbook/modules/blog/')) .'</p>'; return $output; case 'admin/modules#description': return t('Enables keeping an easily and regularly updated web page or a blog.'); diff --git a/modules/blogapi.module b/modules/blogapi.module index 32129f8c2..71d518f90 100644 --- a/modules/blogapi.module +++ b/modules/blogapi.module @@ -21,7 +21,7 @@ function blogapi_help($section) { <li><a href="%admin-settings-blogapi">administer >> settings >> blog api</a>.</li> </ul> ', array('%file-xmlrpc' => 'xmlrpc.php', '%admin-settings-blogapi' => url('admin/settings/blogapi'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%blogapi">BlogApi page</a>.', array('%blogapi' => 'http://www.drupal.org/handbook/modules/blogapi/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%blogapi">BlogApi page</a>.', array('%blogapi' => 'http://drupal.org/handbook/modules/blogapi/')) .'</p>'; return $output; case 'admin/modules#description': return t('Allows users to post content using applications that support XML-RPC blog APIs.'); @@ -612,7 +612,7 @@ function blogapi_rsd() { <rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd"> <service> <engineName>Drupal</engineName> - <engineLink>http://www.drupal.org/</engineLink> + <engineLink>http://drupal.org/</engineLink> <homePageLink>$base</homePageLink> <apis> <api name="MetaWeblog" preferred="false" apiLink="$xmlrpc" blogID="$blogid" /> diff --git a/modules/blogapi/blogapi.module b/modules/blogapi/blogapi.module index 32129f8c2..71d518f90 100644 --- a/modules/blogapi/blogapi.module +++ b/modules/blogapi/blogapi.module @@ -21,7 +21,7 @@ function blogapi_help($section) { <li><a href="%admin-settings-blogapi">administer >> settings >> blog api</a>.</li> </ul> ', array('%file-xmlrpc' => 'xmlrpc.php', '%admin-settings-blogapi' => url('admin/settings/blogapi'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%blogapi">BlogApi page</a>.', array('%blogapi' => 'http://www.drupal.org/handbook/modules/blogapi/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%blogapi">BlogApi page</a>.', array('%blogapi' => 'http://drupal.org/handbook/modules/blogapi/')) .'</p>'; return $output; case 'admin/modules#description': return t('Allows users to post content using applications that support XML-RPC blog APIs.'); @@ -612,7 +612,7 @@ function blogapi_rsd() { <rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd"> <service> <engineName>Drupal</engineName> - <engineLink>http://www.drupal.org/</engineLink> + <engineLink>http://drupal.org/</engineLink> <homePageLink>$base</homePageLink> <apis> <api name="MetaWeblog" preferred="false" apiLink="$xmlrpc" blogID="$blogid" /> diff --git a/modules/book.module b/modules/book.module index 9030316eb..9fa1c9760 100644 --- a/modules/book.module +++ b/modules/book.module @@ -1028,7 +1028,7 @@ function book_help($section) { <li>control who can create, edit, and outline posts in books by setting access permissions: <a href="%admin-access">administer >> access control</a>.</li> </ul> ', array('%node-add-book' => url('node/add/book'), '%admin-node-book' => url('admin/node/book'), '%admin-settings-content-types-book-page' => url('admin/settings/content-types/book'), '%admin-block' => url('admin/block'), '%admin-access' => url('admin/access'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%book">Book page</a>.', array('%book' => 'http://www.drupal.org/handbook/modules/book/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%book">Book page</a>.', array('%book' => 'http://drupal.org/handbook/modules/book/')) .'</p>'; return $output; case 'admin/modules#description': return t('Allows users to collaboratively author a book.'); diff --git a/modules/book/book.module b/modules/book/book.module index 9030316eb..9fa1c9760 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -1028,7 +1028,7 @@ function book_help($section) { <li>control who can create, edit, and outline posts in books by setting access permissions: <a href="%admin-access">administer >> access control</a>.</li> </ul> ', array('%node-add-book' => url('node/add/book'), '%admin-node-book' => url('admin/node/book'), '%admin-settings-content-types-book-page' => url('admin/settings/content-types/book'), '%admin-block' => url('admin/block'), '%admin-access' => url('admin/access'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%book">Book page</a>.', array('%book' => 'http://www.drupal.org/handbook/modules/book/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%book">Book page</a>.', array('%book' => 'http://drupal.org/handbook/modules/book/')) .'</p>'; return $output; case 'admin/modules#description': return t('Allows users to collaboratively author a book.'); diff --git a/modules/comment.module b/modules/comment.module index 50478287e..133badfe8 100644 --- a/modules/comment.module +++ b/modules/comment.module @@ -78,7 +78,7 @@ function comment_help($section) { <li>administer comments <a href="%admin-comment-configure"> administer >> comments >> configure</a>.</li> </ul> ', array('%admin-access' => url('admin/access'), '%admin-comment-configure' => url('admin/comment/configure'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%comment">Comment page</a>.', array('%comment' => 'http://www.drupal.org/handbook/modules/comment/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%comment">Comment page</a>.', array('%comment' => 'http://drupal.org/handbook/modules/comment/')) .'</p>'; return $output; case 'admin/modules#description': return t('Allows users to comment on and discuss published content.'); diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 50478287e..133badfe8 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -78,7 +78,7 @@ function comment_help($section) { <li>administer comments <a href="%admin-comment-configure"> administer >> comments >> configure</a>.</li> </ul> ', array('%admin-access' => url('admin/access'), '%admin-comment-configure' => url('admin/comment/configure'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%comment">Comment page</a>.', array('%comment' => 'http://www.drupal.org/handbook/modules/comment/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%comment">Comment page</a>.', array('%comment' => 'http://drupal.org/handbook/modules/comment/')) .'</p>'; return $output; case 'admin/modules#description': return t('Allows users to comment on and discuss published content.'); diff --git a/modules/contact.module b/modules/contact.module index 00bbc10d0..fef24e6c7 100644 --- a/modules/contact.module +++ b/modules/contact.module @@ -14,7 +14,7 @@ function contact_help($section) { case 'admin/help#contact': $output = sprintf('<p>%s</p><p>%s</p><p>%s</p>', t('The contact module enables the use of both personal and site-wide contact forms, thereby facilitating easy communication within the community. While personal contact forms allow users to contact each other by e-mail, site-wide forms allow community members to contact the site administration from a central location. Users can specify a subject and message in the contact form, and also request that a copy of the e-mail be sent to their own address.'), t("Users can activate/deactivate their personal contact forms in their account settings. Upon activation, a contact tab will appear in their user profiles. Privileged users such as site administrators are able to contact users even if they have chosen not to enable this feature."), t('Contact module links:')); $output .= sprintf('<ul><li>%s</li><li>%s</li><li>%s</li></ul>', t('Default site-wide <a href="%contact-page">contact page</a>.', array('%contact-page' => url('contact'))), t('Site-wide contact form <a href="%configuration-page">category configuration</a>.', array('%configuration-page' => url('admin/contact'))), t('Site-wide contact form <a href="%additional-settings">general settings</a>.', array('%additional-settings' => url('admin/settings/contact')))); - $output .= t('For more information, please read the configuration and customization handbook page for the <a href="%contact">Contact module</a>.', array('%contact' => url('http://www.drupal.org/handbook/modules/contact/', NULL, NULL, TRUE))); + $output .= t('For more information, please read the configuration and customization handbook page for the <a href="%contact">Contact module</a>.', array('%contact' => url('http://drupal.org/handbook/modules/contact/', NULL, NULL, TRUE))); return $output; case 'admin/modules#description': return t('Enables the use of both personal and site-wide contact forms.'); diff --git a/modules/contact/contact.module b/modules/contact/contact.module index 00bbc10d0..fef24e6c7 100644 --- a/modules/contact/contact.module +++ b/modules/contact/contact.module @@ -14,7 +14,7 @@ function contact_help($section) { case 'admin/help#contact': $output = sprintf('<p>%s</p><p>%s</p><p>%s</p>', t('The contact module enables the use of both personal and site-wide contact forms, thereby facilitating easy communication within the community. While personal contact forms allow users to contact each other by e-mail, site-wide forms allow community members to contact the site administration from a central location. Users can specify a subject and message in the contact form, and also request that a copy of the e-mail be sent to their own address.'), t("Users can activate/deactivate their personal contact forms in their account settings. Upon activation, a contact tab will appear in their user profiles. Privileged users such as site administrators are able to contact users even if they have chosen not to enable this feature."), t('Contact module links:')); $output .= sprintf('<ul><li>%s</li><li>%s</li><li>%s</li></ul>', t('Default site-wide <a href="%contact-page">contact page</a>.', array('%contact-page' => url('contact'))), t('Site-wide contact form <a href="%configuration-page">category configuration</a>.', array('%configuration-page' => url('admin/contact'))), t('Site-wide contact form <a href="%additional-settings">general settings</a>.', array('%additional-settings' => url('admin/settings/contact')))); - $output .= t('For more information, please read the configuration and customization handbook page for the <a href="%contact">Contact module</a>.', array('%contact' => url('http://www.drupal.org/handbook/modules/contact/', NULL, NULL, TRUE))); + $output .= t('For more information, please read the configuration and customization handbook page for the <a href="%contact">Contact module</a>.', array('%contact' => url('http://drupal.org/handbook/modules/contact/', NULL, NULL, TRUE))); return $output; case 'admin/modules#description': return t('Enables the use of both personal and site-wide contact forms.'); diff --git a/modules/drupal.module b/modules/drupal.module index c7ba8709e..f921999fa 100644 --- a/modules/drupal.module +++ b/modules/drupal.module @@ -45,7 +45,7 @@ print drupal_client_page(); <li>Save the page.</li> </ul>') . '</p>'; - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%drupal">Drupal page</a>.', array('%drupal' => 'http://www.drupal.org/handbook/modules/drupal/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%drupal">Drupal page</a>.', array('%drupal' => 'http://drupal.org/handbook/modules/drupal/')) .'</p>'; return $output; case 'admin/modules#description': return t('Lets you register your site with a central server and improve ranking of Drupal projects by posting information on your installed modules and themes; also enables users to log in using a Drupal ID.'); @@ -53,7 +53,7 @@ print drupal_client_page(); return t('<p>Using this your site can "call home" to another Drupal server. By calling home to drupal.org and sending a list of your installed modules and themes, you help rank projects on drupal.org and so assist all Drupal administrators to find the best components for meeting their needs. If you want to register with a different server, you can change the Drupal XML-RPC server setting -- but the server has to be able to handle Drupal XML. Some XML-RPC servers may present directories of all registered sites. To get all your site information listed, go to the <a href="%site-settings">settings page</a> and set the site name, the e-mail address, the slogan, and the mission statement.</p>', array('%site-settings' => url('admin/settings'))); case 'user/help#drupal': return variable_get('drupal_authentication_service', 0) ? t("<p><a href=\"%Drupal\">Drupal</a> is the name of the software that powers %this-site. There are Drupal web sites all over the world, and many of them share their registration databases so that users may freely log in to any Drupal site using a single <strong>Drupal ID</strong>.</p> -<p>So please feel free to log in to your account here at %this-site with a username from another Drupal site. The format of a Drupal ID is similar to an e-mail address: <strong>username</strong>@<em>server</em>. An example of a valid Drupal ID is <strong>mwlily</strong>@<em>www.drupal.org</em>.</p>", array('%Drupal' => 'http://www.drupal.org', '%this-site' => '<em>'. variable_get('site_name', 'this web site') .'</em>')) : NULL; +<p>So please feel free to log in to your account here at %this-site with a username from another Drupal site. The format of a Drupal ID is similar to an e-mail address: <strong>username</strong>@<em>server</em>. An example of a valid Drupal ID is <strong>mwlily</strong>@<em>drupal.org</em>.</p>", array('%Drupal' => 'http://drupal.org', '%this-site' => '<em>'. variable_get('site_name', 'this web site') .'</em>')) : NULL; } } @@ -87,13 +87,13 @@ function drupal_settings() { '#title' => t('Register with a Drupal server'), '#default_value' => variable_get('drupal_register', 0), '#options' => $options, - '#description' => t("If enabled, your Drupal site will register itself with the specified Drupal XML-RPC server. For this to work properly, you must set your site's name, e-mail address, slogan and mission statement. When the \"Drupal XML-RPC server\" field is set to \"%drupal-xml-rpc\", your web site will register itself with drupal.org. Requires the cron feature to be enabled.", array("%drupal-xml-rpc" => "http://www.drupal.org/xmlrpc.php", "%drupal-sites" => "http://www.drupal.org/drupal-sites/")) + '#description' => t("If enabled, your Drupal site will register itself with the specified Drupal XML-RPC server. For this to work properly, you must set your site's name, e-mail address, slogan and mission statement. When the \"Drupal XML-RPC server\" field is set to \"%drupal-xml-rpc\", your web site will register itself with drupal.org. Requires the cron feature to be enabled.", array("%drupal-xml-rpc" => "http://drupal.org/xmlrpc.php", "%drupal-sites" => "http://drupal.org/drupal-sites/")) ); $form['drupal']['drupal_server'] = array( '#type' => 'textfield', '#title' => t('Drupal XML-RPC server'), - '#default_value' => variable_get('drupal_server', 'http://www.drupal.org/xmlrpc.php'), + '#default_value' => variable_get('drupal_server', 'http://drupal.org/xmlrpc.php'), '#description' => t('The URL of the Drupal XML-RPC server you wish to register with.') ); diff --git a/modules/drupal/drupal.module b/modules/drupal/drupal.module index c7ba8709e..f921999fa 100644 --- a/modules/drupal/drupal.module +++ b/modules/drupal/drupal.module @@ -45,7 +45,7 @@ print drupal_client_page(); <li>Save the page.</li> </ul>') . '</p>'; - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%drupal">Drupal page</a>.', array('%drupal' => 'http://www.drupal.org/handbook/modules/drupal/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%drupal">Drupal page</a>.', array('%drupal' => 'http://drupal.org/handbook/modules/drupal/')) .'</p>'; return $output; case 'admin/modules#description': return t('Lets you register your site with a central server and improve ranking of Drupal projects by posting information on your installed modules and themes; also enables users to log in using a Drupal ID.'); @@ -53,7 +53,7 @@ print drupal_client_page(); return t('<p>Using this your site can "call home" to another Drupal server. By calling home to drupal.org and sending a list of your installed modules and themes, you help rank projects on drupal.org and so assist all Drupal administrators to find the best components for meeting their needs. If you want to register with a different server, you can change the Drupal XML-RPC server setting -- but the server has to be able to handle Drupal XML. Some XML-RPC servers may present directories of all registered sites. To get all your site information listed, go to the <a href="%site-settings">settings page</a> and set the site name, the e-mail address, the slogan, and the mission statement.</p>', array('%site-settings' => url('admin/settings'))); case 'user/help#drupal': return variable_get('drupal_authentication_service', 0) ? t("<p><a href=\"%Drupal\">Drupal</a> is the name of the software that powers %this-site. There are Drupal web sites all over the world, and many of them share their registration databases so that users may freely log in to any Drupal site using a single <strong>Drupal ID</strong>.</p> -<p>So please feel free to log in to your account here at %this-site with a username from another Drupal site. The format of a Drupal ID is similar to an e-mail address: <strong>username</strong>@<em>server</em>. An example of a valid Drupal ID is <strong>mwlily</strong>@<em>www.drupal.org</em>.</p>", array('%Drupal' => 'http://www.drupal.org', '%this-site' => '<em>'. variable_get('site_name', 'this web site') .'</em>')) : NULL; +<p>So please feel free to log in to your account here at %this-site with a username from another Drupal site. The format of a Drupal ID is similar to an e-mail address: <strong>username</strong>@<em>server</em>. An example of a valid Drupal ID is <strong>mwlily</strong>@<em>drupal.org</em>.</p>", array('%Drupal' => 'http://drupal.org', '%this-site' => '<em>'. variable_get('site_name', 'this web site') .'</em>')) : NULL; } } @@ -87,13 +87,13 @@ function drupal_settings() { '#title' => t('Register with a Drupal server'), '#default_value' => variable_get('drupal_register', 0), '#options' => $options, - '#description' => t("If enabled, your Drupal site will register itself with the specified Drupal XML-RPC server. For this to work properly, you must set your site's name, e-mail address, slogan and mission statement. When the \"Drupal XML-RPC server\" field is set to \"%drupal-xml-rpc\", your web site will register itself with drupal.org. Requires the cron feature to be enabled.", array("%drupal-xml-rpc" => "http://www.drupal.org/xmlrpc.php", "%drupal-sites" => "http://www.drupal.org/drupal-sites/")) + '#description' => t("If enabled, your Drupal site will register itself with the specified Drupal XML-RPC server. For this to work properly, you must set your site's name, e-mail address, slogan and mission statement. When the \"Drupal XML-RPC server\" field is set to \"%drupal-xml-rpc\", your web site will register itself with drupal.org. Requires the cron feature to be enabled.", array("%drupal-xml-rpc" => "http://drupal.org/xmlrpc.php", "%drupal-sites" => "http://drupal.org/drupal-sites/")) ); $form['drupal']['drupal_server'] = array( '#type' => 'textfield', '#title' => t('Drupal XML-RPC server'), - '#default_value' => variable_get('drupal_server', 'http://www.drupal.org/xmlrpc.php'), + '#default_value' => variable_get('drupal_server', 'http://drupal.org/xmlrpc.php'), '#description' => t('The URL of the Drupal XML-RPC server you wish to register with.') ); diff --git a/modules/filter.module b/modules/filter.module index f02d3b909..7d8db1e58 100644 --- a/modules/filter.module +++ b/modules/filter.module @@ -28,7 +28,7 @@ function filter_help($section) { <li>configure the filters for each input format at <a href="%admin-filters">administer >> input formats >> configure</a>.</li> </ul> ', array('%admin-filters' => url('admin/filters'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%filter">Filter page</a>.', array('%filter' => 'http://www.drupal.org/handbook/modules/filter/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%filter">Filter page</a>.', array('%filter' => 'http://drupal.org/handbook/modules/filter/')) .'</p>'; return $output; case 'admin/modules#description': return t('Handles the filtering of content in preparation for display.'); diff --git a/modules/filter/filter.module b/modules/filter/filter.module index f02d3b909..7d8db1e58 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -28,7 +28,7 @@ function filter_help($section) { <li>configure the filters for each input format at <a href="%admin-filters">administer >> input formats >> configure</a>.</li> </ul> ', array('%admin-filters' => url('admin/filters'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%filter">Filter page</a>.', array('%filter' => 'http://www.drupal.org/handbook/modules/filter/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%filter">Filter page</a>.', array('%filter' => 'http://drupal.org/handbook/modules/filter/')) .'</p>'; return $output; case 'admin/modules#description': return t('Handles the filtering of content in preparation for display.'); diff --git a/modules/forum.module b/modules/forum.module index 2154fc403..246cc17a1 100644 --- a/modules/forum.module +++ b/modules/forum.module @@ -23,7 +23,7 @@ function forum_help($section) { <li>read about the taxonomy module at <a href="%admin-help-taxonomy">administer >> help >> taxonomy</a>.</li> </ul> ', array('%admin-forum' => url('admin/forum'), '%admin-modules' => url('admin/modules'), '%admin-help-comment' => url('admin/help/comment'), '%admin-help-taxonomy' => url('admin/help/taxonomy'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%forum">Forum page</a>.', array('%forum' => 'http://www.drupal.org/handbook/modules/forum/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%forum">Forum page</a>.', array('%forum' => 'http://drupal.org/handbook/modules/forum/')) .'</p>'; return $output; case 'admin/modules#description': return t('Enables threaded discussions about general topics.'); diff --git a/modules/forum/forum.module b/modules/forum/forum.module index 2154fc403..246cc17a1 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -23,7 +23,7 @@ function forum_help($section) { <li>read about the taxonomy module at <a href="%admin-help-taxonomy">administer >> help >> taxonomy</a>.</li> </ul> ', array('%admin-forum' => url('admin/forum'), '%admin-modules' => url('admin/modules'), '%admin-help-comment' => url('admin/help/comment'), '%admin-help-taxonomy' => url('admin/help/taxonomy'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%forum">Forum page</a>.', array('%forum' => 'http://www.drupal.org/handbook/modules/forum/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%forum">Forum page</a>.', array('%forum' => 'http://drupal.org/handbook/modules/forum/')) .'</p>'; return $output; case 'admin/modules#description': return t('Enables threaded discussions about general topics.'); diff --git a/modules/help.module b/modules/help.module index 0624ed196..b2a2a52d8 100644 --- a/modules/help.module +++ b/modules/help.module @@ -96,7 +96,7 @@ function help_help($section) { </ul> '); $output .= '<p>'. t('You can not administer the help system.') .'</p>'; - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%help">Help page</a>.', array('%help' => 'http://www.drupal.org/handbook/modules/help/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%help">Help page</a>.', array('%help' => 'http://drupal.org/handbook/modules/help/')) .'</p>'; return $output; case 'admin/modules#description': return t('Manages the display of online help.'); diff --git a/modules/help/help.module b/modules/help/help.module index 0624ed196..b2a2a52d8 100644 --- a/modules/help/help.module +++ b/modules/help/help.module @@ -96,7 +96,7 @@ function help_help($section) { </ul> '); $output .= '<p>'. t('You can not administer the help system.') .'</p>'; - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%help">Help page</a>.', array('%help' => 'http://www.drupal.org/handbook/modules/help/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%help">Help page</a>.', array('%help' => 'http://drupal.org/handbook/modules/help/')) .'</p>'; return $output; case 'admin/modules#description': return t('Manages the display of online help.'); diff --git a/modules/legacy.module b/modules/legacy.module index 2b3c4b3c1..f03db2eb1 100644 --- a/modules/legacy.module +++ b/modules/legacy.module @@ -25,7 +25,7 @@ function legacy_help($section) { </ul> '); $output .= '<p>'. t('Legacy module has no configurable options.') .'</p>'; - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%legacy">Legacy page</a>.', array('%legacy' => 'http://www.drupal.org/handbook/modules/legacy/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%legacy">Legacy page</a>.', array('%legacy' => 'http://drupal.org/handbook/modules/legacy/')) .'</p>'; return $output; case 'admin/modules#description': return t('Provides legacy handlers for upgrades from older Drupal installations.'); diff --git a/modules/legacy/legacy.module b/modules/legacy/legacy.module index 2b3c4b3c1..f03db2eb1 100644 --- a/modules/legacy/legacy.module +++ b/modules/legacy/legacy.module @@ -25,7 +25,7 @@ function legacy_help($section) { </ul> '); $output .= '<p>'. t('Legacy module has no configurable options.') .'</p>'; - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%legacy">Legacy page</a>.', array('%legacy' => 'http://www.drupal.org/handbook/modules/legacy/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%legacy">Legacy page</a>.', array('%legacy' => 'http://drupal.org/handbook/modules/legacy/')) .'</p>'; return $output; case 'admin/modules#description': return t('Provides legacy handlers for upgrades from older Drupal installations.'); diff --git a/modules/locale.module b/modules/locale.module index 4b3d25e76..7d93ebf23 100644 --- a/modules/locale.module +++ b/modules/locale.module @@ -31,7 +31,7 @@ function locale_help($section) { </li> </ul> ', array('%admin-locale' => url('admin/locale'), '%admin-locale-string-search' => url('admin/locale/string/search'), '%admin-locale-language-add' => url('admin/locale/language/add'), '%external-http-drupal-org-project-Translations' => 'http://drupal.org/project/Translations')); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%locale">Locale page</a>.', array('%locale' => 'http://www.drupal.org/handbook/modules/locale/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%locale">Locale page</a>.', array('%locale' => 'http://drupal.org/handbook/modules/locale/')) .'</p>'; return $output; case 'admin/modules#description': return t('Enables the translation of the user interface to languages other than English.'); diff --git a/modules/locale/locale.module b/modules/locale/locale.module index 4b3d25e76..7d93ebf23 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -31,7 +31,7 @@ function locale_help($section) { </li> </ul> ', array('%admin-locale' => url('admin/locale'), '%admin-locale-string-search' => url('admin/locale/string/search'), '%admin-locale-language-add' => url('admin/locale/language/add'), '%external-http-drupal-org-project-Translations' => 'http://drupal.org/project/Translations')); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%locale">Locale page</a>.', array('%locale' => 'http://www.drupal.org/handbook/modules/locale/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%locale">Locale page</a>.', array('%locale' => 'http://drupal.org/handbook/modules/locale/')) .'</p>'; return $output; case 'admin/modules#description': return t('Enables the translation of the user interface to languages other than English.'); diff --git a/modules/menu.module b/modules/menu.module index 35c8afb09..875887259 100644 --- a/modules/menu.module +++ b/modules/menu.module @@ -78,7 +78,7 @@ function menu_help($section) { <li>add a menu item at <a href="%admin-menu-item-add">administer >> menus >> add menu item</a>.</li> </ul> ', array('%admin-menu' => url('admin/menu'), '%admin-block' => url('admin/block'), '%admin-menu-menu-add' => url('admin/menu/menu/add'), '%admin-menu-item-add' => url('admin/menu/item/add'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%menu">Menu page</a>.', array('%menu' => 'http://www.drupal.org/handbook/modules/menu/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%menu">Menu page</a>.', array('%menu' => 'http://drupal.org/handbook/modules/menu/')) .'</p>'; return $output; case 'admin/modules#description': return t('Allows administrators to customize the site navigation menu.'); diff --git a/modules/menu/menu.module b/modules/menu/menu.module index 35c8afb09..875887259 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -78,7 +78,7 @@ function menu_help($section) { <li>add a menu item at <a href="%admin-menu-item-add">administer >> menus >> add menu item</a>.</li> </ul> ', array('%admin-menu' => url('admin/menu'), '%admin-block' => url('admin/block'), '%admin-menu-menu-add' => url('admin/menu/menu/add'), '%admin-menu-item-add' => url('admin/menu/item/add'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%menu">Menu page</a>.', array('%menu' => 'http://www.drupal.org/handbook/modules/menu/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%menu">Menu page</a>.', array('%menu' => 'http://drupal.org/handbook/modules/menu/')) .'</p>'; return $output; case 'admin/modules#description': return t('Allows administrators to customize the site navigation menu.'); diff --git a/modules/node.module b/modules/node.module index 1495f9f01..bb5700483 100644 --- a/modules/node.module +++ b/modules/node.module @@ -30,7 +30,7 @@ function node_help($section) { <li>administer nodes at <a href="%admin-settings-content-types">administer >> settings >> content types</a>.</li> </ul> ', array('%search' => url('search'), '%admin-settings-content-types' => url('admin/settings/content-types'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%node">Node page</a>.', array('%node' => 'http://www.drupal.org/handbook/modules/node/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%node">Node page</a>.', array('%node' => 'http://drupal.org/handbook/modules/node/')) .'</p>'; return $output; case 'admin/modules#description': return t('Allows content to be submitted to the site and displayed on pages.'); @@ -1996,7 +1996,7 @@ function node_page_default() { <p>The first thing you will need to do is <a href=\"%register\">create the first account</a>. This account will have full administration rights and will allow you to configure your website. Once logged in, you can visit the <a href=\"%admin\">administration section</a> and <a href=\"%config\">set up your site's configuration</a>.</p> <p>Drupal comes with various modules, each of which contains a specific piece of functionality. You should visit the <a href=\"%modules\">module list</a> and enable those modules which suit your website's needs.</p> <p><a href=\"%themes\">Themes</a> handle the presentation of your website. You can use one of the existing themes, modify them or create your own from scratch.</p> - <p>We suggest you look around the administration section and explore the various options Drupal offers you. For more information, you can refer to the <a href=\"%handbook\">Drupal handbooks online</a>.</p>", array('%drupal' => 'http://www.drupal.org/', '%register' => url('user/register'), '%admin' => url('admin'), '%config' => url('admin/settings'), '%modules' => url('admin/modules'), '%themes' => url('admin/themes'), '%handbook' => 'http://www.drupal.org/handbooks')); + <p>We suggest you look around the administration section and explore the various options Drupal offers you. For more information, you can refer to the <a href=\"%handbook\">Drupal handbooks online</a>.</p>", array('%drupal' => 'http://drupal.org/', '%register' => url('user/register'), '%admin' => url('admin'), '%config' => url('admin/settings'), '%modules' => url('admin/modules'), '%themes' => url('admin/themes'), '%handbook' => 'http://drupal.org/handbooks')); } return $output; diff --git a/modules/node/node.module b/modules/node/node.module index 1495f9f01..bb5700483 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -30,7 +30,7 @@ function node_help($section) { <li>administer nodes at <a href="%admin-settings-content-types">administer >> settings >> content types</a>.</li> </ul> ', array('%search' => url('search'), '%admin-settings-content-types' => url('admin/settings/content-types'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%node">Node page</a>.', array('%node' => 'http://www.drupal.org/handbook/modules/node/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%node">Node page</a>.', array('%node' => 'http://drupal.org/handbook/modules/node/')) .'</p>'; return $output; case 'admin/modules#description': return t('Allows content to be submitted to the site and displayed on pages.'); @@ -1996,7 +1996,7 @@ function node_page_default() { <p>The first thing you will need to do is <a href=\"%register\">create the first account</a>. This account will have full administration rights and will allow you to configure your website. Once logged in, you can visit the <a href=\"%admin\">administration section</a> and <a href=\"%config\">set up your site's configuration</a>.</p> <p>Drupal comes with various modules, each of which contains a specific piece of functionality. You should visit the <a href=\"%modules\">module list</a> and enable those modules which suit your website's needs.</p> <p><a href=\"%themes\">Themes</a> handle the presentation of your website. You can use one of the existing themes, modify them or create your own from scratch.</p> - <p>We suggest you look around the administration section and explore the various options Drupal offers you. For more information, you can refer to the <a href=\"%handbook\">Drupal handbooks online</a>.</p>", array('%drupal' => 'http://www.drupal.org/', '%register' => url('user/register'), '%admin' => url('admin'), '%config' => url('admin/settings'), '%modules' => url('admin/modules'), '%themes' => url('admin/themes'), '%handbook' => 'http://www.drupal.org/handbooks')); + <p>We suggest you look around the administration section and explore the various options Drupal offers you. For more information, you can refer to the <a href=\"%handbook\">Drupal handbooks online</a>.</p>", array('%drupal' => 'http://drupal.org/', '%register' => url('user/register'), '%admin' => url('admin'), '%config' => url('admin/settings'), '%modules' => url('admin/modules'), '%themes' => url('admin/themes'), '%handbook' => 'http://drupal.org/handbooks')); } return $output; diff --git a/modules/page.module b/modules/page.module index 6f4deeb88..b48836194 100644 --- a/modules/page.module +++ b/modules/page.module @@ -25,7 +25,7 @@ function page_help($section) { <li>administer page content type at <a href="%admin-settings-content-types-page">administer >> settings >> content types >> configure page</a>.</li> </ul> ', array('%admin-help-node' => url('admin/help/node'), '%admin-help-page' => url('admin/help/page'), '%admin-help-story' => url('admin/help/story'), '%node-add-page' => url('node/add/page'), '%admin-settings-content-types-page' => url('admin/settings/content-types/page'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%page">Page page</a>.', array('%page' => 'http://www.drupal.org/handbook/modules/page/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%page">Page page</a>.', array('%page' => 'http://drupal.org/handbook/modules/page/')) .'</p>'; return $output; case 'admin/modules#description': return t('Enables the creation of pages that can be added to the navigation system.'); diff --git a/modules/page/page.module b/modules/page/page.module index 6f4deeb88..b48836194 100644 --- a/modules/page/page.module +++ b/modules/page/page.module @@ -25,7 +25,7 @@ function page_help($section) { <li>administer page content type at <a href="%admin-settings-content-types-page">administer >> settings >> content types >> configure page</a>.</li> </ul> ', array('%admin-help-node' => url('admin/help/node'), '%admin-help-page' => url('admin/help/page'), '%admin-help-story' => url('admin/help/story'), '%node-add-page' => url('node/add/page'), '%admin-settings-content-types-page' => url('admin/settings/content-types/page'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%page">Page page</a>.', array('%page' => 'http://www.drupal.org/handbook/modules/page/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%page">Page page</a>.', array('%page' => 'http://drupal.org/handbook/modules/page/')) .'</p>'; return $output; case 'admin/modules#description': return t('Enables the creation of pages that can be added to the navigation system.'); diff --git a/modules/path.module b/modules/path.module index 004f647d6..ca8cf7612 100644 --- a/modules/path.module +++ b/modules/path.module @@ -32,7 +32,7 @@ function path_help($section) { <li>enable clean url\'s to remove the =? at <a href="%admin-settings">administer >> settings</a>.</li> </ul> ', array('%admin-path-add' => url('admin/path/add'), '%admin-path' => url('admin/path'), '%external-http-drupal-org-node-15365' => 'http://drupal.org/node/15365', '%admin-settings' => url('admin/settings'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%path">Path page</a>.', array('%path' => 'http://www.drupal.org/handbook/modules/path/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%path">Path page</a>.', array('%path' => 'http://drupal.org/handbook/modules/path/')) .'</p>'; return $output; case 'admin/modules#description': return t('Allows users to rename URLs.'); diff --git a/modules/path/path.module b/modules/path/path.module index 004f647d6..ca8cf7612 100644 --- a/modules/path/path.module +++ b/modules/path/path.module @@ -32,7 +32,7 @@ function path_help($section) { <li>enable clean url\'s to remove the =? at <a href="%admin-settings">administer >> settings</a>.</li> </ul> ', array('%admin-path-add' => url('admin/path/add'), '%admin-path' => url('admin/path'), '%external-http-drupal-org-node-15365' => 'http://drupal.org/node/15365', '%admin-settings' => url('admin/settings'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%path">Path page</a>.', array('%path' => 'http://www.drupal.org/handbook/modules/path/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%path">Path page</a>.', array('%path' => 'http://drupal.org/handbook/modules/path/')) .'</p>'; return $output; case 'admin/modules#description': return t('Allows users to rename URLs.'); diff --git a/modules/ping.module b/modules/ping.module index 1d06e78e8..dfc51f03f 100644 --- a/modules/ping.module +++ b/modules/ping.module @@ -21,7 +21,7 @@ function ping_help($section) { <li>read about <a href="%external-http-drupal-org-node-23714">configuring cron jobs</a>.</li> </ul></p> ', array('%admin-modules' => url('admin/modules'), '%file-cron' => 'cron.php', '%external-http-drupal-org-node-23714' => 'http://drupal.org/node/23714')); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%ping">Ping page</a>.', array('%ping' => 'http://www.drupal.org/handbook/modules/ping/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%ping">Ping page</a>.', array('%ping' => 'http://drupal.org/handbook/modules/ping/')) .'</p>'; return $output; case 'admin/modules#description': return('Alerts other sites when your site has been updated.'); diff --git a/modules/ping/ping.module b/modules/ping/ping.module index 1d06e78e8..dfc51f03f 100644 --- a/modules/ping/ping.module +++ b/modules/ping/ping.module @@ -21,7 +21,7 @@ function ping_help($section) { <li>read about <a href="%external-http-drupal-org-node-23714">configuring cron jobs</a>.</li> </ul></p> ', array('%admin-modules' => url('admin/modules'), '%file-cron' => 'cron.php', '%external-http-drupal-org-node-23714' => 'http://drupal.org/node/23714')); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%ping">Ping page</a>.', array('%ping' => 'http://www.drupal.org/handbook/modules/ping/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%ping">Ping page</a>.', array('%ping' => 'http://drupal.org/handbook/modules/ping/')) .'</p>'; return $output; case 'admin/modules#description': return('Alerts other sites when your site has been updated.'); diff --git a/modules/poll.module b/modules/poll.module index d2e62de64..ea0a561a0 100644 --- a/modules/poll.module +++ b/modules/poll.module @@ -21,7 +21,7 @@ function poll_help($section) { <li><a href="%admin-node-configure-types-poll">administer >> content >> configure >> poll</a>.</li> </ul> ', array('%poll' => url('poll'), '%admin-node-configure-types-poll' => url('admin/node/configure/types/poll'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%poll">Poll page</a>.', array('%poll' => 'http://www.drupal.org/handbook/modules/poll/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%poll">Poll page</a>.', array('%poll' => 'http://drupal.org/handbook/modules/poll/')) .'</p>'; return $output; case 'admin/modules#description': return t("Allows your site to capture votes on different topics in the form of multiple choice questions."); diff --git a/modules/poll/poll.module b/modules/poll/poll.module index d2e62de64..ea0a561a0 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -21,7 +21,7 @@ function poll_help($section) { <li><a href="%admin-node-configure-types-poll">administer >> content >> configure >> poll</a>.</li> </ul> ', array('%poll' => url('poll'), '%admin-node-configure-types-poll' => url('admin/node/configure/types/poll'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%poll">Poll page</a>.', array('%poll' => 'http://www.drupal.org/handbook/modules/poll/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%poll">Poll page</a>.', array('%poll' => 'http://drupal.org/handbook/modules/poll/')) .'</p>'; return $output; case 'admin/modules#description': return t("Allows your site to capture votes on different topics in the form of multiple choice questions."); diff --git a/modules/profile.module b/modules/profile.module index 820cef69f..a9ea4d5b0 100644 --- a/modules/profile.module +++ b/modules/profile.module @@ -38,7 +38,7 @@ function profile_help($section) { <li>administer profile settings: <a href="%admin-settings-profile">administer >> settings >> profiles</a>.</li> </ul> ', array('%profile' => url('profile'), '%admin-settings-profile' => url('admin/settings/profile'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%profile">Profile page</a>.', array('%profile' => 'http://www.drupal.org/handbook/modules/profile/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%profile">Profile page</a>.', array('%profile' => 'http://drupal.org/handbook/modules/profile/')) .'</p>'; return $output; case 'admin/modules#description': return t('Supports configurable user profiles.'); diff --git a/modules/profile/profile.module b/modules/profile/profile.module index 820cef69f..a9ea4d5b0 100644 --- a/modules/profile/profile.module +++ b/modules/profile/profile.module @@ -38,7 +38,7 @@ function profile_help($section) { <li>administer profile settings: <a href="%admin-settings-profile">administer >> settings >> profiles</a>.</li> </ul> ', array('%profile' => url('profile'), '%admin-settings-profile' => url('admin/settings/profile'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%profile">Profile page</a>.', array('%profile' => 'http://www.drupal.org/handbook/modules/profile/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%profile">Profile page</a>.', array('%profile' => 'http://drupal.org/handbook/modules/profile/')) .'</p>'; return $output; case 'admin/modules#description': return t('Supports configurable user profiles.'); diff --git a/modules/search.module b/modules/search.module index 18d1f9cf9..57e35a5f8 100644 --- a/modules/search.module +++ b/modules/search.module @@ -105,7 +105,7 @@ function search_help($section) { <li>read about <a href="%external-http-drupal-org-node-23714">configuring cron jobs</a>.</li> <li><a href="%admin-settings-search">administer >> settings >> search</a>.</ul> ', array('%admin-help-system' => url('admin/help/system'), '%file-cron' => 'cron.php', '%external-http-drupal-org-node-23714' => 'http://drupal.org/node/23714', '%admin-settings-search' => url('admin/settings/search'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%search">Search page</a>.', array('%search' => 'http://www.drupal.org/handbook/modules/search/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%search">Search page</a>.', array('%search' => 'http://drupal.org/handbook/modules/search/')) .'</p>'; return $output; case 'admin/modules#description': return t('Enables site-wide keyword searching.'); diff --git a/modules/search/search.module b/modules/search/search.module index 18d1f9cf9..57e35a5f8 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -105,7 +105,7 @@ function search_help($section) { <li>read about <a href="%external-http-drupal-org-node-23714">configuring cron jobs</a>.</li> <li><a href="%admin-settings-search">administer >> settings >> search</a>.</ul> ', array('%admin-help-system' => url('admin/help/system'), '%file-cron' => 'cron.php', '%external-http-drupal-org-node-23714' => 'http://drupal.org/node/23714', '%admin-settings-search' => url('admin/settings/search'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%search">Search page</a>.', array('%search' => 'http://www.drupal.org/handbook/modules/search/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%search">Search page</a>.', array('%search' => 'http://drupal.org/handbook/modules/search/')) .'</p>'; return $output; case 'admin/modules#description': return t('Enables site-wide keyword searching.'); diff --git a/modules/statistics.module b/modules/statistics.module index 18df4d783..cb5024984 100644 --- a/modules/statistics.module +++ b/modules/statistics.module @@ -39,7 +39,7 @@ function statistics_help($section) { <li>enable \'popular content\' block in block administration <a href="%admin-block">administer >> blocks </a> but only after you have enabled \'Count content views\' in settings.</li> </ul> ', array('%admin-settings-statistics' => url('admin/settings/statistics'), '%admin-logs' => url('admin/logs'), '%admin-logs-hits' => url('admin/logs/hits'), '%admin-block' => url('admin/block'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%statistics">Statistics page</a>.', array('%statistics' => 'http://www.drupal.org/handbook/modules/statistics/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%statistics">Statistics page</a>.', array('%statistics' => 'http://drupal.org/handbook/modules/statistics/')) .'</p>'; return $output; case 'admin/modules#description': return t('Logs access statistics for your site.'); diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module index 18df4d783..cb5024984 100644 --- a/modules/statistics/statistics.module +++ b/modules/statistics/statistics.module @@ -39,7 +39,7 @@ function statistics_help($section) { <li>enable \'popular content\' block in block administration <a href="%admin-block">administer >> blocks </a> but only after you have enabled \'Count content views\' in settings.</li> </ul> ', array('%admin-settings-statistics' => url('admin/settings/statistics'), '%admin-logs' => url('admin/logs'), '%admin-logs-hits' => url('admin/logs/hits'), '%admin-block' => url('admin/block'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%statistics">Statistics page</a>.', array('%statistics' => 'http://www.drupal.org/handbook/modules/statistics/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%statistics">Statistics page</a>.', array('%statistics' => 'http://drupal.org/handbook/modules/statistics/')) .'</p>'; return $output; case 'admin/modules#description': return t('Logs access statistics for your site.'); diff --git a/modules/story.module b/modules/story.module index 3692a491c..bf889dbce 100644 --- a/modules/story.module +++ b/modules/story.module @@ -20,7 +20,7 @@ function story_help($section) { <li>configure story at <a href="%admin-settings-content-types-story">administer >> settings >> content types >> configure story</a>.</li> </ul> ', array('%node-add-story' => url('node/add/story'), '%admin-settings-content-types-story' => url('admin/settings/content-types/story'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%story">Story page</a>.', array('%story' => 'http://www.drupal.org/handbook/modules/story/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%story">Story page</a>.', array('%story' => 'http://drupal.org/handbook/modules/story/')) .'</p>'; return $output; case 'admin/modules#description': return t('Allows users to submit stories, articles or similar content.'); diff --git a/modules/story/story.module b/modules/story/story.module index 3692a491c..bf889dbce 100644 --- a/modules/story/story.module +++ b/modules/story/story.module @@ -20,7 +20,7 @@ function story_help($section) { <li>configure story at <a href="%admin-settings-content-types-story">administer >> settings >> content types >> configure story</a>.</li> </ul> ', array('%node-add-story' => url('node/add/story'), '%admin-settings-content-types-story' => url('admin/settings/content-types/story'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%story">Story page</a>.', array('%story' => 'http://www.drupal.org/handbook/modules/story/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%story">Story page</a>.', array('%story' => 'http://drupal.org/handbook/modules/story/')) .'</p>'; return $output; case 'admin/modules#description': return t('Allows users to submit stories, articles or similar content.'); diff --git a/modules/system.module b/modules/system.module index 1785a2837..69b831752 100644 --- a/modules/system.module +++ b/modules/system.module @@ -22,7 +22,7 @@ function system_help($section) { <li>administer cache settings in <a href="%admin-settings">administer >> settings</a>.</li> </ul> ', array('%file-cron' => 'cron.php', '%external-http-drupal-org-cron' => 'http://drupal.org/cron', '%admin-settings' => url('admin/settings'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%system">System page</a>.', array('%system' => 'http://www.drupal.org/handbook/modules/system/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%system">System page</a>.', array('%system' => 'http://drupal.org/handbook/modules/system/')) .'</p>'; return $output; case 'admin/modules#description': return t('Handles general site configuration for administrators.'); diff --git a/modules/system/system.module b/modules/system/system.module index 1785a2837..69b831752 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -22,7 +22,7 @@ function system_help($section) { <li>administer cache settings in <a href="%admin-settings">administer >> settings</a>.</li> </ul> ', array('%file-cron' => 'cron.php', '%external-http-drupal-org-cron' => 'http://drupal.org/cron', '%admin-settings' => url('admin/settings'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%system">System page</a>.', array('%system' => 'http://www.drupal.org/handbook/modules/system/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%system">System page</a>.', array('%system' => 'http://drupal.org/handbook/modules/system/')) .'</p>'; return $output; case 'admin/modules#description': return t('Handles general site configuration for administrators.'); diff --git a/modules/taxonomy.module b/modules/taxonomy.module index 5ad44a6c3..f43529094 100644 --- a/modules/taxonomy.module +++ b/modules/taxonomy.module @@ -1220,7 +1220,7 @@ function taxonomy_help($section) { <li>build a custom view of your categories using the <a href="%external-http-drupal-org-project-taxonomy_browser">taxonomy browser</a>.</li> </ul> ', array('%admin-taxonomy-add-vocabulary' => url('admin/taxonomy/add/vocabulary'), '%admin-taxonomy' => url('admin/taxonomy'), '%external-http-drupal-org-project-taxonomy_access' => 'http://drupal.org/project/taxonomy_access', '%external-http-drupal-org-project-taxonomy_browser' => 'http://drupal.org/project/taxonomy_browser')); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%taxonomy">Taxonomy page</a>.', array('%taxonomy' => 'http://www.drupal.org/handbook/modules/taxonomy/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%taxonomy">Taxonomy page</a>.', array('%taxonomy' => 'http://drupal.org/handbook/modules/taxonomy/')) .'</p>'; return $output; case 'admin/modules#description': return t('Enables the categorization of content.'); diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 5ad44a6c3..f43529094 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -1220,7 +1220,7 @@ function taxonomy_help($section) { <li>build a custom view of your categories using the <a href="%external-http-drupal-org-project-taxonomy_browser">taxonomy browser</a>.</li> </ul> ', array('%admin-taxonomy-add-vocabulary' => url('admin/taxonomy/add/vocabulary'), '%admin-taxonomy' => url('admin/taxonomy'), '%external-http-drupal-org-project-taxonomy_access' => 'http://drupal.org/project/taxonomy_access', '%external-http-drupal-org-project-taxonomy_browser' => 'http://drupal.org/project/taxonomy_browser')); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%taxonomy">Taxonomy page</a>.', array('%taxonomy' => 'http://www.drupal.org/handbook/modules/taxonomy/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%taxonomy">Taxonomy page</a>.', array('%taxonomy' => 'http://drupal.org/handbook/modules/taxonomy/')) .'</p>'; return $output; case 'admin/modules#description': return t('Enables the categorization of content.'); diff --git a/modules/throttle.module b/modules/throttle.module index 980b79fa1..18226523d 100644 --- a/modules/throttle.module +++ b/modules/throttle.module @@ -113,7 +113,7 @@ function throttle_help($section) { <li>administer throttle at <a href="%admin-settings-throttle">administer >> settings >> throttle</a>.</li> </ul> ', array('%admin-modules' => url('admin/modules'), '%admin-block' => url('admin/block'), '%admin-settings-throttle' => url('admin/settings/throttle'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%throttle">Throttle page</a>.', array('%throttle' => 'http://www.drupal.org/handbook/modules/throttle/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%throttle">Throttle page</a>.', array('%throttle' => 'http://drupal.org/handbook/modules/throttle/')) .'</p>'; return $output; case 'admin/modules#description': return t('Handles the auto-throttling mechanism, to control site congestion.'); diff --git a/modules/throttle/throttle.module b/modules/throttle/throttle.module index 980b79fa1..18226523d 100644 --- a/modules/throttle/throttle.module +++ b/modules/throttle/throttle.module @@ -113,7 +113,7 @@ function throttle_help($section) { <li>administer throttle at <a href="%admin-settings-throttle">administer >> settings >> throttle</a>.</li> </ul> ', array('%admin-modules' => url('admin/modules'), '%admin-block' => url('admin/block'), '%admin-settings-throttle' => url('admin/settings/throttle'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%throttle">Throttle page</a>.', array('%throttle' => 'http://www.drupal.org/handbook/modules/throttle/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%throttle">Throttle page</a>.', array('%throttle' => 'http://drupal.org/handbook/modules/throttle/')) .'</p>'; return $output; case 'admin/modules#description': return t('Handles the auto-throttling mechanism, to control site congestion.'); diff --git a/modules/tracker.module b/modules/tracker.module index c9ce3cefd..4f8e602f7 100644 --- a/modules/tracker.module +++ b/modules/tracker.module @@ -21,7 +21,7 @@ function tracker_help($section) { <li>not administer this module.</li> </ul> ', array('%tracker' => url('tracker'), '%profile' => url('profile'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%tracker">Tracker page</a>.', array('%tracker' => 'http://www.drupal.org/handbook/modules/tracker/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%tracker">Tracker page</a>.', array('%tracker' => 'http://drupal.org/handbook/modules/tracker/')) .'</p>'; return $output; case 'admin/modules#description': return t('Enables tracking of recent posts for users.'); diff --git a/modules/tracker/tracker.module b/modules/tracker/tracker.module index c9ce3cefd..4f8e602f7 100644 --- a/modules/tracker/tracker.module +++ b/modules/tracker/tracker.module @@ -21,7 +21,7 @@ function tracker_help($section) { <li>not administer this module.</li> </ul> ', array('%tracker' => url('tracker'), '%profile' => url('profile'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%tracker">Tracker page</a>.', array('%tracker' => 'http://www.drupal.org/handbook/modules/tracker/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%tracker">Tracker page</a>.', array('%tracker' => 'http://drupal.org/handbook/modules/tracker/')) .'</p>'; return $output; case 'admin/modules#description': return t('Enables tracking of recent posts for users.'); diff --git a/modules/upload.module b/modules/upload.module index 3221bb2d8..fc296d6df 100644 --- a/modules/upload.module +++ b/modules/upload.module @@ -21,7 +21,7 @@ function upload_help($section) { <li>administer upload at <a href="%admin-settings">administer >> settings</a>.</li> </ul> ', array('%admin-user-configure' => url('admin/user/configure'), '%admin-node-configure' => url('admin/node/configure'), '%admin-settings' => url('admin/settings'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%upload">Upload page</a>.', array('%upload' => 'http://www.drupal.org/handbook/modules/upload/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%upload">Upload page</a>.', array('%upload' => 'http://drupal.org/handbook/modules/upload/')) .'</p>'; return $output; case 'admin/modules#description': return t('Allows users to upload and attach files to content.'); diff --git a/modules/upload/upload.module b/modules/upload/upload.module index 3221bb2d8..fc296d6df 100644 --- a/modules/upload/upload.module +++ b/modules/upload/upload.module @@ -21,7 +21,7 @@ function upload_help($section) { <li>administer upload at <a href="%admin-settings">administer >> settings</a>.</li> </ul> ', array('%admin-user-configure' => url('admin/user/configure'), '%admin-node-configure' => url('admin/node/configure'), '%admin-settings' => url('admin/settings'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%upload">Upload page</a>.', array('%upload' => 'http://www.drupal.org/handbook/modules/upload/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%upload">Upload page</a>.', array('%upload' => 'http://drupal.org/handbook/modules/upload/')) .'</p>'; return $output; case 'admin/modules#description': return t('Allows users to upload and attach files to content.'); diff --git a/modules/user.module b/modules/user.module index bf1d2e9ab..17e87a89b 100644 --- a/modules/user.module +++ b/modules/user.module @@ -1437,7 +1437,7 @@ function _user_mail_text($messageid, $variables = array()) { case 'welcome_subject': return t('Account details for %username at %site', $variables); case 'welcome_body': - return t("%username,\n\nThank you for registering at %site. You may now log in to %login_uri using the following username and password:\n\nusername: %username\npassword: %password\n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n%login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to %edit_uri so you can change your password.\n\nYour new %site membership also enables to you to login to other Drupal powered websites (e.g. http://www.drupal.org/) without registering. Just use the following Drupal ID and password:\n\nDrupal ID: %username@%uri_brief\npassword: %password\n\n\n-- %site team", $variables); + return t("%username,\n\nThank you for registering at %site. You may now log in to %login_uri using the following username and password:\n\nusername: %username\npassword: %password\n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n%login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to %edit_uri so you can change your password.\n\nYour new %site membership also enables to you to login to other Drupal powered websites (e.g. http://drupal.org/) without registering. Just use the following Drupal ID and password:\n\nDrupal ID: %username@%uri_brief\npassword: %password\n\n\n-- %site team", $variables); case 'approval_subject': return t('Account details for %username at %site (pending admin approval)', $variables); case 'approval_body': @@ -1950,7 +1950,7 @@ function user_help($section) { <li>read about distributed authentication in the system module help at <a href="%admin-help-system">administer >> help >> system</a>.</li> </ul> ', array('%user' => url('user'), '%admin-user' => url('admin/user'), '%admin-themes' => url('admin/themes'), '%admin-help-profile' => url('admin/help/profile'), '%admin-help-system' => url('admin/help/system'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%user">User page</a>.', array('%user' => 'http://www.drupal.org/handbook/modules/user/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%user">User page</a>.', array('%user' => 'http://drupal.org/handbook/modules/user/')) .'</p>'; return $output; case 'admin/modules#description': return t('Manages the user registration and login system.'); @@ -1980,7 +1980,7 @@ function user_help($section) { $output = t(" <h3>Distributed authentication<a id=\"da\"></a></h3> <p>One of the more tedious moments in visiting a new website is filling out the registration form. Here at %site, you do not have to fill out a registration form if you are already a member of %help-links. This capability is called <em>distributed authentication</em>, and is unique to <a href=\"%drupal\">Drupal</a>, the software which powers %site.</p> - <p>Distributed authentication enables a new user to input a username and password into the login box, and immediately be recognized, even if that user never registered at %site. This works because Drupal knows how to communicate with external registration databases. For example, lets say that new user 'Joe' is already a registered member of <a href=\"%delphi-forums\">Delphi Forums</a>. Drupal informs Joe on registration and login screens that he may login with his Delphi ID instead of registering with %site. Joe likes that idea, and logs in with a username of joe@remote.delphiforums.com and his usual Delphi password. Drupal then contacts the <em>remote.delphiforums.com</em> server behind the scenes (usually using <a href=\"%xml\">XML-RPC</a>, <a href=\"%http-post\">HTTP POST</a>, or <a href=\"%soap\">SOAP</a>) and asks: \"Is the password for user Joe correct?\". If Delphi replies yes, then we create a new %site account for Joe and log him into it. Joe may keep on logging into %site in the same manner, and he will always be logged into the same account.</p>", array('%help-links' => (implode(', ', user_auth_help_links())), '%site' => "<em>$site</em>", '%drupal' => 'http://www.drupal.org', '%delphi-forums' => 'http://www.delphiforums.com', '%xml' => 'http://www.xmlrpc.com', '%http-post' => 'http://www.w3.org/Protocols/', '%soap' => 'http://www.soapware.org')); + <p>Distributed authentication enables a new user to input a username and password into the login box, and immediately be recognized, even if that user never registered at %site. This works because Drupal knows how to communicate with external registration databases. For example, lets say that new user 'Joe' is already a registered member of <a href=\"%delphi-forums\">Delphi Forums</a>. Drupal informs Joe on registration and login screens that he may login with his Delphi ID instead of registering with %site. Joe likes that idea, and logs in with a username of joe@remote.delphiforums.com and his usual Delphi password. Drupal then contacts the <em>remote.delphiforums.com</em> server behind the scenes (usually using <a href=\"%xml\">XML-RPC</a>, <a href=\"%http-post\">HTTP POST</a>, or <a href=\"%soap\">SOAP</a>) and asks: \"Is the password for user Joe correct?\". If Delphi replies yes, then we create a new %site account for Joe and log him into it. Joe may keep on logging into %site in the same manner, and he will always be logged into the same account.</p>", array('%help-links' => (implode(', ', user_auth_help_links())), '%site' => "<em>$site</em>", '%drupal' => 'http://drupal.org', '%delphi-forums' => 'http://www.delphiforums.com', '%xml' => 'http://www.xmlrpc.com', '%http-post' => 'http://www.w3.org/Protocols/', '%soap' => 'http://www.soapware.org')); foreach (module_list() as $module) { if (module_hook($module, 'auth')) { diff --git a/modules/user/user.module b/modules/user/user.module index bf1d2e9ab..17e87a89b 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1437,7 +1437,7 @@ function _user_mail_text($messageid, $variables = array()) { case 'welcome_subject': return t('Account details for %username at %site', $variables); case 'welcome_body': - return t("%username,\n\nThank you for registering at %site. You may now log in to %login_uri using the following username and password:\n\nusername: %username\npassword: %password\n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n%login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to %edit_uri so you can change your password.\n\nYour new %site membership also enables to you to login to other Drupal powered websites (e.g. http://www.drupal.org/) without registering. Just use the following Drupal ID and password:\n\nDrupal ID: %username@%uri_brief\npassword: %password\n\n\n-- %site team", $variables); + return t("%username,\n\nThank you for registering at %site. You may now log in to %login_uri using the following username and password:\n\nusername: %username\npassword: %password\n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n%login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to %edit_uri so you can change your password.\n\nYour new %site membership also enables to you to login to other Drupal powered websites (e.g. http://drupal.org/) without registering. Just use the following Drupal ID and password:\n\nDrupal ID: %username@%uri_brief\npassword: %password\n\n\n-- %site team", $variables); case 'approval_subject': return t('Account details for %username at %site (pending admin approval)', $variables); case 'approval_body': @@ -1950,7 +1950,7 @@ function user_help($section) { <li>read about distributed authentication in the system module help at <a href="%admin-help-system">administer >> help >> system</a>.</li> </ul> ', array('%user' => url('user'), '%admin-user' => url('admin/user'), '%admin-themes' => url('admin/themes'), '%admin-help-profile' => url('admin/help/profile'), '%admin-help-system' => url('admin/help/system'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%user">User page</a>.', array('%user' => 'http://www.drupal.org/handbook/modules/user/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%user">User page</a>.', array('%user' => 'http://drupal.org/handbook/modules/user/')) .'</p>'; return $output; case 'admin/modules#description': return t('Manages the user registration and login system.'); @@ -1980,7 +1980,7 @@ function user_help($section) { $output = t(" <h3>Distributed authentication<a id=\"da\"></a></h3> <p>One of the more tedious moments in visiting a new website is filling out the registration form. Here at %site, you do not have to fill out a registration form if you are already a member of %help-links. This capability is called <em>distributed authentication</em>, and is unique to <a href=\"%drupal\">Drupal</a>, the software which powers %site.</p> - <p>Distributed authentication enables a new user to input a username and password into the login box, and immediately be recognized, even if that user never registered at %site. This works because Drupal knows how to communicate with external registration databases. For example, lets say that new user 'Joe' is already a registered member of <a href=\"%delphi-forums\">Delphi Forums</a>. Drupal informs Joe on registration and login screens that he may login with his Delphi ID instead of registering with %site. Joe likes that idea, and logs in with a username of joe@remote.delphiforums.com and his usual Delphi password. Drupal then contacts the <em>remote.delphiforums.com</em> server behind the scenes (usually using <a href=\"%xml\">XML-RPC</a>, <a href=\"%http-post\">HTTP POST</a>, or <a href=\"%soap\">SOAP</a>) and asks: \"Is the password for user Joe correct?\". If Delphi replies yes, then we create a new %site account for Joe and log him into it. Joe may keep on logging into %site in the same manner, and he will always be logged into the same account.</p>", array('%help-links' => (implode(', ', user_auth_help_links())), '%site' => "<em>$site</em>", '%drupal' => 'http://www.drupal.org', '%delphi-forums' => 'http://www.delphiforums.com', '%xml' => 'http://www.xmlrpc.com', '%http-post' => 'http://www.w3.org/Protocols/', '%soap' => 'http://www.soapware.org')); + <p>Distributed authentication enables a new user to input a username and password into the login box, and immediately be recognized, even if that user never registered at %site. This works because Drupal knows how to communicate with external registration databases. For example, lets say that new user 'Joe' is already a registered member of <a href=\"%delphi-forums\">Delphi Forums</a>. Drupal informs Joe on registration and login screens that he may login with his Delphi ID instead of registering with %site. Joe likes that idea, and logs in with a username of joe@remote.delphiforums.com and his usual Delphi password. Drupal then contacts the <em>remote.delphiforums.com</em> server behind the scenes (usually using <a href=\"%xml\">XML-RPC</a>, <a href=\"%http-post\">HTTP POST</a>, or <a href=\"%soap\">SOAP</a>) and asks: \"Is the password for user Joe correct?\". If Delphi replies yes, then we create a new %site account for Joe and log him into it. Joe may keep on logging into %site in the same manner, and he will always be logged into the same account.</p>", array('%help-links' => (implode(', ', user_auth_help_links())), '%site' => "<em>$site</em>", '%drupal' => 'http://drupal.org', '%delphi-forums' => 'http://www.delphiforums.com', '%xml' => 'http://www.xmlrpc.com', '%http-post' => 'http://www.w3.org/Protocols/', '%soap' => 'http://www.soapware.org')); foreach (module_list() as $module) { if (module_hook($module, 'auth')) { diff --git a/modules/watchdog.module b/modules/watchdog.module index 2411b5ae4..7bd72f8ae 100644 --- a/modules/watchdog.module +++ b/modules/watchdog.module @@ -26,7 +26,7 @@ function watchdog_help($section) { <li>view watchdog event logs at <a href="%admin-watchdog-events">administer >> watchdog >> events</a>.</li> </ul> ', array('%admin-watchdog' => url('admin/watchdog'), '%admin-watchdog-events' => url('admin/watchdog/events'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%watchdog">Watchdog page</a>.', array('%watchdog' => 'http://www.drupal.org/handbook/modules/watchdog/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%watchdog">Watchdog page</a>.', array('%watchdog' => 'http://drupal.org/handbook/modules/watchdog/')) .'</p>'; return $output; case 'admin/modules#description': return t('Logs and records system events.'); diff --git a/modules/watchdog/watchdog.module b/modules/watchdog/watchdog.module index 2411b5ae4..7bd72f8ae 100644 --- a/modules/watchdog/watchdog.module +++ b/modules/watchdog/watchdog.module @@ -26,7 +26,7 @@ function watchdog_help($section) { <li>view watchdog event logs at <a href="%admin-watchdog-events">administer >> watchdog >> events</a>.</li> </ul> ', array('%admin-watchdog' => url('admin/watchdog'), '%admin-watchdog-events' => url('admin/watchdog/events'))); - $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%watchdog">Watchdog page</a>.', array('%watchdog' => 'http://www.drupal.org/handbook/modules/watchdog/')) .'</p>'; + $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%watchdog">Watchdog page</a>.', array('%watchdog' => 'http://drupal.org/handbook/modules/watchdog/')) .'</p>'; return $output; case 'admin/modules#description': return t('Logs and records system events.'); diff --git a/scripts/code-style.pl b/scripts/code-style.pl index 796ed6c12..f76d6433b 100644 --- a/scripts/code-style.pl +++ b/scripts/code-style.pl @@ -5,7 +5,7 @@ # Licence: GPL # First version: 2001-10-15 -# Originally written for Drupal (http://www.drupal.org/) to ensure stylish +# Originally written for Drupal (http://drupal.org/) to ensure stylish # code. This program tries to show as many improvements as possible with # no false positives. |