Resolve conflicts with master

Dhruvi16 · Dhruvi16 · commit deb98310b924 · 2020-08-21T16:48:58.000+05:30
diff --git a/content/blog/authors/aldenpage/contents.lr b/content/blog/authors/aldenpage/contents.lr
@@ -2,5 +2,7 @@ username: aldenpage
 ---
 name: Alden Page
 ---
+md5_hashed_email: 32853a2ab283e0093bf088d8af5d3cdc
+---
 about:
 [Alden](https://creativecommons.org/author/aldencreativecommons-org/) is Backend Software Engineer at Creative Commons. He is `@aldenpage` on the CC Slack.
diff --git a/content/blog/categories/gsod-2020/contents.lr b/content/blog/categories/gsod-2020/contents.lr
@@ -0,0 +1 @@
+name: gsod-2020
diff --git a/content/blog/categories/gsod/contents.lr b/content/blog/categories/gsod/contents.lr
@@ -0,0 +1 @@
+name: gsod
diff --git a/content/blog/categories/outreachy-2019-20/contents.lr b/content/blog/categories/outreachy-2019-20/contents.lr
@@ -0,0 +1 @@
+name: outreachy-2019-20
diff --git a/content/blog/categories/outreachy-2020/contents.lr b/content/blog/categories/outreachy-2020/contents.lr
@@ -0,0 +1 @@
+name: outreachy-2020
diff --git a/content/blog/entries/2020-03-05-involucrate-gsoc-outreachy-es/contents.lr b/content/blog/entries/2020-03-05-involucrate-gsoc-outreachy-es/contents.lr
@@ -2,7 +2,9 @@ title: Involúcrate con nuestra comunidad de código abierto a través del  Goog
 ---
 categories:
 gsoc
+gsoc-2020
 outreachy
+outreachy-2020
 ---
 author: hugosolar
 ---
diff --git a/content/blog/entries/2020-03-05-participe-gsoc/contents.lr b/content/blog/entries/2020-03-05-participe-gsoc/contents.lr
@@ -2,7 +2,9 @@ title: Participe do Google Summer of Code / Outreachy
 ---
 categories:
 gsoc
+gsoc-2020
 outreachy
+outreachy-2020
 ---
 author: brenoferreira
 ---
diff --git a/content/blog/entries/cc-platform-toolkit-revamp-2/contents.lr b/content/blog/entries/cc-platform-toolkit-revamp-2/contents.lr
@@ -4,6 +4,7 @@ categories:
 community
 platform-toolkit
 outreachy
+outreachy-2019-20
 ---
 author: apdsrocha
 ---
diff --git a/content/blog/entries/cc-platform-toolkit-revamp-3/contents.lr b/content/blog/entries/cc-platform-toolkit-revamp-3/contents.lr
@@ -4,6 +4,7 @@ categories:
 community
 platform-toolkit
 outreachy
+outreachy-2019-20
 ---
 author: apdsrocha
 ---
diff --git a/content/blog/entries/cc-platform-toolkit-revamp-4/contents.lr b/content/blog/entries/cc-platform-toolkit-revamp-4/contents.lr
@@ -4,6 +4,7 @@ categories:
 community
 platform-toolkit
 outreachy
+outreachy-2019-20
 ---
 author: apdsrocha
 ---
diff --git a/content/blog/entries/cc-platform-toolkit-revamp/contents.lr b/content/blog/entries/cc-platform-toolkit-revamp/contents.lr
@@ -4,6 +4,7 @@ categories:
 community
 platform-toolkit
 outreachy
+outreachy-2019-20
 ---
 author: apdsrocha
 ---
diff --git a/content/blog/entries/cc-vocabulary-my-first-four-weeks/contents.lr b/content/blog/entries/cc-vocabulary-my-first-four-weeks/contents.lr
@@ -5,6 +5,7 @@ categories:
 cc-vocabulary
 product
 outreachy
+outreachy-2019-20
 ---
 author: conye
 ---
diff --git a/content/blog/entries/cc-vocabulary-week5-8/contents.lr b/content/blog/entries/cc-vocabulary-week5-8/contents.lr
@@ -5,6 +5,7 @@ categories:
 cc-vocabulary
 product
 outreachy
+outreachy-2019-20
 ---
 author: conye
 ---
diff --git a/content/blog/entries/cc-vocabulary-week9-13/contents.lr b/content/blog/entries/cc-vocabulary-week9-13/contents.lr
@@ -5,6 +5,7 @@ categories:
 cc-vocabulary
 product
 outreachy
+outreachy-2019-20
 ---
 author: conye
 ---
diff --git a/content/blog/entries/crawling-500-million/contents.lr b/content/blog/entries/crawling-500-million/contents.lr
@@ -45,7 +45,7 @@ We know we're not going to be able to crawl 500 million images with one virtual
   
 The worker processes do the actual analysis of the images, which essentially entails downloading the image, extracting interesting properties, and sticking the resulting metadata back into a Kafka topic for later downstream processing. The worker will also have to include some instrumentation for conforming to rate limits and error reporting.
 
-We also know that we will need to share some information about crawl progress between worker processes, such as whether we've exceeded our proscribed rate limit for a website, the number of times we've seen a status code in the last minute, how many images we've processed so far, and so on. Since we're only interested in sharing application state and aggregate statistics, a lightweight key/value store like Redis seems like a good fit.
+We also know that we will need to share some information about crawl progress between worker processes, such as whether we've exceeded our prescribed rate limit for a website, the number of times we've seen a status code in the last minute, how many images we've processed so far, and so on. Since we're only interested in sharing application state and aggregate statistics, a lightweight key/value store like Redis seems like a good fit.
 
 Finally, we need a supervising process that centrally controls the crawl. This key governing process will be responsible for making sure our crawler workers are behaving properly by moderating crawl rates for each source, taking action in the face of errors, and reporting statistics to the operators of the crawler. We'll call this process the crawl monitor.
 
diff --git a/content/blog/entries/improving-cc-license-chooser-coding/contents.lr b/content/blog/entries/improving-cc-license-chooser-coding/contents.lr
@@ -5,6 +5,7 @@ author: obulat
 categories:
 
 outreachy
+outreachy-2019-20
 cc-chooser
 ---
 series: outreachy-dec-2019-chooser
diff --git a/content/blog/entries/improving-cc-license-chooser-outcomes/contents.lr b/content/blog/entries/improving-cc-license-chooser-outcomes/contents.lr
@@ -5,6 +5,7 @@ author: obulat
 categories:
 
 outreachy
+outreachy-2019-20
 cc-chooser
 ---
 series: outreachy-dec-2019-chooser
diff --git a/content/blog/entries/improving-cc-license-chooser-weeks-1-2-design/contents.lr b/content/blog/entries/improving-cc-license-chooser-weeks-1-2-design/contents.lr
@@ -5,6 +5,7 @@ author: obulat
 categories:
 
 outreachy
+outreachy-2019-20
 cc-chooser
 ---
 series: outreachy-dec-2019-chooser
diff --git a/content/blog/entries/integration-vocabulary-ccos/contents.lr b/content/blog/entries/integration-vocabulary-ccos/contents.lr
@@ -2,6 +2,7 @@ title: Integration of Vocabulary with CCOS.
 ---
 categories:
 outreachy
+outreachy-2020
 tech
 open-source
 ---
diff --git a/content/blog/entries/legal-database-a-new-beginning/contents.lr b/content/blog/entries/legal-database-a-new-beginning/contents.lr
@@ -4,6 +4,7 @@ categories:
 cc-legal-database
 product
 outreachy
+outreachy-2020
 ---
 author: krysal
 ---
diff --git a/content/blog/entries/legal-database-coding-mid-term/contents.lr b/content/blog/entries/legal-database-coding-mid-term/contents.lr
@@ -4,6 +4,7 @@ categories:
 cc-legal-database
 product
 outreachy
+outreachy-2020
 ---
 author: krysal
 ---
diff --git a/content/blog/entries/legal-database-design/contents.lr b/content/blog/entries/legal-database-design/contents.lr
@@ -4,6 +4,7 @@ categories:
 cc-legal-database
 product
 outreachy
+outreachy-2020
 ---
 author: krysal
 ---
diff --git a/content/blog/entries/legal-database-features/contents.lr b/content/blog/entries/legal-database-features/contents.lr
@@ -4,6 +4,7 @@ categories:
 cc-legal-database
 product
 outreachy
+outreachy-2020
 ---
 author: krysal
 ---
diff --git a/content/blog/entries/resource-gathering/contents.lr b/content/blog/entries/resource-gathering/contents.lr
@@ -2,6 +2,7 @@ title: Resource Gathering
 ---
 categories:
 outreachy
+outreachy-2020
 design
 open-source
 ---
diff --git a/content/blog/entries/takeaways-from-my-FOSS-journey/contents.lr b/content/blog/entries/takeaways-from-my-FOSS-journey/contents.lr
@@ -2,6 +2,7 @@ title: Takeaways from my FOSS journey!
 ---
 categories:
 outreachy
+outreachy-2020
 tech
 open-source
 ---
diff --git a/content/blog/entries/what-is-up-ccos/contents.lr b/content/blog/entries/what-is-up-ccos/contents.lr
@@ -2,6 +2,7 @@ title: What is up? - CCOS Revamp
 ---
 categories:
 outreachy
+outreachy-2020
 tech
 open-source
 ---
diff --git a/content/blog/entries/why-lektor/contents.lr b/content/blog/entries/why-lektor/contents.lr
@@ -2,6 +2,7 @@ title: Why Lektor?
 ---
 categories:
 outreachy
+outreachy-2020
 tech
 open-source
 ---
diff --git a/content/internships/contents.lr b/content/internships/contents.lr
@@ -12,25 +12,18 @@ Creative Commons is currently participating in the current rounds of the followi
 
 ### Google Season of Docs
 
-- [Program website](https://developers.google.com/season-of-docs/)
-- CC's [Project Ideas](/internships/project-ideas/)
+**Interns for the 2020 round of Google Season of Docs have been announced.**
 
-If you're interested in this program, please review the resources below and come talk to us on Slack in `#cc-gsoc-outreachy`.
+- [Program website](https://developers.google.com/season-of-docs/)
+- [CC's GSoD participants](https://developers.google.com/season-of-docs/docs/participants)
 
-### Google Summer of Code 
+### Google Summer of Code
 
 **Interns for the 2020 round of Google Summer of Code have been announced.**
 
 - [Program website](https://summerofcode.withgoogle.com/)
 - [CC's GSoC organization page](https://summerofcode.withgoogle.com/organizations/5742311717208064/)
 
-### Outreachy 
-
-**Interns for the May to August 2020 round of Outreachy have been announced.**
-
-- [Program website](https://www.outreachy.org/)
-- [CC's Outreachy page](https://www.outreachy.org/communities/cfp/creative-commons/)
-
 ## Resources
 
 * **[Project Ideas](/internships/project-ideas/)**: This is a list of project ideas for our internships. Please note that these project ideas are shared between all current internship programs and all ideas may not be available for all programs. Please check the project description carefully.
diff --git a/content/internships/history/contents.lr b/content/internships/history/contents.lr
@@ -6,10 +6,25 @@ title: Open Source Internships: History
 ---
 body:
 
+## Google Season of Docs
+
+CC has participated in Google Season of Docs for the first time in 2020.
+
+* [Google Season of Docs 2020](https://developers.google.com/season-of-docs/docs/participants)
+    * [Open Source Blog posts](/blog/categories/gsod-2020/)
+    * [Introducing Our Google Season of Docs 2020 Participants](https://creativecommons.org/2020/08/20/google-season-of-docs-2020/)
+
+### Relevant links
+
+* [Open Source Blog posts](/blog/categories/gsod/)
+
 ## Google Summer of Code
 
-CC has participated in Google Summer of Code eight times before 2020. See below for more information about our projects and participation for each year.
+CC has participated in Google Summer of Code seven times up to 2013, and twice since 2019.
 
+* [Google Summer of Code 2020](https://summerofcode.withgoogle.com/organizations/5742311717208064/)
+    * [Open Source Blog posts](/blog/categories/gsoc-2020/)
+    * [Welcome Our Interns from Google Summer of Code and Outreachy!](https://creativecommons.org/2020/05/11/welcome-interns-google-summer-of-code-and-outreachy/)
 * [Google Summer of Code 2019](https://summerofcode.withgoogle.com/archive/2019/organizations/5500455663173632/)
     * [Open Source Blog posts](/blog/categories/gsoc-2019/)
     * [CC + Google Summer of Code 2019](https://creativecommons.org/2019/03/04/cc-google-summer-of-code-2019/)
@@ -27,8 +42,21 @@ CC has participated in Google Summer of Code eight times before 2020. See below
 * [Google Summer of Code 2007](https://developers.google.com/open-source/gsoc/2007/#cc)
 * [Google Summer of Code 2006](https://developers.google.com/open-source/gsoc/2006/#cc)
 
+### Relevant links
+
+* [Open Source Blog posts](/blog/categories/gsoc/)
+
 ## Outreachy
 
-CC participated in the Dec 2019 to Mar 2020 round of Outreachy.  
-* [Meet Our 2020 Interns From Outreachy](https://creativecommons.org/2019/12/10/2020-outreachy-interns/)
+CC participated in Outreachy twice since 2019.
+
+* [Outreachy May 2020 - August 2020](https://www.outreachy.org/outreachy-may-2020-internship-round/)
+    * [Open Source Blog posts](/blog/categories/outreachy-2020/)
+    * [Welcome Our Interns from Google Summer of Code and Outreachy!](https://creativecommons.org/2020/05/11/welcome-interns-google-summer-of-code-and-outreachy/)
+* [Outreachy December 2019 - March 2020](https://www.outreachy.org/december-2019-to-march-2020-internship-round/)
+    * [Open Source Blog posts](/blog/categories/outreachy-2019-20/)
+    * [Meet Our 2020 Interns From Outreachy](https://creativecommons.org/2019/12/10/2020-outreachy-interns/)
+
+### Relevant links
+
 * [Open Source Blog posts](/blog/categories/outreachy/)
diff --git a/themes/vocabulary_theme/templates/blog-post.html b/themes/vocabulary_theme/templates/blog-post.html
@@ -20,7 +20,7 @@ <h2 class="title">{{ this.title }}</h2>
             </figure>
           {% endif %}
           <p class="column">by <a href="{{ author|url }}">{{ render_author_name(author) }}</a>
-          on {{ this.pub_date|dateformat('yyyy-''MM-d') }}</p>
+          on {{ this.pub_date|dateformat("YYYY-MM-dd") }}</p>
         </div>
         {% if this.series|length %}
           {% set series = this.parent.parent.children.get('series').children.get(this.series) %}
