From 29171e9b92140cbf4a993cbf743acd56c4034043 Mon Sep 17 00:00:00 2001
From: krircc <krircc@aliyun.com>
Date: Fri, 22 Jun 2018 23:38:52 +0800
Subject: [PATCH 1/2] Update config.toml

---
 config.toml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/config.toml b/config.toml
index 8cbca92..64189fc 100644
--- a/config.toml
+++ b/config.toml
@@ -2,10 +2,8 @@ defaultContentLanguageInSubdir = true
 enableRobotsTXT = true
 
 DefaultContentLanguage = "en"
-
-[languages]
-  [languages.en]
-    baseURL = "https://actix.rs"
+[languages.en]
+    baseURL = "https://actix.rs/en"
     title = "actix"
     languageCode = "en-us"
     canonifyURLs = true
@@ -13,7 +11,7 @@ DefaultContentLanguage = "en"
     pygmentsUseClasses = true
     pygmentsCodeFences = true
     weight = 1
-  [languages.cn]
+[languages.cn]
     baseURL = "https://actix.rs/cn"
     title = "actix"
     languageCode = "zh-cn"
@@ -22,7 +20,8 @@ DefaultContentLanguage = "en"
     pygmentsUseClasses = true
     pygmentsCodeFences = true
     weight = 2
+  
 
 [params]
 actixVersion = "0.5"
-actixWebVersion = "0.6"
\ No newline at end of file
+actixWebVersion = "0.6"

From 746541e2183051cf85cad370ce9557c85db74dbd Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sat, 23 Jun 2018 00:27:02 +0200
Subject: [PATCH 2/2] Remove en into the root

---
 config.toml | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/config.toml b/config.toml
index 64189fc..9b0c96e 100644
--- a/config.toml
+++ b/config.toml
@@ -1,26 +1,19 @@
-defaultContentLanguageInSubdir = true
-enableRobotsTXT = true
-
 DefaultContentLanguage = "en"
+enableRobotsTXT = true
+canonifyURLs = true
+googleAnalytics = "UA-110322332-1"
+pygmentsUseClasses = true
+pygmentsCodeFences = true
+baseURL = "https://actix.rs/"
+
 [languages.en]
-    baseURL = "https://actix.rs/en"
     title = "actix"
     languageCode = "en-us"
-    canonifyURLs = true
-    googleAnalytics = "UA-110322332-1"
-    pygmentsUseClasses = true
-    pygmentsCodeFences = true
     weight = 1
 [languages.cn]
-    baseURL = "https://actix.rs/cn"
     title = "actix"
     languageCode = "zh-cn"
-    canonifyURLs = true
-    googleAnalytics = "UA-110322332-1"
-    pygmentsUseClasses = true
-    pygmentsCodeFences = true
     weight = 2
-  
 
 [params]
 actixVersion = "0.5"