Skip to content

Commit 8efa756

Browse files
authored
Merge pull request #481 from dynamsoft-docs/Jenny-preview-branch
Revert "Merge branch 'master' into Jenny-preview-branch"
2 parents 0149d1d + ece4d61 commit 8efa756

18 files changed

+610
-758
lines changed

.github/workflows/full-site-build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,12 @@ jobs:
4949
cd /home/ubuntu
5050
[ -d DWTDocPreview ] && rm -rf DWTDocPreview
5151
[ -d web-twain-docs-preview ] && rm -rf web-twain-docs-preview
52+
[ -d Docs-Template-Repo-preview ] && rm -rf Docs-Template-Repo-preview
5253
mkdir -p DWTDocPreview
5354
git clone --depth 1 --branch preview https://github.com/dynamsoft-docs/web-twain-docs.git web-twain-docs-preview
55+
git clone --depth 1 --branch preview https://github.com/dynamsoft-docs/Docs-Template-Repo.git Docs-Template-Repo-preview
5456
cp -rfp ./web-twain-docs-preview/* ./DWTDocPreview/
55-
cd Docs-Template-Repo && git pull && cd .. && cp -rfp ./Docs-Template-Repo/* ./DWTDocPreview/
57+
cp -rfp ./Docs-Template-Repo-preview/* ./DWTDocPreview/
5658
sed -i -e "1,3s/blob\/master$/blob\/preview/" \
5759
-e "1,3s/blob\/main$/blob\/preview/" /home/ubuntu/DWTDocPreview/_config.yml
5860
cd DWTDocPreview && bundle exec jekyll build

_data/full_tree.yml

Lines changed: 160 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,129 +1,244 @@
11
tree_list:
2-
- name: Introduction
2+
- name: About
33
path: /about/
4+
startVersion:
5+
endVersion:
46
childList:
57
- name: System Requirements
6-
path: /getstarted/platform.html
8+
path: /getstarted/platform.html
9+
startVersion:
10+
endVersion:
11+
- name: License
12+
path: /about/license.html
13+
startVersion:
14+
endVersion:
715
- name: Imaging Hardware
816
path: /getstarted/hardware.html
17+
startVersion:
18+
endVersion:
919
- name: File Types
1020
path: /getstarted/filetype.html
11-
- name: DEVELOPMENT
12-
isCategory: true
13-
- name: User Guide
21+
startVersion:
22+
endVersion:
23+
- name: Resources
24+
path: /about/resources.html
25+
startVersion:
26+
endVersion:
27+
- name: Support
28+
path: /about/getsupport.html
29+
startVersion:
30+
endVersion:
31+
- name: Getting Started
32+
path: /getstarted/
33+
startVersion:
34+
endVersion:
1435
childList:
1536
- name: HelloWorld
1637
path: /getstarted/helloworld.html
17-
- name: License
18-
path: /about/license.html
19-
- name: Set up Dynamsoft Service
20-
path: /indepth/deployment/service.html
21-
- name: Deploy to Server
22-
path: /indepth/deployment/server.html
23-
- name: Explore Features
24-
path: /indepth/features/
25-
childList:
26-
- name: DWT Initialization
27-
path: /indepth/features/initialize.html
28-
- name: Input Options
29-
path: /indepth/features/input.html
30-
- name: Viewer Setting
31-
path: /indepth/features/viewer.html
32-
- name: Image Editing
33-
path: /indepth/features/edit.html
34-
- name: UI Customization
35-
path: /indepth/features/ui.html
36-
- name: Output Options
37-
path: /indepth/features/output.html
38-
- name: Image Buffer Management
39-
path: /indepth/features/buffer.html
40-
- name: Barcode Recognition
41-
path: /indepth/features/barcode.html
42-
- name: PDF Handling
43-
path: /indepth/features/pdf.html
44-
- name: Samples and Demos
45-
childList:
38+
startVersion:
39+
endVersion:
4640
- name: Use Web TWAIN in Angular
4741
path: /indepth/development/angular.html
42+
startVersion:
43+
endVersion:
4844
- name: Use Web TWAIN in React
4945
path: /indepth/development/react.html
46+
startVersion:
47+
endVersion:
5048
- name: Use Web TWAIN in Vue
5149
path: /indepth/development/vue.html
52-
- name: Simple Demo
53-
path: /getstarted/Helloworld.html
50+
startVersion:
51+
endVersion:
52+
- name: Deploy to Server
53+
path: /indepth/deployment/server.html
54+
startVersion:
55+
endVersion:
56+
- name: Set up Dynamsoft Service
57+
path: /indepth/deployment/service.html
58+
startVersion:
59+
endVersion:
60+
- name: How to Upgrade
61+
path: /indepth/development/upgrade.html
62+
startVersion:
63+
endVersion:
64+
- name: DEVELOPMENT
65+
isCategory: true
66+
- name: Using DWT
67+
path: /indepth/features/
68+
startVersion:
69+
endVersion:
70+
childList:
71+
- name: Initialize DWT
72+
path: /indepth/features/initialize.html
73+
startVersion:
74+
endVersion:
75+
- name: Input Options
76+
path: /indepth/features/input.html
77+
startVersion:
78+
endVersion:
79+
- name: Output Options
80+
path: /indepth/features/output.html
81+
startVersion:
82+
endVersion:
83+
- name: Manage Image Buffer
84+
path: /indepth/features/buffer.html
85+
startVersion:
86+
endVersion:
87+
- name: Manage Viewer
88+
path: /indepth/features/viewer.html
89+
startVersion:
90+
endVersion:
91+
- name: Customize UI
92+
path: /indepth/features/ui.html
93+
startVersion:
94+
endVersion:
95+
- name: Edit Images
96+
path: /indepth/features/edit.html
97+
startVersion:
98+
endVersion:
99+
- name: Read Barcodes
100+
path: /indepth/features/barcode.html
101+
startVersion:
102+
endVersion:
103+
- name: Handle PDFs
104+
path: /indepth/features/pdf.html
105+
startVersion:
106+
endVersion:
54107
- name: API Reference
55108
path: /info/api/
109+
startVersion:
110+
endVersion:
56111
childList:
57112
- name: Dynamsoft_DWT
58113
path: /info/api/Dynamsoft_WebTwainEnv.html
114+
startVersion:
115+
endVersion:
59116
- name: Dynamsoft_Enum
60117
path: /info/api/Dynamsoft_Enum.html
118+
startVersion:
119+
endVersion:
120+
- name: Interfaces
121+
path: /info/api/Interfaces.html
122+
startVersion:
123+
endVersion:
124+
- name: Device
125+
path: /info/api/Device.html
126+
startVersion:
127+
endVersion:
61128
- name: WebTwain_Scanner
62129
path: /info/api/WebTwain_Acquire.html
130+
startVersion:
131+
endVersion:
63132
- name: WebTwain_Buffer
64133
path: /info/api/WebTwain_Buffer.html
134+
startVersion:
135+
endVersion:
65136
- name: WebTwain_Viewer
66137
path: /info/api/WebTwain_Viewer.html
138+
startVersion:
139+
endVersion:
67140
- name: WebTwain_Edit
68141
path: /info/api/WebTwain_Edit.html
142+
startVersion:
143+
endVersion:
69144
- name: WebTwain_IO
70145
path: /info/api/WebTwain_IO.html
146+
startVersion:
147+
endVersion:
71148
- name: WebTwain_Util
72149
path: /info/api/WebTwain_Util.html
150+
startVersion:
151+
endVersion:
73152
- name: Addon_BarcodeReader
74153
path: /info/api/Addon_BarcodeReader.html
154+
startVersion:
155+
endVersion:
75156
- name: Addon_Camera
76157
path: /info/api/Addon_Camera.html
158+
startVersion:
159+
endVersion:
77160
- name: Addon_PDF
78161
path: /info/api/Addon_PDF.html
162+
startVersion:
163+
endVersion:
79164
- name: Addon_Webcam
80165
path: /info/api/Addon_Webcam.html
166+
startVersion:
167+
endVersion:
81168
- name: Dynamsoft_FileUploader
82169
path: /info/api/Dynamsoft_FileUploader.html
170+
startVersion:
171+
endVersion:
83172
- name: Error List
84173
path: /info/api/appendix.html
85-
# - name: Interface
86-
# path: /info/api/interface.html
174+
startVersion:
175+
endVersion:
87176
- name: USEFUL RESOURCES
88177
isCategory: true
89178
- name: Release Notes
90179
path: /info/schedule/
180+
startVersion:
181+
endVersion:
91182
childList:
92183
- name: Stable
93184
path: /info/schedule/stable.html
185+
startVersion:
186+
endVersion:
94187
- name: Addon
95188
path: /info/schedule/Addon.html
189+
startVersion:
190+
endVersion:
96191
- name: Deprecated
97192
path: /info/schedule/deprecated.html
98-
- name: Upgrade Instructions
99-
path: /indepth/development/upgrade.html
100-
- name: Resources
101-
path: /about/resources.html
102-
- name: Support
103-
path: /about/getsupport.html
193+
startVersion:
194+
endVersion:
104195
- name: FAQ
105196
path: /faq/
197+
startVersion:
198+
endVersion:
106199
isHashNode: true
107200
childList:
108201
- name: SDK Download/Free Trial
109202
path: /faq/#sdk-downloadfree-trial
203+
startVersion:
204+
endVersion:
110205
- name: Capture/Image Source
111206
path: /faq/#captureimage-source
207+
startVersion:
208+
endVersion:
112209
- name: Image Viewer
113210
path: /faq/#image-viewer
211+
startVersion:
212+
endVersion:
114213
- name: Image Editing
115214
path: /faq/#image-editing
215+
startVersion:
216+
endVersion:
116217
- name: UI Customization
117218
path: /faq/#ui-customization
219+
startVersion:
220+
endVersion:
118221
- name: Document Saving
119222
path: /faq/#document-saving
223+
startVersion:
224+
endVersion:
120225
- name: Security
121226
path: /faq/#security
227+
startVersion:
228+
endVersion:
122229
- name: Addon
123230
path: /faq/#addon
231+
startVersion:
232+
endVersion:
124233
- name: Project Deployment and End-user Installation
125234
path: /faq/#project-deployment-and-end-user-installation
235+
startVersion:
236+
endVersion:
126237
- name: Error Troubleshooting
127238
path: /faq/#error-troubleshooting
239+
startVersion:
240+
endVersion:
128241
- name: Licensing and Purchase
129-
path: /faq/#licensing-and-purchase
242+
path: /faq/#licensing-and-purchase
243+
startVersion:
244+
endVersion:

faq/failed-to-load-resource.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ By default, we use "127.0.0.1" for service connection. However, you may use our
2323

2424
Ref: <a href="{{site.faq}}how-come-would-you-need-local.dynamsoft.com.html" target="_blank">In which cases would I use local.dynamsoft.com instead of 127.0.0.1?</a>
2525

26-
In this case, if you are trying to access an application that integrates a version of Dynamic Web TWAIN V15.3 ~ V17.2.1, you will get the error. Because the old "local.dynamsoft.com" certificate expired on <font color=red>November 20th, 2021</font>.
26+
In this case, if you are trying to access an application that integrates a version of Dynamic Web TWAIN V15.3 ~ V17.1.1, you will get the error. Because the old "local.dynamsoft.com" certificate expired on <font color=red>November 20th, 2021</font>.
2727

2828
### Resolution
2929

faq/http-insecure-websites-in-chromium-browser.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ If you need time to update your website, you may try one of the following workar
5757
[InsecurePrivateNetworkRequestsAllowedForUrls](https://chromeenterprise.google/policies/#InsecurePrivateNetworkRequestsAllowedForUrls)
5858
For more details about managing policies for your users, see refer to google's [help center article](https://support.google.com/chrome/a/answer/9037717).
5959

60-
3. **Deprecated by Chrome from version 108**
61-
If you need to disable the block for an end user, there is a Chrome setting available.
60+
3. If you need to disable the block for an end user, there is a Chrome setting available.
6261
see the steps below
6362
Step 1: visit chrome://flags/#block-insecure-private-network-requests
6463
Step 2: set 'Block insecure private network requests' to Disabled

faq/private-network-access-in-chrome101.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ https://www.dynamsoft.com/web-twain/docs/faq/#project-deployment-and-end-user-in
1818

1919
(REF: <a href="https://developer.chrome.com/blog/private-network-access-preflight/" target="_blank">https://developer.chrome.com/blog/private-network-access-preflight/</a>)
2020

21-
<span style="background-color:#f9f2f4; color:#c7254e">December 15, 2022: Google has updated that the pre-flight changes will not occur sooner than Chrome version 111. Please refer to <a href="https://chromiumdash.appspot.com/schedule" target="_blank">Google's release calendar</a> for release dates.</span>
22-
2321
<span style="background-color:#f9f2f4; color:#c7254e">September 27, 2022: Google has stated that the pre-flight changes will not occur sooner than Chrome version 109, which according to <a href="https://chromiumdash.appspot.com/schedule" target="_blank">Google's release calendar</a>, is scheduled for early 2023.</span>
2422

2523
<span style="background-color:#f9f2f4; color:#c7254e">July 7, 2022: Google has updated the timeline for this preflight request feature. The experiment is scheduled again for Chrome 104 and may be released in Chrome 107 at the earliest. Please refer to Google's feature updates <a href="https://chromestatus.com/feature/5436853517811712" target="_blank">here</a>.</span>

getstarted/service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ These ports can be configured in the `DSConfiguration.ini` file located in:
2525

2626
## Installation of Dynamsoft Service
2727

28-
On a desktop, when a new user accesses a web page using Dynamic Web TWAIN SDK for the first time, the user will be prompted to install the Dynamsoft Service. This is a built-in behaviour of the library. The prompt will display the download link. Once the installer is downloaded, the installation process will take just a few seconds.
28+
On a desktop, when a new user accesses a web page using Dynamic Web TWAIN SDK for the first time, he will be prompted to install the Dynamsoft Service. This is a built-in behaviour of the library. The prompt will display the download link. Once the installer is downloaded, the installation process will take just a few seconds.
2929

3030
The prompt comes up when you try to [create a WebTwain instance]({{site.indepth}}features/initialize.html#creating-the-webtwain-instance) in Service mode.
3131

indepth/features/buffer.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,6 @@ The buffer also comes with the ability to detect if a scanned image is blank or
143143

144144
If you believe an image should be blank but `IsBlankImage()` or `IsBlankImageExpress()` is returning `false` , you can read [ `BlankImageCurrentStdDev` ]({{site.info}}api/WebTwain_Buffer.html#blankimagecurrentstddev) (a read-only property) for that image and then **set a bigger value** to [ `BlankImageMaxStdDev` ]({{site.info}}api/WebTwain_Buffer.html#blankimagemaxstddev) , which sets the "limit" at which the buffer considers the image blank. Then when you try again, that image will be regarded as blank.
145145

146-
[Go to FAQ for more details](https://www.dynamsoft.com/web-twain/docs/faq/remove-blank-page-automatically.html).
147-
148146
## Buffer Event Callbacks
149147

150148
The buffer also provides a few event callbacks that take place under specific conditions. You can use these callbacks to trigger a certain action once this event takes place. Here is an overview of the events and what each represents:

0 commit comments

Comments
 (0)