Merge pull request #465 from nervosnetwork/merge-develop

Merge develop

examples/simple-lock/frontend/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@ckb-ccc/core": "^0.0.14-alpha.0",
-    "next": "14.2.3",
+    "next": "14.2.10",
     "react": "^18",
     "react-dom": "^18"
   },

website/docs/ecosystem/EcoCardContents.tsx

@@ -225,14 +225,6 @@ const ecoCardContents: EcoCardProps[] = [
       },
     ],
   },
-  {
-    title: "Nervos Scan",
-    description: "A CKB Explorer produced with love by 7774.bit",
-    href: "https://nervosscan.com/",
-    bannerSrc: "nervosscan",
-    tags: ["Explorer"],
-    links: [{ label: "website", link: "https://nervosscan.com/" }],
-  },
   {
     title: "Neuron",
     description:
@@ -247,7 +239,17 @@ const ecoCardContents: EcoCardProps[] = [
       },
     ],
   },
-
+  {
+    title: "NervDAO",
+    description: "A Universal Wallet-Interfaced Nervos DAO Portal",
+    href: "https://www.nervdao.com/",
+    bannerSrc: "nervdao",
+    tags: ["DApp"],
+    links: [
+      { label: "website", link: "https://www.nervdao.com/" },
+      { label: "github", link: "https://github.com/ckb-ecofund/nervdao" },
+    ],
+  },
   {
     title: "CKBull",
     description:

website/docs/getting-started/how-ckb-works.mdx

@@ -106,7 +106,7 @@ A Script in CKB is a binary executable that can be executed on-chain. It is a
 
 There’re two main types of Scripts:
 
-- **Lock Script**: A required Script controlling the ownership and access to a Cell, ensuring only authorized users can spend its contents.
+- **Lock Script**: A required Script controlling the ownership and access to a Cell, ensuring only authorized users can spend/consume the Cell.
 - **Type Script**: An optional Script dictating how a Cell can be used or modified in a transaction.
 
 ### CKB System Script

website/docs/script/intro-to-script.mdx

@@ -24,9 +24,9 @@ A Script can be one of two types:
 - **Lock Script** - Used to control ownership and access to a Cell.
 - **Type Script** - Used to control how a Cell is used in a transaction.
 
-In most cases, Lock Script works the same with Type Script. The difference is that, only the Lock Script from the input Cells will be executed in the transaction, while the Type Script from both the input Cells and output Cells will be executed in the transaction.
+In most cases, Lock Script and Type Script function similarly. The only key difference is that, the output Cells' Lock Scripts will NOT be executed in a transaction, whereas the input Cells' Lock Scripts, the input Cells' Type Scripts, and the output Cells' Type Scripts will be executed.
 
-This difference has lead to the different usecases of Lock Script and Type Script as we have mentioned above. Lock Script is often used to control owner ship of a Cell while Type Script defines what kinds of changes of a Cell is valid for the transaction.
+This difference has led to the different usecases of Lock Script and Type Script as we have mentioned above. Lock Script is often used to control owner ship of a Cell while Type Script defines what kinds of changes of a Cell is valid for the transaction.
 
 ## Script Structure
 

website/docs/sdk-and-devtool/cli-tool.mdx

@@ -15,7 +15,7 @@ Command-line tools are often used by developers to perform specific blockchain t
 
 [ckb-cli](https://github.com/nervosnetwork/ckb-cli) is a CKB command-line tool developed in Rust.
 
-If you need to interact with Mainnet blockchain from the command line, `ckb-cli` is an ideal choice to manager accounts, deploy Scripts and send Transactions.
+If you need to interact with Mainnet blockchain from the command line, `ckb-cli` is an ideal choice to manage accounts, deploy Scripts and send Transactions.
 
 ### Features
 

website/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docs.nervos.org",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "description": "Official docs website for Nervos CKB",
   "license": "MIT",
   "scripts": {