15
15
var DOCUMENTATION_OPTIONS = {
16
16
URL_ROOT :'../' ,
17
17
VERSION :'' ,
18
- LANGUAGE :'zh-CN ' ,
18
+ LANGUAGE :'zh_CN ' ,
19
19
COLLAPSE_INDEX :false ,
20
20
FILE_SUFFIX :'.html' ,
21
21
HAS_SOURCE : true ,
26
26
< script src ="../_static/underscore.js "> </ script >
27
27
< script src ="../_static/doctools.js "> </ script >
28
28
< script src ="../_static/asciinema-player.js "> </ script >
29
+ < script src ="../_static/translations.js "> </ script >
29
30
< script src ="../_static/js/theme.js "> </ script >
30
- < link rel ="index " title ="Index " href ="../genindex.html " />
31
- < link rel ="search " title ="Search " href ="../search.html " />
31
+ < link rel ="index " title ="索引 " href ="../genindex.html " />
32
+ < link rel ="search " title ="搜索 " href ="../search.html " />
32
33
< link rel ="next " title ="中文翻译介绍 " href ="chinese-localization-info.html " />
33
34
< link rel ="prev " title ="自定义虚拟机配置 " href ="extra-vm.html " />
34
35
</ head >
134
135
< div itemprop ="articleBody ">
135
136
136
137
< div class ="section " id ="linux ">
137
- < h1 > 对 Linux 内核实验室项目做贡献< a class ="headerlink " href ="#linux " title ="Permalink to this headline "> ¶</ a > </ h1 >
138
+ < h1 > 对 Linux 内核实验室项目做贡献< a class ="headerlink " href ="#linux " title ="永久链接至标题 "> ¶</ a > </ h1 >
138
139
< p > < code class ="docutils literal "> < span class ="pre "> Linux</ span > < span class ="pre "> 内核实验室</ span > </ code > 是一个开放的平台。你可以通过对文档、练习或基础设施的贡献来帮助它变得更好。无论是对错别字的修正还是在文档中添加新的部分,所有的贡献我们都欢迎。</ p >
139
140
< p > 所有需要进行贡献的信息都可以在 < a class ="reference external " href ="https://github.com/linux-kernel-labs/linux "> linux 内核实验室 Linux 仓库</ a > 中找到。如果要改变任何东西,你需要从你自己的 fork 创建一个拉取请求(< code class ="docutils literal "> < span class ="pre "> Pull</ span > < span class ="pre "> Request</ span > </ code > ,< code class ="docutils literal "> < span class ="pre "> PR</ span > </ code > )到这个仓库。PR 将由团队成员进行审核,并在解决任何可能的问题后合并。</ p >
140
141
< div class ="section " id ="section-1 ">
141
- < h2 > 仓库结构< a class ="headerlink " href ="#section-1 " title ="Permalink to this headline "> ¶</ a > </ h2 >
142
+ < h2 > 仓库结构< a class ="headerlink " href ="#section-1 " title ="永久链接至标题 "> ¶</ a > </ h2 >
142
143
< p > < a class ="reference external " href ="https://github.com/linux-kernel-labs/linux "> Linux 内核实验室仓库</ a > 是 Linux 内核仓库的一个 fork,增加了以下内容:</ p >
143
144
< blockquote >
144
145
< div > < ul class ="simple ">
@@ -152,13 +153,13 @@ <h2>仓库结构<a class="headerlink" href="#section-1" title="Permalink to this
152
153
</ div > </ blockquote >
153
154
</ div >
154
155
< div class ="section " id ="section-2 ">
155
- < h2 > 构建文档< a class ="headerlink " href ="#section-2 " title ="Permalink to this headline "> ¶</ a > </ h2 >
156
+ < h2 > 构建文档< a class ="headerlink " href ="#section-2 " title ="永久链接至标题 "> ¶</ a > </ h2 >
156
157
< p > 要构建文档,请导航到 < code class ="docutils literal "> < span class ="pre "> tools/labs</ span > </ code > 并运行以下命令:</ p >
157
158
< div class ="highlight-bash "> < div class ="highlight "> < pre > < span > </ span > make docs
158
159
</ pre > </ div >
159
160
</ div >
160
161
< div class ="admonition note ">
161
- < p class ="first admonition-title "> Note </ p >
162
+ < p class ="first admonition-title "> 注解 </ p >
162
163
< p > 该命令会安装所有需要的包。在某些情况下,包的安装或文档的构建可能会因为依赖版本不兼容而失败。</ p >
163
164
< p > 与其费力去修复依赖,构建文档最简单的方法是使用 < a class ="reference external " href ="https://www.docker.com/ "> Docker</ a > 。 首先,在你的主机上安装 < code class ="docutils literal "> < span class ="pre "> docker</ span > </ code > 和 < code class ="docutils literal "> < span class ="pre "> docker-compose</ span > </ code > ,然后运行:</ p >
164
165
< div class ="highlight-bash "> < div class ="highlight "> < pre > < span > </ span > make docker-docs
@@ -168,9 +169,9 @@ <h2>构建文档<a class="headerlink" href="#section-2" title="Permalink to this
168
169
</ div >
169
170
</ div >
170
171
< div class ="section " id ="section-3 ">
171
- < h2 > 做出贡献< a class ="headerlink " href ="#section-3 " title ="Permalink to this headline "> ¶</ a > </ h2 >
172
+ < h2 > 做出贡献< a class ="headerlink " href ="#section-3 " title ="永久链接至标题 "> ¶</ a > </ h2 >
172
173
< div class ="section " id ="fork ">
173
- < h3 > Fork 仓库< a class ="headerlink " href ="#fork " title ="Permalink to this headline "> ¶</ a > </ h3 >
174
+ < h3 > Fork 仓库< a class ="headerlink " href ="#fork " title ="永久链接至标题 "> ¶</ a > </ h3 >
174
175
< ol class ="arabic ">
175
176
< li > < p class ="first "> 如果你还没有做过,请把 < a class ="reference external " href ="https://github.com/linux-kernel-labs/linux "> linux-kernel-labs repo</ a > 仓库克隆到本地:</ p >
176
177
< div class ="highlight-bash "> < div class ="highlight "> < pre > < span > </ span > $ mkdir -p ~/src
@@ -189,9 +190,9 @@ <h3>Fork 仓库<a class="headerlink" href="#fork" title="Permalink to this headl
189
190
< p > 现在,你可以用 < code class ="docutils literal "> < span class ="pre "> my_fork</ span > </ code > 来代替 < code class ="docutils literal "> < span class ="pre "> origin</ span > </ code > 推送到你的分叉(例如 < code class ="docutils literal "> < span class ="pre "> git</ span > < span class ="pre "> push</ span > < span class ="pre "> my_fork</ span > < span class ="pre "> master</ span > </ code > )。</ p >
190
191
</ div >
191
192
< div class ="section " id ="section-4 ">
192
- < h3 > 创建拉取请求< a class ="headerlink " href ="#section-4 " title ="Permalink to this headline "> ¶</ a > </ h3 >
193
+ < h3 > 创建拉取请求< a class ="headerlink " href ="#section-4 " title ="永久链接至标题 "> ¶</ a > </ h3 >
193
194
< div class ="admonition warning ">
194
- < p class ="first admonition-title "> Warning </ p >
195
+ < p class ="first admonition-title "> 警告 </ p >
195
196
< p class ="last "> 拉取请求必须从它们自己的分支创建,这些分支是从``master``开始的。</ p >
196
197
</ div >
197
198
< ol class ="arabic simple ">
@@ -214,7 +215,7 @@ <h3>创建拉取请求<a class="headerlink" href="#section-4" title="Permalink t
214
215
</ pre > </ div >
215
216
</ div >
216
217
< div class ="admonition note ">
217
- < p class ="first admonition-title "> Note </ p >
218
+ < p class ="first admonition-title "> 注解 </ p >
218
219
< p > 你也可以将最新的 master 推送到你 fork 的仓库:</ p >
219
220
< div class ="last highlight-bash "> < div class ="highlight "> < pre > < span > </ span > student@eg106:~/src/linux$ git push my_fork master
220
221
</ pre > </ div >
@@ -239,7 +240,7 @@ <h3>创建拉取请求<a class="headerlink" href="#section-4" title="Permalink t
239
240
</ pre > </ div >
240
241
</ div >
241
242
< div class ="admonition warning ">
242
- < p class ="first admonition-title "> Warning </ p >
243
+ < p class ="first admonition-title "> 警告 </ p >
243
244
< p > 提交信息必须包含对更改的相关描述以及已更改组件的位置。</ p >
244
245
< p > 示例:</ p >
245
246
< blockquote class ="last ">
@@ -272,7 +273,7 @@ <h3>创建拉取请求<a class="headerlink" href="#section-4" title="Permalink t
272
273
</ div > </ blockquote >
273
274
</ div >
274
275
< div class ="section " id ="section-5 ">
275
- < h3 > 修改拉取请求< a class ="headerlink " href ="#section-5 " title ="Permalink to this headline "> ¶</ a > </ h3 >
276
+ < h3 > 修改拉取请求< a class ="headerlink " href ="#section-5 " title ="永久链接至标题 "> ¶</ a > </ h3 >
276
277
< p > 在收到对你的更改的反馈后,你可能需要更新拉取请求。你应该对同一分支进行新的推送。为此,请按照以下步骤操作:</ p >
277
278
< ol class ="arabic simple ">
278
279
< li > 确保你的分支仍然与 < code class ="docutils literal "> < span class ="pre "> linux-kernel-labs</ span > </ code > 仓库的 < code class ="docutils literal "> < span class ="pre "> master</ span > </ code > 分支同步。</ li >
@@ -283,7 +284,7 @@ <h3>修改拉取请求<a class="headerlink" href="#section-5" title="Permalink t
283
284
</ pre > </ div >
284
285
</ div >
285
286
< div class ="admonition note ">
286
- < p class ="first admonition-title "> Note </ p >
287
+ < p class ="first admonition-title "> 注解 </ p >
287
288
< p > 如果你遇到冲突,这意味着其他人修改了与你相同的文件/行,并且在你打开拉取请求后已经合并了更改。</ p >
288
289
< p class ="last "> 在这种情况下,你需要通过手动编辑冲突文件来修复冲突(运行 < code class ="docutils literal "> < span class ="pre "> git</ span > < span class ="pre "> status</ span > </ code > 查看这些文件)。
289
290
修复冲突后,使用 < code class ="docutils literal "> < span class ="pre "> git</ span > < span class ="pre "> add</ span > </ code > 添加它们,然后运行 < code class ="docutils literal "> < span class ="pre "> git</ span > < span class ="pre "> rebase</ span > < span class ="pre "> --continue</ span > </ code > 。</ p >
0 commit comments