From 01b671bf398001647650db24dcc51f584ea82490 Mon Sep 17 00:00:00 2001 From: Levi Bostian Date: Fri, 17 Oct 2014 20:54:45 -0500 Subject: [PATCH 1/4] Fix beginning typo from bash --- bash.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash.html.markdown b/bash.html.markdown index 9b199b8c..11c1f3a2 100644 --- a/bash.html.markdown +++ b/bash.html.markdown @@ -202,7 +202,7 @@ uniq -d file.txt cut -d ',' -f 1 file.txt # replaces every occurrence of 'okay' with 'great' in file.txt, (regex compatible) sed -i 's/okay/great/g' file.txt -# print to stdout all lines of file.txt which match some regex, the example prints lines which beginning with "foo" and end in "bar" +# print to stdout all lines of file.txt which match some regex, the example prints lines which begin with "foo" and end in "bar" grep "^foo.*bar$" file.txt # pass the option "-c" to instead print the number of lines matching the regex grep -c "^foo.*bar$" file.txt From 0ec14c6914ae9a0c968b8f2e70e31b43f3aaaf73 Mon Sep 17 00:00:00 2001 From: Levi Bostian Date: Fri, 17 Oct 2014 20:57:18 -0500 Subject: [PATCH 2/4] Add fixes from @marcom's PR https://github.com/adambard/learnxinyminutes-docs/pull/765 --- c.html.markdown | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/c.html.markdown b/c.html.markdown index 10e6fa45..6daabe94 100644 --- a/c.html.markdown +++ b/c.html.markdown @@ -5,6 +5,7 @@ contributors: - ["Adam Bard", "http://adambard.com/"] - ["Árpád Goretity", "http://twitter.com/H2CO3_iOS"] - ["Jakub Trzebiatowski", "http://cbs.stgn.pl"] + - ["Marco Scannadinari", "https://marcoms.github.io"] --- @@ -21,6 +22,10 @@ memory management and C will take you as far as you need to go. Multi-line comments look like this. They work in C89 as well. */ +/* +Multi-line comments don't nest /* Be careful */ // comment ends on this line... +*/ // ...not this one! + // Constants: #define #define DAYS_IN_YEAR 365 @@ -74,10 +79,10 @@ int main() { long long x_long_long = 0; // floats are usually 32-bit floating point numbers - float x_float = 0.0; + float x_float = 0.0f; // 'f' suffix here denotes floating point literal // doubles are usually 64-bit floating-point numbers - double x_double = 0.0; + double x_double = 0.0; // real numbers without any suffix are doubles // Integral types may be unsigned. unsigned short ux_short; From 780826ac277bdbbc7d6841facbcc8df9f19b22f3 Mon Sep 17 00:00:00 2001 From: Levi Bostian Date: Fri, 17 Oct 2014 20:58:45 -0500 Subject: [PATCH 3/4] Fix typos from amd.html PR https://github.com/adambard/learnxinyminutes-docs/pull/803 --- amd.html.markdown | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/amd.html.markdown b/amd.html.markdown index 3500fa58..36210d03 100644 --- a/amd.html.markdown +++ b/amd.html.markdown @@ -8,7 +8,11 @@ filename: learnamd.js ## Getting Started with AMD -The **Asynchronous Module Definition** API specifies a mechanism for defining JavaScript modules such that the module and its dependencies can be asynchronously loaded. This is particularly well suited for the browser environment where synchronous loading of modules incurs performance, usability, debugging, and cross-domain access problems. +The **Asynchronous Module Definition** API specifies a mechanism for defining +JavaScript modules such that the module and its dependencies can be asynchronously +loaded. This is particularly well suited for the browser environment where +synchronous loading of modules incurs performance, usability, debugging, and +cross-domain access problems. ### Basic concept ```javascript @@ -55,7 +59,7 @@ require(['loudmouth'], function(loudmouth){ loudmouth(); }); -// To make this tutorial running code, let's implement a very basic +// To make this tutorial run code, let's implement a very basic // (non-asynchronous) version of AMD right here on the spot: function define(name, deps, factory){ // notice how modules without dependencies are handled From ccdd47267b28104a74352151a0424bd6f62bd390 Mon Sep 17 00:00:00 2001 From: Levi Bostian Date: Fri, 17 Oct 2014 21:09:51 -0500 Subject: [PATCH 4/4] Add a couple missing parts to the markdown doc from @ukom PR https://github.com/adambard/learnxinyminutes-docs/pull/341 --- markdown.html.markdown | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/markdown.html.markdown b/markdown.html.markdown index 3d4d0af6..7541f904 100644 --- a/markdown.html.markdown +++ b/markdown.html.markdown @@ -126,6 +126,14 @@ render the numbers in order, but this may not be a good idea --> * Sub-item 4. Item four + + +Boxes below without the 'x' are unchecked HTML checkboxes. +- [ ] First task to complete. +- [ ] Second task that needs done +This checkbox below will be a checked HTML checkbox. +- [x] This task has been completed +