Merge branch 'master' into patch-2

Author: kenyonj

Gemfile.lock

@@ -10,16 +10,18 @@ GEM
       ast (~> 2.4.0)
     rainbow (3.0.0)
     rake (12.3.2)
-    rubocop (0.68.1)
+    rubocop (0.69.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.6)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-performance (1.3.0)
+      rubocop (>= 0.68.0)
     ruby-progressbar (1.10.0)
     safe_yaml (1.0.5)
-    unicode-display_width (1.5.0)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
@@ -29,6 +31,7 @@ DEPENDENCIES
   minitest
   rake
   rubocop
+  rubocop-performance
   safe_yaml
 
 BUNDLED WITH

collections/open-journalism/index.md

@@ -13,6 +13,7 @@ items:
  - dukechronicle/chronline
  - BloombergMedia/whatiscode
  - times/cardkit
+ - mkiser/WTFJHT
 display_name: Open journalism
 created_by: benbalter
 ---

collections/open-source-organizations/index.md

@@ -17,6 +17,10 @@ items:
  - OSGeo/osgeo
  - godaddy/godaddy.github.io
  - cloudflare/cloudflare.github.io
+ - eleme/eleme.github.io
+ - didi/didi.github.io
+ - alibaba/alibaba.github.com
+ - baidu/baidu.github.io
 display_name: Open source organizations
 created_by: benbalter
 image: open-source-organizations.png

collections/programming-languages/index.md

@@ -35,7 +35,7 @@ items:
 - IoLanguage/io
 - dlang/dmd
 - zdevito/terra
-- Microsoft/visualfsharp
+- dotnet/fsharp
 - skiplang/skip
 - FascinatedBox/lily
 - rakudo/rakudo

topics/open-source/index.md

@@ -0,0 +1,9 @@
+---
+display_name: Open Source
+short_description: Software with source code available to inspect, modify, and enhance.
+topic: open-source
+aliases: opensource, oss
+related: foss, floss, github, mit, gpl, gplv3, creative-commons
+wikipedia_url: https://en.wikipedia.org/wiki/Open_source
+---
+Open source is a term denoting that a product includes permission to use its source code, design documents, or content. It most commonly refers to the open source model, in which open source software or other products are released under an open source license as part of the open source-software movement. Use of the term originated with software, but has expanded beyond the software sector to cover other open content and forms of open collaboration.