summaryrefslogtreecommitdiff
path: root/2016
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2016-03-08 11:18:14 +0700
committerHarald Welte <laforge@gnumonks.org>2016-03-08 11:18:14 +0700
commit759677f802b02f4eee02bf4a87d0d3b2449a7b82 (patch)
treec361a742ecd2bea0d6d5dbeb41b75b5dff490c5f /2016
parent7b1742695631770b7feb68bf93b55c3055d73f29 (diff)
linaro: tone it down, be less offensive
Diffstat (limited to '2016')
-rw-r--r--2016/linaroconnect/compliance.adoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/2016/linaroconnect/compliance.adoc b/2016/linaroconnect/compliance.adoc
index ff8cf4a..8740222 100644
--- a/2016/linaroconnect/compliance.adoc
+++ b/2016/linaroconnect/compliance.adoc
@@ -170,8 +170,8 @@ company first engaging with FOSS
[role="incremental"]
* Our _farang/gaijin/laowei_ now complies with local laws by not
- bringing illegal drugs into Asia that might be legal at his home
- (legal compliance)
+ bringing restricted items (medication, too long pocket knives) into
+ Asia which might be legal at his home (legal compliance)
* He still often ignores the local culture and social norms, and is
perceived by some of the locals as disrespectful or rude at times
(doesn't cause legal risks)
@@ -188,7 +188,7 @@ company first engaging with FOSS
time still think FOSS is a one-way road that enables them to profit
on the work of others while keeping their code private / out-of-tree
** Sure, you can have a marriage that caters exclusively to the needs of one of the people involved
-*** But will it be sustainable _till death do us part_?
+*** But will it be a sustainable long-term relationship?
*** Or will it just be a short affair?
* we need to shift the focus from _legal-centric GPL compliance_ to
_engineering-centric collaborative development_
personal git repositories of Harald Welte. Your mileage may vary