Bug 605739 - Ensure GPLv2 license text in about:license is consistent with the official GPLv2 text [r=gerv a=bsmedberg]

This commit is contained in:
Reed Loden 2010-11-05 00:14:43 -07:00
parent 6365c6aa32
commit c6aa80feff

View File

@ -1073,7 +1073,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
<p> When we speak of free software, we are referring to freedom, not
@ -1375,9 +1375,9 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
</pre>
<p>Also add information on how to contact you by electronic and paper mail.
@ -1412,7 +1412,7 @@ necessary. Here is a sample; alter the names:
<p>This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.