Commit Graph

398 Commits

Author SHA1 Message Date
Yang.Y
4925bc523e Merge pull request #53 from JinhaiZ/patch-3
update a broken link
2016-10-19 10:37:15 +08:00
Jinhai ZHOU
32927ec650 update a broken link 2016-10-18 10:45:36 +02:00
Yang.Y
80f9f1d5a7 Merge pull request #52 from JinhaiZ/patch-2
fix a typo
2016-10-18 15:12:11 +08:00
Yang.Y
94f031d4b1 Merge pull request #51 from JinhaiZ/patch-1
fix a typo
2016-10-18 15:12:02 +08:00
Jinhai ZHOU
4c57c72622 fix a typo
iff here means: if and only if
origianl text: if i & (i-1) == 0:        # true iff i is a power of 2
2016-10-13 14:55:25 +02:00
Jinhai ZHOU
a4c02d6131 fix a typo
original text: Use from x import y as z if two modules named y are to be imported or if y is an inconveniently long name.
2016-10-13 14:52:45 +02:00
Yang.Y
0f9338d8d3 Merge pull request #50 from endaye/master
在C++第六章的译者笔记里,标记了一段code的格式。
2016-10-08 11:36:37 +08:00
Yuancheng Zhang
72d40b637e update 2016-10-04 17:54:19 -07:00
Yuancheng Zhang
bb4459ab9d 在第六章的译者笔记里,标记了一段code的格式。
标记后code变成等距字体看着舒服一些
2016-10-04 17:49:26 -07:00
Yang.Y
94cf1b6a9d Merge pull request #48 from tylderen/bugfix/typo
typo
2016-08-27 20:19:24 +08:00
tylderen
f1af737c83 typo 2016-08-27 15:16:39 +08:00
Yang.Y
410dda9cdd Merge pull request #45 from m4jing/m4jing-patch-for-cpp-styleguide
Fixed typo.
2016-04-30 22:08:04 +08:00
Jing Ma
c68132602d Fixed typo. 2016-04-28 20:39:57 +08:00
Yang.Y
092f354c33 Merge pull request #43 from MrJasper/master
更新headers.rst并修正`#includes`
2016-04-21 20:32:35 +08:00
Jasper Wan
a0d24679a8 Fix " on line 132 2016-04-21 16:45:06 +08:00
Jasper Wan
c3ba7d8251 Update headers.rst and fix #includes
* 已参照<http://google.github.io/styleguide/cppguide.html#Header_Files>内容更新
* 修正`#includes`为`#include`
* 注:最新的规范已经将“1.5. 函数参数的顺序”一节移动到“Functions”一章中,本commit删除这一节,删去的代码如下:
```rst

1.5. 函数参数的顺序
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

.. tip::

    定义函数时, 参数顺序依次为: 输入参数, 然后是输出参数.

C/C++ 函数参数分为输入参数, 输出参数, 和输入/输出参数三种. 输入参数一般传值或传 ``const`` 引用, 输出参数或输入/输出参数则是非 ``const`` 指针. 对参数排序时, 将只输入的参数放在所有输出参数之前. 尤其是不要仅仅因为是新加的参数, 就把它放在最后; 即使是新加的只输入参数也要放在输出参数之前.

这条规则并不需要严格遵守. 输入/输出两用参数 (通常是类/结构体变量) 把事情变得复杂, 为保持和相关函数的一致性, 你有时不得不有所变通.
```
2016-04-21 16:42:36 +08:00
Yang.Y
e83d41b7af Merge pull request #41 from bugparty/patch-1
解释了self contained header
2016-04-20 21:49:32 +08:00
bowman han
f6286de025 解释了self contained header 2016-04-20 18:35:16 +08:00
Bean Zhang
fe1f468a3b Update README.rst and the contents of Python
Because of the adding of Shell Style Guide,
the total number becomes five.

