diff options
| -rw-r--r-- | winsup/doc/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/doc/legal.sgml | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog index 2bacafff2..b9185ea9f 100644 --- a/winsup/doc/ChangeLog +++ b/winsup/doc/ChangeLog @@ -1,3 +1,8 @@ +2011-05-25 Corinna Vinschen <corinna@vinschen.de> + + * legal.sgml: Drop an old paragraph. Reactivate copyright note for + documentation. + 2011-05-19 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> * new-features.sgml (ov-new1.7.10): Document __fpurge. diff --git a/winsup/doc/legal.sgml b/winsup/doc/legal.sgml index 2799ebd3b..3c55f84e8 100644 --- a/winsup/doc/legal.sgml +++ b/winsup/doc/legal.sgml @@ -4,10 +4,12 @@ <!-- -<para>GNUPro™, the GNUPro™ logo, and the Red Hat +<para>Cygwin™, GNUPro™, the GNUPro™ logo, and the Red Hat logo are trademarks of Red Hat, Inc. All other brand and product names are trademarks of their respective owners.</para> +--> + <para>Permission is granted to make and distribute verbatim copies of this documentation provided the copyright notice and this permission notice are preserved on all copies.</para> @@ -23,8 +25,4 @@ for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation.</para> -<para>This documentation has been prepared by Red Hat, Inc. -Technical Publications.</para> ---> - </legalnotice> |