From: Shlomi Fish <shlomif@shlomifish.org>
Date: Sun, 12 Dec 2021 07:58:58 +0000 (+0200)
Subject: Merged linuxcookie into "linux".
X-Git-Tag: fortune-mod-3.8.0~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f41f7b02f478f4e8e29d70b91274ce52d3d4342f;p=fortune-mod

Merged linuxcookie into "linux".

See: https://github.com/shlomif/fortune-mod/issues/57
---

diff --git a/fortune-mod/CMakeLists.txt b/fortune-mod/CMakeLists.txt
index 13f8e31..4d8cd82 100644
--- a/fortune-mod/CMakeLists.txt
+++ b/fortune-mod/CMakeLists.txt
@@ -302,7 +302,6 @@ SET (COOKIES
     humorists
     kids
     law
-    linuxcookie
     literature
     love
     magic
diff --git a/fortune-mod/cookie-files b/fortune-mod/cookie-files
index cf594c2..1d49ee4 100644
--- a/fortune-mod/cookie-files
+++ b/fortune-mod/cookie-files
@@ -41,7 +41,7 @@ kids		: Real advice and cynical observations on children, parenting,
 		  and family life.
 law		: Stupid laws, stupider lawyers.  *No* joke about a lawyer
 		  is *ever* offensive (except to lawyers, and who cares?).
-linuxcookie	: From the collection at ftp.icce.rug.nl.  Linux-related.
+linux	: From the collection at ftp.icce.rug.nl.  Linux-related.
 		  It probably ought to go in with 'computers,' but it's
 		  archived separately, so I'm keeping it separate.
 literature	: Mostly classic authors; a few newbies.  And Bulwer-Lytton.
diff --git a/fortune-mod/datfiles/linux b/fortune-mod/datfiles/linux
index b3b9343..e196c1e 100644
--- a/fortune-mod/datfiles/linux
+++ b/fortune-mod/datfiles/linux
@@ -396,15 +396,15 @@ If it breaks then you get to keep both pieces.
 %
 'Mounten' wird für drei Dinge benutzt: 'Aufsitzen' auf Pferde, 'einklinken'
 von Festplatten in Dateisysteme, und, nun, 'besteigen' beim Sex.
+
+'Mounting' is used for three things: climbing on a horse, linking in a
+hard disk unit in data systems, and, well, mounting during sex.
+
 	-- Christa Keil
 %
 Manchmal stehe nachts auf und installier's mir einfach...
 	-- H0arry @ IRC
 %
-'Mounting' is used for three things: climbing on a horse, linking in a
-hard disk unit in data systems, and, well, mounting during sex.
-	-- Christa Keil
-%
 We are using Linux daily to UP our productivity - so UP yours!
 	-- Adapted from Pat Paulsen by Joe Sloan
 %
@@ -994,8 +994,9 @@ S:      Buried alive in email
 Netscape is not a newsreader, and probably never shall be.
 	-- Tom Christiansen
 %
-I think it's time to remove Qt and Qt-derived applications from the distributon.
-By distributing it, we only encourage authors to create restrictive licenses.
+I think it's time to remove Qt and Qt-derived applications from the
+distribution.  By distributing it, we only encourage authors to create
+restrictive licenses.
 	-- Bruce Perens
 %
 If someone can point me to a good and _FREE_ backup software that keeps
diff --git a/fortune-mod/datfiles/linuxcookie b/fortune-mod/datfiles/linuxcookie
deleted file mode 100644
index b14d455..0000000
--- a/fortune-mod/datfiles/linuxcookie
+++ /dev/null
@@ -1,12 +0,0 @@
-'Mounten' wird fuer drei Dinge benutzt: 'Aufsitzen' auf Pferde, 'einklinken'
-von Festplatten in Dateisysteme, und, nun, 'besteigen' beim Sex.
-(Christa Keil in a German posting: "Mounting is used for three things:
-climbing on a horse, linking in a hard disk unit in data systems, and, well,
-mounting during sex".)
-%
-"On the Internet, no one knows you're using Windows NT"
-(Submitted by Ramiro Estrugo, restrugo@fateware.com)
-%
-Why use Windows, since there is a door?
-(By fachat@galileo.rhein-neckar.de, Andre Fachat)
-%