.gitlab/merge_request_templates/Release-Post.md

@@ -13,28 +13,29 @@ Due date: MM/DD (6th working day before the 22nd)
 - [ ] Add milestone 
 - [ ] Intro
 - [ ] MVP
-- [ ] Webcast link
+- [ ] Add cover image `image_title` (compressed)
 - [ ] Upgrade barometer
-- [ ] Main features
-- [ ] Secondary features
-- [ ] Other features
+- [ ] Top features
+- [ ] Primary features
+- [ ] Secondary features (improvements)
 - [ ] Performance improvements
 - [ ] Omnibus improvements
 - [ ] Deprecations
-- [ ] Extras
 - [ ] Documentation links
 - [ ] Authorship (author's data)
-### Content Review
-Due date: MM/DD (4th working day before the 22nd)
+### Review
+#### Content review (PMs)
+
+Due date: MM/DD (2nd working day before the 22nd)
 - [ ] Label MR: ~"blog post" ~release ~review-in-progress
 - [ ] General review (PM)
   - [ ] Check Features' names
   - [ ] Check Features' availability (CE, EES, EEP)
   - [ ] Check Documentation links
-  - [ ] Add `data/promo.yml`
+  - [ ] Update `data/promo.yml`
   - [ ] Check all images' size - compress whenever > 300KB
   - [ ] Meaningful links (SEO)
   - [ ] Check links to product/feature webpages
@@ -44,24 +45,17 @@ Due date: MM/DD (4th working day before the 22nd)
   - [ ] Grammar, spelling, clearness (body)
 - [ ] Final review (Job)
-### Structure & Styles
-
-Add HTML/CSS structure to style the blog post, review markup. Technical Writing / Frontend / UX.
-Due date: MM/DD (1st working day before the 22nd)
+#### Structural Check
+Due date: MM/DD (2nd working day before the 22nd)
 - 1. Structural check
 - [ ] Label MR: ~"blog post" ~release ~review-structure
 - [ ] Check frontmatter (entries, syntax)
-  - [ ] Uncomment custom css and custom js
-- [ ] Add cover image `image_title` - compressed
-- [ ] Add social sharing image `twitter_image` - compressed
+- [ ] Check `image_title` and `twitter_image`
 - [ ] Check image shadow `{:.shadow}`
 - [ ] Check images' `ALT` text
 - [ ] Videos/iframes wrapped in `<figure>` tags (responsiveness)
-- 2. Apply styles
-- [ ] Add/check html parser `{::options parse_block_html="true" /}`
-- [ ] Apply semantic HTML (sections, divs, classes, ids)
 - [ ] Add/check `<!-- more -->` separator
 - [ ] Add/check cover img reference (at the end of the post)
 - [ ] Columns (content balance between the columns)

doc/AAAA_MM_DD_gitlab_x_y_released.yml

+###
+#
+# Release post data file
+#
+# Start the release post with this file, named `AAAA_MM_22_gitlab_X_Y_released.yml`
+# placed into `data/release_posts/`.
+#
+# Notes:
+#  - All description fields support markdown. Make sure the indentation is respected.
+#
+## Optional fields:
+#
+# - Features
+#   - Top:
+#     - documentation_text: "Learn more about Amazing Feature" # text displaying the documentation_link
+#   - Primary:
+#     - documentation_link: 'https://docs.gitlab.com/#amazing' # webpage or documentation
+#     - documentation_text: "Learn more about Amazing Feature" # text displaying the documentation_link
+#   - Secondary, upgrade barometer, deprecations:
+#     - documentation_link: 'https://docs.gitlab.com/#amazing' # webpage or documentation
+#     - documentation_text: "Learn more about Amazing Feature" # text displaying the documentation_link
+#     - image_url: '/images/x_y/feature-a.png'
+#   - Optional to all features:
+#     - image_noshadow: true # this eliminates double shadows for images that already have a shadow
+#
+# Read through the Release Posts Handbook for more information:
+# https://about.gitlab.com/handbook/marketing/blog/release-posts/
+#
+###
+
+features:
+# TOP FEATURE
+  top:
+    - name: Amazing Feature
+      available_in: [ees, eep] # required
+      documentation_link: 'https://docs.gitlab.com/#amazing' # webpage or documentation - required
+      documentation_text: "Learn more about Amazing Feature" # optional
+      description: | # supports markdown
+        Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aliquid laudantium,
+        quisquam pariatur architecto quo vel sequi, aperiam ex autem itaque saepe
+        sint dignissimos, quis voluptates similique.
+        Hic veritatis facere eligendi, minus nisi eveniet delectus fugiat.
+
+        <figure class="video_container">
+          <iframe src="https://www.youtube.com/embed/videoid" frameborder="0" allowfullscreen="true"> </iframe>
+        </figure>
+
+        Lorem ipsum dolor sit amet, `consectetur adipisicing` elit.
+        Rerum nisi et ex rem, obcaecati, commodi incidunt fugit,
+        deleniti nesciunt aperiam consequuntur.
+
+        1. Lorem ipsum dolor.
+        1. Lorem ipsum dolor sit.
+
+        > Lorem ipsum dolor sit amet.
+
+        Lorem ipsum dolor sit amet, [consectetur adipisicing elit](#link).
+        Quae repellat, at ullam amet.
+
+        ![Amazing feature screenshot](/images/X_Y/amazing-feature.png){:.shadow}
+
+        Lorem ipsum dolor sit amet, consectetur adipisicing elit.
+
+# PRIMARY FEATURES
+  primary:
+    - name: Lorem ipsum
+      available_in: [ce, ees, eep] # required
+      documentation_link: '/features/lorem-ipsum' # webpage or documentation - optional
+      documentation_text: "Learn more about Lorem ipsum" # optional
+      image_url: '/images/9_X/feature-a.png' # required
+      image_noshadow: true # optional
+      description: | # supports markdown
+        Lorem ipsum [dolor sit amet](#link), consectetur adipisicing elit.
+        Perferendis nisi vitae quod ipsum saepe cumque quia `veritatis`.
+
+    - name: Lorem
+      available_in: [ees, eep] # required
+      documentation_link: 'https://docs.gitlab.com/#lorem' # webpage or documentation - optional
+      documentation_text: "Learn more about Lorem" # optional
+      image_url: '/images/9_X/feature-a.png' # required
+      description: | # supports markdown
+        Lorem ipsum [dolor sit amet](#link), consectetur adipisicing elit.
+        Perferendis nisi vitae quod ipsum saepe cumque quia `veritatis`.
+
+# SECONDARY FEATURES
+  secondary:
+    - name: Lorem ipsum
+      available_in: [eep] # required
+      documentation_link: 'https://docs.gitlab.com/#'
+      documentation_text: "Learn more on how to lorem ipsum." # webpage or documentation - optional
+      image_url: '/images/9_X/feature-a.png' # optional
+      image_noshadow: true # optional
+      description: | # supports markdown
+        Lorem ipsum [dolor sit amet](#link), consectetur adipisicing elit.
+        Perferendis nisi vitae quod ipsum saepe cumque quia `veritatis`.
+
+        Lorem ipsum dolor sit amet, consectetur adipisicing elit.
+        Voluptate eveniet, adipisci earum sed harum nostrum
+        itaque beatae, repellat sunt unde.
+
+    - name: Sunt nam accusantium nostrum
+      available_in: [ees, eep] # required
+      documentation_link: 'https://docs.gitlab.com/#' # webpage or documentation - optional
+      documentation_text: "Praesentium tempore nulla asperiores" # optional
+      description: | # supports markdown
+        Lorem ipsum [dolor sit amet](#link), consectetur adipisicing elit.
+        Perferendis nisi vitae quod ipsum saepe cumque quia `veritatis`.
+
+    - name: Omnibus Improvements
+      available_in: [ce, ees, eep] # required
+      documentation_link:  # webpage or documentation - optional
+      description: | # supports markdown
+        Lorem ipsum [dolor sit amet](#link), consectetur adipisicing elit.
+      Perferendis nisi vitae quod ipsum saepe cumque quia `veritatis`.
+
+    - name: Performance Improvements
+      available_in: [ce, ees, eep] # required
+      documentation_link:  # webpage or documentation - optional
+      description: | # supports markdown
+        Lorem ipsum [dolor sit amet](#link), consectetur adipisicing elit.
+        Perferendis nisi vitae quod ipsum saepe cumque quia `veritatis`.
+
+# MVP
+mvp:
+  fullname: # Name Surname
+  gitlab: # gitlab.com username
+  description: | # example (supports markdown)
+    Dosuken extended our [Pipelines API](http://docs.gitlab.com/ce/api/pipelines.html#list-project-pipelines)
+    by [adding additional search attributes](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9367).
+    This is a huge improvement to our CI API, for example enabling queries to easily return the latest
+    pipeline for a specific branch, as well as a host of other possibilities. Dosuken also made a great
+    contribution last release, laying the foundation for
+    [scheduled pipelines](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10133). Thanks Dosuken!
+
+# COVER IMAGE LICENCE
+cover_img:
+  image_url: 'https://example.com#link_to_original_image' # required
+  licence: CC0 # which licence the image is available with - required
+  licence_url: '#https://example.com#link_to_licence' # required
+
+# CTA BUTTONS
+cta:
+  - title: "Join us for an upcoming event" # default
+    link: '/events/'
+  - title: "Join the release webcast" # optional
+    link: 
+  - title: Lorem ipsum amet # optional
+    link:
+
+# UPGRADE BAROMETER
+barometer:
+  description: | # example (supports markdown)
+    To upgrade to GitLab 9.2, no downtime is required.
+
+    However we're also migrating data for CI jobs. If you have a significant number of jobs, this could take some time.
+
+    Starting with GitLab 9.1.0 it's possible to upgrade to a newer version of GitLab without having to take your GitLab instance offline. However, for this to work there are the following requirements:
+
+    1.  You can only upgrade 1 release at a time. For example, if 9.1.15 is the last release of 9.1 then you can safely upgrade from that version to 9.2.0. However, if you are running 9.1.14 you first need to upgrade to 9.1.15.
+    2.  You have to use [post-deployment migrations](https://docs.gitlab.com/ce/development/post_deployment_migrations.html).
+    3.  You are using PostgreSQL. If you are using MySQL you will still need downtime when upgrading.
+
+    This applies to major, minor, and patch releases unless stated otherwise in a release post.
+
+    A new version of our API was released in [GitLab 9.0](https://about.gitlab.com/2017/03/22/gitlab-9-0-released/#api-v4). While existing calls to API v3 will continue to work until August 2017, we advise you to make any necessary changes to applications that use the v3 API. [Read the documentation](https://docs.gitlab.com/ee/api/v3_to_v4.html) to learn more.
+
+# DEPRECATIONS
+# include as many deprecation blocks as necessary
+deprecations:
+  - feature_name: Lorem ipsum dolor
+    due: May 22nd, 2017. # example
+    description: |  # example (supports markdown)
+      Lorem ipsum dolor sit amet, consectetur adipisicing elit.
+      Veritatis, quisquam.
+  - feature_name: Lorem ipsum dolor
+    due: May 22nd, 2017.
+    description: |  # example (supports markdown)
+      Lorem ipsum dolor sit amet, consectetur adipisicing elit.
+      Veritatis, quisquam.

doc/release_blog_template.html.md

 ---
-release_number: "x.x"
-title: "GitLab x.x Released with XXX and XXX"
-author: Name Surname
-author_gitlab: GitLab.com-username
-author_twitter: Twitter-username
-image_title: '/images/x_x/x_x-cover-image.jpg'
-description: "GitLab x.x Released with Main-CE-Feature, Main-EE-Feature, Secondary-Feature, Secondary-Feature, and much more!"
-twitter_image: '/images/tweets/gitlab-x-x-released.jpg'
-categories: release
-# extra_css:
-#  - release-posts.css
-# extra_js:
-#  - release-posts.js
+release_number: "X.Y" # feature number - required
+title: "GitLab X.Y Released with Feature A and Feature B" # short title - required
+author: Joshua Lambert # author name ans surname - required
+author_gitlab: joshlambert # author's gitlab.com username - required
+author_twitter: # author's twitter username - optional
+image_title: '/images/9_2/9_2-cover-image.jpg' # cover image - required
+description: "GitLab X.Y Released with Feature A, Feature B, Feature C, Feature D and much more!" # short description - required
+twitter_image: '/images/tweets/gitlab-9-2-released.png' # social sharing image - not required but recommended
+categories: release # required
+layout: release # required
 ---
 <!--
-- Add the content here. _Ad hoc_ free until the 6th working day before the 22nd. After that, we'll freeze the post.
-- Content review: will take place during the 5th and the 4th working day before the 22nd.
-- Styles will be applied in the 3rd to 1st working day before the 22nd. How to apply styles: check the release post handbook: https://about.gitlab.com/handbook/marketing/blog/relese-post/.
-**Use the merge request template "Release-Post", and please set the calendar date for each stage.**
--->
-
-## Introduction
-
-Enter the introduction here
-
-## MVP
-
-<!--
-
-- Name and Surname:
-- GitLab.com handle: https://gitlab.com/username
-- Contributed to:
-- Merge request link:
-- Short description (example below):
-
--->
-
-Example <!-- delete this example when you add the MVP data -->
-
-"Jacopo made it possible to [undo marking a todo item as done in the todos list](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8691). This is a huge productivity enhancement that helps you recover from mistakes in managing todos. Thanks Jacopo!" 
-
-<!--
-## Cover image:
-
-Link to original image:
-Image name (if available):
-Author's name (if available):
-Licensed under:
-Link to license:
--->
-
-## Upgrade barometer
-
-- DESCRIBE HOW INVOLVED THE MIGRATIONS ARE. CAN USERS EXPECT MUCH DOWNTIME?
-- CHECK IF THERE ARE ANY MIGRATIONS THAT REMOVE OR CHANGE COLUMNS.
-- IF THERE ARE ONLY ADDITIONS OR NO MIGRATIONS CONFIRM THAT DEPLOY CAN BE WITHOUT DOWNTIME
-
-## Performance improvements
-
-Describe it as a feature.
-
-## Omnibus improvements
-
-- Describe all improvements here. Link to docs, issues, and MRs whenever applicable.
-
-## Extras
-Are there any extra stuff to be added, or noted? Please describe them here. E.g.: events, news, notifications, etc.
-## Deprecations
-
-Anything being deprecated? Please fill the following block. Copy and paste the items as much as necessary.
- 
-<!--
-Template
-
-### GitLab XXX Deprecation
-
-- Feature name:
-- Available in: (CE/EES/EEP)
-- Link to issue or MR:
-
-Description:
-
-Due date:
--->
-
-----
-
-<!-- FEATURES -->
-
-## FEATURES 🚀
-
-<!--
-For each feature added to the post, provide the required info. Use dashes to separate them. Push all related images to the MR and provide the correct link. Compress every image with [Tiny PNG](https://tinypng.com/) or similar tool.
+This is the release blog post file. Add here the introduction only.
+All remaining content goes into data/release-posts/.
+**Use the merge request template "Release-Post", and please set the calendar due
+date for each stage (general contributions, review).**
+Read through the Release Posts Handbook for more information:
+https://about.gitlab.com/handbook/marketing/blog/release-posts/
 -->
-<!-- Template:
-## Feature name
-
-
-- Available in: (CE/EES/EEP)
-- Feature weight: primary, secondary
-- Documentation link:
-- Feature description, related images, and videos:
-
-----
-
-Example:
-
-## Deploy Boards
-- Available in: EEP
-- Feature weight: primary
-- Documentation link: https://docs.gitlab.com/ee/user/project/deploy_boards.html
-- Feature description, related images, and videos:
-Today with 9.0, we are excited to release Deploy Boards for environments running on Kubernetes. The Environments page of Pipelines now offers a single place to view the current health and deployment status of each environment, displaying the specific status of each pod in the deployment. Developers and other teammates can view the progress and status of a rollout, pod by pod, in the workflow they already use without any need to access Kubernetes.
-
-![Deploy Boards](/images/9_0/deploy_boards.png){: .shadow}
-
-Watch the video:
-
-<figure class="video_container">
-  <iframe src="https://www.youtube.com/embed/enMumwvLAug" frameborder="0" allowfullscreen="true"> </iframe>
-</figure>
-
-----
--->
+Introductory paragraph.
+<!-- more -->
+Introduction.
+[Markdown](/handbook/product/technical-writing/markdown-guide/) supported.

lib/custom_helpers.rb

@@ -26,7 +26,7 @@ module CustomHelpers
     Tilt['markdown'].new { text }.render
   end
-  def markdown s
+  def kramdown s
     Kramdown::Document.new(s).to_html
   end

source/handbook/finance/index.html.md

@@ -40,7 +40,7 @@ For details on regular compensation, view the [People Ops page](/handbook/people
 ### Legal and Financial Information
-This [document](https://docs.google.com/a/gitlab.com/document/d/1V7bUuCYZmK3FCZlR3TrZRZb8Li3BukRdNI-TGx7C-GE/edit?usp=sharing) contains various legal and financial information that is fundamental to the company, including but not limited to- corporate addresses, banking details, VAT registration numbers, etc. The accessibility of this information is restricted to GitLab team members. If you are looking for information that is not included in this document, send an inquiry to the Finance team. 
+This [document](https://docs.google.com/a/gitlab.com/document/d/1V7bUuCYZmK3FCZlR3TrZRZb8Li3BukRdNI-TGx7C-GE/edit?usp=sharing) contains various legal and financial information that is fundamental to the company, including but not limited to- corporate addresses, banking details, VAT registration numbers, etc. The accessibility of this information is restricted to GitLab team members. If you are looking for information that is not included in this document, send an inquiry to the Finance team.
 ### Corporate Metric Definitions
 We track a wide range of metrics on our corporate dashboard.  Many definitions are self evident but some are not.
@@ -156,20 +156,20 @@ Coverage is **not** provided for personal use of automobiles or when family memb
 The finance and accounting tech stack includes the following applications:
 - **NetSuite**- The company Enterprise Resource Planning (ERP) system. The application is cloud based and allows enhanced dimensional reporting as well as multi-currency/multi-entity reporting. This is where the General Ledger resides and all financial activity is ultimately recorded, which is critical to reporting the financial health of the company.
- 
+
 - **Zuora**- Customer billing is processed using Zuora, a cloud based subscription management platform. All invoicing, both recurring and non-recurring, is managed in Zuora.
- 
+
 - **Stripe**- Stripe is a software application that enables GitLab customers to make online payments. Finance uses this system to collect information pertaining to payments made online.
- 
+
 - **Expensify**- The company travel and expense management application. The platform provides employees a simple tool to create expense reports, which can then be managed from approval workflow through the final stage of reimbursement. Expensify is integrated with NetSuite, which further automates the processing of employee expenses by the Finance team.
 - **eShares**- Stock option administration, capitalization table and equity management are all managed using the eShares software platform.
-- **Salesforce**- Salesforce is the company CRM platform. This application primarily functions under Sales and Marketing, but inevitably, contains information that is also used by the Finance team. 
+- **Salesforce**- Salesforce is the company CRM platform. This application primarily functions under Sales and Marketing, but inevitably, contains information that is also used by the Finance team.
 ## Month-End Close Checklist
-This [link](https://docs.google.com/a/gitlab.com/spreadsheets/d/1SSUQpudxxpPgXIS97Ctuj-JRII0qhq0I3r19jmBKU7c/edit?usp=sharing) will take you the check list used by Finance to track the month-end close process. This is updated regularly to reflect our progress in closing the books for any given month. 
+This [link](https://docs.google.com/a/gitlab.com/spreadsheets/d/1SSUQpudxxpPgXIS97Ctuj-JRII0qhq0I3r19jmBKU7c/edit?usp=sharing) will take you the check list used by Finance to track the month-end close process. This is updated regularly to reflect our progress in closing the books for any given month.
 ## Processing Payroll
 <a name="payroll"></a>
@@ -189,7 +189,7 @@ This [link](https://docs.google.com/a/gitlab.com/spreadsheets/d/1SSUQpudxxpPgXIS
 1. Do not use the Submit button. It will make adding last minute changes difficult and TriNet will take your last save when processing payroll.
 1. Make sure that you calculate the hours based on the pay days (count them) for each pay period.
-All hourly time sheets are kept on the Google Drive and shared with Finance. Each employee will populate the time sheet before the end of the pay cycle. 
+All hourly time sheets are kept on the Google Drive and shared with Finance. Each employee will populate the time sheet before the end of the pay cycle.
 #### Additional Begin/End Payment (for adding payment to payroll)
@@ -316,14 +316,14 @@ Invoices will arrive by email to ap@gitlab.com.
 1. In Salesforce, click the "+" icon and select "Z-Quotes".
 1. Subscriptions to be invoiced are sorted by date. Choose a subscription from today's date and proceed.
 1. Still in Salesforce, check the customer account for a current PO number under the notes and attachments.
-1. Then in Zuora, search for the corresponding customer subscription and open the record. 
+1. Then in Zuora, search for the corresponding customer subscription and open the record.
 1. Check to see if the PO from the file in Salesforce matches that of Zuora. If not, update the record in Zuora with the latest PO number.
 1. Verify that the "Bill to" and "Sold to" contacts listed in the Zuora customer record match the related record in Salesforce. If not, update Zuora.
 1. Verify that the payment terms and method listed in Zuora match the related record in Salesforce. If not, update Zuora.
-1. In Zuora, scroll down to transactions and click "Create Bill Run." 
+1. In Zuora, scroll down to transactions and click "Create Bill Run."
 1. It is important to find the subscription start date in Salesforce and enter it in the "Target Date for this bill run" field in Zuora. The invoice date should be today's date.
 1. Once these dates agree, click "Create Bill Run."
-1. On the following screen, select the bill run that was just created (the bill run files begin with BR- followed by a set of numbers). 
+1. On the following screen, select the bill run that was just created (the bill run files begin with BR- followed by a set of numbers).
 1. Scroll down and click on the invoice that was just generated. The PDF file will be at the bottom of the page.
 1. Open the PDF file and review every field of the invoice for accuracy.
 1. Once the review is complete, close the invoice and click “Post Invoice.”
@@ -398,7 +398,7 @@ In Netsuite:
 1. Fill the "Deposit to" with "Comerica Checking".
 1. Fill the "Amount Received" with the amount received from the incoming wire.
-### Asset Tracking
+## Asset Tracking
 Items paid for by the company are property of the company.
@@ -411,3 +411,5 @@ The information is then entered into BambooHR (to track who has which piece of e
 1. Click Update Assets
 1. Enter Asset Category, Asset Description, Serial Number, Asset Cost, and Date Loaned
 1. This process is repeated for each asset purchased
+
+If a team member would like to purchase an asset from the company (i.e. a laptop), please email People Operations to obtain the amount to be paid. This is derived from original cost less accumulated depreciation.

source/handbook/people-operations/learning-and-development/index.html.md

+Please find an overview of our learning and development on our [courses page](https://about.gitlab.com/handbook/people-operations/courses)
\ No newline at end of file

source/handbook/product/index.html.md

@@ -125,6 +125,7 @@ For anything that falls under:
   * Slack
   * MatterMost
   * etc... relating to conversation & issue management
+* version.gitlab.com and usage ping
 This means that if a customer would like to see burndown charts, which
 relates to issues, you should speak to Victor.
@@ -173,10 +174,6 @@ directly part of GitLab. This includes:
 * about.gitlab.com
 * customers.gitlab.com
 * license.gitlab.com
-* version.gitlab.com
-
-This also includes anything related to how GitLab handles licenses and how we
-handle data that we get from customers through the usage ping.
 ### Build - Joshua

source/includes/release.html.haml

@@ -9,7 +9,7 @@
         %a{href: "/mvp/"} MVP
         is
         = link_to(mvp.fullname, "https://gitlab.com/#{mvp.gitlab}")
-      = markdown(mvp.description)
+      = kramdown(mvp.description)
 / top feature
@@ -32,7 +32,7 @@
             %a{"title" => "GitLab Enterprise Edition Premium", "data-toggle" => "tooltip", "data-placement" => "top"}
               %span{class: "#{available_in}"}
                 = "#{available_in}"
-    = markdown(top_feature.description)
+    = kramdown(top_feature.description)
     %p
       %i.fa.fa-book
       %a{href: "#{top_feature.documentation_link}", target: "_blank"}
@@ -66,7 +66,7 @@
                   %a{"title" => "GitLab Enterprise Edition Premium", "data-toggle" => "tooltip", "data-placement" => "top"}
                     %span{class: "#{available_in}"}
                       = "#{available_in}"
-          = markdown(primary_feature.description)
+          = kramdown(primary_feature.description)
           - if primary_feature.documentation_link != nil
             %p
               %i.fa.fa-book
@@ -102,7 +102,7 @@
                   %a{"title" => "GitLab Enterprise Edition Premium", "data-toggle" => "tooltip", "data-placement" => "top"}
                     %span{class: "#{available_in}"}
                       = "#{available_in}"
-          = markdown(primary_feature.description)
+          = kramdown(primary_feature.description)
           - if primary_feature.documentation_link != nil
             %p
               %i.fa.fa-book
@@ -145,7 +145,7 @@
                   %a{"title" => "GitLab Enterprise Edition Premium", "data-toggle" => "tooltip", "data-placement" => "top"}
                     %span{class: "#{available_in}"}
                       = "#{available_in}"
-          = markdown(secondary_feature.description)
+          = kramdown(secondary_feature.description)
           - if secondary_feature.image_url != nil
             - if secondary_feature.image_noshadow == true
               %img{:src => "#{secondary_feature.image_url}", :alt => "#{secondary_feature.name}"}/
@@ -181,7 +181,7 @@
                   %a{"title" => "GitLab Enterprise Edition Premium", "data-toggle" => "tooltip", "data-placement" => "top"}
                     %span{class: "#{available_in}"}
                       = "#{available_in}"
-          = markdown(secondary_feature.description)
+          = kramdown(secondary_feature.description)
           - if secondary_feature.image_url != nil
             - if secondary_feature.image_noshadow == true
               %img{:src => "#{secondary_feature.image_url}", :alt => "#{secondary_feature.name}"}/
@@ -208,7 +208,7 @@
         %h3{:id => "#{deprecation.feature_name.downcase.tr(" ", "-")}"}
           %a.header-link{href: "##{deprecation.feature_name.downcase.tr(" ", "-")}"}
           = deprecation.feature_name
-        = markdown(deprecation.description)
+        = kramdown(deprecation.description)
         %p
           Due:
           %strong= "#{deprecation.due}"
@@ -219,5 +219,5 @@
     %h2.text-center{:id => "barometer"}
       %a.header-link{href: "#barometer"}
       Upgrade barometer
-    = markdown(barometer.description)
+    = kramdown(barometer.description)

source/sdlc/index.html.md

 ---
 layout: markdown_page
-title: Software Development Life Cycle
+title: Software Development Life Cycle (SDLC)
 ---
-## Definition
-The modern software development life cycle (SDLC) consists multiple phases. It starts with chatting about an idea and ends at measuring the metrics of running it in production. For each phase the appropriate type of tool is listed.
+## SDLC definition
+The modern Software Development Life Cycle (SDLC) consists multiple phases. It starts with chatting about an idea and ends at measuring the metrics of running it in production. Below is a list of the phases with the type of tool used for this in brackets.
 1. Idea (Chat)
 1. Define (Issue Tracker)
@@ -15,56 +15,71 @@ The modern software development life cycle (SDLC) consists multiple phases. It s
 1. Deploy (Continuous Delivery)
 1. Measure (Metrics Monitoring)
-## Related concepts
-- [Application Lifecycle Management](https://en.wikipedia.org/wiki/Application_lifecycle_management) ALM is defined on wikipedia as "ALM is a broader perspective than the Software Development Life Cycle (SDLC), which is limited to the phases of software development such as requirements, design, coding, testing, configuration, project management, and change management. ALM continues after development until the application is no longer used, and may span many SDLCs."
-- [Systems Development Life Cycle](https://en.wikipedia.org/wiki/Systems_development_life_cycle)
-- Idea to Production (I2P) is a way to refer to the SDLC cycle of chatting about an idea to measuring it in production.
-## Methodologies
-There are a couple of methodologies that help with the SDLC process:
-- Agile
-- DevOps
-- [Conversational Development](http://conversationaldevelopment.com/) (ConvDev)
-## Platforms
-You need a platform to run your SDLC on, that is currently undergoing a shift from Virtual Machines to Cloud Native:
-- Dedicated machines (Rackspace)
-- Virtual Machines (Amazon Web Services)
-- Cloud Native (Kubernetes)
-## SDLC Stacks
-There are a couple of organizations that are building a stack for the SDLC.
-| SDLC phase (tool)             | GitLab         | GitHub        | Atlassian             |  Legacy OSS      |
-|-------------------------------|----------------|---------------|-----------------------|------------------|
-| Idea (chat)                   | Mattermost     | Slack         | HipChat               | IRC              |
-| Define (issue tracker)        | GitLab Issues  | GitHub Issues | JIRA                  | Redmine          |
-| Plan (issue board)            | GitLab Boards  | GitHub Boards | Trello                | Kanboards        |
-| Code (version control)        | GitLab         | GitHub        | BitBucket             | SVN              |
-| Test (continuous integration) | GitLab CI      | Travis CI     | BitBucket CI / Bamboo | Jenkins          |
-| Deploy (continuous delivery)  | GitLab CD      | Heroku        | BitBucket CD          | Jenkins          |
-| Monitor (metrics)             | GitLab Metrics | New Relic     | Undefined             | Nagios           |
-| (preferred platform)          | Kubernetes     | Heroku        | Undefined             | OpenStack        |
-## GitLab specific
-GitLab is the only Integrated Product / Development OS. We believe that brings emergent benefits.
-Features in GitLab related to the SDLC and made possible because of being an integrated product are:
-- Chatops
-- Review Apps
-- Web terminal
-- Auto deploy
-- Cycle Analytics
-TODO Link the above to feature pages / docs.
-As a company we believe that [remote only](http://www.remoteonly.org/) will become much more popular.
+## Most important organizational process
+[Every company is becoming a software company.](https://www.forbes.com/sites/techonomy/2011/11/30/now-every-company-is-a-software-company/)
+Therefore the SDLC is becoming the most important organizational process.
+Effective software development is an essential skill to create value, attract great people, and keep applications secure.
+To enable this skill organizations are adopting SDLC stacks that help this workflow.
+## SDLC Stacks
+There are a couple of organizations that are building a stack for the SDLC.
+| SDLC phase (tool)             | GitLab         | GitHub        | Atlassian             | Legacy Open Source  |
+|-------------------------------|----------------|---------------|-----------------------|---------------------|
+| Idea (chat)                   | Mattermost     | Slack         | HipChat               | IRC                 |
+| Define (issue tracker)        | GitLab Issues  | GitHub Issues | JIRA                  | Redmine             |
+| Plan (issue board)            | GitLab Boards  | GitHub Boards | Trello                | Kanboards           |
+| Code (version control)        | GitLab         | GitHub        | BitBucket             | SVN                 |
+| Test (continuous integration) | GitLab CI      | Travis CI     | BitBucket CI / Bamboo | Jenkins             |
+| Deploy (continuous delivery)  | GitLab CD      | Heroku        | BitBucket CD          | Jenkins             |
+| Monitor (metrics)             | GitLab Metrics | New Relic     | Undefined             | Nagios              |
+| (preferred platform)          | Kubernetes     | Heroku        | Undefined             | OpenStack           |
+## Cloud Native work-flow
+Cloud Native means developing applications to run in the cloud.
+The platform for deploying these applications is switching from Virtual Machines (AWS) to Container Schedulers (Kubernetes).
+Cloud native applications are split up into [micro services](https://martinfowler.com/articles/microservices.html).
+This means one application consists of many services that each have their own project and code base.
+To handle these cloud native work-flows GitLab has [sub-groups](https://docs.gitlab.com/ce/user/group/subgroups/), [Auto DevOps](https://gitlab.com/gitlab-org/gitlab-ee/issues/2517), and [multi-project pipelines](https://gitlab.com/gitlab-org/gitlab-ee/issues/933)
+## An integrated product brings emergent benefits
+GitLab is the only integrated product for the SDLC, all others are combinations of different products.
+Having one product makes for a much better user experience because there is one UI, better security because of consistent permission settings, and less time spend on administration and integration.
+Apart from that this 'development operating system' has some emergent properties that wouldn't otherwise be possible:
+- [Auto DevOps](https://gitlab.com/gitlab-org/gitlab-ee/issues/2517) with features such as Auto ChatOps and Auto Review Apps.
+- [Cycle Analytics](https://about.gitlab.com/features/cycle-analytics/) that allow you to measure and reduce the time from idea to production.
+- [ConvDev Index](https://gitlab.com/gitlab-org/gitlab-ce/issues/30469) to help spread best practices.
+
+These emergent properties allow the following emergent benefits:
+- Go from idea to value faster and more consistently.
+- Creating better business outcomes, needing fewer people, having more security.
+- Transforming the company from agile to [conversational development](http://conversationaldevelopment.com/).
+## Open source is the future of software development
+GitLab is developed out in the open with most code available under an open source license.
+This allowed more than 1500 experts to contribute their process in the form of code.
+GitLab's code distills the greatest collection of best practices into a work-flow.
+Allowing you to stand on the shoulders of experts by using one integrated product.
+
+## Methodologies
+There are a couple of methodologies that are related to the SDLC process:
+- [Agile](http://agilemanifesto.org/)
+- [DevOps](https://en.wikipedia.org/wiki/DevOps)
+- [Conversational Development](http://conversationaldevelopment.com/) (ConvDev)
+Due to modern methodologies and better tools it is becoming much easier and more popular to make create software in a [remote only](http://www.remoteonly.org/) organization.
+## Other software lifecycle concepts
+- [Application Lifecycle Management](https://en.wikipedia.org/wiki/Application_lifecycle_management) ALM is defined on wikipedia as "ALM is a broader perspective than the Software Development Life Cycle (SDLC), which is limited to the phases of software development such as requirements, design, coding, testing, configuration, project management, and change management. ALM continues after development until the application is no longer used, and may span many SDLCs."
+- [Systems Development Life Cycle](https://en.wikipedia.org/wiki/Systems_development_life_cycle)
+- Idea to Production (I2P) is a way to refer to the SDLC cycle of chatting about an idea to measuring it in production.