Linux->GNU/Linux (Issue 2651)

10 files changed, 16 insertions, 16 deletions

diff --git a/Documentation/contributor/administration.itexi b/Documentation/contributor/administration.itexi
index 73c317855e..6695375807 100644
--- a/Documentation/contributor/administration.itexi
+++ b/Documentation/contributor/administration.itexi
@@ -935,7 +935,7 @@ open-source software.  For example,
 @uref{http://foundation.gnome.org/legal/}   board members pledge
 to keep certain matters confidential
 
-every security team of every linux distribution and OS
+every security team of every GNU/Linux distribution and OS
 @end example
 
 In fact, Karl Fogel's @qq{Producing Open Source Software}
diff --git a/Documentation/contributor/programming-work.itexi b/Documentation/contributor/programming-work.itexi
index 9644cf7868..d72424ab4c 100644
--- a/Documentation/contributor/programming-work.itexi
+++ b/Documentation/contributor/programming-work.itexi
@@ -1453,7 +1453,7 @@ When these commands complete without error, the patch is
 considered to function successfully.
 
 Developers on Windows who are unable to build LilyPond should
-get help from a Linux or OSX developer to do the make tests.
+get help from a GNU/Linux or OSX developer to do the make tests.
 
 
 @node Verify regression tests
diff --git a/Documentation/contributor/quick-start.itexi b/Documentation/contributor/quick-start.itexi
index a549c4ef57..2172677054 100644
--- a/Documentation/contributor/quick-start.itexi
+++ b/Documentation/contributor/quick-start.itexi
@@ -17,7 +17,7 @@ for you and will help you do this as quickly and easily as possible.
 @node LilyDev
 @section LilyDev
 
-There is a disk image of a @q{remix} of Ubuntu Linux available for
+There is a disk image of a @q{remix} of Ubuntu GNU/Linux available for
 download which includes all the necessary software and tools to compile
 both LilyPond and the documentation.  Called the
 @qq{Ubuntu LilyPond Developer Remix}, but known simply as @qq{LilyDev}
@@ -25,14 +25,14 @@ for short.  Although it is not possible to compile LilyPond on Windows
 and extremely difficult on MacOS, LilyDev can be installed and run
 inside a @q{virtual machine} on any of these operating systems without
 disturbing your main operating system.  The LilyDev disk image can also
-be burnt to a DVD and installed like any other Ubuntu Linux
+be burnt to a DVD and installed like any other Ubuntu GNU/Linux
 distribution.
 
 Most virtualization software can be used but we recommend VirtualBox as
 it is available for all major operating systems and is easy to install
 & configure.
 
-If you are not familiar with Linux, it may be beneficial to read a
+If you are not familiar with GNU/Linux, it may be beneficial to read a
 couple of @qq{introduction to Ubuntu} web pages.
 
 Some contributors have recommended a free PDF:
diff --git a/Documentation/contributor/source-code.itexi b/Documentation/contributor/source-code.itexi
index 2567484e70..d3f4f3a11b 100644
--- a/Documentation/contributor/source-code.itexi
+++ b/Documentation/contributor/source-code.itexi
@@ -549,7 +549,7 @@ environment variable to point to that repository.
 @end example
 
 To configure an environment variable in bash (the default for most
-Linux distributions),
+GNU/Linux distributions),
 
 @example
 export LILYPOND_WEB_MEDIA_GIT=$HOME/dir/of/lilypond-extra/
diff --git a/Documentation/learning/tweaks.itely b/Documentation/learning/tweaks.itely
index 675e585ca5..5f9f1dc7b1 100644
--- a/Documentation/learning/tweaks.itely
+++ b/Documentation/learning/tweaks.itely
@@ -4009,14 +4009,14 @@ first find the directory appropriate to your system.  The location
 of this directory depends (a) on whether you obtained LilyPond
 by downloading a precompiled binary from lilypond.org
 or whether you installed it from a package manager (i.e.
-distributed with Linux, or installed under fink or cygwin) or
+distributed with GNU/Linux, or installed under fink or cygwin) or
 compiled it from source, and (b) on which operating system it is
 being used:
 
 @strong{Downloaded from lilypond.org}
 
 @itemize @bullet
