Commit Graph

4238 Commits

Author SHA1 Message Date
Sebastian
35ea33448d Fix Typo
Im dem Fall -> Im Fall
2016-12-16 18:59:19 +01:00
Sebastian
2048c18928 fix typo 2016-12-16 18:57:16 +01:00
astaxie
8d7accd78c Merge pull request #746 from kelvins/master
Fixed some duplicate words in the English version.
2016-11-30 14:20:38 +08:00
Kelvin Salton do Prado
4075b93d2c Fixed some duplicate words in the English version. 2016-11-29 12:04:47 -02:00
astaxie
b37884a4a3 Merge pull request #745 from knarfeh/master
修正中英文标点混用
2016-11-29 13:00:34 +08:00
knarfeh
79e292f71e 修正中英文标点混用 2016-11-28 23:47:25 +08:00
astaxie
ca9a6dd4b1 Merge pull request #743 from kelvins/translation_pt_br/chapter2
Translation of section 2.2 to Portuguese (PT_BR)
2016-11-28 20:53:58 +08:00
Kelvin S. do Prado
9c76201b49 Review of the section 2.2 translation. Update the SUMMARY and preface files. 2016-11-26 17:53:40 -02:00
Kelvin S. do Prado
2db6d163d5 Translation of code from section 2.2 to Portuguese (PT_BR). 2016-11-26 17:40:38 -02:00
Kelvin S. do Prado
5b3f629985 Translation of section 2.2 to Portuguese (PT_BR). 2016-11-26 11:00:21 -02:00
astaxie
8c88df6c3c Merge pull request #742 from moklick/patch-1
fix typos
2016-11-25 09:01:18 +08:00
Moritz
0aa45a759f fix typos 2016-11-24 19:41:33 +01:00
astaxie
fa21e6a157 Merge pull request #740 from mistadikay/master
Fix failing build for Chinese, Japanese and German versions
2016-11-20 09:36:41 +08:00
Denis Koltsov
8a802cf8c3 Fix failing build for a German version because of template tags 2016-11-19 18:15:54 +01:00
Denis Koltsov
61b5bc35e7 Hide raw/endraw tags for a regular markdown 2016-11-19 17:27:04 +01:00
Denis Koltsov
1e5131b5c7 Fix failing build for a Chinese version because of template tags 2016-11-19 16:40:48 +01:00
Denis Koltsov
1b85586e22 Fix failing build for a Japanese version because of template tags 2016-11-19 16:37:09 +01:00
Denis Koltsov
58cfbca7ff Fix build by copying build files from English to Japanese version 2016-11-19 16:10:47 +01:00
Denis Koltsov
5dea1d8b59 Temporary remove Japanese build files to trick git 2016-11-19 16:09:28 +01:00
astaxie
83bf29ff2d Merge pull request #739 from mistadikay/master
Fix failing build for English version
2016-11-19 22:42:51 +08:00
Denis Koltsov
a91ae34cf0 Fix japanese book missing src folder preventing book to be built 2016-11-19 14:09:06 +01:00
Denis Koltsov
f5182cb3c4 Fix english 7.4 chapter preventing book to be built 2016-11-19 14:08:01 +01:00
Denis Koltsov
b19cd5d8d3 Add system and generated files to the .gitignore 2016-11-19 14:01:39 +01:00
Denis Koltsov
dab03f4a84 Fix unresolved conflicts in gitignore, readme and en-version of the book 2016-11-19 14:01:11 +01:00
astaxie
ce406eda04 Merge pull request #738 from mylxsw/master
Update ref.md
2016-11-19 12:45:24 +08:00
管宜尧
500dac03dd Update ref.md
冲突解决
2016-11-19 00:25:51 +08:00
astaxie
ce3d03c970 Merge pull request #737 from mehmetkose/master
Fixed Some Typos Section 1&2
2016-11-13 08:53:01 +08:00
Mehmet Kose
2d2a38f36f convert a block in 02.1 and fix typos in other papers 2016-11-12 13:21:51 +03:00
Mehmet Kose
3425074fb8 fixed few typos 2016-11-11 23:35:54 +03:00
astaxie
37d32faab5 Merge pull request #732 from justinclift/patch-1
Update SQLite mgmt tool link with something actively maintained
2016-10-24 10:19:23 +08:00
astaxie
efceac8ad3 Merge pull request #733 from otokaze/master
解决zh 02.2冲突
2016-10-24 10:17:48 +08:00
Otokaze
1b4d51658f 解决zh 02.2冲突 2016-10-24 00:57:41 +08:00
Justin Clift
f95425a800 Update SQLite mgmt tool link with something actively maintained 2016-10-22 12:01:56 +01:00
astaxie
2f26d5c4cd Merge pull request #728 from iamybj/patch-1
这个方式更好
2016-10-19 12:05:49 +08:00
iamybj
9f5da651db 这个方式更好
这个方式更好
2016-10-19 11:24:08 +08:00
astaxie
75fe66d989 Merge pull request #726 from y-yagi/fix_conflicts
[ja] fix conflicts
2016-10-17 09:32:40 +08:00
yuuji.yaginuma
499f29d41f remove needless file 2016-10-17 08:05:02 +09:00
yuuji.yaginuma
6251606d3b [ja] fix conflicts 2016-10-17 08:04:39 +09:00
astaxie
9a08ecab9e Update README.md 2016-10-15 13:08:09 +08:00
astaxie
cb6fa8050a Merge pull request #725 from alext/patch-1
Fix Index link in English README.
2016-10-15 13:07:25 +08:00
Alex Tomlins
27be0a4d5b Fix Index link in en README.
It was pointing into an `eBook` directory that no longer looks to exist.
2016-10-14 16:03:31 +01:00
astaxie
d037da8f73 Merge pull request #723 from rootturk/master
Kelime Duzeltmesi
2016-10-14 09:28:05 +08:00
Gordon Freeman
c97672b9a1 tr dokumani altindaki 02.1.md markdown icerisindeki atamdan kelimesi atmadan olarak duzenlendi. Temeli atmadan seklinde baslamaktadir. 2016-10-14 01:04:32 +03:00
astaxie
d1f2745f83 fix the conflict 2016-10-13 11:17:35 +08:00
astaxie
5770c25b78 Delete 01.3.md~380a8ee74c41759d8189ad553423467994187253 2016-10-09 09:43:26 +08:00
astaxie
8d8565c560 Delete 01.2.md~380a8ee74c41759d8189ad553423467994187253 2016-10-09 09:43:15 +08:00
astaxie
169d038e90 Delete 01.1.md~380a8ee74c41759d8189ad553423467994187253 2016-10-09 09:43:03 +08:00
astaxie
93cbf5b131 Delete 01.0.md~380a8ee74c41759d8189ad553423467994187253 2016-10-09 09:42:52 +08:00
astaxie
2ec5557f48 Delete 14.6.md~380a8ee74c41759d8189ad553423467994187253 2016-10-09 09:41:10 +08:00
astaxie
0f7d4e6284 Delete README.md.orig 2016-10-09 09:40:59 +08:00