diff mbox

gnu: Remove trademark acknowledgements.

Message ID 1471890295-25249-1-git-send-email-jmd@gnu.org
State New
Headers show

Commit Message

John Darrington Aug. 22, 2016, 6:24 p.m. UTC
* gnu/packages/imagemagick.scm (imagemagick), gnu/packages/python.scm
  (python-2.7), gnu/packages/wordnet.scm (wordnet) [description]:
   Remove trademark acknowledgements.
---
 gnu/packages/imagemagick.scm | 2 +-
 gnu/packages/python.scm      | 2 +-
 gnu/packages/wordnet.scm     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

John Darrington Aug. 22, 2016, 6:28 p.m. UTC | #1
These somehow crept in, but are an explicit violation of GNU policy and
coding standards.
On Mon, Aug 22, 2016 at 08:24:55PM +0200, John Darrington wrote:
     * gnu/packages/imagemagick.scm (imagemagick), gnu/packages/python.scm
       (python-2.7), gnu/packages/wordnet.scm (wordnet) [description]:
        Remove trademark acknowledgements.
     ---
      gnu/packages/imagemagick.scm | 2 +-
      gnu/packages/python.scm      | 2 +-
      gnu/packages/wordnet.scm     | 2 +-
      3 files changed, 3 insertions(+), 3 deletions(-)
     
     diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
     index c88fd7a..b7054c8 100644
     --- a/gnu/packages/imagemagick.scm
     +++ b/gnu/packages/imagemagick.scm
     @@ -100,7 +100,7 @@
          (home-page "http://www.imagemagick.org/")
          (synopsis "Create, edit, compose, or convert bitmap images")
          (description
     -     "ImageMagick?? is a software suite to create, edit, compose, or convert
     +     "ImageMagick is a software suite to create, edit, compose, or convert
      bitmap images.  It can read and write images in a variety of formats (over 100)
      including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG,
      and TIFF.  Use ImageMagick to resize, flip, mirror, rotate, distort, shear and
     diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
     index 15c957e..eb949fa 100644
     --- a/gnu/packages/python.scm
     +++ b/gnu/packages/python.scm
     @@ -5732,7 +5732,7 @@ object to help create WSGI responses.")
          (home-page "http://www.python-excel.org/")
          (synopsis "Library for extracting data from Excel files")
          (description "This packages provides a library to extract data from
     -spreadsheets using Microsoft Excel?? proprietary file formats @samp{.xls} and
     +spreadsheets using Microsoft Excel proprietary file formats @samp{.xls} and
      @samp{.xlsx} (versions 2.0 onwards).  It has support for Excel dates and is
      Unicode-aware.  It is not intended as an end-user tool.")
          (license bsd-3)))
     diff --git a/gnu/packages/wordnet.scm b/gnu/packages/wordnet.scm
     index dbc7586..289ecde 100644
     --- a/gnu/packages/wordnet.scm
     +++ b/gnu/packages/wordnet.scm
     @@ -83,7 +83,7 @@
          (home-page "http://wordnet.princeton.edu/")
          (synopsis "Lexical database for the English language")
          (description
     -     "WordNet?? is a large lexical database of English.  Nouns, verbs,
     +     "WordNet is a large lexical database of English.  Nouns, verbs,
      adjectives and adverbs are grouped into sets of cognitive synonyms (synsets),
      each expressing a distinct concept.  Synsets are interlinked by means of
      conceptual-semantic and lexical relations.  The resulting network of
     -- 
     2.1.4
Leo Famulari Aug. 22, 2016, 7:30 p.m. UTC | #2
On Mon, Aug 22, 2016 at 08:24:55PM +0200, John Darrington wrote:
> * gnu/packages/imagemagick.scm (imagemagick), gnu/packages/python.scm
>   (python-2.7), gnu/packages/wordnet.scm (wordnet) [description]:
>    Remove trademark acknowledgements.

Thanks!

The second two lines of the changelog should begin in the first column,
with no indentation.

> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 15c957e..eb949fa 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -5732,7 +5732,7 @@ object to help create WSGI responses.")
>      (home-page "http://www.python-excel.org/")
>      (synopsis "Library for extracting data from Excel files")
>      (description "This packages provides a library to extract data from
> -spreadsheets using Microsoft Excel® proprietary file formats @samp{.xls} and
> +spreadsheets using Microsoft Excel proprietary file formats @samp{.xls} and
>  @samp{.xlsx} (versions 2.0 onwards).  It has support for Excel dates and is
>  Unicode-aware.  It is not intended as an end-user tool.")
>      (license bsd-3)))

Please make the changelog reflect that this change is not in the
python-2.7 variable, but rather in the python-xlrd variable.
Ricardo Wurmus Aug. 22, 2016, 8:03 p.m. UTC | #3
John Darrington <john@darrington.wattle.id.au> writes:

> These somehow crept in, but are an explicit violation of GNU policy and
> coding standards.

Good catch!  Thanks for fixing this.

~~ Ricardo
diff mbox

Patch

diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index c88fd7a..b7054c8 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -100,7 +100,7 @@ 
     (home-page "http://www.imagemagick.org/")
     (synopsis "Create, edit, compose, or convert bitmap images")
     (description
-     "ImageMagick® is a software suite to create, edit, compose, or convert
+     "ImageMagick is a software suite to create, edit, compose, or convert
 bitmap images.  It can read and write images in a variety of formats (over 100)
 including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG,
 and TIFF.  Use ImageMagick to resize, flip, mirror, rotate, distort, shear and
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 15c957e..eb949fa 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -5732,7 +5732,7 @@  object to help create WSGI responses.")
     (home-page "http://www.python-excel.org/")
     (synopsis "Library for extracting data from Excel files")
     (description "This packages provides a library to extract data from
-spreadsheets using Microsoft Excel® proprietary file formats @samp{.xls} and
+spreadsheets using Microsoft Excel proprietary file formats @samp{.xls} and
 @samp{.xlsx} (versions 2.0 onwards).  It has support for Excel dates and is
 Unicode-aware.  It is not intended as an end-user tool.")
     (license bsd-3)))
diff --git a/gnu/packages/wordnet.scm b/gnu/packages/wordnet.scm
index dbc7586..289ecde 100644
--- a/gnu/packages/wordnet.scm
+++ b/gnu/packages/wordnet.scm
@@ -83,7 +83,7 @@ 
     (home-page "http://wordnet.princeton.edu/")
     (synopsis "Lexical database for the English language")
     (description
-     "WordNet® is a large lexical database of English.  Nouns, verbs,
+     "WordNet is a large lexical database of English.  Nouns, verbs,
 adjectives and adverbs are grouped into sets of cognitive synonyms (synsets),
 each expressing a distinct concept.  Synsets are interlinked by means of
 conceptual-semantic and lexical relations.  The resulting network of