From 6629b5cd39b4d87ef47b57060d050919c7f40aa8 Mon Sep 17 00:00:00 2001 From: Alexander Sologub Date: Thu, 9 Oct 2014 19:50:55 +0300 Subject: [python/en] Removed unnecessary plus signs in bool operators section --- python.html.markdown | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/python.html.markdown b/python.html.markdown index 390c7b76..42a1f63a 100644 --- a/python.html.markdown +++ b/python.html.markdown @@ -58,15 +58,15 @@ to Python 2.x. Look for another tour of Python 3 soon! (1 + 3) * 2 # => 8 # Boolean Operators -+# Note "and" and "or" are case-sensitive -+True and False #=> False -+False or True #=> True -+ -+# Note using Bool operators with ints -+0 and 2 #=> 0 -+-5 or 0 #=> -5 -+0 == False #=> True -+2 == True #=> False +# Note "and" and "or" are case-sensitive +True and False #=> False +False or True #=> True + +# Note using Bool operators with ints +0 and 2 #=> 0 +-5 or 0 #=> -5 +0 == False #=> True +2 == True #=> False 1 == True #=> True # negate with not -- cgit v1.2.3 From 39d8753d5285348b998a7b87ae68614acf816df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=20Polykanine=20A=2EK=2EA=2E=20Menelion=20Elens=C3=BA?= =?UTF-8?q?l=C3=AB?= Date: Thu, 9 Oct 2014 22:49:47 +0300 Subject: [python/en] Adding exponentiation operator --- python.html.markdown | 4 ++++ python3.html.markdown | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/python.html.markdown b/python.html.markdown index 390c7b76..a980b6dc 100644 --- a/python.html.markdown +++ b/python.html.markdown @@ -3,6 +3,7 @@ language: python contributors: - ["Louie Dinh", "http://ldinh.ca"] - ["Amin Bandali", "http://aminbandali.com"] + - "Andre Polykanine", "https://github.com/Oire"] filename: learnpython.py --- @@ -54,6 +55,9 @@ to Python 2.x. Look for another tour of Python 3 soon! # Modulo operation 7 % 3 # => 1 +# Exponentiation (x to the y'th power) +2 ** 4 # => 16 + # Enforce precedence with parentheses (1 + 3) * 2 # => 8 diff --git a/python3.html.markdown b/python3.html.markdown index a94f4eae..6fce9bf7 100644 --- a/python3.html.markdown +++ b/python3.html.markdown @@ -3,6 +3,7 @@ language: python3 contributors: - ["Louie Dinh", "http://pythonpracticeprojects.com"] - ["Steven Basart", "http://github.com/xksteven"] + - ["Andre Polykanine", "https://github.com/Oire"] filename: learnpython3.py --- @@ -50,6 +51,9 @@ Note: This article applies to Python 3 specifically. Check out the other tutoria # Modulo operation 7 % 3 # => 1 +# Exponentiation (x to the y'th power) +2 ** 4 # => 16 + # Enforce precedence with parentheses (1 + 3) * 2 # => 8 -- cgit v1.2.3 From 68c9aed1346fe20df741014de415f4297460dc67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=20Polykanine=20A=2EK=2EA=2E=20Menelion=20Elens=C3=BA?= =?UTF-8?q?l=C3=AB?= Date: Thu, 9 Oct 2014 23:06:24 +0300 Subject: Corrected as per @iirelu's comment --- python.html.markdown | 2 +- python3.html.markdown | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python.html.markdown b/python.html.markdown index a980b6dc..cac9d539 100644 --- a/python.html.markdown +++ b/python.html.markdown @@ -56,7 +56,7 @@ to Python 2.x. Look for another tour of Python 3 soon! 7 % 3 # => 1 # Exponentiation (x to the y'th power) -2 ** 4 # => 16 +2**4 # => 16 # Enforce precedence with parentheses (1 + 3) * 2 # => 8 diff --git a/python3.html.markdown b/python3.html.markdown index 6fce9bf7..e478e57f 100644 --- a/python3.html.markdown +++ b/python3.html.markdown @@ -52,7 +52,7 @@ Note: This article applies to Python 3 specifically. Check out the other tutoria 7 % 3 # => 1 # Exponentiation (x to the y'th power) -2 ** 4 # => 16 +2**4 # => 16 # Enforce precedence with parentheses (1 + 3) * 2 # => 8 -- cgit v1.2.3 From a2043f3adbbeaca72c7ef15c4505924903111c5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=20Polykanine=20A=2EK=2EA=2E=20Menelion=20Elens=C3=BA?= =?UTF-8?q?l=C3=AB?= Date: Thu, 9 Oct 2014 23:22:24 +0300 Subject: Gosh, what happened to me today?( Fixed the left bracket --- python.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python.html.markdown b/python.html.markdown index cac9d539..febfa119 100644 --- a/python.html.markdown +++ b/python.html.markdown @@ -3,7 +3,7 @@ language: python contributors: - ["Louie Dinh", "http://ldinh.ca"] - ["Amin Bandali", "http://aminbandali.com"] - - "Andre Polykanine", "https://github.com/Oire"] + - ["Andre Polykanine", "https://github.com/Oire"] filename: learnpython.py --- -- cgit v1.2.3 From a994e73a23109290f25b54dccac4658b0efc9b03 Mon Sep 17 00:00:00 2001 From: Alex Saskevich Date: Fri, 10 Oct 2014 22:35:22 +0300 Subject: Russian tranlation of coffeescript.html.markdown --- ru-ru/coffeescript-ru.html.markdown | 103 ++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 ru-ru/coffeescript-ru.html.markdown diff --git a/ru-ru/coffeescript-ru.html.markdown b/ru-ru/coffeescript-ru.html.markdown new file mode 100644 index 00000000..335cfa50 --- /dev/null +++ b/ru-ru/coffeescript-ru.html.markdown @@ -0,0 +1,103 @@ +--- +language: coffeescript +contributors: + - ["Tenor Biel", "http://github.com/L8D"] + - ["Xavier Yao", "http://github.com/xavieryao"] + - ["asaskevich", "http://github.com/asaskevich"] +filename: coffeescript.coffee +lang: ru-ru +--- + +CoffeeScript - это небольшой язык, который компилируется один-к-одному в эквивалентный код на языке JavaScript, а потому он не интерпретируется во время исполнения JavaScript кода. +Ключевой особенностью CoffeeScript является то, что он пытается создать читабельный, качественно оформленный и плавный JavaScript код, прекрасно работающий в любой среде JavaScript. + +Также загляните на официальный сайт [языка](http://coffeescript.org/), где можно найти весьма полный туториал по CoffeeScript. + +```coffeescript +# CoffeeScript - язык хипстеров. +# Язык использует только самое лучшее из множества современных языков. +# Эти комментарии по стилю похожи на комментарии Ruby или Python, они используют "решетку" в качестве знака комментария. + +### +Блоки комментариев выделяются тремя символами "решетки", в результирующем JavaScript коде они будут преобразованы в '/ * и '* /'. + +Перед тем, как идти далее, Вам нужно понимать семантику JavaScript. +### + +# Присвоение: +number = 42 #=> var number = 42; +opposite = true #=> var opposite = true; + +# Условия: +number = -42 if opposite #=> if(opposite) { number = -42; } + +# Функции: +square = (x) -> x * x #=> var square = function(x) { return x * x; } + +fill = (container, liquid = "coffee") -> + "Заполняем #{container} жидкостью #{liquid}..." +#=>var fill; +# +#fill = function(container, liquid) { +# if (liquid == null) { +# liquid = "coffee"; +# } +# return "Заполняем " + container + " жидкостью " + liquid + "..."; +#}; + +# Списки и диапазоны: +list = [1..5] #=> var list = [1, 2, 3, 4, 5]; + +# Объекты: +math = + root: Math.sqrt + square: square + cube: (x) -> x * square x +#=> var math = { +# "root": Math.sqrt, +# "square": square, +# "cube": function(x) { return x * square(x); } +#} + +# Функции: +race = (winner, runners...) -> + print winner, runners +#=>race = function() { +# var runners, winner; +# winner = arguments[0], runners = 2 <= arguments.length ? __slice.call(arguments, 1) : []; +# return print(winner, runners); +#}; + +# Проверка на существование объекта: +alert "Я знаю это!" if elvis? +#=> if(typeof elvis !== "undefined" && elvis !== null) { alert("Я знаю это!"); } + +# Понимание массивов: +cubes = (math.cube num for num in list) +#=>cubes = (function() { +# var _i, _len, _results; +# _results = []; +# for (_i = 0, _len = list.length; _i < _len; _i++) { +# num = list[_i]; +# _results.push(math.cube(num)); +# } +# return _results; +# })(); + +foods = ['broccoli', 'spinach', 'chocolate'] +eat food for food in foods when food isnt 'chocolate' +#=>foods = ['broccoli', 'spinach', 'chocolate']; +# +#for (_k = 0, _len2 = foods.length; _k < _len2; _k++) { +# food = foods[_k]; +# if (food !== 'chocolate') { +# eat(food); +# } +#} +``` + +## На почитать + +- [Smooth CoffeeScript](http://autotelicum.github.io/Smooth-CoffeeScript/) +- [CoffeeScript Ristretto](https://leanpub.com/coffeescript-ristretto/read) +- [CoffeeScript на русском](http://cidocs.ru/coffeescript/) -- cgit v1.2.3 From 849f1d26e270ac59026740e3d6dda01a8c130556 Mon Sep 17 00:00:00 2001 From: Alex Saskevich Date: Sat, 11 Oct 2014 00:18:04 +0300 Subject: Fixed filename --- ru-ru/coffeescript-ru.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru-ru/coffeescript-ru.html.markdown b/ru-ru/coffeescript-ru.html.markdown index 335cfa50..b57372df 100644 --- a/ru-ru/coffeescript-ru.html.markdown +++ b/ru-ru/coffeescript-ru.html.markdown @@ -4,7 +4,7 @@ contributors: - ["Tenor Biel", "http://github.com/L8D"] - ["Xavier Yao", "http://github.com/xavieryao"] - ["asaskevich", "http://github.com/asaskevich"] -filename: coffeescript.coffee +filename: learncoffee-ru.coffee lang: ru-ru --- -- cgit v1.2.3 From 83217c2475b87cd41ca82f8fc4009fdd055a8f7b Mon Sep 17 00:00:00 2001 From: Alex Saskevich Date: Sat, 11 Oct 2014 00:56:33 +0300 Subject: Nickname moved to `translators` section --- ru-ru/coffeescript-ru.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/ru-ru/coffeescript-ru.html.markdown b/ru-ru/coffeescript-ru.html.markdown index b57372df..5c9a7870 100644 --- a/ru-ru/coffeescript-ru.html.markdown +++ b/ru-ru/coffeescript-ru.html.markdown @@ -3,6 +3,7 @@ language: coffeescript contributors: - ["Tenor Biel", "http://github.com/L8D"] - ["Xavier Yao", "http://github.com/xavieryao"] +translators: - ["asaskevich", "http://github.com/asaskevich"] filename: learncoffee-ru.coffee lang: ru-ru -- cgit v1.2.3 From 7519249a0e66f3447bc0e91a0390f015e458b0a5 Mon Sep 17 00:00:00 2001 From: Alex Saskevich Date: Sun, 12 Oct 2014 11:03:06 +0300 Subject: Update coffeescript-ru.html.markdown --- ru-ru/coffeescript-ru.html.markdown | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ru-ru/coffeescript-ru.html.markdown b/ru-ru/coffeescript-ru.html.markdown index 5c9a7870..9ee547a4 100644 --- a/ru-ru/coffeescript-ru.html.markdown +++ b/ru-ru/coffeescript-ru.html.markdown @@ -9,14 +9,14 @@ filename: learncoffee-ru.coffee lang: ru-ru --- -CoffeeScript - это небольшой язык, который компилируется один-к-одному в эквивалентный код на языке JavaScript, а потому он не интерпретируется во время исполнения JavaScript кода. +CoffeeScript - это небольшой язык, который компилируется один-в-один в эквивалентный код на языке JavaScript, а потому он не интерпретируется во время исполнения JavaScript кода. Ключевой особенностью CoffeeScript является то, что он пытается создать читабельный, качественно оформленный и плавный JavaScript код, прекрасно работающий в любой среде JavaScript. -Также загляните на официальный сайт [языка](http://coffeescript.org/), где можно найти весьма полный туториал по CoffeeScript. +Также загляните на официальный сайт [языка](http://coffeescript.org/), где можно найти весьма полное учебное пособие по CoffeeScript. ```coffeescript # CoffeeScript - язык хипстеров. -# Язык использует только самое лучшее из множества современных языков. +# Язык использует самое модное из множества современных языков. # Эти комментарии по стилю похожи на комментарии Ruby или Python, они используют "решетку" в качестве знака комментария. ### @@ -70,8 +70,8 @@ race = (winner, runners...) -> #}; # Проверка на существование объекта: -alert "Я знаю это!" if elvis? -#=> if(typeof elvis !== "undefined" && elvis !== null) { alert("Я знаю это!"); } +alert "Так и знал!" if elvis? +#=> if(typeof elvis !== "undefined" && elvis !== null) { alert("Так и знал!"); } # Понимание массивов: cubes = (math.cube num for num in list) -- cgit v1.2.3 From fb9726b7bef32fd2a94a4eca05ee7e0ba470fed7 Mon Sep 17 00:00:00 2001 From: Alex Saskevich Date: Sun, 12 Oct 2014 11:11:40 +0300 Subject: Update coffeescript-ru.html.markdown --- ru-ru/coffeescript-ru.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ru-ru/coffeescript-ru.html.markdown b/ru-ru/coffeescript-ru.html.markdown index 9ee547a4..f8416f38 100644 --- a/ru-ru/coffeescript-ru.html.markdown +++ b/ru-ru/coffeescript-ru.html.markdown @@ -60,7 +60,7 @@ math = # "cube": function(x) { return x * square(x); } #} -# Функции: +# Многоточия: race = (winner, runners...) -> print winner, runners #=>race = function() { @@ -73,7 +73,7 @@ race = (winner, runners...) -> alert "Так и знал!" if elvis? #=> if(typeof elvis !== "undefined" && elvis !== null) { alert("Так и знал!"); } -# Понимание массивов: +# Итерации по массивам: cubes = (math.cube num for num in list) #=>cubes = (function() { # var _i, _len, _results; -- cgit v1.2.3 From 4feb1f380a4e86b36a4ba6b6541ee6137ce1c52f Mon Sep 17 00:00:00 2001 From: Adam Bard Date: Sun, 12 Oct 2014 12:48:32 +0300 Subject: Update scala.html.markdown --- fr-fr/scala.html.markdown | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fr-fr/scala.html.markdown b/fr-fr/scala.html.markdown index da562138..a43edf16 100644 --- a/fr-fr/scala.html.markdown +++ b/fr-fr/scala.html.markdown @@ -1,12 +1,11 @@ --- language: Scala -filename: learnscala.scala contributors: - ["George Petrov", "http://github.com/petrovg"] - ["Dominic Bou-Samra", "http://dbousamra.github.com"] translators: - - ["Anne-Catherine Dehier", "https://github.com/spellart"] -filename: learn.scala + - ["Anne-Catherine Dehier", "https://github.com/spellart"] +filename: learnscala-fr.scala lang: fr-fr --- -- cgit v1.2.3 From 74533ea29279c82957b45c6af0083e344800a17c Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 12 Oct 2014 19:41:07 +0200 Subject: Fix a comment that indicates what "say @array" will print. We assigned 6 to @array[1] a few lines before, so say @array will print "a 6 b", not "a 2 b". --- perl6.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl6.html.markdown b/perl6.html.markdown index ee27ff42..52625bc2 100644 --- a/perl6.html.markdown +++ b/perl6.html.markdown @@ -64,7 +64,7 @@ say "Interpolate an array using [] : @array[]"; my @keys = 0, 2; @array[@keys] = @letters; # Assign using an array -say @array; #=> a 2 b +say @array; #=> a 6 b # There are two more kinds of lists: Parcel and Arrays. # Parcels are immutable lists (you can't modify a list that's not assigned). -- cgit v1.2.3 From 6933d24227ec5a0f220bf897e57d5222eaba0084 Mon Sep 17 00:00:00 2001 From: Geoffrey Liu Date: Sun, 12 Oct 2014 12:24:52 -0700 Subject: Capitalize language names. See #137 --- haskell.html.markdown | 2 +- julia.html.markdown | 2 +- lua.html.markdown | 2 +- php.html.markdown | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/haskell.html.markdown b/haskell.html.markdown index e0489710..ad12de2a 100644 --- a/haskell.html.markdown +++ b/haskell.html.markdown @@ -1,5 +1,5 @@ --- -language: haskell +language: Haskell contributors: - ["Adit Bhargava", "http://adit.io"] --- diff --git a/julia.html.markdown b/julia.html.markdown index feb38463..3a52018c 100644 --- a/julia.html.markdown +++ b/julia.html.markdown @@ -1,5 +1,5 @@ --- -language: julia +language: Julia contributors: - ["Leah Hanson", "http://leahhanson.us"] filename: learnjulia.jl diff --git a/lua.html.markdown b/lua.html.markdown index be9f3141..0809215f 100644 --- a/lua.html.markdown +++ b/lua.html.markdown @@ -1,5 +1,5 @@ --- -language: lua +language: Lua contributors: - ["Tyler Neylon", "http://tylerneylon.com/"] filename: learnlua.lua diff --git a/php.html.markdown b/php.html.markdown index e1bb86a0..039288a0 100644 --- a/php.html.markdown +++ b/php.html.markdown @@ -1,5 +1,5 @@ --- -language: php +language: PHP contributors: - ["Malcolm Fell", "http://emarref.net/"] - ["Trismegiste", "https://github.com/Trismegiste"] -- cgit v1.2.3 From ef6544a8868d3b19a115804b2db3962d91ad7979 Mon Sep 17 00:00:00 2001 From: Geoffrey Liu Date: Sun, 12 Oct 2014 14:24:42 -0700 Subject: Capitalize language names for translations. #137 --- de-de/haskell-de.html.markdown | 2 +- es-es/julia-es.html.markdown | 5 +++-- fr-fr/haskell.html.markdown | 2 +- fr-fr/lua-fr.html.markdown | 2 +- ko-kr/lua-kr.html.markdown | 2 +- ko-kr/php-kr.html.markdown | 2 +- pt-br/haskell-pt.html.markdown | 2 +- pt-br/php-pt.html.markdown | 2 +- ru-ru/haskell-ru.html.markdown | 2 +- ru-ru/julia-ru.html.markdown | 2 +- ru-ru/php-ru.html.markdown | 2 +- tr-tr/php-tr.html.markdown | 2 +- zh-cn/haskell-cn.html.markdown | 2 +- zh-cn/julia-cn.html.markdown | 2 +- zh-cn/lua-cn.html.markdown | 2 +- zh-cn/php-cn.html.markdown | 2 +- 16 files changed, 18 insertions(+), 17 deletions(-) diff --git a/de-de/haskell-de.html.markdown b/de-de/haskell-de.html.markdown index df6267f9..2c548961 100644 --- a/de-de/haskell-de.html.markdown +++ b/de-de/haskell-de.html.markdown @@ -1,5 +1,5 @@ --- -language: haskell +language: Haskell lang: de-de contributors: - ["Adit Bhargava", "http://adit.io"] diff --git a/es-es/julia-es.html.markdown b/es-es/julia-es.html.markdown index 41a7c68b..203ee3bb 100644 --- a/es-es/julia-es.html.markdown +++ b/es-es/julia-es.html.markdown @@ -1,8 +1,9 @@ --- -language: julia +language: Julia contributors: - ["Leah Hanson", "http://leahhanson.us"] - - ["Guillermo Garza" ] +translators: + - ["Guillermo Garza", "http://github.com/ggarza"] filename: learnjulia-es.jl lang: es-es --- diff --git a/fr-fr/haskell.html.markdown b/fr-fr/haskell.html.markdown index 989db1d5..d9d3151f 100644 --- a/fr-fr/haskell.html.markdown +++ b/fr-fr/haskell.html.markdown @@ -1,5 +1,5 @@ --- -language: haskell +language: Haskell contributors: - ["Adit Bhargava", "http://adit.io"] translators: diff --git a/fr-fr/lua-fr.html.markdown b/fr-fr/lua-fr.html.markdown index 922d6ebc..b4e2a161 100644 --- a/fr-fr/lua-fr.html.markdown +++ b/fr-fr/lua-fr.html.markdown @@ -1,5 +1,5 @@ --- -language: lua +language: Lua filename: learnlua-fr.lua contributors: - ["Tyler Neylon", "http://tylerneylon.com/"] diff --git a/ko-kr/lua-kr.html.markdown b/ko-kr/lua-kr.html.markdown index 850587a0..b4a018ef 100644 --- a/ko-kr/lua-kr.html.markdown +++ b/ko-kr/lua-kr.html.markdown @@ -1,5 +1,5 @@ --- -language: lua +language: Lua category: language contributors: - ["Tyler Neylon", "http://tylerneylon.com/"] diff --git a/ko-kr/php-kr.html.markdown b/ko-kr/php-kr.html.markdown index 80f324f3..1f53221f 100644 --- a/ko-kr/php-kr.html.markdown +++ b/ko-kr/php-kr.html.markdown @@ -1,5 +1,5 @@ --- -language: php +language: PHP category: language contributors: - ["Malcolm Fell", "http://emarref.net/"] diff --git a/pt-br/haskell-pt.html.markdown b/pt-br/haskell-pt.html.markdown index 55f90bd6..788dc1d2 100644 --- a/pt-br/haskell-pt.html.markdown +++ b/pt-br/haskell-pt.html.markdown @@ -1,5 +1,5 @@ --- -language: haskell +language: Haskell contributors: - ["Adit Bhargava", "http://adit.io"] translators: diff --git a/pt-br/php-pt.html.markdown b/pt-br/php-pt.html.markdown index 344df43a..0e710742 100644 --- a/pt-br/php-pt.html.markdown +++ b/pt-br/php-pt.html.markdown @@ -1,5 +1,5 @@ --- -language: php +language: PHP contributors: - ["Malcolm Fell", "http://emarref.net/"] - ["Trismegiste", "https://github.com/Trismegiste"] diff --git a/ru-ru/haskell-ru.html.markdown b/ru-ru/haskell-ru.html.markdown index 03e66d05..e15fe6b7 100644 --- a/ru-ru/haskell-ru.html.markdown +++ b/ru-ru/haskell-ru.html.markdown @@ -1,5 +1,5 @@ --- -language: haskell +language: Haskell contributors: - ["Adit Bhargava", "http://adit.io"] translators: diff --git a/ru-ru/julia-ru.html.markdown b/ru-ru/julia-ru.html.markdown index cd55e116..29392604 100644 --- a/ru-ru/julia-ru.html.markdown +++ b/ru-ru/julia-ru.html.markdown @@ -1,5 +1,5 @@ --- -language: julia +language: Julia contributors: - ["Leah Hanson", "http://leahhanson.us"] translators: diff --git a/ru-ru/php-ru.html.markdown b/ru-ru/php-ru.html.markdown index edcac4dd..53b2f916 100644 --- a/ru-ru/php-ru.html.markdown +++ b/ru-ru/php-ru.html.markdown @@ -1,5 +1,5 @@ --- -language: php +language: PHP contributors: - ["Malcolm Fell", "http://emarref.net/"] - ["Trismegiste", "https://github.com/Trismegiste"] diff --git a/tr-tr/php-tr.html.markdown b/tr-tr/php-tr.html.markdown index 3db437cf..5258d785 100644 --- a/tr-tr/php-tr.html.markdown +++ b/tr-tr/php-tr.html.markdown @@ -1,5 +1,5 @@ --- -language: php +language: PHP filename: learnphp-tr.php contributors: - ["Malcolm Fell", "http://emarref.net/"] diff --git a/zh-cn/haskell-cn.html.markdown b/zh-cn/haskell-cn.html.markdown index 8d51f144..cb7ccdee 100644 --- a/zh-cn/haskell-cn.html.markdown +++ b/zh-cn/haskell-cn.html.markdown @@ -1,5 +1,5 @@ --- -language: haskell +language: Haskell filename: learn-haskell-zh.hs contributors: - ["Adit Bhargava", "http://adit.io"] diff --git a/zh-cn/julia-cn.html.markdown b/zh-cn/julia-cn.html.markdown index 7afc9043..1f91d52c 100644 --- a/zh-cn/julia-cn.html.markdown +++ b/zh-cn/julia-cn.html.markdown @@ -1,5 +1,5 @@ --- -language: julia +language: Julia filename: learn-julia-zh.jl contributors: - ["Jichao Ouyang", "http://oyanglul.us"] diff --git a/zh-cn/lua-cn.html.markdown b/zh-cn/lua-cn.html.markdown index 3ba098ec..53a603a2 100644 --- a/zh-cn/lua-cn.html.markdown +++ b/zh-cn/lua-cn.html.markdown @@ -1,5 +1,5 @@ --- -language: lua +language: Lua lang: zh-cn contributors: - ["Tyler Neylon", "http://tylerneylon.com/"] diff --git a/zh-cn/php-cn.html.markdown b/zh-cn/php-cn.html.markdown index 24939681..2def7f1c 100644 --- a/zh-cn/php-cn.html.markdown +++ b/zh-cn/php-cn.html.markdown @@ -1,5 +1,5 @@ --- -language: php +language: PHP contributors: - ["Malcolm Fell", "http://emarref.net/"] - ["Trismegiste", "https://github.com/Trismegiste"] -- cgit v1.2.3 From 6119f4b3072200007990d4b0000fa46de5106951 Mon Sep 17 00:00:00 2001 From: zang Date: Tue, 14 Oct 2014 16:13:22 +0800 Subject: octal is eight in Chinese --- zh-cn/c-cn.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh-cn/c-cn.html.markdown b/zh-cn/c-cn.html.markdown index 223f6e35..1e10416e 100644 --- a/zh-cn/c-cn.html.markdown +++ b/zh-cn/c-cn.html.markdown @@ -566,7 +566,7 @@ typedef void (*my_fnp_type)(char *); '\'' // 单引号 '\"' // 双引号 '\xhh' // 十六进制数字. 例子: '\xb' = vertical tab -'\ooo' // 十进制数字. 例子: '\013' = vertical tab +'\ooo' // 八进制数字. 例子: '\013' = vertical tab // 打印格式： "%d" // 整数 @@ -579,7 +579,7 @@ typedef void (*my_fnp_type)(char *); "%c" // 字母 "%p" // 指针 "%x" // 十六进制 -"%o" // 十进制 +"%o" // 八进制 "%%" // 打印 % /////////////////////////////////////// -- cgit v1.2.3 From 8768176023c4bb2efaea70ed19a89831e67fd402 Mon Sep 17 00:00:00 2001 From: Justin Campbell Date: Tue, 14 Oct 2014 16:42:39 -0400 Subject: Rust tutorial -> The Rust Guide Previous link is deprecated --- rust.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust.html.markdown b/rust.html.markdown index 0b9a5e58..3717a7d9 100644 --- a/rust.html.markdown +++ b/rust.html.markdown @@ -255,8 +255,8 @@ fn main() { ## Further reading There’s a lot more to Rust—this is just the basics of Rust so you can -understand the most important things. To learn more about Rust, read the -[Rust tutorial](http://doc.rust-lang.org/tutorial.html) and check out the +understand the most important things. To learn more about Rust, read [The Rust +Guide](http://doc.rust-lang.org/guide.html) and check out the [/r/rust](http://reddit.com/r/rust) subreddit. The folks on the #rust channel on irc.mozilla.org are also always keen to help newcomers. -- cgit v1.2.3