Commit baa852fa authored by Son Nguyen's avatar Son Nguyen Committed by Gerrit Code Review
Browse files

Merge "Bug 1487052: Fixing up places where link to mahara wiki are not correct"

parents 27e375b4 671ee2e0
...@@ -10,5 +10,5 @@ user attributes" settings in order for groups to be synced.</p> ...@@ -10,5 +10,5 @@ user attributes" settings in order for groups to be synced.</p>
<p>Group members can be removed as well as added by this setting. If a group is no longer found in the LDAP <p>Group members can be removed as well as added by this setting. If a group is no longer found in the LDAP
records, all of its members will be removed from the group.</p> records, all of its members will be removed from the group.</p>
<p>This setting will have no effect if the cron is not running. See the <p>This setting will have no effect if the cron is not running. See the
<a href="http://wiki.mahara.org/System_Administrator's_Guide/Installing_Mahara">installation guide</a> for <a href="http://wiki.mahara.org/wiki/System_Administrator's_Guide/Installing_Mahara">installation guide</a> for
instructions on how to set it up.</p> instructions on how to set it up.</p>
\ No newline at end of file
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<h3>Sync users automatically via cron job</h3> <h3>Sync users automatically via cron job</h3>
<p>Enable this setting to activate a task in the cron which will automatically create and/or update <p>Enable this setting to activate a task in the cron which will automatically create and/or update
user accounts based on records in the LDAP server. By default, this cron task will execute once user accounts based on records in the LDAP server. By default, this cron task will execute once
daily at midnight (server time). Edit the record in the "auth_cron" table or use the optional command-line script daily at midnight (server time). Edit the record in the "auth_cron" table or use the optional command-line script
supplied at htdocs/auth/ldap/cli/sync_users.php if you wish to schedule it to run at other times or with other settings.</p> supplied at htdocs/auth/ldap/cli/sync_users.php if you wish to schedule it to run at other times or with other settings.</p>
<p>This setting will have no effect if the cron is not running. See the <p>This setting will have no effect if the cron is not running. See the
<a href="http://wiki.mahara.org/System_Administrator's_Guide/Installing_Mahara">installation guide</a> for <a href="http://wiki.mahara.org/wiki/System_Administrator's_Guide/Installing_Mahara">installation guide</a> for
instructions on how to set it up.</p> instructions on how to set it up.</p>
\ No newline at end of file
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* 2. Change the values in it to suit your environment. * 2. Change the values in it to suit your environment.
* *
* Information about this file is available on the Mahara wiki: * Information about this file is available on the Mahara wiki:
* http://wiki.mahara.org/System_Administrator's_Guide/Installing_Mahara#Create_Mahara's_config.php * http://wiki.mahara.org/wiki/System_Administrator's_Guide/Installing_Mahara#Create_Mahara's_config.php
* *
* This file includes only the most commonly used Mahara configuration directives. For more options * This file includes only the most commonly used Mahara configuration directives. For more options
* that can be placed in this file, see the Mahara lib file * that can be placed in this file, see the Mahara lib file
......
...@@ -268,7 +268,7 @@ $string['groupmemberaverage'] = 'On average, each user is in %s groups'; ...@@ -268,7 +268,7 @@ $string['groupmemberaverage'] = 'On average, each user is in %s groups';
$string['viewsperuser'] = 'Users who make pages have about %s pages each'; $string['viewsperuser'] = 'Users who make pages have about %s pages each';
$string['Cron'] = 'Cron'; $string['Cron'] = 'Cron';
$string['runningnormally'] = 'Running normally'; $string['runningnormally'] = 'Running normally';
$string['cronnotrunning2'] = '<strong class="error text-danger">Cron is not running.</strong><br>See the <a href="http://wiki.mahara.org/System_Administrator\'s_Guide/Installing_Mahara">installation guide</a> for instructions on how to set it up. If you have already set up cron, one or more of its activities have failed to run recently.'; $string['cronnotrunning2'] = '<strong class="error text-danger">Cron is not running.</strong><br>See the <a href="http://wiki.mahara.org/wiki/System_Administrator\'s_Guide/Installing_Mahara">installation guide</a> for instructions on how to set it up. If you have already set up cron, one or more of its activities have failed to run recently.';
$string['cronnotrunningsiteclosed1'] = '<strong class="error text-danger">Cron is not running.</strong><br>The site is currently closed. Please re-open the site for the cron to run.'; $string['cronnotrunningsiteclosed1'] = '<strong class="error text-danger">Cron is not running.</strong><br>The site is currently closed. Please re-open the site for the cron to run.';
$string['Loggedin'] = 'Logged in'; $string['Loggedin'] = 'Logged in';
$string['youraverageuser'] = 'Your average user...'; $string['youraverageuser'] = 'Your average user...';
......
...@@ -424,7 +424,7 @@ $cfg->productionmode = true; ...@@ -424,7 +424,7 @@ $cfg->productionmode = true;
* @global bool $cfg->cleanurls Set "true" to activate clean URLS in Mahara * @global bool $cfg->cleanurls Set "true" to activate clean URLS in Mahara
* Do not turn this on until you have the correct rewrite rules in place on your webserver, or none of * Do not turn this on until you have the correct rewrite rules in place on your webserver, or none of
* your links will work. * your links will work.
* See https://wiki.mahara.org/index.php/System_Administrator%27s_Guide/Clean_URL_Configuration * See https://wiki.mahara.org/wiki/System_Administrator%27s_Guide/Clean_URL_Configuration
*/ */
// $cfg->cleanurls = true; // $cfg->cleanurls = true;
...@@ -468,7 +468,7 @@ $cfg->cleanurlusereditable = true; ...@@ -468,7 +468,7 @@ $cfg->cleanurlusereditable = true;
/** /**
* @global bool $cfg->cleanurlusersubdomains generate subdomain-style profile urls like http://bob.mahara.example.com * @global bool $cfg->cleanurlusersubdomains generate subdomain-style profile urls like http://bob.mahara.example.com
* Warning: Enabling this option on your site is likely to cause users with open sessions to be logged out on all profile pages. * Warning: Enabling this option on your site is likely to cause users with open sessions to be logged out on all profile pages.
* See https://wiki.mahara.org/index.php/System_Administrator%27s_Guide/Clean_URL_Configuration#User_Subdomains * See https://wiki.mahara.org/wiki/System_Administrator%27s_Guide/Clean_URL_Configuration#User_Subdomains
*/ */
// $cfg->cleanurlusersubdomains = true; // $cfg->cleanurlusersubdomains = true;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment