Skip to content

Commit a63a351

Browse files
ElizabethSamuel-MSFTElizabethSamuel-MSFT
committed
Resolve merge conflicts
2 parents 162485f + 1303a32 commit a63a351

File tree

2,494 files changed

+491633
-111564
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,494 files changed

+491633
-111564
lines changed

‎.openpublishing.publish.config.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
"word-js-desktop-1.1",
7070
"word-js-1.9",
7171
"word-js-desktop-1.2",
72+
"word-js-desktop-1.3",
7273
"word-js-online"
7374
],
7475
"open_to_public_contributors": true,
@@ -387,6 +388,10 @@
387388
"ReferenceTOC": "docs/docs-ref-autogen/word_desktop_1_2/toc.yml",
388389
"ConceptualTOCUrl": "/office/dev/add-ins/toc.json"
389390
},
391+
{
392+
"ReferenceTOC": "docs/docs-ref-autogen/word_desktop_1_3/toc.yml",
393+
"ConceptualTOCUrl": "/office/dev/add-ins/toc.json"
394+
},
390395
{
391396
"ReferenceTOC": "docs/docs-ref-autogen/word_online/toc.yml",
392397
"ConceptualTOCUrl": "/office/dev/add-ins/toc.json"

‎docs/docfx.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -882,6 +882,18 @@
882882
"src": "docs-ref-autogen/word_desktop_1_2",
883883
"dest": "api"
884884
},
885+
{
886+
"files": ["**/toc.yml"],
887+
"group": "word-js-desktop-1.3",
888+
"src": "docs-ref-autogen/word_desktop_1_3",
889+
"dest": "api/office-js-docs-reference"
890+
},
891+
{
892+
"files": ["**/*.md", "**/*.yml"],
893+
"group": "word-js-desktop-1.3",
894+
"src": "docs-ref-autogen/word_desktop_1_3",
895+
"dest": "api"
896+
},
885897
{
886898
"files": ["**/toc.yml"],
887899
"group": "word-js-online",
@@ -1165,6 +1177,10 @@
11651177
"dest": "word-js-desktop-1.2",
11661178
"moniker_range": "word-js-desktop-1.2"
11671179
},
1180+
"word-js-desktop-1.3": {
1181+
"dest": "word-js-desktop-1.3",
1182+
"moniker_range": "word-js-desktop-1.3"
1183+
},
11681184
"word-js-online": {
11691185
"dest": "word-js-online",
11701186
"moniker_range": "word-js-online"

‎docs/docs-ref-autogen/common/toc.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -885,6 +885,10 @@ items:
885885
- name: WordApi online-only requirement set
886886
href: ../../requirement-sets/word/word-api-online-requirement-set.md
887887
displayName: Word
888+
- name: WordApiDesktop 1.3 requirement set
889+
href: >-
890+
../../requirement-sets/word/word-api-desktop-1.3-requirement-set.md
891+
displayName: Word
888892
- name: WordApiDesktop 1.2 requirement set
889893
href: >-
890894
../../requirement-sets/word/word-api-desktop-1.2-requirement-set.md

‎docs/docs-ref-autogen/common_preview/toc.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -885,6 +885,10 @@ items:
885885
- name: WordApi online-only requirement set
886886
href: ../../requirement-sets/word/word-api-online-requirement-set.md
887887
displayName: Word
888+
- name: WordApiDesktop 1.3 requirement set
889+
href: >-
890+
../../requirement-sets/word/word-api-desktop-1.3-requirement-set.md
891+
displayName: Word
888892
- name: WordApiDesktop 1.2 requirement set
889893
href: >-
890894
../../requirement-sets/word/word-api-desktop-1.2-requirement-set.md

‎docs/docs-ref-autogen/excel/toc.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2097,6 +2097,10 @@ items:
20972097
- name: WordApi online-only requirement set
20982098
href: ../../requirement-sets/word/word-api-online-requirement-set.md
20992099
displayName: Word
2100+
- name: WordApiDesktop 1.3 requirement set
2101+
href: >-
2102+
../../requirement-sets/word/word-api-desktop-1.3-requirement-set.md
2103+
displayName: Word
21002104
- name: WordApiDesktop 1.2 requirement set
21012105
href: >-
21022106
../../requirement-sets/word/word-api-desktop-1.2-requirement-set.md

‎docs/docs-ref-autogen/excel_1_1/toc.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,6 +1027,10 @@ items:
10271027
- name: WordApi online-only requirement set
10281028
href: ../../requirement-sets/word/word-api-online-requirement-set.md
10291029
displayName: Word
1030+
- name: WordApiDesktop 1.3 requirement set
1031+
href: >-
1032+
../../requirement-sets/word/word-api-desktop-1.3-requirement-set.md
1033+
displayName: Word
10301034
- name: WordApiDesktop 1.2 requirement set
10311035
href: >-
10321036
../../requirement-sets/word/word-api-desktop-1.2-requirement-set.md

‎docs/docs-ref-autogen/excel_1_10/toc.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1711,6 +1711,10 @@ items:
17111711
- name: WordApi online-only requirement set
17121712
href: ../../requirement-sets/word/word-api-online-requirement-set.md
17131713
displayName: Word
1714+
- name: WordApiDesktop 1.3 requirement set
1715+
href: >-
1716+
../../requirement-sets/word/word-api-desktop-1.3-requirement-set.md
1717+
displayName: Word
17141718
- name: WordApiDesktop 1.2 requirement set
17151719
href: >-
17161720
../../requirement-sets/word/word-api-desktop-1.2-requirement-set.md

‎docs/docs-ref-autogen/excel_1_11/toc.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1723,6 +1723,10 @@ items:
17231723
- name: WordApi online-only requirement set
17241724
href: ../../requirement-sets/word/word-api-online-requirement-set.md
17251725
displayName: Word
1726+
- name: WordApiDesktop 1.3 requirement set
1727+
href: >-
1728+
../../requirement-sets/word/word-api-desktop-1.3-requirement-set.md
1729+
displayName: Word
17261730
- name: WordApiDesktop 1.2 requirement set
17271731
href: >-
17281732
../../requirement-sets/word/word-api-desktop-1.2-requirement-set.md

‎docs/docs-ref-autogen/excel_1_12/toc.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1769,6 +1769,10 @@ items:
17691769
- name: WordApi online-only requirement set
17701770
href: ../../requirement-sets/word/word-api-online-requirement-set.md
17711771
displayName: Word
1772+
- name: WordApiDesktop 1.3 requirement set
1773+
href: >-
1774+
../../requirement-sets/word/word-api-desktop-1.3-requirement-set.md
1775+
displayName: Word
17721776
- name: WordApiDesktop 1.2 requirement set
17731777
href: >-
17741778
../../requirement-sets/word/word-api-desktop-1.2-requirement-set.md

‎docs/docs-ref-autogen/excel_1_13/toc.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1779,6 +1779,10 @@ items:
17791779
- name: WordApi online-only requirement set
17801780
href: ../../requirement-sets/word/word-api-online-requirement-set.md
17811781
displayName: Word
1782+
- name: WordApiDesktop 1.3 requirement set
1783+
href: >-
1784+
../../requirement-sets/word/word-api-desktop-1.3-requirement-set.md
1785+
displayName: Word
17821786
- name: WordApiDesktop 1.2 requirement set
17831787
href: >-
17841788
../../requirement-sets/word/word-api-desktop-1.2-requirement-set.md

0 commit comments

Comments
 (0)