Merge remote-tracking branch 'origin/dev' into dev

app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p.sy

@@ -8,7 +8,7 @@
 		"title": "Please Start Here",
 		"title-img": "background-color:#556;background-image: linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a);background-size:80px 140px;background-position: 0 0, 0 0, 40px 70px, 40px 70px, 0 0, 40px 70px;",
 		"type": "doc",
-		"updated": "20210428231747"
+		"updated": "20230415112503"
 	},
 	"Children": [
 		{
@@ -33,20 +33,45 @@
 			"Properties": {
 				"id": "20210428222033-bhbz6yg",
 				"style": "color: var(--b3-card-info-color); background-color: var(--b3-card-info-background);",
-				"updated": "20210512150301"
+				"updated": "20230415112503"
 			},
 			"Children": [
 				{
 					"Type": "NodeText",
-					"Data": "In SiYuan, the only important core concept is "
+					"Data": "In "
 				},
 				{
 					"Type": "NodeTextMark",
+					"Properties": {
+						"parent-style": "color: var(--b3-card-info-color); background-color: var(--b3-card-info-background);"
+					},
+					"TextMarkType": "block-ref",
+					"TextMarkBlockRefID": "20230415111951-vt4y4gg",
+					"TextMarkBlockRefSubtype": "s",
+					"TextMarkTextContent": "SiYuan"
+				},
+				{
+					"Type": "NodeKramdownSpanIAL",
+					"Data": "{: parent-style=\"color: var(--b3-card-info-color); background-color: var(--b3-card-info-background);\"}"
+				},
+				{
+					"Type": "NodeText",
+					"Data": ", the only important core concept is "
+				},
+				{
+					"Type": "NodeTextMark",
+					"Properties": {
+						"parent-style": "color: var(--b3-card-info-color); background-color: var(--b3-card-info-background);"
+					},
 					"TextMarkType": "block-ref",
 					"TextMarkBlockRefID": "20200924101106-19z4kaa",
 					"TextMarkBlockRefSubtype": "s",
 					"TextMarkTextContent": "Content block"
 				},
+				{
+					"Type": "NodeKramdownSpanIAL",
+					"Data": "{: parent-style=\"color: var(--b3-card-info-color); background-color: var(--b3-card-info-background);\"}"
+				},
 				{
 					"Type": "NodeText",
 					"Data": ". The content block can be formed through the formatting format, so that we can organize our thoughts and knowledge at the block-level granularity, and it is also convenient for reading and outputting long content."

app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy

@@ -7,7 +7,7 @@
 		"id": "20200923234731-h3zkwm2",
 		"title": "FAQ",
 		"type": "doc",
-		"updated": "20230406112010"
+		"updated": "20230415112018"
 	},
 	"Children": [
 		{
@@ -2072,6 +2072,49 @@
 					]
 				}
 			]
+		},
+		{
+			"ID": "20230415111951-vt4y4gg",
+			"Type": "NodeHeading",
+			"HeadingLevel": 2,
+			"Properties": {
+				"id": "20230415111951-vt4y4gg",
+				"updated": "20230415112008"
+			},
+			"Children": [
+				{
+					"Type": "NodeText",
+					"Data": "Origin of the name \"SiYuan\""
+				}
+			]
+		},
+		{
+			"ID": "20230415112018-2o1sxi9",
+			"Type": "NodeParagraph",
+			"Properties": {
+				"id": "20230415112018-2o1sxi9",
+				"updated": "20230415112018"
+			},
+			"Children": [
+				{
+					"Type": "NodeText",
+					"Data": "The name \"SiYuan\" comes from the Chinese idiom \"饮水思源\", which means \"when drinking water, one should remember where it comes from\" and is used to describe the virtues of not forgetting one's roots and gratitude."
+				}
+			]
+		},
+		{
+			"ID": "20230415112018-tl4v3cu",
+			"Type": "NodeParagraph",
+			"Properties": {
+				"id": "20230415112018-tl4v3cu",
+				"updated": "20230415112018"
+			},
+			"Children": [
+				{
+					"Type": "NodeText",
+					"Data": "We hope that users of SiYuan note-taking software for knowledge management will not forget the sources and connections of their knowledge, and more importantly, will not forget to contribute to society and all of humanity with what they have learned."
+				}
+			]
 		}
 	]
 }

