summaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeLines
* Merge pull request #1180 from anthonyn60/patch-1ven2015-08-04-27/+30
|\ | | | | Println deprecated in Swift 2, added name
| * Merge pull request #1 from anthonyn60/anthonyn60-patch-1Anthony Nguyen2015-08-03-0/+1
| |\ | | | | | | Println deprecated in Swift 2, added name
| | * Println deprecated in Swift 2, added nameAnthony Nguyen2015-08-03-0/+1
| |/
| * Updated print description on SwiftAnthony Nguyen2015-08-03-3/+3
| |
| * Println deprecated in Swift 2Anthony Nguyen2015-08-03-27/+29
|/
* Merge pull request #1179 from cmpitg/masterven2015-08-03-59/+56
|\ | | | | [scala/en] Consistent code format & some minor language corrections
| * scala: consistent code formatHa-Duong, NGUYEN2015-08-03-2/+2
| |
| * scala: clearer further resources (itemized)Ha-Duong, NGUYEN2015-08-03-10/+5
| |
| * scala: consistent code formatHa-Duong, NGUYEN2015-08-03-15/+15
| |
| * scala: consistent code formatHa-Duong, NGUYEN2015-08-03-11/+11
| |
| * scala: clearer commentsHa-Duong, NGUYEN2015-08-03-3/+3
| |
| * scala: easier-to-look commentHa-Duong, NGUYEN2015-08-03-10/+10
| |
| * scala: correct formatHa-Duong, NGUYEN2015-08-03-1/+1
| |
| * scala: language correctionHa-Duong, NGUYEN2015-08-03-2/+3
| |
| * scala: consistent style, language correctionHa-Duong, NGUYEN2015-08-03-6/+7
|/
* Merge pull request #1177 from ian-bertolacci/masterven2015-08-02-15/+158
|\ | | | | Chapel: Sync, atomics, reductions, scans, zippered iterators
| * Clarified some wording on the zipper iterator. Changed the example to ↵Ian Bertolacci2015-08-02-5/+7
| | | | | | | | something more simple and informative.
| * added count-down mutex example. Cleaned up some of the reductions and scans ↵Ian Bertolacci2015-08-01-23/+65
| | | | | | | | prints
| * added scans and reductionsIan Bertolacci2015-07-22-0/+19
| |
| * config param changeupIan Bertolacci2015-07-20-8/+9
| | | | | | | | | | | | changed some of the wording of the param config example. Namely put the comment immediately below the example. Also added --set to the noteable arguments list. Also changed "compile(?: )?time" to "compile-time"
| * Word errorIan Bertolacci2015-07-20-1/+1
| | | | | | that -> than
| * Erroneous commentIan Bertolacci2015-07-20-1/+1
| | | | | | removed "define mySecondVar as a real" unnecessary and incorrect.
| * Spelling errorIan Bertolacci2015-07-20-1/+1
| | | | | | Tupe -> Tuple
| * Explained atomics, moved atomics firstIan Bertolacci2015-07-20-33/+36
| | | | | | | | Felt the need to add in an explanation about atomics, then felt that (because atomics are common in language and in theory) it should go before sync and single vars. Should I explain sync and single?
| * Merge branch 'master' of github.com:ian-bertolacci/learnxinyminutes-docsIan Bertolacci2015-07-19-2/+2
| |\
| * | Added sync, single, and atomic vars.Ian Bertolacci2015-07-19-1/+77
| | |
* | | Merge pull request #1178 from thiagovandieten/patch-1ven2015-08-02-1/+1
|\ \ \ | | | | | | | | Fix 'filename' collision between csharp{,-tr}.html.markdown
| * | | Fix 'filename' collision between csharp{,-tr}.html.markdownThiago van Dieten2015-08-02-1/+1
|/ / / | | | | | | Both were set to LearnCSharp.cs, so the live site has been serving the Turkish version for English.
* | | Merge pull request #1150 from a3f/patch-1ven2015-07-28-3/+3
|\ \ \ | | | | | | | | Fixed misinfo regarding sigils
| * | | Fixed misinfo regarding sigilsAhmad Fatoum2015-06-19-3/+3
| | | | | | | | | | | | also # is more commonly called number sign than number symbol.
* | | | Merge pull request #1175 from genkimarshall/python3-nextGeoff Liu2015-07-24-6/+6
|\ \ \ \ | | | | | | | | | | [python3/en] Use `next()` instead of `__next__()`
| * | | | [python3/en] Use `next()` instead of `__next__()`Genki Marshall2015-07-24-6/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue #1148. The reasoning is well explained by the issue. One can also refer to the docs [0], showing it is more idiomatic to use `next()`. [0]: https://www.python.org/dev/peps/pep-3114/ #double-underscore-methods-and-built-in-functions
* | | | Merge pull request #1174 from asweigart/masterLevi Bostian2015-07-23-0/+2
|\ \ \ \ | | | | | | | | | | Added links to the free book "Automate the Boring Stuff with Python" …
| * | | | Added links to the free book "Automate the Boring Stuff with Python" to the ↵Al Sweigart2015-07-23-0/+2
|/ / / / | | | | | | | | | | | | "Free Online" section.
* | | | Merge pull request #1169 from ian-bertolacci/masterLevi Bostian2015-07-19-13/+11
|\ \ \ \ | | |_|/ | |/| | Merged fix from upstream, added slight corrections
| * | | De-capitalizationIan Bertolacci2015-07-19-2/+2
| | |/ | |/| | | | Changed language name and filename back to lower case 'chapel' in keeping with previous name to avoid possible site breakage.
| * | Slight modifications.Ian Bertolacci2015-07-18-4/+4
| | |
| * | Merged downIan Bertolacci2015-07-18-15/+25
| |\ \ | |/ / |/| |
* | | More line breaksAdam Bard2015-07-18-1/+11
| | | | | | | | | Fix formatting in places
* | | Merge pull request #1167 from MrMallIronmaker/patch-1Adam Bard2015-07-17-4/+4
|\ \ \ | | | | | | | | Changed %s formatting to {n} style.
| * | | Changed %s formatting to {n} style.Mark Miller2015-07-16-4/+4
| | | | | | | | | | | | If line 117 is accurate, then {n} style string formatting is the preferred style, and it should be reflected in the examples.
| | * | Capitalization, Chapel Directory.Ian Bertolacci2015-07-17-1/+1
| | | |
| | * | SpellcheckIan Bertolacci2015-07-17-8/+6
| | | |
| | * | Put lists back inIan Bertolacci2015-07-17-12/+7
| | | | | | | | | | | | Pretty sure what was causing the 'back end' error was my bad markdown skills
| | * | Changed bash examples from block code Ian Bertolacci2015-07-17-9/+9
| | | | | | | | | | | | Bash examples were in block code form (triple tick), should have been in inline mode (single tic)
| | * | capitalization and attempt to fix listsIan Bertolacci2015-07-17-12/+17
| |/ / |/| |
* | | Update chapel.html.markdownAdam Bard2015-07-17-2/+1
| | | | | | | | | Make sure nothing breaks (too badly)
* | | Merge pull request #1165 from ian-bertolacci/masterAdam Bard2015-07-17-0/+815
|\ \ \ | |/ / |/| | Chapel Tutorial
| * | Merge branch 'master' of github.com:ian-bertolacci/learnxinyminutes-docsian.bertolacci2015-07-15-1/+1
| |\ \ | | | | | | | | | | | | Something
| | * | Codify proc() main lacking noteIan Bertolacci2015-07-14-1/+1
| | | |