diff options
author | Lennart Poettering <lennart@poettering.net> | 2008-08-05 19:42:21 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2008-08-05 19:42:21 +0200 |
commit | 3cca13223b8f038fb82e34b8979579b34efafee0 (patch) | |
tree | 2f37513a24e60aebd7bbf9fdf8f8dc7802ba8ada /doc | |
parent | 0ed4f324326f63e5672367bc63609a3ee65faef6 (diff) |
update license headers for GPL 2.0+
Diffstat (limited to 'doc')
-rw-r--r-- | doc/Makefile.am | 17 | ||||
-rw-r--r-- | doc/README.html.in | 10 | ||||
-rw-r--r-- | doc/style.css | 39 |
3 files changed, 32 insertions, 34 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index bccc116..a08c59e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,18 +1,20 @@ # This file is part of pavucontrol. # -# pavucontrol is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# Copyright 2006-2008 Lennart Poettering +# +# pavucontrol is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 2 of the +# License, or (at your option) any later version. # # pavucontrol is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # 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 pavucontrol; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +# You should have received a copy of the GNU General Public +# License along with pavucontrol. If not, see +# <http://www.gnu.org/licenses/>. noinst_DATA = README.html README EXTRA_DIST = $(noinst_DATA) style.css README.html.in @@ -31,4 +33,3 @@ tidy: README.html tidy -e < README.html .PHONY: tidy - diff --git a/doc/README.html.in b/doc/README.html.in index 4d5b3ea..ed27320 100644 --- a/doc/README.html.in +++ b/doc/README.html.in @@ -27,19 +27,15 @@ <h2><a name="license">License</a></h2> <p>This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version.</p> +modify it under the terms of the GNU Public License as published by +the Free Software Foundation, either version 2 of the License, or (at +your option) any later version.</p> <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</p> -<p>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., 675 Mass Ave, Cambridge, MA 02139, USA.</p> - <h2><a name="news">News</a></h2> <div class="news-date">Fri Mar 28 diff --git a/doc/style.css b/doc/style.css index a8f004f..b185c24 100644 --- a/doc/style.css +++ b/doc/style.css @@ -1,24 +1,25 @@ /*** - * This file is part of pavucontrol. - * - * pavucontrol is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * pavucontrol is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * 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 pavucontrol; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - ***/ + This file is part of pavucontrol. -body { color: black; background-color: white; } -a:link, a:visited { color: #900000; } -div.news-date { font-size: 80%; font-style: italic; } + Copyright 2006-2008 Lennart Poettering + + pavucontrol is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + pavucontrol is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + 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 pavucontrol. If not, see <http://www.gnu.org/licenses/>. + ***/ + +body { color: black; background-color: white; } +a:link, a:visited { color: #900000; } +div.news-date { font-size: 80%; font-style: italic; } pre { background-color: #f0f0f0; padding: 0.4cm; } .grey { color: #8f8f8f; font-size: 80%; } table { margin-left: 1cm; border:1px solid lightgrey; padding: 0.2cm; } |