diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | en/welcome/what-is-linux.xml | 26 |
2 files changed, 15 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog index 5dff91693..57d277e41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ installation-guide (20210805) UNRELEASED; urgency=medium * Include a note on how to change init system during install. Closes: #992034 * Add missing preseed line for apt-setup in example-preseed template. Closes: 992183 + * Don't call 'Linux' an operating system, use 'GNU/Linux' instead. + Closes: 993475 [ Updated translations ] * Catalan by d diff --git a/en/welcome/what-is-linux.xml b/en/welcome/what-is-linux.xml index d69e28bee..14555bffe 100644 --- a/en/welcome/what-is-linux.xml +++ b/en/welcome/what-is-linux.xml @@ -5,7 +5,7 @@ <title>What is GNU/Linux?</title> <para> -Linux is an operating system: a series of programs that let you +GNU/Linux is an operating system: a series of programs that let you interact with your computer and run other programs. </para><para> @@ -24,12 +24,12 @@ to refer to systems that many people casually refer to as </para><para> -Linux is modelled on the Unix operating system. From the start, Linux +GNU/Linux is modelled on the Unix operating system. From the start, GNU/Linux was designed to be a multi-tasking, multi-user system. These facts are -enough to make Linux different from other well-known operating -systems. However, Linux is even more different than you might +enough to make GNU/Linux different from other well-known operating +systems. However, GNU/Linux is even more different than you might imagine. In contrast to other operating systems, nobody owns -Linux. Much of its development is done by unpaid volunteers. +GNU/Linux. Much of its development is done by unpaid volunteers. </para><para> @@ -42,17 +42,17 @@ began development of a free Unix-like operating system called GNU. The <ulink url="&url-gnu;">GNU Project</ulink> has developed a comprehensive set of free software tools for use with Unix™ and Unix-like operating systems such as -Linux. These tools enable users to perform tasks ranging from the +GNU/Linux. These tools enable users to perform tasks ranging from the mundane (such as copying or removing files from the system) to the arcane (such as writing and compiling programs or doing sophisticated editing in a variety of document formats). </para><para> -While many groups and individuals have contributed to Linux, the +While many groups and individuals have contributed to GNU/Linux, the largest single contributor is still the Free Software Foundation, -which created not only most of the tools used in Linux, but also the -philosophy and the community that made Linux possible. +which created not only most of the tools used in GNU/Linux, but also the +philosophy and the community that made GNU/Linux possible. </para><para> @@ -75,7 +75,7 @@ list can be found on the </para><para> -Linux users have immense freedom of choice in their software. For +GNU/Linux users have immense freedom of choice in their software. For example, Linux users can choose from a dozen different command line shells and several graphical desktops. This selection is often bewildering to users of other operating systems, who are not used to @@ -84,10 +84,10 @@ change. </para><para> -Linux is also less likely to crash, better able to run more than one +GNU/Linux is also less likely to crash, better able to run more than one program at the same time, and more secure than many operating -systems. With these advantages, Linux is the fastest growing operating -system in the server market. More recently, Linux has begun to be +systems. With these advantages, GNU/Linux is the fastest growing operating +system in the server market. More recently, GNU/Linux has begun to be popular among home and business users as well. </para> |