Modify the contents of Python Style Guide,
make it consistent with others.
2016-03-21 09:32:59 +08:00
Yang.Y
77c5236df2 Merge pull request #38 from 87boy/master
添加 Google Shell 风格指南翻译
2016-03-19 22:25:40 +08:00
Bin Zhang
c357a1c5c5 Add Google Shell Style Guide 2016-03-19 19:44:56 +08:00
Yang.Y
d50a3af180 Merge pull request #37 from xiuyanduan/master
Change the link of google_python_style.vim
2016-03-09 21:07:28 +08:00
xiuyanduan
94768a475e Change the link of google_python_style.vim
The former link [http://google-styleguide.googlecode.com/svn/trunk/google_python_style.vim](http://google-styleguide.googlecode.com/svn/trunk/google_python_style.vim) is 404. Update it to the [new](https://github.com/google/styleguide/blob/gh-pages/google_python_style.vim) one from official github account of google
2016-03-09 15:18:17 +08:00
Yang.Y
1d1822ac1f Merge pull request #35 from iccz/master
添加缺失的内容
2016-02-24 14:55:06 +08:00
iccz
18d70a0890 Merge pull request #1 from iccz/iccz-patch-1
添加缺失的内容
2016-02-09 11:51:52 +08:00
iccz
23244c60c6 添加缺失的内容 2016-02-09 11:49:13 +08:00
Yang.Y
2f75d0f215 Merge pull request #34 from np-csu/patch-3
Update headers.rst
2016-01-25 13:11:20 +08:00
np-csu
6797a5bc2e Update headers.rst 2016-01-25 11:20:12 +08:00
Yang.Y
18a50c45c5 Merge pull request #33 from np-csu/patch-2
Update scoping.rst
2016-01-23 23:14:17 +08:00
np-csu
6f10ecec54 Update scoping.rst 2016-01-23 14:54:59 +08:00
Yang.Y
ac7a06740e Merge pull request #31 from ilcc/feature-fixtypos
Fixed typo in README.rst file.
2016-01-19 16:23:50 +08:00
lcc_comm
ef8e3f43dc Fixed typo in README.rst file. 2016-01-19 15:25:24 +08:00
Yang.Y
6b155c93ab Merge pull request #30 from ilcc/feature-fixtypos
Fix incongruous punctuation.
2016-01-19 11:07:02 +08:00
lcc_comm
7dd7a76c57 Fixed for better translation. 2016-01-19 10:51:44 +08:00
lcc_comm
2f440ccf41 Revert "Fix incongruous punctuation."
This reverts commit 61af282627.
2016-01-19 10:50:13 +08:00
没头脑
61af282627 Fix incongruous punctuation. 2016-01-18 17:15:49 +00:00
Yang.Y
ae13703040 Merge pull request #27 from alvisisme/master
补充了一个反引号
2016-01-15 15:28:32 +08:00
Yang.Y
2cca63cf14 Merge pull request #28 from alvisisme/patch-1
others.rst:更正模版元的错别字
2016-01-15 15:27:54 +08:00
Alvis
5127efeec1 更正模版元错别字 2016-01-15 15:21:22 +08:00
Alvis
bf75d47654 补充了一个反引号
“前置声明来自命名空间 ``std::` 的 symbol 时,其行为未定义。”这一句缺少一个反引号
2016-01-15 09:52:43 +08:00
Yang.Y
cb8432160f Merge pull request #24 from xuxinkun/master
update the Google Style Guide home page.
2015-12-15 09:16:52 +08:00
Yang.Y
88158556bc Merge pull request #26 from cocakuma/patch-1
fix typing mistake
2015-11-27 20:07:43 +08:00
coca-kuma
db81cc5212 fix typing mistake 2015-11-27 17:26:01 +08:00
xuxinkun
8880889201 update the Google Style Guide home page.
Signed-off-by: xuxinkun <xuxinkun@gmail.com>
2015-11-18 14:54:56 +08:00
Yang.Y
4b2aace0b6 Official style guides were moved to GitHub.
Also fixes issue #23
2015-11-14 18:36:55 +08:00
Yang.Y
0fc2905a6c Merge pull request #22 from imcaffrey/patch-1
Update others.rst
2015-11-14 18:31:18 +08:00
SCaffrey
0e1fee8d91 Update others.rst
Add a blank space to fix
2015-11-14 17:22:42 +08:00
Yang.Y
e76f483f77 Merge pull request #21 from fountainment/master
magic.rst: 更新一处链接
2015-11-09 11:28:46 +08:00
非天
919dcf244e magic.rst: 更新一处链接
更新了cpplint.py的链接地址
2015-11-09 11:17:20 +08:00
Yang.Y
606dd81906 Merge pull request #20 from wlbksy/patch-1
typo- in headers.rst
2015-11-03 15:05:15 +08:00