| Index: trunk/phase3/config/index.php |
| — | — | @@ -415,7 +415,7 @@ |
| 416 | 416 | |
| 417 | 417 | if( !$conf->turck && !$conf->eaccel && !$conf->apc ) { |
| 418 | 418 | echo( '<li>Couldn\'t find <a href="http://turck-mmcache.sourceforge.net">Turck MMCache</a>, |
| 419 | | - <a href="http://eaccelerator.sourceforge.net">eAccelerator</a> or |
| | 419 | + <a href="http://eaccelerator.sourceforge.net">eAccelerator</a>, or |
| 420 | 420 | <a href="http://www.php.net/apc">APC</a>. Object caching functions cannot be used.</li>' ); |
| 421 | 421 | } |
| 422 | 422 | |
| — | — | @@ -1063,7 +1063,7 @@ |
| 1064 | 1064 | <p class="config-desc"> |
| 1065 | 1065 | Using a shared memory system such as Turck MMCache, APC, eAccelerator, or Memcached |
| 1066 | 1066 | will speed up MediaWiki significantly. Memcached is the best solution but needs to be |
| 1067 | | - installed. Specify the server addresses and ports in a comma-separted list. Only |
| | 1067 | + installed. Specify the server addresses and ports in a comma-separated list. Only |
| 1068 | 1068 | use Turck shared memory if the wiki will be running on a single Apache server. |
| 1069 | 1069 | </p> |
| 1070 | 1070 | </div> |
| — | — | @@ -1079,7 +1079,7 @@ |
| 1080 | 1080 | </ul> |
| 1081 | 1081 | </div> |
| 1082 | 1082 | <p class="config-desc"> |
| 1083 | | - Use this to disable all e-mail functions (password reminders, user-to-user e-mail and e-mail notifications) |
| | 1083 | + Use this to disable all e-mail functions (password reminders, user-to-user e-mail, and e-mail notifications) |
| 1084 | 1084 | if sending mail doesn't work on your server. |
| 1085 | 1085 | </p> |
| 1086 | 1086 | |
| — | — | @@ -1157,7 +1157,7 @@ |
| 1158 | 1158 | enter those here. If you have database root access (see below) |
| 1159 | 1159 | you can specify new accounts/databases to be created. This account |
| 1160 | 1160 | will not be created if it pre-exists. If this is the case, ensure that it |
| 1161 | | - has SELECT, INSERT, UPDATE and DELETE permissions on the MediaWiki database. |
| | 1161 | + has SELECT, INSERT, UPDATE, and DELETE permissions on the MediaWiki database. |
| 1162 | 1162 | </p> |
| 1163 | 1163 | |
| 1164 | 1164 | <div class="config-input"> |
| — | — | @@ -1188,7 +1188,7 @@ |
| 1189 | 1189 | ?></div> |
| 1190 | 1190 | <div class="config-desc"> |
| 1191 | 1191 | <p>If you need to share one database between multiple wikis, or |
| 1192 | | - MediaWiki and another web application, you may choose to |
| | 1192 | + between MediaWiki and another web application, you may choose to |
| 1193 | 1193 | add a prefix to all the table names to avoid conflicts.</p> |
| 1194 | 1194 | |
| 1195 | 1195 | <p>Avoid exotic characters; something like <tt>mw_</tt> is good.</p> |
| — | — | @@ -1221,8 +1221,9 @@ |
| 1222 | 1222 | aField( $conf, "DBts2schema", "Schema for tsearch2:" ); |
| 1223 | 1223 | ?></div> |
| 1224 | 1224 | <div class="config-desc"> |
| 1225 | | - <p>The username specified above will have it's search path set to the above schemas, |
| 1226 | | - so it is recommended that you create a new user.</p> |
| | 1225 | + <p>The username specified above (at "DB username") will have its search path set to the above schemas, |
| | 1226 | + so it is recommended that you create a new user. The above schemas are generally correct: |
| | 1227 | + only change them if you are sure you need to.</p> |
| 1227 | 1228 | </div> |
| 1228 | 1229 | </div> |
| 1229 | 1230 | |