Commit 3fcdeb02 authored by Boyuan Yang's avatar Boyuan Yang

chinese: devel/website/using_git: Several tweaks

parent 106cefb7
......@@ -15,8 +15,8 @@
<h3><a name="write-access">Git 存储库写入权限</a></h3>
<p>整个 Debian 网站源代码都使用 Git 管理。它<url https://salsa.debian.org/webmaster-team/webwml/>。\
默认情况下,不允许来宾推送自己的提交到源代码存储库中。您需要一些许可才能获得对存储库的写入权。</p>
<p>整个 Debian 网站源代码都使用 Git 管理。它位于<url https://salsa.debian.org/webmaster-team/webwml/>。\
默认情况下,不允许访客推送自己的提交到源代码存储库中。您需要一些许可才能获得对存储库的写入权。</p>
<h4><a name="write-access-unlimited">不受限制的写入权限</a></h4>
......@@ -24,24 +24,24 @@
<url https://salsa.debian.org/webmaster-team/webwml/>网页登录到 Debian Salsa 平台后请求写入\
权限。</p>
<p>如果您刚开始参与 Debian 网站开发,并且没有经验,请在请求不受限制的写入访问权限之前发送\
<p>如果您刚开始参与 Debian 网站开发,并且没有经验,请在请求不受限制的写入访问权限之前发送\
一封带有自我介绍的电子邮件到<a href="mailto:debian-www@lists.debian.org">
debian-www@lists.debian.org</a>。请考虑在自我介绍中提供一些有用的信息,例如您打算翻译哪种语言\
或网站的哪个部分,以及谁来担保您。</p>
或网站的哪个部分,以及谁会为您担保。</p>
<h4><a name="write-access-via-merge-request">通过合并请求(Merge Requests)写入存储库</a></h4>
<h4><a name="write-access-via-merge-request">通过合并请求(Merge Requests)写入存储库</a></h4>
<p>如果您不打算获得对存储库的不受限制的写入权限或无法做到这一点,您可以随时提交合并请求,\
并让其他开发人员检查并接受您的成果。请使用由 Salsa GitLab 平台通过其网页界面提供的标准程序提交\
合并请求。</p>
<p>并不是所有的网站开发人员都随时查看合并请求,因此他们不一定总是及时处理。如果不确定您的贡献\
是否会被接受,请发送电子邮件至<a href="https://lists.debian.org/debian-www/">debian-www</a>\
<p>并不是所有的网站开发人员都随时查看合并请求,因此他们不一定总是及时处理。如果您不确定所作的\
贡献是否会被接受,请发送电子邮件至<a href="https://lists.debian.org/debian-www/">debian-www</a>\
邮件列表请求核查。</p>
<h2><a name="work-on-repository">Working on the repository</a></h2>
<h2><a name="work-on-repository">使用存储库开展工作</a></h2>
<h3><a name="get-local-repo-copy">Get a local copy of the repository</a></h3>
<h3><a name="get-local-repo-copy">获取一份本地副本</a></h3>
<p>First, you need to install git to work with the repository. Next,
configure your user and e-mail details on your computer (please refer
......@@ -60,8 +60,7 @@ webwml repository using the following command:</p>
git clone git@salsa.debian.org:webmaster-team/webwml.git
</pre>
<p>If you don't have a salsa account, an alternative method is to
clone the repository using the HTTPS protocol:</p>
<p>如果您还没有 Salsa 帐号,您可以使用 HTTPS 协议克隆并获取仓库副本:</p>
<pre>
git clone https://salsa.debian.org/webmaster-team/webwml.git
......@@ -88,7 +87,7 @@ repository: </p>
git fetch --unshallow # fetch all missing commits, convert the repo to a complete one
</pre>
<h4><a name="partial-content-checkout">Partial content checkout</a></h4>
<h4><a name="partial-content-checkout">检出部分内容</a></h4>
<p>You can create a checkout for only a subset of the pages like this:</p>
......@@ -107,7 +106,7 @@ repository: </p>
$ git checkout --
</pre>
<h3><a name="submit-changes">Submitting local changes</a></h3>
<h3><a name="submit-changes">提交本地修改</a></h3>
<h4><a name="keep-local-repo-up-to-date">Keep your local repo up-to-date</a></h4>
......@@ -247,9 +246,9 @@ multiple changes across files in one pass:</p>
<p>This is more involved than the previous one (needing two commits), but
unavoidable due to the way git commit hashes work.</p>
<h2><a name="notifications">Getting notifications</a></h3>
<h2><a name="notifications">获取通知</a></h3>
<h3><a name="commit-notifications">Receiving commit notifications</a></h3>
<h3><a name="commit-notifications">接收提交通知</a></h3>
<p>We have configured the webwml project in Salsa so that commits are
shown in the IRC channel #debian-www.</p>
......@@ -260,7 +259,7 @@ pseudopackage via tracker.debian.org and activate the <q>vcs</q> keyword
there, following these steps (only once):</p>
<ul>
<li>Open a web browser and go to <url https://tracker.debian.org/pkg/www.debian.org></li>
<li>打开网页浏览器并访问 <url https://tracker.debian.org/pkg/www.debian.org></li>
<li>Subscribe to the <q>www.debian.org</q> pseudopackage. (You can authenticate
via SSO or register an email and password, if you were not using
tracker.debian.org already for other purposes).</li>
......@@ -270,7 +269,7 @@ there, following these steps (only once):</p>
webwml repo. We will add the other webmaster-team repositories soon.</li>
</ul>
<h3><a name="merge-request-notifications">Receiving Merge Request notifications</a></h3>
<h3><a name="merge-request-notifications">接收合并请求通知</a></h3>
<p>
If you wish to receive notification emails whenever there are new Merge
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment