Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync #626a4bf6 #780

Merged
merged 18 commits into from
Nov 2, 2023
Merged

Sync #626a4bf6 #780

merged 18 commits into from
Nov 2, 2023

Conversation

wxsms
Copy link
Member

@wxsms wxsms commented Oct 31, 2023

Description of Problem

vuejs/docs@85fc0ef...626a4bf

phox081 and others added 18 commits October 12, 2023 02:39
* Adding Italian urls

* order fix
I think teleport component name should be capitalized. Sincere sorry if I'm wrong.
Changed "In Dom" to "In in-DOM" in two places as used in the rest of the document
Bumps [vue](https://github.com/vuejs/core) from 3.3.4 to 3.3.6.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](vuejs/core@v3.3.4...v3.3.6)

---
updated-dependencies:
- dependency-name: vue
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [vue](https://github.com/vuejs/core) from 3.3.6 to 3.3.7.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](vuejs/core@v3.3.6...v3.3.7)

---
updated-dependencies:
- dependency-name: vue
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Remove the app variable name from the method name

To be consitent with the rest of the guide, it should be displayed the method name (with the dot accessor)
i.e.: https://vuejs.org/guide/essentials/application.html#mounting-the-app

* remove app const name from method
docs: add missing div to seperate bad and good examples
…(#2550)

* Update events.md - Diff between Options API and Composition API text

The emits support for object sintax for Options API text was displayed for both, Options and Composition API.

* Update events.md - in span instead of repeat code in different divs

* Update events.md - fix options-api class

* Update src/guide/components/events.md

Co-authored-by: Natalia Tepluhina <[email protected]>

---------

Co-authored-by: Natalia Tepluhina <[email protected]>
# Conflicts:
#	pnpm-lock.yaml
#	src/about/faq.md
#	src/about/releases.md
#	src/guide/components/events.md
#	src/guide/components/registration.md
#	src/guide/typescript/overview.md
#	src/translations/index.md
@wxsms wxsms added 从英文版同步 请使用 merge commit 合并 从 upstream 同步的 PR 需保留 git 历史记录 labels Oct 31, 2023
@vercel
Copy link

vercel bot commented Oct 31, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
cn-vuejs-org ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 31, 2023 6:35am

@Jinjiang Jinjiang merged commit b742c35 into main Nov 2, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
从英文版同步 请使用 merge commit 合并 从 upstream 同步的 PR 需保留 git 历史记录
Projects
None yet
Development

Successfully merging this pull request may close these issues.