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

doc: 同步英文文档到 v1.10 #140

Merged
merged 6 commits into from
Dec 14, 2024

Conversation

inkydragon
Copy link
Member

@inkydragon inkydragon commented Dec 14, 2024

  • 同步到了 v1.10.5

同步步骤如 commit 所示

  1. 准备一个干净的分支用于追踪英文文档源文件。
    https://github.com/inkydragon/JuliaZH.jl/tree/cyhan/en-v1.6
  2. 基于英文分支,新建中文翻译分支(即 master),应用当前的中文翻译到此分支
  3. 更新英文分支,并新建目标版本的新分支
    https://github.com/inkydragon/JuliaZH.jl/tree/cyhan/en-v1.10
  4. 将中文翻译分支 rebase 到新的英文分支上。
    这一步会产生大量的冲突,可以选择保留冲突并提交,然后逐步修复冲突。
    从 cyhan/en-v1.10 更新到 v1.10.5 inkydragon/JuliaZH.jl#5
  5. 得到基于新英文分支的中文翻译
  6. 更新 CI 中构建用 julia 版本

我再 fork 上合并并部署了这些修改,在线预览版本:https://inkydragon.github.io/JuliaZH.jl/dev
pr: inkydragon#13

#5

* wip: 保留合并冲突更新到 v1.10.5

```sh
git merge cyhan/en-v1.10
git add .
git commit
```

* doc: 修复 stdlib 文档的冲突

* doc: 修复 base 文档的冲突

* doc: 修复 devdocs 文档的冲突

* doc: 修复 manual 文档的冲突 arrays~distributed-computing

不包含 calling-c-and-fortran-code.md

* doc: 修复 manual 文档的冲突 documentation~interfaces

* doc: 修复 manual 文档的冲突 mathematical-operations~parallel-computing

* doc: 修复 manual 文档的冲突 performance-tips~workflow-tips

* doc: 修复 manual 文档的冲突 calling-c-and-fortran-code

* doc: 更新 index

* doc.manual: 删除未结束的代码块

* doc.base: 修复标题

* doc: 修复文档链接

* doc: 清理 manual\distributed-computing 中重复的英文原文

* doc: 清理 manual\multi-threading 中重复的英文原文

* doc: 删除重复的标题 manual\strings

* doc: 修复内链:参数类型 Parametric-Types

* doc: 修复内链:Arbitrary-Precision-Arithmetic

* doc: 修复内链:Broadcasting

* doc: 修复内链:Handling-Operating-System-Variation

* doc: 修复内链:Random-Numbers

* doc: 修复内链:Running-External-Programs

* doc: 修复内链:方法

* doc: 修复内链:间接调用

* doc: 修复内链:字典

* doc: 修复内链:类型声明

* doc: 修复内链:值类型;有理数;嵌入-Julia;空值与缺失值

* doc: 修复内链:The-Julia-REPL;输出预分配;

* doc: 修复内链:类型声明;

* doc: 修复内链:函数的复合与链式调用
@inkydragon inkydragon mentioned this pull request Dec 14, 2024
5 tasks
@inkydragon inkydragon marked this pull request as ready for review December 14, 2024 08:27
@HaoxuanGuo HaoxuanGuo merged commit 37b5b66 into JuliaCN:master Dec 14, 2024
1 check passed
@inkydragon inkydragon deleted the cyhan/doc-update-v1.10 branch December 14, 2024 11:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants