Skip to content

Commit

Permalink
Merge branch 'develop' into 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jhchen committed Jun 28, 2018
2 parents cdd4b90 + 5411b76 commit 9a77567
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/guides/adding-quill-to-your-build-pipeline.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ You will need to add Webpack and appropriate loaders as development dependencies
- Parchment source code - [`ts-loader`](https://www.npmjs.com/package/ts-loader), [`typescript`](https://www.npmjs.com/package/typescript)
- SVG icons - [`html-loader`](https://www.npmjs.com/package/html-loader)

You Webpack configuration file will also need to alias Quill and Parchment to point to their respective entry source files. Without this, Webpack will use the pre-built files included in NPM, instead of building from source.
Your Webpack configuration file will also need to alias Quill and Parchment to point to their respective entry source files. Without this, Webpack will use the pre-built files included in NPM, instead of building from source.


### Entry
Expand Down
4 changes: 2 additions & 2 deletions docs/guides/designing-the-delta-format.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ var content = [{
a: true,
b: true
}
];
}];
```

It is up to the implementer to pick appropriate names:
Expand All @@ -79,7 +79,7 @@ var content = [{
italic: true,
bold: true
}
];
}];
```

This canonicalization applies to both keys and values, `text` and `attributes`. For example, Quill by default:
Expand Down

0 comments on commit 9a77567

Please sign in to comment.