-@item Linux
+@item GNU/Linux
 
 Navigate to
 @example
diff --git a/Documentation/usage/running.itely b/Documentation/usage/running.itely
index 7522cec85b..2c1ea3126d 100644
--- a/Documentation/usage/running.itely
+++ b/Documentation/usage/running.itely
@@ -721,7 +721,7 @@ smaller value means more CPU time is used.  The default value is
 
 Setting up the server to run LilyPond in a chroot jail is a complicated
 task.  The steps are listed below.  Examples in the steps are from
-Ubuntu Linux, and may require the use of @code{sudo} as appropriate.
+Ubuntu GNU/Linux, and may require the use of @code{sudo} as appropriate.
 
 @itemize
 
diff --git a/Documentation/usage/suggestions.itely b/Documentation/usage/suggestions.itely
index 8b3314257a..421782ce16 100644
--- a/Documentation/usage/suggestions.itely
+++ b/Documentation/usage/suggestions.itely
@@ -281,11 +281,11 @@ See the @strong{GNU Make Manual} for full details on using
 can do.
 
 The commands to define rules in a makefile differ
-according to platform; for instance the various forms of Linux and
+according to platform; for instance the various forms of GNU/Linux and
 MacOS use @code{bash}, while Windows uses @code{cmd}.  Note that on
 MacOS X, you need to configure the system to use the command-line
 interpreter.  Here are some example makefiles, with versions for both
-Linux/MacOS and Windows.
+GNU/Linux/MacOS and Windows.
 
 The first example is for an orchestral work in four
 movements with a directory structure as follows:
diff --git a/Documentation/web/download.itexi b/Documentation/web/download.itexi
index 365ecedaa3..dd6dabb464 100644
--- a/Documentation/web/download.itexi
+++ b/Documentation/web/download.itexi
@@ -47,7 +47,7 @@ our @ref{Text input}.}
 @c ref is duplicated to avoid underlining ref as image.
 @ref{Unix, @sourceimage{logo-linux,,,}
 @sourceimage{logo-freebsd,,,}}
-@ref{Unix, Unix (Linux and FreeBSD)}
+@ref{Unix, Unix (GNU/Linux and FreeBSD)}
 
 @item
 @ref{MacOS X, @sourceimage{logo-macosx,,,}}
diff --git a/Documentation/web/introduction.itexi b/Documentation/web/introduction.itexi
index 127d174d09..e07321bb3c 100644
--- a/Documentation/web/introduction.itexi
+++ b/Documentation/web/introduction.itexi
@@ -1089,7 +1089,7 @@ viewer with advanced point-and-click support.
 
 Frescobaldi is lightweight, yet powerful LilyPond music and text editor
 with a built-in PDF viewer.  It is easy to use and will run on all major
-operating systems (Linux, Mac OS X and Windows).
+operating systems (GNU/Linux, Mac OS X and Windows).
 
 @divEnd
 
diff --git a/scripts/build/create-weblinks-itexi.py b/scripts/build/create-weblinks-itexi.py
index c7e02ceb84..62d5afbfbd 100644
--- a/scripts/build/create-weblinks-itexi.py
+++ b/scripts/build/create-weblinks-itexi.py
@@ -320,11 +320,11 @@ def make_download_source(name, vstring, version, lang):
 
 def make_all_downloads(macroName, version):
     make_download("download"+macroName+"LinuxNormal", "linux-x86/",
-        "linux-x86.sh",    version, "1", "Linux x86")
+        "linux-x86.sh",    version, "1", "GNU/Linux x86")
     make_download("download"+macroName+"LinuxBig", "linux-64/",
-        "linux-64.sh", version, "1", "Linux 64")
+        "linux-64.sh", version, "1", "GNU/Linux 64")
     make_download("download"+macroName+"LinuxPPC", "linux-ppc/",
-        "linux-ppc.sh", version, "1", "Linux PPC")
+        "linux-ppc.sh", version, "1", "GNU/Linux PPC")
 
     make_download("download"+macroName+"FreeBSDNormal", "freebsd-x86/",
         "freebsd-x86.sh", version, "1", "FreeBSD i386")