0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2022-08-21 17:19:03 +08:00
commit 1bb8351d75
3 changed files with 81 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy
View file

@ -4,7 +4,7 @@
"Properties": {
"id": "20210721112206-mhr9wxi",
"title": "Data sync",
"updated": "20220807180100"
"updated": "20220821170709"
},
"Children": [
{
@ -76,7 +76,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220703231817-nbhxxb6",
"updated": "20220708104604"
"updated": "20220821170709"
},
"Children": [
{
@ -114,7 +114,7 @@
},
{
"Type": "NodeText",
"Data": ", if all goes well, the synchronization is already configured."
"Data": ", if all goes well, the synchronization is already configured. If you are not familiar with synchronization configuration, it is recommended to open the synchronization configuration wizard by clicking the synchronization button. It is easier to configure through the wizard."
}
]
},
@ -691,7 +691,7 @@
},
"Properties": {
"id": "20220703232421-gmxxahn",
"updated": "20220703232715"
"updated": "20220821165444"
},
"Children": [
{
@ -765,7 +765,7 @@
},
"Properties": {
"id": "20220703232421-axvmpcs",
"updated": "20220703232715"
"updated": "20220821165444"
},
"Children": [
{
@ -773,12 +773,32 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220703232421-r4nw5op",
"updated": "20220703232715"
"updated": "20220821165444"
},
"Children": [
{
"Type": "NodeText",
"Data": "At this time, the cloud file a will be overwritten by a of the B device, and the history of the previous A device file a will be generated on the B device"
"Data": "At this time, the cloud file a will be overwritten by a of the B device, and the history of the previous A device file a will be generated on the B device. If the file a is a document, a copy of the document (with "
},
{
"Type": "NodeCodeSpan",
"Data": "code",
"Children": [
{
"Type": "NodeCodeSpanOpenMarker"
},
{
"Type": "NodeCodeSpanContent",
"Data": "(Conflicted 2006-01-02 15:04:05)"
},
{
"Type": "NodeCodeSpanCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " as the document name suffix) will be generated in the same level directory at the same time as the history is generated, so as to facilitate subsequent manual edit merge conflicts"
}
]
}

34
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721103420-vn6g2yy.sy
View file

@ -4,7 +4,7 @@
"Properties": {
"id": "20210721103420-vn6g2yy",
"title": "数据同步",
"updated": "20220807180028"
"updated": "20220821170632"
},
"Children": [
{
@ -92,7 +92,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20211027205711-07u1glm",
"updated": "20220703225408"
"updated": "20220821170632"
},
"Children": [
{
@ -126,7 +126,7 @@
},
{
"Type": "NodeText",
"Data": "后如果一切正常就已经配置好同步了。"
"Data": "后如果一切正常就已经配置好同步了。如果你不太熟悉同步配置，建议通过点击同步按钮打开同步配置向导，通过向导进行配置会更简便一些。"
}
]
},
@ -732,7 +732,7 @@
},
"Properties": {
"id": "20220307093112-lz7p32d",
"updated": "20220703232528"
"updated": "20220821165223"
},
"Children": [
{
@ -805,7 +805,7 @@
},
"Properties": {
"id": "20220307094021-74y5lau",
"updated": "20220703232528"
"updated": "20220821165223"
},
"Children": [
{
@ -813,12 +813,32 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220307094021-jtlbgw4",
"updated": "20220703232528"
"updated": "20220821165223"
},
"Children": [
{
"Type": "NodeText",
"Data": "此时云端 a 文件会被 B 设备上的 a 覆盖，同时在 B 设备上生成之前 A 设备 a 的历史"
"Data": "此时云端 a 文件会被 B 设备上的 a 覆盖，同时在 B 设备上生成之前 A 设备 a 的历史。如果 a 文件是文档的话，生成历史的同时也会在同级目录下生成该文档的副本（以 "
},
{
"Type": "NodeCodeSpan",
"Data": "code",
"Children": [
{
"Type": "NodeCodeSpanOpenMarker"
},
{
"Type": "NodeCodeSpanContent",
"Data": "(Conflicted 2006-01-02 15:04:05)"
},
{
"Type": "NodeCodeSpanCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " 作为文档名后缀），以方便后续手动编辑合并冲突"
}
]
}

34
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121438-xaafdo8.sy
View file

@ -4,7 +4,7 @@
"Properties": {
"id": "20211226121438-xaafdo8",
"title": "資料同步",
"updated": "20220807180200"
"updated": "20220821170702"
},
"Children": [
{
@ -76,7 +76,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220703231425-knmdjxb",
"updated": "20220703231555"
"updated": "20220821170702"
},
"Children": [
{
@ -110,7 +110,7 @@
},
{
"Type": "NodeText",
"Data": "后如果一切正常就已经配置好同步了。"
"Data": "后如果一切正常就已经配置好同步了。如果你不太熟悉同步配置，建議通過點擊同步按鈕打開同步配置嚮導，通過嚮導進行配置會更簡便一些。"
}
]
},
@ -712,7 +712,7 @@
},
"Properties": {
"id": "20220703231640-9pkvgzl",
"updated": "20220703232524"
"updated": "20220821165506"
},
"Children": [
{
@ -786,7 +786,7 @@
},
"Properties": {
"id": "20220703231640-ytzbgh6",
"updated": "20220703232524"
"updated": "20220821165506"
},
"Children": [
{
@ -794,12 +794,32 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220703231640-qqg6ca6",
"updated": "20220703232524"
"updated": "20220821165506"
},
"Children": [
{
"Type": "NodeText",
"Data": "此時雲端 a 文件會被 B 設備上的 a 覆蓋，同時在 B 設備上生成之前 A 設備 a 的歷史"
"Data": "此時雲端 a 文件會被 B 設備上的 a 覆蓋，同時在 B 設備上生成之前 A 設備 a 的歷史。如果 a 文件是文檔的話，生成歷史的同時也會在同級目錄下生成該文檔的副本（以 "
},
{
"Type": "NodeCodeSpan",
"Data": "code",
"Children": [
{
"Type": "NodeCodeSpanOpenMarker"
},
{
"Type": "NodeCodeSpanContent",
"Data": "(Conflicted 2006-01-02 15:04:05)"
},
{
"Type": "NodeCodeSpanCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " 作為文檔名後綴），以方便後續手動編輯合併衝突"
}
]
}