app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa.sy

@@ -8,7 +8,7 @@
 		"title": "请从这里开始",
 		"title-img": "background-color:#556;background-image: linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a);background-size:80px 140px;background-position: 0 0, 0 0, 40px 70px, 40px 70px, 0 0, 40px 70px;",
 		"type": "doc",
-		"updated": "20221114173007"
+		"updated": "20230415112508"
 	},
 	"Children": [
 		{
@@ -33,20 +33,45 @@
 			"Properties": {
 				"id": "20210428212840-8rqwn5o",
 				"style": "color: var(--b3-card-info-color); background-color: var(--b3-card-info-background);",
-				"updated": "20210622232119"
+				"updated": "20230415112508"
 			},
 			"Children": [
 				{
 					"Type": "NodeText",
-					"Data": "在思源中，唯一重要的核心概念是"
+					"Data": "在"
 				},
 				{
 					"Type": "NodeTextMark",
+					"Properties": {
+						"parent-style": "color: var(--b3-card-info-color); background-color: var(--b3-card-info-background);"
+					},
+					"TextMarkType": "block-ref",
+					"TextMarkBlockRefID": "20230415111858-vgohvf3",
+					"TextMarkBlockRefSubtype": "s",
+					"TextMarkTextContent": "思源"
+				},
+				{
+					"Type": "NodeKramdownSpanIAL",
+					"Data": "{: parent-style=\"color: var(--b3-card-info-color); background-color: var(--b3-card-info-background);\"}"
+				},
+				{
+					"Type": "NodeText",
+					"Data": "中，唯一重要的核心概念是"
+				},
+				{
+					"Type": "NodeTextMark",
+					"Properties": {
+						"parent-style": "color: var(--b3-card-info-color); background-color: var(--b3-card-info-background);"
+					},
 					"TextMarkType": "block-ref",
 					"TextMarkBlockRefID": "20200813004931-q4cu8na",
 					"TextMarkBlockRefSubtype": "s",
 					"TextMarkTextContent": "内容块"
 				},
+				{
+					"Type": "NodeKramdownSpanIAL",
+					"Data": "{: parent-style=\"color: var(--b3-card-info-color); background-color: var(--b3-card-info-background);\"}"
+				},
 				{
 					"Type": "NodeText",
 					"Data": "。通过排版格式即可形成内容块，这样我们就能在块级粒度上对思绪和知识进行整理，同时也能方便长文阅读和输出。"

app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy

@@ -7,7 +7,7 @@
 		"id": "20200813093015-u6bopdt",
 		"title": "常见问题",
 		"type": "doc",
-		"updated": "20230406111942"
+		"updated": "20230415111915"
 	},
 	"Children": [
 		{
@@ -2192,6 +2192,49 @@
 					]
 				}
 			]
+		},
+		{
+			"ID": "20230415111858-vgohvf3",
+			"Type": "NodeHeading",
+			"HeadingLevel": 2,
+			"Properties": {
+				"id": "20230415111858-vgohvf3",
+				"updated": "20230415111915"
+			},
+			"Children": [
+				{
+					"Type": "NodeText",
+					"Data": "“思源”命名的由来"
+				}
+			]
+		},
+		{
+			"ID": "20230415111923-z21yqq4",
+			"Type": "NodeParagraph",
+			"Properties": {
+				"id": "20230415111923-z21yqq4",
+				"updated": "20230415111923"
+			},
+			"Children": [
+				{
+					"Type": "NodeText",
+					"Data": "思源这个名字取自中国古代成语“饮水思源”，其字面意思是“喝水的时候，要想到水是从哪里来的”，比喻不忘本、知感恩。"
+				}
+			]
+		},
+		{
+			"ID": "20230415111923-37gvzqk",
+			"Type": "NodeParagraph",
+			"Properties": {
+				"id": "20230415111923-37gvzqk",
+				"updated": "20230415111923"
+			},
+			"Children": [
+				{
+					"Type": "NodeText",
+					"Data": "我们希望用户在使用思源笔记进行知识管理的时候不要忘记知识的出处和关联，更重要的是不要忘记通过自己的所学回报社会，回报全人类。"
+				}
+			]
 		}
 	]
 }

