Commit Graph

52 Commits

Author SHA1 Message Date
徐顺选
603aa59695 修改格式 2015-11-18 09:58:59 +08:00
Xu, Shunxuan
973ab00a8f 添加git reset远程主分支到merge前状态的文档链接到首页
修改:     README.md

Signed-off-by: Xu, Shunxuan <sxxu@linx-info.com>
2015-11-18 09:53:17 +08:00
Xu, Shunxuan
bf4d303718 添加reset远程服务器git主分支到merge前状态的操作纪录
新文件:   Modified_git_default_branch.md

Signed-off-by: Xu, Shunxuan <sxxu@linx-info.com>
2015-11-18 09:49:44 +08:00
徐顺选
721d85bd58 Merge branch '4.2/2480' into 'master'
4.2/2480

applications介绍文档

See merge request !7
2015-11-17 17:12:32 +08:00
朱映春
bc004d6b7e title 2015-10-23 11:47:06 +08:00
朱映春
554b1a6955 进一步完善 2015-10-23 09:48:25 +08:00
朱映春
b3401fc8c3 完善内容 2015-10-22 10:40:22 +08:00
朱映春
99dee790f1 调整格式 2015-10-21 16:29:31 +08:00
Yingchun Zhu
ee72f8f19b [Bug #2480] 4.2的光盘镜像文件介绍
new file:   intro-4.2-iso/intro-iso.md
	new file:   intro-4.2-iso/tool-tree.png

Signed-off-by: Yingchun Zhu <yczhu@linx-info.com>
2015-10-21 16:17:38 +08:00
朱映春
c3e31db04c modify 2015-09-25 13:27:12 +08:00
朱映春
6281f8b42e 完善内容 2015-09-25 13:25:34 +08:00
Yingchun Zhu
dd227b2f4a Merge branch '4.2/2480' of gitlab.rd.in.linx:linx6.0.42/documents into 4.2/2480 2015-09-25 13:13:07 +08:00
朱映春
50c8aa80f2 编写过滤器文档
new file:   filter/builddir.png
	new file:   filter/filter-rule.png
	new file:   filter/filter.md
	new file:   filter/filter.png
	new file:   filter/inner.png
	new file:   filter/select-dir.png
	modified:   workflow/workflow.md
2015-09-25 13:11:19 +08:00
朱映春
c064689efb 完善了部分内容 2015-09-24 09:54:53 +08:00
Yingchun Zhu
f29e8a8019 workflow.png
modified:   workflow.png
2015-09-23 17:35:55 +08:00
朱映春
5a58ce68e3 完善格式 2015-09-23 13:32:59 +08:00
Yingchun Zhu
9ad74bd3d3 Merge branch '4.2/2480' of gitlab.rd.in.linx:linx6.0.42/documents into 4.2/2480
Conflicts:
	workflow/workflow.md
2015-09-23 13:18:26 +08:00
朱映春
bed19c02fb changed workflow.png 2015-09-23 13:15:21 +08:00
朱映春
188854858d 添加图片 2015-09-23 09:02:31 +08:00
朱映春
18fb24b65a modified 2015-09-22 16:11:26 +08:00
Yingchun Zhu
dec5c0ba0e Merge branch '4.2/2480' of gitlab.rd.in.linx:linx6.0.42/documents into 4.2/2480 2015-09-22 15:58:02 +08:00
Yingchun Zhu
311d77544b new
new file:   attachment1.png
	new file:   attachment2.png
	new file:   merge1.png
	new file:   merge2.png
	new file:   workflow.jpg
	modified:   workflow.md
2015-09-22 15:56:16 +08:00
Yingchun Zhu
ac23b2b167 Merge branch '4.2/2480' of gitlab.rd.in.linx:linx6.0.42/documents into 4.2/2480 2015-09-22 11:16:04 +08:00
Yingchun Zhu
00a6a13301 changed workflow.png 2015-09-22 11:13:54 +08:00
Yingchun Zhu
1276e1dc6b test 2015-09-22 10:45:20 +08:00
朱映春
ede047ae32 调整了格式 2015-09-18 15:54:11 +08:00
Yingchun Zhu
d743f636f2 [Bug #2480] applications.git库介绍
modified:   intro-applications-repository.md

Signed-off-by: Yingchun Zhu <yczhu@linx-info.com>
2015-09-18 15:43:29 +08:00
Yingchun Zhu
b6a569f722 [Bug #2480] applications.git库介绍
modified:   README.md
	modified:   intro-applications-repository.md

Signed-off-by: Yingchun Zhu <yczhu@linx-info.com>
2015-09-18 13:06:39 +08:00
朱映春
5f6acb4a01 调整了链接地址 2015-09-17 11:52:24 +08:00
Zhu Yingchun
f3767a561d [Bug #2480] applications介绍文档
Signed-off-by: Zhu Yingchun <yczhu@linx-info.com>
2015-09-17 11:37:15 +08:00
徐顺选
f69dcbe940 添加获取bug信息的依赖包及发送邮件的发件人配置。 2015-09-10 13:36:49 +08:00
徐顺选
084fb8a61e 修改格式 2015-09-09 14:27:10 +08:00
Xu, Shunxuan
ea0b9b423d Merge branch '4.2/2514'
Conflicts:
	README.md
2015-09-09 14:17:23 +08:00
Xu, Shunxuan
31469daf41 添加4.2自动编译正式发布实现说明
修改:     README.md
	新文件:   release_stable.md

Signed-off-by: Xu, Shunxuan <sxxu@linx-info.com>
2015-09-09 14:10:03 +08:00
张国栋
268774facb 更新目录 2015-09-08 09:20:28 +08:00
张国栋
3aeb2352ce Merge branch '4.2/2509' into 'master'
4.2/#2509

See merge request !5
2015-09-08 09:18:45 +08:00
朱映春
d38f1c90a3 调整了格式 2015-09-07 11:29:58 +08:00
Yingchun Zhu
ea14ec4a54 [Bug #2509] 凝思操作系统版本号介绍
new file:   OS-version-node.md

Signed-off-by: Yingchun Zhu <yczhu@linx-info.com>
2015-09-07 09:19:19 +08:00
徐顺选
53acd0cd61 README.md中linx6.0.42.41自动编译环境搭建说明链接错误。 2015-09-02 16:03:40 +08:00
张国栋
bbcda56a17 Merge branch '2480' into 'master'
[Bug #2480] modified:   Pkgfile-yczhu.md

Signed-off-by: Zhang, Guodong <gdzhang@linx-info.com>

See merge request !4
2015-09-01 10:00:28 +08:00
Zhang, Guodong
5e30dd388f modified: Pkgfile-yczhu.md
Signed-off-by: Zhang, Guodong <gdzhang@linx-info.com>
2015-09-01 09:59:24 +08:00
张国栋
d150ac142c Merge branch '2480' into 'master'
[Bug #2480] add autobuild instruction

Signed-off-by: Zhang, Guodong <gdzhang@linx-info.com>

See merge request !3
2015-09-01 09:53:35 +08:00
Zhang, Guodong
3385cc6c9e add autobuild instruction
Signed-off-by: Zhang, Guodong <gdzhang@linx-info.com>
2015-09-01 09:52:38 +08:00
张国栋
3c6d0ac1cb Merge branch '4.2/autobuild' into 'master'
[Bug #2480] autobuild 说明

See merge request !2
2015-09-01 09:49:18 +08:00
张国栋
92d8964362 Merge branch '2480' into 'master'
[Bug #2480] update Pkgfile

        new file:   Pkgfile-yczhu.md
	new file:   workflow.md

Signed-off-by: Zhang, Guodong <gdzhang@linx-info.com>

See merge request !1
2015-09-01 09:45:54 +08:00
Zhang, Guodong
0b18a8b6fe update readme
Signed-off-by: Zhang, Guodong <gdzhang@linx-info.com>
2015-09-01 09:44:02 +08:00
Zhang, Guodong
d5dc608d2f Pkgfile and workflow
new file:   Pkgfile-yczhu.md
	new file:   workflow.md

Signed-off-by: Zhang, Guodong <gdzhang@linx-info.com>
2015-09-01 09:38:46 +08:00
Xu, Shunxuan
8238c7d06e 修改注意事项的markdown格式。
修改:   autobuild.md

Signed-off-by: Xu, Shunxuan <sxxu@linx-info.com>
2015-08-24 14:05:58 +08:00
Xu, Shunxuan
7b91611b4d 添加搭建rocky4.2自动编译环境的文档
新文件:   autobuild.md

Signed-off-by: Xu, Shunxuan <sxxu@linx-info.com>
2015-08-24 13:46:01 +08:00
徐顺选
e0096e1289 Add new master 2015-08-11 11:22:15 +08:00