summaryrefslogtreecommitdiff
path: root/faq
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@schwinge.name>2011-05-02 10:50:59 +0200
committerThomas Schwinge <thomas@schwinge.name>2011-05-02 10:50:59 +0200
commitfc333951a76c5cc8ec4611b2b14562fde4c65219 (patch)
tree81ed68cc5096ba93ad11dd2013f8386bd713082b /faq
parent0198b3664ef958c44eccaf9cb6f847c2984e3d79 (diff)
parent92d73f6d792bf0b3d32008e5e89c5d2402c72b53 (diff)
Merge remote branch 'kepler.SCHWINGE/foss_factory'
Conflicts: sidebar.mdwn
Diffstat (limited to 'faq')
-rw-r--r--faq/how_many_developers.mdwn3
1 files changed, 2 insertions, 1 deletions
diff --git a/faq/how_many_developers.mdwn b/faq/how_many_developers.mdwn
index ab8e8f28..a96e0576 100644
--- a/faq/how_many_developers.mdwn
+++ b/faq/how_many_developers.mdwn
@@ -23,7 +23,8 @@ participating in the current development anymore.
In the past (that is, a lot of years ago), the FSF did pay a few developers for
working full time on the GNU Hurd. But that was for a limited amount of time
only, and evidently, it was too little for getting the system into a
-competitive state. Nowadays, it's only unpaid and free-time volunteers' work.
+competitive state. Nowadays, it's only unpaid (apart from some
+[[bounties|tag/bounty]]) and free-time volunteers' work.
In contrast to the Linux kernel, there is no industry involvement in
development. For one, this is a good thing: independency; no conflicts of