app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy

@@ -6,7 +6,7 @@
 		"icon": "2753",
 		"id": "20211226115227-r1rty9v",
 		"title": "常見問題",
-		"updated": "20230406111957"
+		"updated": "20230415112115"
 	},
 	"Children": [
 		{
@@ -2063,6 +2063,49 @@
 					]
 				}
 			]
+		},
+		{
+			"ID": "20230415112040-xyakvb0",
+			"Type": "NodeHeading",
+			"HeadingLevel": 2,
+			"Properties": {
+				"id": "20230415112040-xyakvb0",
+				"updated": "20230415112102"
+			},
+			"Children": [
+				{
+					"Type": "NodeText",
+					"Data": "“思源”命名的由來"
+				}
+			]
+		},
+		{
+			"ID": "20230415112115-cu92dxe",
+			"Type": "NodeParagraph",
+			"Properties": {
+				"id": "20230415112115-cu92dxe",
+				"updated": "20230415112115"
+			},
+			"Children": [
+				{
+					"Type": "NodeText",
+					"Data": "思源這個名字取自中國古代成語“飲水思源”，其字面意思是“喝水的時候，要想到水是從哪裡來的”，比喻不忘本、知感恩。"
+				}
+			]
+		},
+		{
+			"ID": "20230415112115-5o2ogev",
+			"Type": "NodeParagraph",
+			"Properties": {
+				"id": "20230415112115-5o2ogev",
+				"updated": "20230415112115"
+			},
+			"Children": [
+				{
+					"Type": "NodeText",
+					"Data": "我們希望用戶在使用思源筆記進行知識管理的時候不要忘記知識的出處和關聯，更重要的是不要忘記通過自己的所學回報社會，回報全人類。"
+				}
+			]
 		}
 	]
 }

app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq.sy

@@ -7,7 +7,7 @@
 		"id": "20211226115423-d5z1joq",
 		"title": "請從這裡開始",
 		"title-img": "background-color:#556;background-image: linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a);background-size:80px 140px;background-position: 0 0, 0 0, 40px 70px, 40px 70px, 0 0, 40px 70px;",
-		"updated": "20211226115745"
+		"updated": "20230415112512"
 	},
 	"Children": [
 		{
@@ -32,20 +32,45 @@
 			"Properties": {
 				"id": "20211226115745-bygtonj",
 				"style": "color: var(--b3-card-info-color); background-color: var(--b3-card-info-background);",
-				"updated": "20211228142856"
+				"updated": "20230415112512"
 			},
 			"Children": [
 				{
 					"Type": "NodeText",
-					"Data": "在思源中，唯一重要的核心概念是"
+					"Data": "在"
 				},
 				{
 					"Type": "NodeTextMark",
+					"Properties": {
+						"parent-style": "color: var(--b3-card-info-color); background-color: var(--b3-card-info-background);"
+					},
+					"TextMarkType": "block-ref",
+					"TextMarkBlockRefID": "20230415112040-xyakvb0",
+					"TextMarkBlockRefSubtype": "s",
+					"TextMarkTextContent": "思源"
+				},
+				{
+					"Type": "NodeKramdownSpanIAL",
+					"Data": "{: parent-style=\"color: var(--b3-card-info-color); background-color: var(--b3-card-info-background);\"}"
+				},
+				{
+					"Type": "NodeText",
+					"Data": "中，唯一重要的核心概念是"
+				},
+				{
+					"Type": "NodeTextMark",
+					"Properties": {
+						"parent-style": "color: var(--b3-card-info-color); background-color: var(--b3-card-info-background);"
+					},
 					"TextMarkType": "block-ref",
 					"TextMarkBlockRefID": "20211226120055-9mityht",
 					"TextMarkBlockRefSubtype": "s",
 					"TextMarkTextContent": "內容塊"
 				},
+				{
+					"Type": "NodeKramdownSpanIAL",
+					"Data": "{: parent-style=\"color: var(--b3-card-info-color); background-color: var(--b3-card-info-background);\"}"
+				},
 				{
 					"Type": "NodeText",
 					"Data": "。通過排版格式即可形成內容塊，這樣我們就能在區塊級上對思緒和知識進行整理，同時也能方便長文閱讀和輸出。"