Unified reference to GNU/Linux and free software

One of the main reasons to building Maneage is to properly
acknowledge/attribute the authors of software in research. So we have
adopted a standard of never referring to the GNU-based operating systems
running the Linux kernel simply as "Linux", we avoid terms like "Open
Sourse" and use Free Software instead (in the same spirit).

With this commit, a few instances of the cases above have been corrected,
they had slipped through our fingers when we initially imported them into
the project. In the special case of the "Journal for Open Source Software",
we simply replaced it with its abbreviation (JOSS). This was done because
in effect we were generally using journal name abbreviations in almost all
the citations already. To avoid any inconsistancies, the names of the three
other journals that weren't abbreviated are also abbreviated.

6 files changed, 8 insertions, 8 deletions

diff --git a/reproduce/software/bibtex/corner.tex b/reproduce/software/bibtex/corner.tex
index b55c157..c4359d1 100644
--- a/reproduce/software/bibtex/corner.tex
+++ b/reproduce/software/bibtex/corner.tex
@@ -8,7 +8,7 @@
 @ARTICLE{corner,
        author = {{Foreman-Mackey}, Daniel},
         title = "{corner.py: Scatterplot matrices in Python}",
-      journal = {The Journal of Open Source Software},
+      journal = {JOSS},
          year = "2016",
         month = "Jun",
        volume = {1},
diff --git a/reproduce/software/bibtex/galsim.tex b/reproduce/software/bibtex/galsim.tex
index 0efa048..b9d0b08 100644
--- a/reproduce/software/bibtex/galsim.tex
+++ b/reproduce/software/bibtex/galsim.tex
@@ -12,7 +12,7 @@
          {Dietrich}, J.~P. and {Armstrong}, R. and {Melchior}, P. and
          {Gill}, M.~S.~S.},
         title = "{GALSIM: The modular galaxy image simulation toolkit}",
-      journal = {Astronomy and Computing},
+      journal = {Astron.Comput.},
      keywords = {Methods: data analysis, Techniques: image processing, Gravitational lensing, Cosmology: observations, Astrophysics - Instrumentation and Methods for Astrophysics, Astrophysics - Cosmology and Nongalactic Astrophysics, 85-04},
          year = "2015",
         month = "Apr",
diff --git a/reproduce/software/bibtex/missfits.tex b/reproduce/software/bibtex/missfits.tex
index 85a1645..bdb2879 100644
--- a/reproduce/software/bibtex/missfits.tex
+++ b/reproduce/software/bibtex/missfits.tex
@@ -8,11 +8,11 @@
 @ARTICLE{missfits,
        author = {{Marmo}, C. and {Bertin}, E.},
         title = "{MissFITS and WeightWatcher: Two Optimised Tools for Managing FITS Data.}",
-      journal = {Astronomical Data Analysis Software and Systems XVII},
+      journal = {ASPC},
          year = 2008,
        volume = {394},
        series = {Astronomical Society of the Pacific Conference Series},
         pages = {619},
        adsurl = {https://ui.adsabs.harvard.edu/abs/2008ASPC..394..619M},
       adsnote = {Provided by the SAO/NASA Astrophysics Data System}
-}
\ No newline at end of file
+}
diff --git a/reproduce/software/bibtex/mpi4py.tex b/reproduce/software/bibtex/mpi4py.tex
index dde77f0..a72d529 100644
--- a/reproduce/software/bibtex/mpi4py.tex
+++ b/reproduce/software/bibtex/mpi4py.tex
@@ -9,7 +9,7 @@
    author = {{Dalcin}, L.~D. and {Paz}, R.~R. and {Kler}, P.~A. and {Cosimo}, A.
 	},
     title = "{Parallel distributed computing using Python}",
-  journal = {Advances in Water Resources},
+  journal = {AdvWatRes},
      year = 2011,
     month = sep,
    volume = 34,
diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk
index 8b216fe..e0da312 100644
--- a/reproduce/software/make/basic.mk
+++ b/reproduce/software/make/basic.mk
@@ -374,7 +374,7 @@ $(ibidir)/bzip2: $(tdir)/bzip2-$(bzip2-version).tar.gz
         # Bzip2 doesn't have a `./configure' script, and its Makefile
         # doesn't build a shared library. So we can't use the `gbuild'
         # function here and we need to take some extra steps (inspired
-        # from the "Linux from Scratch" guide for Bzip2):
+        # from the GNU/Linux from Scratch (LFS) guide for Bzip2):
         #   1) The `sed' call is for relative installed symbolic links.
         #   2) The special Makefile-libbz2_so builds shared libraries.
         #
@@ -514,7 +514,7 @@ $(ibidir)/ncurses: $(ibidir)/make \
         # explicitly mentioning its name correctly (as a value to `-l' at
         # link time in their configure scripts).
         #
-        # This part is taken from the Arch Linux build script[1], then
+        # This part is taken from the Arch GNU/Linux build script[1], then
         # extended to Mac thanks to Homebrew's script [2].
         #
         # [1] https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/ncurses
diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk
index 3ad4468..96de036 100644
--- a/reproduce/software/make/high-level.mk
+++ b/reproduce/software/make/high-level.mk
@@ -1059,7 +1059,7 @@ $(ibidir)/imfit: $(ibidir)/gsl \
 # Autotools (Autoconf and Automake). Note that Minizip 2.x isn't like this
 # any more and has its own independent tarball, but currently the programs
 # that depend on Minizip need Minizip 1.x. The instructions to build
-# minizip were taken from ArchLinux.
+# minizip were taken from Arch GNU/Linux.
 #
 # About deleting the final crypt.h file after installation, see
 # https://bugzilla.redhat.com/show_bug.cgi?id=1424609