Merge branch 'master' into 1827-prevent-concurrent-editing-wiki

 Conflicts:
	app/controllers/projects/wikis_controller.rb
	app/views/projects/wikis/edit.html.haml
	spec/features/projects/wiki/user_updates_wiki_page_spec.rb

1 files changed, 25 insertions, 0 deletions

diff --git a/doc/articles/index.md b/doc/articles/index.md
new file mode 100644
index 00000000000..342fa88e80f
--- /dev/null
+++ b/doc/articles/index.md
@@ -0,0 +1,25 @@
+# Technical Articles
+
+[Technical Articles](../development/writing_documentation.md#technical-articles) are
+topic-related documentation, written with an user-friendly approach and language, aiming
+to provide the community with guidance on specific processes to achieve certain objectives.
+
+They are written by members of the GitLab Team and by
+[Community Writers](https://about.gitlab.com/handbook/product/technical-writing/community-writers/).
+
+## Authentication
+
+- **LDAP**
+  - [How to configure LDAP with GitLab CE](how_to_configure_ldap_gitlab_ce/index.md)
+
+## Git
+
+- [How to install Git](how_to_install_git/index.md)
+
+## GitLab Pages
+
+- **GitLab Pages from A to Z**
+  - [Part 1: Static sites and GitLab Pages domains](../user/project/pages/getting_started_part_one.md)
+  - [Part 2: Quick start guide - Setting up GitLab Pages](../user/project/pages/getting_started_part_two.md)
+  - [Part 3: Setting Up Custom Domains - DNS Records and SSL/TLS Certificates](../user/project/pages/getting_started_part_three.md)
+  - [Part 4: Creating and tweaking `.gitlab-ci.yml` for GitLab Pages](../user/project/pages/getting_started_part_four.md)