Browse Source

s/Linux/GNU\/Linux/g

Patches by v_2e@ukr.net
Swaroop C H 12 years ago
parent
commit
6e41e99b12
6 changed files with 47 additions and 50 deletions
  1. 4 4
      03-intro.md
  2. 9 10
      04-installation.md
  3. 6 6
      05-first-steps.md
  4. 9 10
      12-problem-solving.md
  5. 18 19
      18-what-next.md
  6. 1 1
      19-appendix-floss.md

+ 4 - 4
03-intro.md

@@ -61,10 +61,10 @@ to make it work on) many platforms. All your Python programs can work
 on any of these platforms without requiring any changes at all if you
 are careful enough to avoid any system-dependent features.
 
-You can use Python on Linux, Windows, FreeBSD, Macintosh, Solaris,
-OS/2, Amiga, AROS, AS/400, BeOS, OS/390, z/OS, Palm OS, QNX, VMS,
-Psion, Acorn RISC OS, VxWorks, PlayStation, Sharp Zaurus, Windows CE
-and PocketPC!
+You can use Python on GNU/Linux, Windows, FreeBSD, Macintosh, Solaris,
+OS/2, Amiga, AROS, AS/400, BeOS, OS/390, z/OS, Palm OS, QNX, VMS, Psion,
+Acorn RISC OS, VxWorks, PlayStation, Sharp Zaurus, Windows CE and
+PocketPC!
 
 You can even use a platform like [Kivy](http://kivy.org) to create
 games for your computer *and* for iPhone, iPad, and Android.

+ 9 - 10
04-installation.md

@@ -88,19 +88,18 @@ brew install python3
 
 Now, run `python3` and ensure there are no errors.
 
-## Installation on Linux ##
+## Installation on GNU/Linux ##
 
-For Linux users, open the terminal by opening the `Terminal`
-application or by pressing `Alt + F2` and entering
-`gnome-terminal`. If that doesn't work, please refer the documentation
-or forums of your particular Linux distribution.
+For GNU/Linux users, open the terminal by opening the `Terminal`
+application or by pressing `Alt + F2` and entering `gnome-terminal`. If
+that doesn't work, please refer the documentation or forums of your
+particular GNU/Linux distribution.
 
-Next, we have to install the `python3` package. For example, on
-Ubuntu, you can use
+Next, we have to install the `python3` package. For example, on Ubuntu,
+you can use
 [`sudo apt-get install python3`](http://packages.ubuntu.com/search?keywords=python3&searchon=names&suite=all&section=all).
-Please check the documentation or forums of the Linux distribution
-that you have installed for the correct package manager command to
-run.
+Please check the documentation or forums of the GNU/Linux distribution
+that you have installed for the correct package manager command to run.
 
 Once you have finished the installation, run the `python3` and ensure
 there are no errors.

+ 6 - 6
05-first-steps.md

@@ -44,11 +44,11 @@ screen.
 
 How to Quit the Interpreter Prompt
 
-:   If you are using a Linux or Unix shell, you can exit the interpreter
-    prompt by pressing `ctrl-d` or entering `exit()` (note: remember to
-    include the parentheses, '()') followed by the `enter` key. If you are
-    using the Windows command prompt, press `ctrl-z` followed by the
-    `enter` key.
+:   If you are using a GNU/Linux or Unix shell, you can exit the
+    interpreter prompt by pressing `ctrl-d` or entering `exit()` (note:
+    remember to include the parentheses, '()') followed by the `enter`
+    key. If you are using the Windows command prompt, press `ctrl-z`
+    followed by the `enter` key.
 
 ## Choosing An Editor ##
 
@@ -70,7 +70,7 @@ can *see* your program and visualize its running.
 
 If you have no idea where to start, I would recommend using
 [Sublime Text 3](http://www.sublimetext.com/3) software which is
-available on Windows, Mac OS X and Linux. Details in next section.
+available on Windows, Mac OS X and GNU/Linux. Details in next section.
 
 If you are using Windows, **do not use Notepad** - it is a bad choice
 because it does not do syntax highlighting and also importantly it

+ 9 - 10
12-problem-solving.md

@@ -26,10 +26,9 @@ perfectly okay.
 - The backup must be stored in a main backup directory.
 - The files are backed up into a zip file.
 - The name of the zip archive is the current date and time.
-- We use the standard `zip` command available by default in any
-  standard Linux/Unix distribution. Windows users can
-  [install](http://gnuwin32.sourceforge.net/downlinks/zip.php) from
-  the
+- We use the standard `zip` command available by default in any standard
+  GNU/Linux or Unix distribution. Windows users can
+  [install](http://gnuwin32.sourceforge.net/downlinks/zip.php) from the
   [GnuWin32 project page](http://gnuwin32.sourceforge.net/packages/zip.htm)
   and add `C:\Program Files\GnuWin32\bin` to your system PATH
   environment variable, similar to
@@ -104,7 +103,7 @@ the `target_dir` directory.
 
 Notice the use of the `os.sep` variable - this gives the directory
 separator according to your operating system i.e. it will be `'/'` in
-Linux and Unix, it will be `'\\'` in Windows and `':'` in Mac
+GNU/Linux and Unix, it will be `'\\'` in Windows and `':'` in Mac
 OS. Using `os.sep` instead of these characters directly will make our
 program portable and work across all of these systems.
 
@@ -116,11 +115,11 @@ on. The complete list of such specifications can be found in the
 [Python Reference Manual](http://docs.python.org/3/library/time.html#time.strftime).
 
 We create the name of the target zip file using the addition operator
-which *concatenates* the strings i.e. it joins the two strings
-together and returns a new one. Then, we create a string `zip_command`
-which contains the command that we are going to execute. You can check
-if this command works by running it in the shell (Linux terminal or
-DOS prompt).
+which *concatenates* the strings i.e. it joins the two strings together
+and returns a new one. Then, we create a string `zip_command` which
+contains the command that we are going to execute. You can check if this
+command works by running it in the shell (GNU/Linux terminal or DOS
+prompt).
 
 The `zip` command that we are using has some options and parameters
 passed. The `-q` option is used to indicate that the zip command

+ 18 - 19
18-what-next.md

@@ -142,12 +142,12 @@ Kivy
 PyGTK
 
 :   This is the Python binding for the GTK+ toolkit which is the
-    foundation upon which GNOME is built. GTK+ has many quirks in
-    usage but once you become comfortable, you can create GUI apps
-    fast. The Glade graphical interface designer is indispensable. The
-    documentation is yet to improve. GTK+ works well on Linux but its
-    port to Windows is incomplete. You can create both free as well as
-    proprietary software using GTK+. To get started, read the
+    foundation upon which GNOME is built. GTK+ has many quirks in usage
+    but once you become comfortable, you can create GUI apps fast. The
+    Glade graphical interface designer is indispensable. The
+    documentation is yet to improve. GTK+ works well on GNU/Linux but
+    its port to Windows is incomplete. You can create both free as well
+    as proprietary software using GTK+. To get started, read the
     [PyGTK tutorial](http://www.pygtk.org/tutorial.html).
 
 PyQt
@@ -163,16 +163,15 @@ PyQt
 
 wxPython
 
-:   This is the Python bindings for the wxWidgets toolkit. wxPython
-    has a learning curve associated with it. However, it is very
-    portable and runs on Linux, Windows, Mac and even embedded
-    platforms. There are many IDEs available for wxPython which
-    include GUI designers as well such as
+:   This is the Python bindings for the wxWidgets toolkit. wxPython has
+    a learning curve associated with it. However, it is very portable
+    and runs on GNU/Linux, Windows, Mac and even embedded
+    platforms. There are many IDEs available for wxPython which include
+    GUI designers as well such as
     [SPE (Stani's Python Editor)](http://spe.pycs.net/) and the
     [wxGlade](http://wxglade.sourceforge.net/) GUI builder. You can
     create free as well as proprietary software using wxPython. To get
-    started, read the
-    [wxPython tutorial](http://zetcode.com/wxpython/).
+    started, read the [wxPython tutorial](http://zetcode.com/wxpython/).
 
 ### Summary of GUI Tools ###
 
@@ -180,12 +179,12 @@ For more choices, see the
 [GuiProgramming wiki page at the official python website](http://www.python.org/cgi-bin/moinmoin/GuiProgramming).
 
 Unfortunately, there is no one standard GUI tool for Python. I suggest
-that you choose one of the above tools depending on your
-situation. The first factor is whether you are willing to pay to use
-any of the GUI tools. The second factor is whether you want the
-program to run only on Windows or on Mac and Linux or all of them. The
-third factor, if Linux is a chosen platform, is whether you are a KDE
-or GNOME user on Linux.
+that you choose one of the above tools depending on your situation. The
+first factor is whether you are willing to pay to use any of the GUI
+tools. The second factor is whether you want the program to run only on
+Windows or on Mac and GNU/Linux or all of them. The third factor, if
+GNU/Linux is a chosen platform, is whether you are a KDE or GNOME user
+on GNU/Linux.
 
 For a more detailed and comprehensive analysis, see Page 26 of the
 [The Python Papers, Volume 3, Issue 1](http://archive.pythonpapers.org/ThePythonPapersVolume3Issue1.pdf).

+ 1 - 1
19-appendix-floss.md

@@ -23,7 +23,7 @@ that community sharing and building can create:
 [Ubuntu](http://www.ubuntu.com)
 
 :   This is a community-driven distribution, sponsored by Canonical
-    and it is the most popular Linux distribution today. It allows you
+    and it is the most popular GNU/Linux distribution today. It allows you
     to install a plethora of FLOSS available and all this in an
     easy-to-use and easy-to-install manner. Best of all, you can just
     reboot your computer and run GNU/Linux off the CD! This allows you