| Index: trunk/phase3/UPGRADE |
| — | — | @@ -1,3 +1,4 @@ |
| | 2 | + |
| 2 | 3 | This file provides an overview of the MediaWiki upgrade process. For help with |
| 3 | 4 | specific problems, check |
| 4 | 5 | |
| — | — | @@ -118,10 +119,8 @@ |
| 119 | 120 | from the list on Special:Recentchanges, although the deletions themselves |
| 120 | 121 | will be hidden by default. (Click "show bot edits" to list them.) |
| 121 | 122 | |
| 122 | | - |
| 123 | 123 | See RELEASE-NOTES for more details about new and changed options. |
| 124 | 124 | |
| 125 | | - |
| 126 | 125 | == Upgrading from 1.7 wikis == |
| 127 | 126 | |
| 128 | 127 | $wgDefaultUserOptions now contains all the defaults, not only overrides. |
| — | — | @@ -131,9 +130,6 @@ |
| 132 | 131 | == Upgrading from 1.6 wikis == |
| 133 | 132 | |
| 134 | 133 | $wgLocalTZoffset was in hours, it is now using minutes. |
| 135 | | -Link autonumbering got fixed (#5918) for protocols other than http. |
| 136 | | - - 'irc://irc.server.tld/' render as a link with a chat icon |
| 137 | | - - '[irc://irc.server.tld]' render as an autonumbered link: [1] |
| 138 | 134 | |
| 139 | 135 | == Upgrading from pre-1.5 wikis == |
| 140 | 136 | |
| — | — | @@ -259,20 +255,21 @@ |
| 260 | 256 | As well as new messages, the processing of some messages has changed. |
| 261 | 257 | If you have customized them, please compare the new format using |
| 262 | 258 | Special:Allmessages or the relevant LanguageXX.php files: |
| 263 | | - copyrightwarning |
| 264 | | - dberrortext |
| 265 | | - editingcomment (was named commentedit) |
| 266 | | - editingsection (was named sectionedit) |
| 267 | | - numauthors |
| 268 | | - numedits |
| 269 | | - numtalkauthors |
| 270 | | - numtalkedits |
| 271 | | - numwatchers |
| 272 | | - protectedarticle |
| 273 | | - searchresulttext |
| 274 | | - showhideminor |
| 275 | | - unprotectedarticle |
| 276 | 259 | |
| | 260 | +* copyrightwarning |
| | 261 | +* dberrortext |
| | 262 | +* editingcomment (was named commentedit) |
| | 263 | +* editingsection (was named sectionedit) |
| | 264 | +* numauthors |
| | 265 | +* numedits |
| | 266 | +* numtalkauthors |
| | 267 | +* numtalkedits |
| | 268 | +* numwatchers |
| | 269 | +* protectedarticle |
| | 270 | +* searchresulttext |
| | 271 | +* showhideminor |
| | 272 | +* unprotectedarticle |
| | 273 | + |
| 277 | 274 | Note that the 1.3 beta releases included a potential vulnerability if PHP |
| 278 | 275 | is configured with register_globals on and the includes directory is |
| 279 | 276 | served to the web. For general safety, turn register_globals *off* if you |
| Index: trunk/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -979,6 +979,7 @@ |
| 980 | 980 | |
| 981 | 981 | public function execute() { |
| 982 | 982 | $text = $this->getFileContents(); |
| | 983 | + $text = $this->formatTextFile( $text ); |
| 983 | 984 | $this->parent->output->addWikiText( $text ); |
| 984 | 985 | $this->startForm(); |
| 985 | 986 | $this->endForm( false ); |
| — | — | @@ -989,24 +990,21 @@ |
| 990 | 991 | } |
| 991 | 992 | |
| 992 | 993 | protected function formatTextFile( $text ) { |
| 993 | | - $text = str_replace( array( '<', '{{', '[[' ), |
| 994 | | - array( '<', '{{', '[[' ), $text ); |
| 995 | | - // replace numbering with [1], [2], etc with MW-style numbering |
| 996 | | - $text = preg_replace( "/\r?\n(\r?\n)?\\[\\d+\\]/m", "\\1#", $text ); |
| | 994 | + // Use Unix line endings, escape some wikitext stuff |
| | 995 | + $text = str_replace( array( '<', '{{', '[[', "\r" ), |
| | 996 | + array( '<', '{{', '[[', '' ), $text ); |
| 997 | 997 | // join word-wrapped lines into one |
| 998 | 998 | do { |
| 999 | 999 | $prev = $text; |
| 1000 | | - $text = preg_replace( "/\n([\\*#])([^\r\n]*?)\r?\n([^\r\n#\\*:]+)/", "\n\\1\\2 \\3", $text ); |
| | 1000 | + $text = preg_replace( "/\n([\\*#\t])([^\n]*?)\n([^\n#\\*:]+)/", "\n\\1\\2 \\3", $text ); |
| 1001 | 1001 | } while ( $text != $prev ); |
| | 1002 | + // Replace tab indents with colons |
| | 1003 | + $text = preg_replace( '/^\t\t/m', '::', $text ); |
| | 1004 | + $text = preg_replace( '/^\t/m', ':', $text ); |
| 1002 | 1005 | // turn (bug nnnn) into links |
| 1003 | 1006 | $text = preg_replace_callback('/bug (\d+)/', array( $this, 'replaceBugLinks' ), $text ); |
| 1004 | 1007 | // add links to manual to every global variable mentioned |
| 1005 | 1008 | $text = preg_replace_callback('/(\$wg[a-z0-9_]+)/i', array( $this, 'replaceConfigLinks' ), $text ); |
| 1006 | | - // special case for <pre> - formatted links |
| 1007 | | - do { |
| 1008 | | - $prev = $text; |
| 1009 | | - $text = preg_replace( '/^([^\\s].*?)\r?\n[\\s]+(https?:\/\/)/m', "\\1\n:\\2", $text ); |
| 1010 | | - } while ( $text != $prev ); |
| 1011 | 1009 | return $text; |
| 1012 | 1010 | } |
| 1013 | 1011 | |
| — | — | @@ -1023,49 +1021,18 @@ |
| 1024 | 1022 | } |
| 1025 | 1023 | |
| 1026 | 1024 | class WebInstaller_Readme extends WebInstaller_Document { |
| 1027 | | - |
| 1028 | 1025 | protected function getFileName() { return 'README'; } |
| 1029 | | - |
| 1030 | | - public function getFileContents() { |
| 1031 | | - return $this->formatTextFile( parent::getFileContents() ); |
| 1032 | | - } |
| 1033 | | - |
| 1034 | 1026 | } |
| 1035 | 1027 | |
| 1036 | 1028 | class WebInstaller_ReleaseNotes extends WebInstaller_Document { |
| 1037 | | - |
| 1038 | 1029 | protected function getFileName() { return 'RELEASE-NOTES'; } |
| 1039 | | - |
| 1040 | | - public function getFileContents() { |
| 1041 | | - return $this->formatTextFile( parent::getFileContents() ); |
| 1042 | | - } |
| 1043 | | - |
| 1044 | 1030 | } |
| 1045 | 1031 | |
| 1046 | 1032 | class WebInstaller_UpgradeDoc extends WebInstaller_Document { |
| 1047 | | - |
| 1048 | 1033 | protected function getFileName() { return 'UPGRADE'; } |
| 1049 | | - |
| 1050 | | - public function getFileContents() { |
| 1051 | | - return $this->formatTextFile( parent::getFileContents() ); |
| 1052 | | - } |
| 1053 | | - |
| 1054 | 1034 | } |
| 1055 | 1035 | |
| 1056 | 1036 | class WebInstaller_Copying extends WebInstaller_Document { |
| 1057 | | - |
| 1058 | 1037 | protected function getFileName() { return 'COPYING'; } |
| 1059 | | - |
| 1060 | | - public function getFileContents() { |
| 1061 | | - $text = parent::getFileContents(); |
| 1062 | | - $text = str_replace( "\x0C", '', $text ); |
| 1063 | | - $text = preg_replace_callback( '/\n[ \t]+/m', array( 'WebInstaller_Copying', 'replaceLeadingSpaces' ), $text ); |
| 1064 | | - $text = '<tt>' . nl2br( $text ) . '</tt>'; |
| 1065 | | - return $text; |
| 1066 | | - } |
| 1067 | | - |
| 1068 | | - private static function replaceLeadingSpaces( $matches ) { |
| 1069 | | - return "\n" . str_repeat( ' ', strlen( $matches[0] ) ); |
| 1070 | | - } |
| 1071 | | - |
| 1072 | 1038 | } |
| | 1039 | + |
| Index: trunk/phase3/COPYING |
| — | — | @@ -1,14 +1,15 @@ |
| 2 | | - GNU GENERAL PUBLIC LICENSE |
| 3 | | - Version 2, June 1991 |
| | 2 | +== GNU GENERAL PUBLIC LICENSE == |
| 4 | 3 | |
| 5 | | - Copyright (C) 1989, 1991 Free Software Foundation, Inc. |
| 6 | | - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA |
| 7 | | - Everyone is permitted to copy and distribute verbatim copies |
| 8 | | - of this license document, but changing it is not allowed. |
| | 4 | +Version 2, June 1991 |
| 9 | 5 | |
| 10 | | - Preamble |
| | 6 | +Copyright (C) 1989, 1991 Free Software Foundation, Inc. |
| | 7 | +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA |
| | 8 | +Everyone is permitted to copy and distribute verbatim copies |
| | 9 | +of this license document, but changing it is not allowed. |
| 11 | 10 | |
| 12 | | - The licenses for most software are designed to take away your |
| | 11 | +=== Preamble === |
| | 12 | + |
| | 13 | +The licenses for most software are designed to take away your |
| 13 | 14 | freedom to share and change it. By contrast, the GNU General Public |
| 14 | 15 | License is intended to guarantee your freedom to share and change free |
| 15 | 16 | software--to make sure the software is free for all its users. This |
| — | — | @@ -18,48 +19,47 @@ |
| 19 | 20 | the GNU Library General Public License instead.) You can apply it to |
| 20 | 21 | your programs, too. |
| 21 | 22 | |
| 22 | | - When we speak of free software, we are referring to freedom, not |
| | 23 | +When we speak of free software, we are referring to freedom, not |
| 23 | 24 | price. Our General Public Licenses are designed to make sure that you |
| 24 | 25 | have the freedom to distribute copies of free software (and charge for |
| 25 | 26 | this service if you wish), that you receive source code or can get it |
| 26 | 27 | if you want it, that you can change the software or use pieces of it |
| 27 | 28 | in new free programs; and that you know you can do these things. |
| 28 | 29 | |
| 29 | | - To protect your rights, we need to make restrictions that forbid |
| | 30 | +To protect your rights, we need to make restrictions that forbid |
| 30 | 31 | anyone to deny you these rights or to ask you to surrender the rights. |
| 31 | 32 | These restrictions translate to certain responsibilities for you if you |
| 32 | 33 | distribute copies of the software, or if you modify it. |
| 33 | 34 | |
| 34 | | - For example, if you distribute copies of such a program, whether |
| | 35 | +For example, if you distribute copies of such a program, whether |
| 35 | 36 | gratis or for a fee, you must give the recipients all the rights that |
| 36 | 37 | you have. You must make sure that they, too, receive or can get the |
| 37 | 38 | source code. And you must show them these terms so they know their |
| 38 | 39 | rights. |
| 39 | 40 | |
| 40 | | - We protect your rights with two steps: (1) copyright the software, and |
| | 41 | +We protect your rights with two steps: (1) copyright the software, and |
| 41 | 42 | (2) offer you this license which gives you legal permission to copy, |
| 42 | 43 | distribute and/or modify the software. |
| 43 | 44 | |
| 44 | | - Also, for each author's protection and ours, we want to make certain |
| | 45 | +Also, for each author's protection and ours, we want to make certain |
| 45 | 46 | that everyone understands that there is no warranty for this free |
| 46 | 47 | software. If the software is modified by someone else and passed on, we |
| 47 | 48 | want its recipients to know that what they have is not the original, so |
| 48 | 49 | that any problems introduced by others will not reflect on the original |
| 49 | 50 | authors' reputations. |
| 50 | 51 | |
| 51 | | - Finally, any free program is threatened constantly by software |
| | 52 | +Finally, any free program is threatened constantly by software |
| 52 | 53 | patents. We wish to avoid the danger that redistributors of a free |
| 53 | 54 | program will individually obtain patent licenses, in effect making the |
| 54 | 55 | program proprietary. To prevent this, we have made it clear that any |
| 55 | 56 | patent must be licensed for everyone's free use or not licensed at all. |
| 56 | 57 | |
| 57 | | - The precise terms and conditions for copying, distribution and |
| | 58 | +The precise terms and conditions for copying, distribution and |
| 58 | 59 | modification follow. |
| 59 | | - |
| 60 | | - GNU GENERAL PUBLIC LICENSE |
| 61 | | - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION |
| 62 | 60 | |
| 63 | | - 0. This License applies to any program or other work which contains |
| | 61 | +== TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION == |
| | 62 | + |
| | 63 | +'''0.''' This License applies to any program or other work which contains |
| 64 | 64 | a notice placed by the copyright holder saying it may be distributed |
| 65 | 65 | under the terms of this General Public License. The "Program", below, |
| 66 | 66 | refers to any such program or work, and a "work based on the Program" |
| — | — | @@ -76,7 +76,7 @@ |
| 77 | 77 | Program (independent of having been made by running the Program). |
| 78 | 78 | Whether that is true depends on what the Program does. |
| 79 | 79 | |
| 80 | | - 1. You may copy and distribute verbatim copies of the Program's |
| | 80 | +'''1.''' You may copy and distribute verbatim copies of the Program's |
| 81 | 81 | source code as you receive it, in any medium, provided that you |
| 82 | 82 | conspicuously and appropriately publish on each copy an appropriate |
| 83 | 83 | copyright notice and disclaimer of warranty; keep intact all the |
| — | — | @@ -87,30 +87,30 @@ |
| 88 | 88 | You may charge a fee for the physical act of transferring a copy, and |
| 89 | 89 | you may at your option offer warranty protection in exchange for a fee. |
| 90 | 90 | |
| 91 | | - 2. You may modify your copy or copies of the Program or any portion |
| | 91 | +'''2.''' You may modify your copy or copies of the Program or any portion |
| 92 | 92 | of it, thus forming a work based on the Program, and copy and |
| 93 | 93 | distribute such modifications or work under the terms of Section 1 |
| 94 | 94 | above, provided that you also meet all of these conditions: |
| 95 | 95 | |
| 96 | | - a) You must cause the modified files to carry prominent notices |
| 97 | | - stating that you changed the files and the date of any change. |
| | 96 | + '''a)''' You must cause the modified files to carry prominent notices |
| | 97 | + stating that you changed the files and the date of any change. |
| 98 | 98 | |
| 99 | | - b) You must cause any work that you distribute or publish, that in |
| 100 | | - whole or in part contains or is derived from the Program or any |
| 101 | | - part thereof, to be licensed as a whole at no charge to all third |
| 102 | | - parties under the terms of this License. |
| | 99 | + '''b)''' You must cause any work that you distribute or publish, that in |
| | 100 | + whole or in part contains or is derived from the Program or any |
| | 101 | + part thereof, to be licensed as a whole at no charge to all third |
| | 102 | + parties under the terms of this License. |
| 103 | 103 | |
| 104 | | - c) If the modified program normally reads commands interactively |
| 105 | | - when run, you must cause it, when started running for such |
| 106 | | - interactive use in the most ordinary way, to print or display an |
| 107 | | - announcement including an appropriate copyright notice and a |
| 108 | | - notice that there is no warranty (or else, saying that you provide |
| 109 | | - a warranty) and that users may redistribute the program under |
| 110 | | - these conditions, and telling the user how to view a copy of this |
| 111 | | - License. (Exception: if the Program itself is interactive but |
| 112 | | - does not normally print such an announcement, your work based on |
| 113 | | - the Program is not required to print an announcement.) |
| 114 | | - |
| | 104 | + '''c)''' If the modified program normally reads commands interactively |
| | 105 | + when run, you must cause it, when started running for such |
| | 106 | + interactive use in the most ordinary way, to print or display an |
| | 107 | + announcement including an appropriate copyright notice and a |
| | 108 | + notice that there is no warranty (or else, saying that you provide |
| | 109 | + a warranty) and that users may redistribute the program under |
| | 110 | + these conditions, and telling the user how to view a copy of this |
| | 111 | + License. (Exception: if the Program itself is interactive but |
| | 112 | + does not normally print such an announcement, your work based on |
| | 113 | + the Program is not required to print an announcement.) |
| | 114 | + |
| 115 | 115 | These requirements apply to the modified work as a whole. If |
| 116 | 116 | identifiable sections of that work are not derived from the Program, |
| 117 | 117 | and can be reasonably considered independent and separate works in |
| — | — | @@ -131,26 +131,26 @@ |
| 132 | 132 | a storage or distribution medium does not bring the other work under |
| 133 | 133 | the scope of this License. |
| 134 | 134 | |
| 135 | | - 3. You may copy and distribute the Program (or a work based on it, |
| | 135 | +'''3.''' You may copy and distribute the Program (or a work based on it, |
| 136 | 136 | under Section 2) in object code or executable form under the terms of |
| 137 | 137 | Sections 1 and 2 above provided that you also do one of the following: |
| 138 | 138 | |
| 139 | | - a) Accompany it with the complete corresponding machine-readable |
| 140 | | - source code, which must be distributed under the terms of Sections |
| 141 | | - 1 and 2 above on a medium customarily used for software interchange; or, |
| | 139 | + '''a)''' Accompany it with the complete corresponding machine-readable |
| | 140 | + source code, which must be distributed under the terms of Sections |
| | 141 | + 1 and 2 above on a medium customarily used for software interchange; or, |
| 142 | 142 | |
| 143 | | - b) Accompany it with a written offer, valid for at least three |
| 144 | | - years, to give any third party, for a charge no more than your |
| 145 | | - cost of physically performing source distribution, a complete |
| 146 | | - machine-readable copy of the corresponding source code, to be |
| 147 | | - distributed under the terms of Sections 1 and 2 above on a medium |
| 148 | | - customarily used for software interchange; or, |
| | 143 | + '''b)''' Accompany it with a written offer, valid for at least three |
| | 144 | + years, to give any third party, for a charge no more than your |
| | 145 | + cost of physically performing source distribution, a complete |
| | 146 | + machine-readable copy of the corresponding source code, to be |
| | 147 | + distributed under the terms of Sections 1 and 2 above on a medium |
| | 148 | + customarily used for software interchange; or, |
| 149 | 149 | |
| 150 | | - c) Accompany it with the information you received as to the offer |
| 151 | | - to distribute corresponding source code. (This alternative is |
| 152 | | - allowed only for noncommercial distribution and only if you |
| 153 | | - received the program in object code or executable form with such |
| 154 | | - an offer, in accord with Subsection b above.) |
| | 150 | + '''c)''' Accompany it with the information you received as to the offer |
| | 151 | + to distribute corresponding source code. (This alternative is |
| | 152 | + allowed only for noncommercial distribution and only if you |
| | 153 | + received the program in object code or executable form with such |
| | 154 | + an offer, in accord with Subsection b above.) |
| 155 | 155 | |
| 156 | 156 | The source code for a work means the preferred form of the work for |
| 157 | 157 | making modifications to it. For an executable work, complete source |
| — | — | @@ -168,8 +168,8 @@ |
| 169 | 169 | access to copy the source code from the same place counts as |
| 170 | 170 | distribution of the source code, even though third parties are not |
| 171 | 171 | compelled to copy the source along with the object code. |
| 172 | | - |
| 173 | | - 4. You may not copy, modify, sublicense, or distribute the Program |
| | 172 | + |
| | 173 | +'''4.''' You may not copy, modify, sublicense, or distribute the Program |
| 174 | 174 | except as expressly provided under this License. Any attempt |
| 175 | 175 | otherwise to copy, modify, sublicense or distribute the Program is |
| 176 | 176 | void, and will automatically terminate your rights under this License. |
| — | — | @@ -177,7 +177,7 @@ |
| 178 | 178 | this License will not have their licenses terminated so long as such |
| 179 | 179 | parties remain in full compliance. |
| 180 | 180 | |
| 181 | | - 5. You are not required to accept this License, since you have not |
| | 181 | +'''5.''' You are not required to accept this License, since you have not |
| 182 | 182 | signed it. However, nothing else grants you permission to modify or |
| 183 | 183 | distribute the Program or its derivative works. These actions are |
| 184 | 184 | prohibited by law if you do not accept this License. Therefore, by |
| — | — | @@ -186,7 +186,7 @@ |
| 187 | 187 | all its terms and conditions for copying, distributing or modifying |
| 188 | 188 | the Program or works based on it. |
| 189 | 189 | |
| 190 | | - 6. Each time you redistribute the Program (or any work based on the |
| | 190 | +'''6.''' Each time you redistribute the Program (or any work based on the |
| 191 | 191 | Program), the recipient automatically receives a license from the |
| 192 | 192 | original licensor to copy, distribute or modify the Program subject to |
| 193 | 193 | these terms and conditions. You may not impose any further |
| — | — | @@ -194,7 +194,7 @@ |
| 195 | 195 | You are not responsible for enforcing compliance by third parties to |
| 196 | 196 | this License. |
| 197 | 197 | |
| 198 | | - 7. If, as a consequence of a court judgment or allegation of patent |
| | 198 | +'''7.''' If, as a consequence of a court judgment or allegation of patent |
| 199 | 199 | infringement or for any other reason (not limited to patent issues), |
| 200 | 200 | conditions are imposed on you (whether by court order, agreement or |
| 201 | 201 | otherwise) that contradict the conditions of this License, they do not |
| — | — | @@ -225,8 +225,8 @@ |
| 226 | 226 | |
| 227 | 227 | This section is intended to make thoroughly clear what is believed to |
| 228 | 228 | be a consequence of the rest of this License. |
| 229 | | - |
| 230 | | - 8. If the distribution and/or use of the Program is restricted in |
| | 229 | + |
| | 230 | +'''8.''' If the distribution and/or use of the Program is restricted in |
| 231 | 231 | certain countries either by patents or by copyrighted interfaces, the |
| 232 | 232 | original copyright holder who places the Program under this License |
| 233 | 233 | may add an explicit geographical distribution limitation excluding |
| — | — | @@ -234,7 +234,7 @@ |
| 235 | 235 | countries not thus excluded. In such case, this License incorporates |
| 236 | 236 | the limitation as if written in the body of this License. |
| 237 | 237 | |
| 238 | | - 9. The Free Software Foundation may publish revised and/or new versions |
| | 238 | +'''9.''' The Free Software Foundation may publish revised and/or new versions |
| 239 | 239 | of the General Public License from time to time. Such new versions will |
| 240 | 240 | be similar in spirit to the present version, but may differ in detail to |
| 241 | 241 | address new problems or concerns. |
| — | — | @@ -247,7 +247,7 @@ |
| 248 | 248 | this License, you may choose any version ever published by the Free Software |
| 249 | 249 | Foundation. |
| 250 | 250 | |
| 251 | | - 10. If you wish to incorporate parts of the Program into other free |
| | 251 | +'''10.''' If you wish to incorporate parts of the Program into other free |
| 252 | 252 | programs whose distribution conditions are different, write to the author |
| 253 | 253 | to ask for permission. For software which is copyrighted by the Free |
| 254 | 254 | Software Foundation, write to the Free Software Foundation; we sometimes |
| — | — | @@ -255,9 +255,9 @@ |
| 256 | 256 | of preserving the free status of all derivatives of our free software and |
| 257 | 257 | of promoting the sharing and reuse of software generally. |
| 258 | 258 | |
| 259 | | - NO WARRANTY |
| | 259 | +=== NO WARRANTY === |
| 260 | 260 | |
| 261 | | - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY |
| | 261 | +'''11.''' BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY |
| 262 | 262 | FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN |
| 263 | 263 | OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES |
| 264 | 264 | PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED |
| — | — | @@ -267,7 +267,7 @@ |
| 268 | 268 | PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, |
| 269 | 269 | REPAIR OR CORRECTION. |
| 270 | 270 | |
| 271 | | - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING |
| | 271 | +'''12.''' IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING |
| 272 | 272 | WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR |
| 273 | 273 | REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, |
| 274 | 274 | INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING |
| — | — | @@ -277,46 +277,47 @@ |
| 278 | 278 | PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE |
| 279 | 279 | POSSIBILITY OF SUCH DAMAGES. |
| 280 | 280 | |
| 281 | | - END OF TERMS AND CONDITIONS |
| 282 | | - |
| 283 | | - How to Apply These Terms to Your New Programs |
| | 281 | + '''END OF TERMS AND CONDITIONS''' |
| 284 | 282 | |
| 285 | | - If you develop a new program, and you want it to be of the greatest |
| | 283 | +== How to Apply These Terms to Your New Programs == |
| | 284 | + |
| | 285 | +If you develop a new program, and you want it to be of the greatest |
| 286 | 286 | possible use to the public, the best way to achieve this is to make it |
| 287 | 287 | free software which everyone can redistribute and change under these terms. |
| 288 | 288 | |
| 289 | | - To do so, attach the following notices to the program. It is safest |
| | 289 | +To do so, attach the following notices to the program. It is safest |
| 290 | 290 | to attach them to the start of each source file to most effectively |
| 291 | 291 | convey the exclusion of warranty; and each file should have at least |
| 292 | 292 | the "copyright" line and a pointer to where the full notice is found. |
| 293 | 293 | |
| 294 | | - <one line to give the program's name and a brief idea of what it does.> |
| 295 | | - Copyright (C) <year> <name of author> |
| | 294 | + <one line to give the program's name and a brief idea of what it does.> |
| 296 | 295 | |
| 297 | | - This program is free software; you can redistribute it and/or modify |
| 298 | | - it under the terms of the GNU General Public License as published by |
| 299 | | - the Free Software Foundation; either version 2 of the License, or |
| 300 | | - (at your option) any later version. |
| | 296 | + Copyright (C) <year> <name of author> |
| 301 | 297 | |
| 302 | | - This program is distributed in the hope that it will be useful, |
| 303 | | - but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 304 | | - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 305 | | - GNU General Public License for more details. |
| | 298 | + This program is free software; you can redistribute it and/or modify |
| | 299 | + it under the terms of the GNU General Public License as published by |
| | 300 | + the Free Software Foundation; either version 2 of the License, or |
| | 301 | + (at your option) any later version. |
| 306 | 302 | |
| 307 | | - You should have received a copy of the GNU General Public License |
| 308 | | - along with this program; if not, write to the Free Software |
| 309 | | - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA |
| | 303 | + This program is distributed in the hope that it will be useful, |
| | 304 | + but WITHOUT ANY WARRANTY; without even the implied warranty of |
| | 305 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| | 306 | + GNU General Public License for more details. |
| 310 | 307 | |
| | 308 | + You should have received a copy of the GNU General Public License |
| | 309 | + along with this program; if not, write to the Free Software |
| | 310 | + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA |
| 311 | 311 | |
| | 312 | + |
| 312 | 313 | Also add information on how to contact you by electronic and paper mail. |
| 313 | 314 | |
| 314 | 315 | If the program is interactive, make it output a short notice like this |
| 315 | 316 | when it starts in an interactive mode: |
| 316 | 317 | |
| 317 | | - Gnomovision version 69, Copyright (C) year name of author |
| 318 | | - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. |
| 319 | | - This is free software, and you are welcome to redistribute it |
| 320 | | - under certain conditions; type `show c' for details. |
| | 318 | + Gnomovision version 69, Copyright (C) year name of author |
| | 319 | + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. |
| | 320 | + This is free software, and you are welcome to redistribute it |
| | 321 | + under certain conditions; type `show c' for details. |
| 321 | 322 | |
| 322 | 323 | The hypothetical commands `show w' and `show c' should show the appropriate |
| 323 | 324 | parts of the General Public License. Of course, the commands you use may |
| — | — | @@ -327,12 +328,13 @@ |
| 328 | 329 | school, if any, to sign a "copyright disclaimer" for the program, if |
| 329 | 330 | necessary. Here is a sample; alter the names: |
| 330 | 331 | |
| 331 | | - Yoyodyne, Inc., hereby disclaims all copyright interest in the program |
| 332 | | - `Gnomovision' (which makes passes at compilers) written by James Hacker. |
| | 332 | + Yoyodyne, Inc., hereby disclaims all copyright interest in the program |
| | 333 | + `Gnomovision' (which makes passes at compilers) written by James Hacker. |
| 333 | 334 | |
| 334 | | - <signature of Ty Coon>, 1 April 1989 |
| 335 | | - Ty Coon, President of Vice |
| | 335 | + <signature of Ty Coon>, 1 April 1989 |
| 336 | 336 | |
| | 337 | + Ty Coon, President of Vice |
| | 338 | + |
| 337 | 339 | This General Public License does not permit incorporating your program into |
| 338 | 340 | proprietary programs. If your program is a subroutine library, you may |
| 339 | 341 | consider it more useful to permit linking proprietary applications with the |
| Index: trunk/phase3/README |
| — | — | @@ -39,7 +39,7 @@ |
| 40 | 40 | * Several others (view CREDITS for a more complete list) |
| 41 | 41 | |
| 42 | 42 | The contributors hold the copyright to this work, and it is licensed under the |
| 43 | | -terms of the GNU General Public License, version 2 or later[1] (see |
| | 43 | +terms of the GNU General Public License, version 2 or later (see |
| 44 | 44 | http://www.fsf.org/licensing/licenses/gpl.html). Derivative works and later |
| 45 | 45 | versions of the code must be free software licensed under the same or a |
| 46 | 46 | compatible license. This includes "extensions" that use MediaWiki functions or |
| — | — | @@ -48,66 +48,65 @@ |
| 49 | 49 | |
| 50 | 50 | The Wikimedia Foundation currently has no legal rights to the software. |
| 51 | 51 | |
| 52 | | -[1] Sections of code written exclusively by Lee Crocker or Erik Moeller are also |
| | 52 | +Sections of code written exclusively by Lee Crocker or Erik Moeller are also |
| 53 | 53 | released into the public domain, which does not impair the obligations of users |
| 54 | 54 | under the GPL for use of the whole code or other sections thereof. |
| 55 | 55 | |
| 56 | | -[2] MediaWiki makes use of the Sajax Toolkit by modernmethod, |
| 57 | | - http://www.modernmethod.com/sajax/ |
| 58 | | - which has the following license: |
| | 56 | +MediaWiki makes use of the Sajax Toolkit by modernmethod, |
| | 57 | +http://www.modernmethod.com/sajax/ which has the following license: |
| 59 | 58 | |
| 60 | | - 'This work is licensed under the Creative Commons Attribution |
| 61 | | - License. To view a copy of this license, visit |
| 62 | | - http://creativecommons.org/licenses/by/2.0/ or send a letter |
| 63 | | - to Creative Commons, 559 Nathan Abbott Way, |
| 64 | | - Stanford, California 94305, USA.' |
| | 59 | + 'This work is licensed under the Creative Commons Attribution |
| | 60 | + License. To view a copy of this license, visit |
| | 61 | + http://creativecommons.org/licenses/by/2.0/ or send a letter |
| | 62 | + to Creative Commons, 559 Nathan Abbott Way, |
| | 63 | + Stanford, California 94305, USA.' |
| 65 | 64 | |
| 66 | | -[3] MediaWiki use Creative Commons license marks to points to their online |
| | 65 | +MediaWiki use Creative Commons license marks to points to their online |
| 67 | 66 | licenses. This content is trademarked and used under a specific license |
| 68 | 67 | available at http://creativecommons.org/policies#trademark |
| 69 | 68 | The restricted content is: |
| 70 | | - skins/common/images/cc-by-nc-sa.png |
| 71 | | - skins/common/images/cc-by-sa.png |
| 72 | 69 | |
| | 70 | +* skins/common/images/cc-by-nc-sa.png |
| | 71 | +* skins/common/images/cc-by-sa.png |
| 73 | 72 | |
| 74 | 73 | Many thanks to the Wikimedia regulars for testing and suggestions. |
| 75 | 74 | |
| 76 | 75 | The official website for MediaWiki is located at: |
| 77 | 76 | |
| 78 | | - http://www.mediawiki.org/ |
| | 77 | + http://www.mediawiki.org/ |
| 79 | 78 | |
| 80 | 79 | The code is currently maintained in a Subversion repository at |
| 81 | 80 | svn.wikimedia.org. See http://www.mediawiki.org/wiki/Subversion for details. |
| 82 | 81 | |
| 83 | 82 | Please report bugs and make feature requests in our Bugzilla system: |
| 84 | 83 | |
| 85 | | - https://bugzilla.wikimedia.org/ |
| | 84 | +* https://bugzilla.wikimedia.org/ |
| 86 | 85 | |
| 87 | 86 | Documentation and discussion on new features may be found at: |
| 88 | 87 | |
| 89 | | - http://www.mediawiki.org/wiki/Manual:FAQ |
| 90 | | - http://www.mediawiki.org/wiki/Documentation |
| 91 | | - http://www.mediawiki.org/wiki/Development |
| | 88 | +* http://www.mediawiki.org/wiki/Manual:FAQ |
| | 89 | +* http://www.mediawiki.org/wiki/Documentation |
| | 90 | +* http://www.mediawiki.org/wiki/Development |
| 92 | 91 | |
| 93 | 92 | Extensions are listed at: |
| 94 | 93 | |
| 95 | | - http://www.mediawiki.org/wiki/Category:Extensions |
| | 94 | +* http://www.mediawiki.org/wiki/Category:Extensions |
| 96 | 95 | |
| 97 | 96 | If you are setting up your own wiki based on this software, it is highly |
| 98 | 97 | recommended that you subscribe to mediawiki-announce: |
| 99 | 98 | |
| 100 | | - https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce |
| | 99 | +* https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce |
| 101 | 100 | |
| 102 | 101 | The mailing list is very low volume, and is intended primarily for announcements |
| 103 | 102 | of new versions, bug fixes, and security issues. |
| 104 | 103 | |
| 105 | 104 | A higher volume support mailing list can be found at: |
| 106 | 105 | |
| 107 | | - https://lists.wikimedia.org/mailman/listinfo/mediawiki-l |
| | 106 | +* https://lists.wikimedia.org/mailman/listinfo/mediawiki-l |
| 108 | 107 | |
| 109 | 108 | Developer discussion takes place at: |
| 110 | 109 | |
| 111 | | - https://lists.wikimedia.org/mailman/listinfo/wikitech-l |
| | 110 | +* https://lists.wikimedia.org/mailman/listinfo/wikitech-l |
| 112 | 111 | |
| 113 | 112 | There is also a development and support channel #mediawiki on irc.freenode.net, |
| 114 | 113 | and an unoffical support forum at www.mwusers.com. |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -635,7 +635,7 @@ |
| 636 | 636 | License (except for pages that explicitly state that their contents are in |
| 637 | 637 | the public domain) : |
| 638 | 638 | |
| 639 | | - http://www.mediawiki.org/wiki/Documentation |
| | 639 | + http://www.mediawiki.org/wiki/Documentation |
| 640 | 640 | |
| 641 | 641 | |
| 642 | 642 | === Mailing list === |
| — | — | @@ -643,11 +643,11 @@ |
| 644 | 644 | A MediaWiki-l mailing list has been set up distinct from the Wikipedia |
| 645 | 645 | wikitech-l list: |
| 646 | 646 | |
| 647 | | - http://lists.wikimedia.org/mailman/listinfo/mediawiki-l |
| | 647 | + http://lists.wikimedia.org/mailman/listinfo/mediawiki-l |
| 648 | 648 | |
| 649 | 649 | A low-traffic announcements-only list is also available: |
| 650 | 650 | |
| 651 | | - http://lists.wikimedia.org/mailman/listinfo/mediawiki-announce |
| | 651 | + http://lists.wikimedia.org/mailman/listinfo/mediawiki-announce |
| 652 | 652 | |
| 653 | 653 | It's highly recommended that you sign up for one of these lists if you're |
| 654 | 654 | going to run a public MediaWiki, so you can be notified of security fixes. |