diff --git a/markup/build b/markup/build index a9f9916..58435ad 100644 --- a/markup/build +++ b/markup/build @@ -345,7 +345,7 @@ task :default => [:foo] _ _ task :foo do _ @<  >@puts "foo" _ -end||##gray|## _ _ @<  >@ _ @@ -1021,7 +1021,7 @@ How to define a target with multiple recipes. If the target is invoked, all rec If a target has multiple recipes, all of them must use the double colon syntax. The recipes are executed in the order in which they are defined in the Makefile. -Each recipe can have its own prerequisites. Recipes for which the the prerequisites exist and the target is newer than the prerequisites will not execute. +Each recipe can have its own prerequisites. Recipes for which the prerequisites exist and the target is newer than the prerequisites will not execute. [[# empty-recipe-note]] ++ [#empty-recipe empty recipe] @@ -1448,4 +1448,4 @@ We can define a property containing the value of an environment variable: $(USERNAME) -[[/code]] \ No newline at end of file +[[/code]] diff --git a/markup/c b/markup/c index ef7c7ee..9986a83 100644 --- a/markup/c +++ b/markup/c @@ -98,7 +98,7 @@ func baz() { _ _ @<  >@fmt.Println(foo.X + y + z) _ }|| -||[[# uninitialized-var]][#uninitialized-var-note uninitialized variable]||##gray|//The behavior of reading from uninitialized stack variables or unitialized memory allocated by// malloc //is undefined. _ +||[[# uninitialized-var]][#uninitialized-var-note uninitialized variable]||##gray|//The behavior of reading from uninitialized stack variables or uninitialized memory allocated by// malloc //is undefined. _ _ Global and static variables are zero-initialized. _ _ @@ -1243,7 +1243,7 @@ caller() { _ ##gray|/* seconds */## _ int retval = sleep(10); _ if (retval != 0) { _ -@<  >@printf("interupted with %d s to go", retval); _ +@<  >@printf("interrupted with %d s to go", retval); _ } _ _ ##gray|/* microseconds */## _ @@ -2375,7 +2375,7 @@ Unsigned integer types. **c:** -Whether //char// is a signed or unsigned type depends on the implmentation. +Whether //char// is a signed or unsigned type depends on the implementation. [[# float-type-note]] ++ [#float-type float type] @@ -2424,7 +2424,7 @@ The square root function. [[# sqrt-negative-one-note]] ++ [#sqrt-negative-one sqrt -1] -The result of attempting to find the square root of a negative nubmer. +The result of attempting to find the square root of a negative number. [[# transcendental-func-note]] ++ [#transcendental-func transcendental functions] @@ -2645,7 +2645,7 @@ The list of regular expression metacharacters. A regular expression that does not contain any metacharacters matches itself as a string. [[# char-class-abbrev-note]] -++ [#char-class-abbrev character class abbrevations] +++ [#char-class-abbrev character class abbreviations] Abbreviations for character classes. @@ -3752,4 +3752,4 @@ MAC SPECIFIC + [#top Go] [http://golang.org/doc/go_spec.html Language Specification] -[http://golang.org/pkg/ Package Reference] \ No newline at end of file +[http://golang.org/pkg/ Package Reference] diff --git a/markup/computer-algebra b/markup/computer-algebra index d862b54..89e9109 100644 --- a/markup/computer-algebra +++ b/markup/computer-algebra @@ -275,7 +275,7 @@ numeric. */##|| @< >@||StringSplit["foo,bar,baz", ","]|| || ||split("foo,bar,baz", ",");|| ||[[# str-subst]][#str-subst-note substitute] _ _ -##gray|//first occurrence, all occurences//## ||s = "do re mi mi" _ +##gray|//first occurrence, all occurrences//## ||s = "do re mi mi" _ re = RegularExpression["mi"] _ _ StringReplace[s, re -> "ma", 1] _ @@ -1198,7 +1198,7 @@ How to test whether a value is an element of a list. [[# intersection-note]] ++ [#intersection intersection] -How to to find the intersection of two lists. +How to find the intersection of two lists. [[# union-note]] ++ [#union union] @@ -1397,4 +1397,4 @@ http://doc.sagemath.org/html/en/index.html [[# sympy]] + [#top SymPy] -[http://docs.sympy.org/latest/index.html Welcome to SymPy’s documentation!] \ No newline at end of file +[http://docs.sympy.org/latest/index.html Welcome to SymPy’s documentation!] diff --git a/markup/computer-algebra2 b/markup/computer-algebra2 index 0dd5260..f837213 100644 --- a/markup/computer-algebra2 +++ b/markup/computer-algebra2 @@ -2131,7 +2131,7 @@ If a matrix //A// is symmetric, then a spectral decomposition //P ⋅ D ⋅ P^^- [[# svd-note]] ++ [#svd singular value decomposition] -A singluar value decomposition of a matrix //A// is a factorization into a diagonal matrix //S// and unitary matrices //U// and //V// such that //A = U ⋅ S ⋅ V^^*^^//. +A singular value decomposition of a matrix //A// is a factorization into a diagonal matrix //S// and unitary matrices //U// and //V// such that //A = U ⋅ S ⋅ V^^*^^//. Unlike the spectral decomposition, an SVD always exists, even if //A// is not square. The values on the diagonal of //S// are called the singular values, and they are the eigenvalues of //A ⋅ A^^*^^//. @@ -2149,7 +2149,7 @@ A factorization of a square matrix into a unitary matrix //U// and a positive de All invertible matrices have a polar decomposition. -A unitary matrix corresponds to a linear transformation representing a rotation, reflection, or a combination of the two. It is distance perserving, in that it maps vectors to vectors of the same length. A real valued unitary matrix is called an orthogonal matrix. +A unitary matrix corresponds to a linear transformation representing a rotation, reflection, or a combination of the two. It is distance preserving, in that it maps vectors to vectors of the same length. A real valued unitary matrix is called an orthogonal matrix. [[# combinatorics-note]] + [#combinatorics Combinatorics] @@ -3036,7 +3036,7 @@ How to change the size of the symbols used to mark points. [[# scatter-plot-matrix-note]] ++ [#scatter-plot-matrix scatter plot matrix] -A scatter plot matrix is a way of displaying a multivariate data set by means of a grid of scatter plots. Off-diagonal plots are scatter plots of two of the variables. On-diagonal plots can be used to to display the name or a histogram of one of the variables. +A scatter plot matrix is a way of displaying a multivariate data set by means of a grid of scatter plots. Off-diagonal plots are scatter plots of two of the variables. On-diagonal plots can be used to display the name or a histogram of one of the variables. [[# scatter-plot-3d-note]] ++ [#scatter-plot-3d 3d scatter plot] @@ -3179,4 +3179,4 @@ http://doc.sagemath.org/html/en/index.html [[# maxima]] + [#top Maxima] -http://maxima.sourceforge.net/docs/manual/maxima.html \ No newline at end of file +http://maxima.sourceforge.net/docs/manual/maxima.html diff --git a/markup/cpp b/markup/cpp index 1d91ac3..3292eb5 100644 --- a/markup/cpp +++ b/markup/cpp @@ -2279,7 +2279,7 @@ The parens are necessary because compound assignment has lower precedence than t The caveat about primitive types is necessary because the {{++}} operator can be overloaded. In fact the prefix and postfix versions can be overloaded separately. -In the case of the the postfix operator, the following are equivalent for primitive types: +In the case of the postfix operator, the following are equivalent for primitive types: [[code]] cout << i-- << endl; @@ -3051,7 +3051,7 @@ How to iterate over a resizable array. **C++** -The range-based for loop was introduced in C++11. It it can be used to iterate over an initialization list: +The range-based for loop was introduced in C++11. It can be used to iterate over an initialization list: [[code]] for (const auto& n: {1, 2, 3}) { @@ -3839,4 +3839,4 @@ open("/Library/JVM/jdk7.0/Contents/Home/jre/lib/rt.jar\0", 0x0, 0x0) = 4 0 [http://standards.iso.org/ittf/PubliclyAvailableStandards/c042926_ISO_IEC_23270_2006(E).zip C# Standard: ECMA-334] [http://www.go-mono.com/docs/ Mono API] -[http://msdn.microsoft.com/en-us/library/67ef8sbd.aspx C# Programming Guide] Microsoft \ No newline at end of file +[http://msdn.microsoft.com/en-us/library/67ef8sbd.aspx C# Programming Guide] Microsoft diff --git a/markup/db b/markup/db index b9a7e64..7b5031e 100644 --- a/markup/db +++ b/markup/db @@ -1400,7 +1400,7 @@ Query information_schema. This requires a language which can branch. [[# postgresql]] + [#top PostgreSQL] -* [http://www.postgresql.org/docs/9.1/static/index.html PostgresSQL 9.1 Documentation] +* [http://www.postgresql.org/docs/9.1/static/index.html PostgreSQL 9.1 Documentation] [[# mysql]] + [#top MySQL] @@ -1411,4 +1411,4 @@ Query information_schema. This requires a language which can branch. [[# sqlite]] + [#top SQLite] -* [http://www.sqlite.org/docs.html SQLite Documentation] \ No newline at end of file +* [http://www.sqlite.org/docs.html SQLite Documentation] diff --git a/markup/fortran b/markup/fortran index 4e25d1f..016681a 100644 --- a/markup/fortran +++ b/markup/fortran @@ -283,7 +283,7 @@ write(*, *) 'elapsed time: ', t2 - t1||##gray|//none//##|| ||[[# allocate-array-on-stack]][#allocate-array-on-stack-note allocate on stack]||##gray|! uninitialized values get zero values:## _ integer, dimension(3) :: a _ integer :: a2(3)||##gray|//none//##|| -||[[# allocate-array-on-heap]][#allocate-array-on-heap-note allocate on heap]||##gray|! unitialized values get zero values:## _ +||[[# allocate-array-on-heap]][#allocate-array-on-heap-note allocate on heap]||##gray|! uninitialized values get zero values:## _ integer, dimension(:), allocatable :: a _ allocate(a(3))||##gray|//all data is stored on heap//##|| ||[[# free-array-on-heap]][#free-array-on-heap-note free heap]||##gray|! usually not necessary, since memory is freed _ @@ -834,4 +834,4 @@ The first issue one must resolve when getting started with APL is figuring out h One technique is to add a input method to your desktop environment. Here are [https://github.com/clarkgrubb/latex-input/tree/master/apl APL input methods for Mac OS X and Windows]. The Windows input method uses AutoHotkey. If you don't have AutoHotkey installed, you can use the {{.exe}} file that was generated using AutoHotkey. Otherwise you can use the {{.ahk}} file. -The notation in the above input methods is derived from the [http://www.jsoftware.com/papers/APLDictionary1.htm#tab4 standard names and synonyms] for the symbols in the APL community. The standard name for {{⍋}} is "grade". The above input methods use an ampersand prefix in front of the standard name. Thus, to create a {{⍋}} character, one types "@grade" when the input method is in effect. \ No newline at end of file +The notation in the above input methods is derived from the [http://www.jsoftware.com/papers/APLDictionary1.htm#tab4 standard names and synonyms] for the symbols in the APL community. The standard name for {{⍋}} is "grade". The above input methods use an ampersand prefix in front of the standard name. Thus, to create a {{⍋}} character, one types "@grade" when the input method is in effect. diff --git a/markup/gui b/markup/gui index 12d1531..b49a57c 100644 --- a/markup/gui +++ b/markup/gui @@ -1109,7 +1109,7 @@ The syntax for a conditional expression. **tcl** -To evaluate a relational expression outside of the the conditional of an {{if}} statement, the {{expr}} command can be used. +To evaluate a relational expression outside of the conditional of an {{if}} statement, the {{expr}} command can be used. Use square brackets to make an expression an argument of a command: @@ -1875,4 +1875,4 @@ Alternatively the JavaScript can be in a separate file served by the same server To guard against websites serving malicious JavaScript code, the JavaScript interpreters in browsers do not provide the ability to interact with the local operating system. In particular, client-side JavaScript cannot read or write to files. Client-side JavaScript cannot spawn other processes. -Client-side JavaScript can make HTTP requests. Client-side JavaScript can modify the DOM of an HTML page which was served from the same [https://developer.mozilla.org/en-US/docs/Web/JavaScript/Same_origin_policy_for_JavaScript origin] as the JavaScript. To be from the same origin, the URLs must have the same protocol, domain, and port. Client-side JavaScript can also get and set cookies which share the same origin. The origin policy for cookies is slightly relaxed, since the JavaScript can also get and set cookies for a parent domain, excluding public top level domains such as {{.com}}, {{.net}}, and {{.org}}. \ No newline at end of file +Client-side JavaScript can make HTTP requests. Client-side JavaScript can modify the DOM of an HTML page which was served from the same [https://developer.mozilla.org/en-US/docs/Web/JavaScript/Same_origin_policy_for_JavaScript origin] as the JavaScript. To be from the same origin, the URLs must have the same protocol, domain, and port. Client-side JavaScript can also get and set cookies which share the same origin. The origin policy for cookies is slightly relaxed, since the JavaScript can also get and set cookies for a parent domain, excluding public top level domains such as {{.com}}, {{.net}}, and {{.org}}. diff --git a/markup/lightweight-markup b/markup/lightweight-markup index 570a2ab..58b5fcc 100644 --- a/markup/lightweight-markup +++ b/markup/lightweight-markup @@ -206,7 +206,7 @@ ii. roman numeral two||##gray|//numbers in source are used://## _ 2 ) numbered two _ _ i) roman numeral one _ -ii) roma numberal two||# numbered one _ +ii) roma numeral two||# numbered one _ # numbered two||##gray|//error if values in markup are not sequential starting from one://## _ 1. numbered one _ 2. numbered two|| || @@ -629,4 +629,4 @@ $ asciidoc -b slidy foo.txt [[# org-mode]] + [#top Org-mode] -[http://orgmode.org/org.html The Org Manual] \ No newline at end of file +[http://orgmode.org/org.html The Org Manual] diff --git a/markup/lisp b/markup/lisp index 448821d..4a5467c 100644 --- a/markup/lisp +++ b/markup/lisp @@ -1578,12 +1578,12 @@ Code with balanced parens can be commented out in the following manner: [[# id-note]] ++ [#id identifier] -Are identifiers case sensitive; which characters can be used in identifers. +Are identifiers case sensitive; which characters can be used in identifiers. In Lisp, identifiers are called //symbols//. [[# quoted-id-note]] -++ [#quoted-id quoted identifer] +++ [#quoted-id quoted identifier] How to quote or escape characters in identifiers which are otherwise prohibited. @@ -3220,4 +3220,4 @@ To bind the command to the key {{C-c l}} run the following in Lisp interaction m (global-set-key "\C-cl" 'dired-emacs-lisp) [[/code]] -If it is desired to have the above command and key binding always available when Emacs starts up, put them in {{~/.emacs.d/init.el}}. \ No newline at end of file +If it is desired to have the above command and key binding always available when Emacs starts up, put them in {{~/.emacs.d/init.el}}. diff --git a/markup/misc-math b/markup/misc-math index fa115ea..43c5589 100644 --- a/markup/misc-math +++ b/markup/misc-math @@ -70,7 +70,7 @@ param pi := 3.14;|| @@&& || !@@|| ||[[# relational-op]][#relational-op-note relational operators]||== != < > <= >= _ _ -##gray|# string comparision:## _ +##gray|# string comparison:## _ eq ne||@@=@@ <> < > <= >= _ _ == ##gray|//and//## != ##gray|//are synonyms of//## = ##gray|//and//## <> || @@ -665,4 +665,4 @@ Input data is declared with the {{param}} statement, and values to be found by t //constraints and objective functions// -//data section; can everything be defined in model? data section or -d flag; what happens when data section misses parameters; data section limitations: parameters and sets, with just literals for values// \ No newline at end of file +//data section; can everything be defined in model? data section or -d flag; what happens when data section misses parameters; data section limitations: parameters and sets, with just literals for values// diff --git a/markup/numerical-analysis2 b/markup/numerical-analysis2 index a6b388a..0d7c333 100644 --- a/markup/numerical-analysis2 +++ b/markup/numerical-analysis2 @@ -1315,7 +1315,7 @@ points(rnorm(20) + 1, rnorm(20) + 1, _ 'v': triangle (down) _ '^': triangle (up) _ '<': triangle (left) _ -'>': traingle (right) _ +'>': triangle (right) _ 'p': pentagram _ 'h': hexagram##||##gray|//Integer values for// pch //parameter:// _ _ @@ -1986,7 +1986,7 @@ How to compute the 1-norm, the 2-norm, the infinity norm, and the frobenius norm How to construct a sparse matrix using coordinate format. -Coordinate format specifies a matrix with three arrays: the row indices, the the column indices, and the values. +Coordinate format specifies a matrix with three arrays: the row indices, the column indices, and the values. [[# sparse-matrix-decomposition-note]] ++ [#sparse-matrix-decomposition sparse matrix decomposition] @@ -2378,7 +2378,7 @@ The probability density, cumulative distribution, quantile, and random number ge The uniform distribution is described by the parameters //a// and //b// which delimit the interval on which the density function is nonzero. -The uniform distribution the is maximum entropy probability distribution with support //[a, b]//. +The uniform distribution is the maximum entropy probability distribution with support //[a, b]//. Consider the uniform distribution on //[0, b]//. Suppose that we take //k// samples from it, and //m// is the largest of the samples. The minimum variance unbiased estimator for //b// is @@ -2922,4 +2922,4 @@ SciPy, Matplotlib, and Pandas are libraries which depend on Numpy. [[# julia]] + [#top Julia] -http://julialang.org/ \ No newline at end of file +http://julialang.org/ diff --git a/markup/pascal b/markup/pascal index a5d98d6..7db6162 100644 --- a/markup/pascal +++ b/markup/pascal @@ -1040,7 +1040,7 @@ Files use lower case letters and underscores, but are otherwise named after the [[# plpgsql]] + [#top PL/SQL] -[http://www.postgresql.org/docs/9.1/interactive/plpgsql.html PostgreSQL 9.1 Documention: PL/pgSQL] +[http://www.postgresql.org/docs/9.1/interactive/plpgsql.html PostgreSQL 9.1 Documentation: PL/pgSQL] [http://www.postgresql.org/docs/9.1/interactive/plpgsql-porting.html Porting from PL/SQL to PL/pgSQL] Execute statement with no result: @@ -1074,4 +1074,4 @@ Functions to prevent sql injection: * quote_literal * quote_nullable -* quote_ident \ No newline at end of file +* quote_ident diff --git a/markup/scripting b/markup/scripting index 12778e5..2685bdb 100644 --- a/markup/scripting +++ b/markup/scripting @@ -657,7 +657,7 @@ $s = = preg_replace('/(\s)+/', '\1', $s);||re.sub('(\s)+', r'\1', _ \S@<  >@[^ \t\r\n\f] _ \w@<  >@[A-Za-z0-9_] _ \W@<  >@[^A-Za-z0-9_]|| -||[[# unicode-char-class-abbrev]][#unicode-char-class-abbrev-note unicode character class abbreviations]||##gray|//none//##||##gray|//POSIX character classes such as// [[:alpha:]] //are available, but they match sets of ASCII characters. General category values (e.g.// \p{L}, \p{Lu}//) can be used. Morever, they can be used inside character classes (.e.g.// [\p{L}\p{N}]//).//##||.@<   >@[^\n]@<  >@##gray|//with// re.S //modifier matches all chars//## _ +||[[# unicode-char-class-abbrev]][#unicode-char-class-abbrev-note unicode character class abbreviations]||##gray|//none//##||##gray|//POSIX character classes such as// [[:alpha:]] //are available, but they match sets of ASCII characters. General category values (e.g.// \p{L}, \p{Lu}//) can be used. Moreover, they can be used inside character classes (.e.g.// [\p{L}\p{N}]//).//##||.@<   >@[^\n]@<  >@##gray|//with// re.S //modifier matches all chars//## _ \d@<  >@[##gray|//Nd//##]@<  >@##gray|Nd: //Number, decimal digit//## _ \D@<  >@[^##gray|//Nd//##] _ \s@<  >@[##gray|//Z//##\t\n\r\f\v\x1c\x1d\x1e\x1f\x85] _ @@ -1127,7 +1127,7 @@ a.reverse _ ||[[# array-sort]][#array-sort-note sort] _ ##gray|//non-destructive, _ in-place, _ -custom comparision//##||let a = [3, 1, 4, 2]; _ +custom comparison//##||let a = [3, 1, 4, 2]; _ _ let a2 = a.slice(0).sort(); _ a.sort();||$a = ["b", "A", "a", "B"]; _ @@ -1138,7 +1138,7 @@ sort($a); _ _ sorted(a) _ a.sort() _ -##gray|# custom binary comparision _ +##gray|# custom binary comparison _ # removed from Python 3:## _ a.sort(key=str.lower)||a = %w(b A a B) _ _ @@ -3458,7 +3458,7 @@ The first day in the Gregorian calendar was 15 October 1582. The //proleptic Gr An //ordinal date// is a broken-down date consisting of a year, followed by the day of the year. The ISO 8601 standard recommends that it be written in {{YYYY-DDD}} or {{YYYYDDD}} format. The corresponding {{strftime}} formats are {{%Y-%j}} and {{%Y%j}}. -A //week date// is a type of calendar which uses the year, week of the year, and day of the week to refer to to dates. In the ISO 8601 week date, the first week of the year is the week starting from Monday which contains January 4th. An ISO 8601 week date can thus have a different year number than the corresponding Gregorian date. The first week of the year is numbered {{01}}, and the first day of the week, Monday, is numbered {{1}}. Weeks are written in {{YYYY-Www-D}} or {{YYYYWwwD}} format, where the upper case W is literal. The corresponding {{strftime}} literals are {{%G-W%V-%u}} and {{%GW%V%u}}. +A //week date// is a type of calendar which uses the year, week of the year, and day of the week to refer to dates. In the ISO 8601 week date, the first week of the year is the week starting from Monday which contains January 4th. An ISO 8601 week date can thus have a different year number than the corresponding Gregorian date. The first week of the year is numbered {{01}}, and the first day of the week, Monday, is numbered {{1}}. Weeks are written in {{YYYY-Www-D}} or {{YYYYWwwD}} format, where the upper case W is literal. The corresponding {{strftime}} literals are {{%G-W%V-%u}} and {{%GW%V%u}}. Common years have 365 days and leap years have 366 days. The extra day in February 29th. Leap years are years divisible by 4 but not 100, or years divisible by 400. @@ -3549,7 +3549,7 @@ The format specifiers used by the {{strftime}} function from the standard C libr %r is %I:%M:%S %p|| ||**date and time**|| ||%c||locale dependent|| ||**date, time, and tmz**|| ||%+||locale dependent|| -||**time zone name**|| ||%Z||the ambiguous 3 letter abbrevation; e.g. "PST"|| +||**time zone name**|| ||%Z||the ambiguous 3 letter abbreviation; e.g. "PST"|| ||**time zone offset**||%z|| ||"-0800" for Pacific Standard Time|| ||**percent sign**|| ||%%|| || ||**newline**|| ||%n|| || @@ -3743,7 +3743,7 @@ A negative index refers to the //length - index// element. **ruby:** -A negative index refers to to the //length - index// element. +A negative index refers to the //length - index// element. [[# array-update-note]] ++ [#array-update update] @@ -3932,7 +3932,7 @@ usort($a, "cmp"); **python:** -In Python 2 it is possible to specify a binary comparision function when calling {{sort}}: +In Python 2 it is possible to specify a binary comparison function when calling {{sort}}: [[code]] a = [(1, 3), (2, 2), (3, 1)] @@ -4920,4 +4920,4 @@ Although passing a method or a function is a bit awkward, Ruby provides a conven Ruby blocks are closures like lambda functions and can see local variables in the enclosing scope in which they were defined. The parameters of the block are local to the block. Semicolon syntax is available so that identifiers listed after the arguments could be made local to the block even if already defined in the containing scope. -The {{lambda}} keyword or the {{Proc.new}} constructor can be used to store an anonymous function in a variable. The function can be invoked with ##gray|//variable//##.call(). If such a function is passed to a method argument as the last argument and preceded with an ampersand, the function will be used as the block for the method. Conversely, if the last argument in a method definition is preceded with an ampersand, any block provided to the function will be bound to the argument name as an anonymous function. \ No newline at end of file +The {{lambda}} keyword or the {{Proc.new}} constructor can be used to store an anonymous function in a variable. The function can be invoked with ##gray|//variable//##.call(). If such a function is passed to a method argument as the last argument and preceded with an ampersand, the function will be used as the block for the method. Conversely, if the last argument in a method definition is preceded with an ampersand, any block provided to the function will be bound to the argument name as an anonymous function. diff --git a/markup/shell b/markup/shell index f27de23..0e36328 100644 --- a/markup/shell +++ b/markup/shell @@ -438,7 +438,7 @@ if (test-path -pathtype leaf) { _ ||[[# readable-writeable-executable]][#readable-writeable-executable-note is readable, is writeable, is executable]||if [ -r /etc/passwd ]; then echo readable; fi _ if [ -w /tmp ]; then echo writeable; fi _ if [ -x /bin/ls ]; then echo executable; fi|| || || -||[[# chmod]][#chmod-note set file permisions]||chmod 0600 foo.txt|| || || +||[[# chmod]][#chmod-note set file permissions]||chmod 0600 foo.txt|| || || ||[[# last-modification-time]][#last-modification-time-note last modification time]||ls -l foo.txt||dir foo.txt||get-childitem foo.txt|| ||[[# file-cp-rm-mv]][#file-cp-rm-mv-note copy file, remove file, rename file]||cp /tmp/foo.txt /tmp/bar.txt _ rm /tmp/foo.txt _ @@ -1556,4 +1556,4 @@ What a library looks like. [[# powershell]] + [#top PowerShell] -[http://technet.microsoft.com/en-us/library/cc196356.aspx Windows PowerShell User's Guide] \ No newline at end of file +[http://technet.microsoft.com/en-us/library/cc196356.aspx Windows PowerShell User's Guide] diff --git a/markup/stack b/markup/stack index ce11585..51586eb 100644 --- a/markup/stack +++ b/markup/stack @@ -93,7 +93,7 @@ frot||3 -1 roll|| f= f<> f> f< f>= f<=||eq ne gt lt ge le|| ||[[# min-max]][#min-max-note min and max]||1 2 min _ 1 2 max|| || -||[[# three-val-comparision]][#three-val-comparison-note three value comparison]|| || || +||[[# three-val-comparison]][#three-val-comparison-note three value comparison]|| || || ||[[# float-literal]][#float-literal-note float literal]||##gray|//must contain an// e:## _ 3.14e0||3.14 _ 3.14e0|| @@ -816,4 +816,4 @@ Mac OS X includes an application called //Preview// which renders PDF documents currentdict /h get 3 get show showpage } stopped { showerror } if -[[/code]] \ No newline at end of file +[[/code]] diff --git a/markup/text-mode-editors b/markup/text-mode-editors index f1a739f..fead9f0 100644 --- a/markup/text-mode-editors +++ b/markup/text-mode-editors @@ -392,7 +392,7 @@ TAB||M-x indent-for-tab-command|| || ||remove all whitespace on left of region|| || ||M-x delete-whitespace-rectangle|| || ||vertically align parts in region matching regexp|| || ||M-x align-regexp|| || ||prepend string to each line of rectangle|| ||C-x r t RET ##gray|//str//##||M-x string-insert|| || -||replace each line of rectange with string|| || ||M-x string-rectangle|| || +||replace each line of rectangle with string|| || ||M-x string-rectangle|| || ||insert blank rectangle||C-v ##gray|//...//## I ##gray|//...//## ESC||C-x r o||M-x open-rectangle|| || ||delete rectangle||C-v ##gray|//...//## d||C-x r k||M-x kill-rectangle|| || ||paste rectangle|| ||C-x r y||M-x yank-rectangle|| || @@ -1151,7 +1151,7 @@ The variable {{sentence-end}} can be set to a regular expression to customize th [[# next-sentence-note]] ++ [#next-sentence next sentence] -If the point is mid-sentence, how to go the the end of the sentence. If already at the end of the sentence, how to go the end of the following sentence. +If the point is mid-sentence, how to go the end of the sentence. If already at the end of the sentence, how to go the end of the following sentence. [[# start-paragraph-note]] ++ [#start-paragraph start of paragraph] @@ -2005,4 +2005,4 @@ bindkey -v To get Emacs style bindings in Visual Studio, one must go to the {{Tools | Options... | Environment | Keyboard}} section and set the additional keyboard mapping scheme to Emacs. -To get Emacs style bindings in Eclipse, one must go to {{Preferences | General | Keys}} and set the Scheme to Emacs. \ No newline at end of file +To get Emacs style bindings in Eclipse, one must go to {{Preferences | General | Keys}} and set the Scheme to Emacs. diff --git a/markup/unix-shells b/markup/unix-shells index 596482d..874fabf 100644 --- a/markup/unix-shells +++ b/markup/unix-shells @@ -919,7 +919,7 @@ end||false() { _ @<  >@set -l bar 7 _ end _ _ -##gray|//without the -l flag, the the variable will _ +##gray|//without the -l flag, the variable will _ be global if already defined, otherwise local//##||##gray|//none//##||##gray|//none//##||foo() { _ @<  >@local bar=7 _ } _ @@ -2307,4 +2307,4 @@ Special {{zsh}} builtins: * zformat * zmodload * zparseopts -* zstyle \ No newline at end of file +* zstyle diff --git a/markup/version-control b/markup/version-control index 16f2d90..9e7cbd8 100644 --- a/markup/version-control +++ b/markup/version-control @@ -338,7 +338,7 @@ tip //refers to the most recent revision in the repository.//##|| _ $ git log -g|| || ||difference between commit and its parent||$ git diff @@[--@@name-only@@]@@ [#COMMIT COMMIT]^ [#COMMIT COMMIT] [@@--@@] [PATH ...]||$ hg diff -c [#HG-REV REV] @@[@@[#HG-PATH PATH] ...]|| -||difference between two comits||$ git diff @@[--@@name-only@@]@@ [#COMMIT COMMIT1] [#COMMIT COMMIT2] [@@--@@] [PATH ...]||$ hg diff -r [#HG-REV REV1] -r [#HG-REV REV2] @@[@@[#HG-PATH PATH] ...]|| +||difference between two commits||$ git diff @@[--@@name-only@@]@@ [#COMMIT COMMIT1] [#COMMIT COMMIT2] [@@--@@] [PATH ...]||$ hg diff -r [#HG-REV REV1] -r [#HG-REV REV2] @@[@@[#HG-PATH PATH] ...]|| ||diff options||##gray|@@--@@name-only: list modified file names _ @@--@@name-status: status (M, A, D, R, ..) and modified file names _ @@--@@stat: histogram of changes by file _ @@ -598,7 +598,7 @@ Git has three types of objects: commits, trees, and blobs. Each is assigned a u Commit hashes are the hashes the user most commonly sees and needs to reference. Only as many of the digits that are necessary to uniquely identify an object in the object database need to be provided to a git command; usually the first 6 or 7 is sufficient. -HEAD is a special name which refers to the most recent commit of the current branch. It is stored in {{.git/HEAD}}. The previous commit is HEAD^ and the commit before that is HEAD@@^^@@. The is also numerical notation: HEAD~4 is 4 commits ahead of HEAD. If HEAD is the result of a merge, then the antecedents can be be referenced with HEAD^1 and HEAD^2. +HEAD is a special name which refers to the most recent commit of the current branch. It is stored in {{.git/HEAD}}. The previous commit is HEAD^ and the commit before that is HEAD@@^^@@. There is also a numerical notation: HEAD~4 is 4 commits ahead of HEAD. If HEAD is the result of a merge, then the antecedents can be be referenced with HEAD^1 and HEAD^2. **hg** @@ -1547,4 +1547,4 @@ If the source and target paths have the same basename, then {{rsync}} will copy [[# colordiff]] + [#top colordiff (2002)] -A version of {{diff}} which colorizes the output. It takes the same options as {{diff}}. \ No newline at end of file +A version of {{diff}} which colorizes the output. It takes the same options as {{diff}}. diff --git a/markup/web b/markup/web index fdedcdc..535d79f 100644 --- a/markup/web +++ b/markup/web @@ -520,7 +520,7 @@ List a2 = new List.from(a.reversed);|| ||[[# array-sort]][#array-sort-note sort] _ ##gray|//non-destructive, _ in-place, _ -custom comparision//##||var a = [3, 1, 4, 2]; _ +custom comparison//##||var a = [3, 1, 4, 2]; _ a.sort();||var a = [3, 1, 4, 2]; _ a.sort();|| ||[[# array-dedupe]][#array-dedupe-note dedupe] _ @@ -1515,4 +1515,4 @@ $ curl https://github.com/palantir/tslint/blob/master/docs/sample.tslint.json > + [#top Dart] [https://www.dartlang.org/docs/ Programmer's Guide] -[https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/home API Reference] \ No newline at end of file +[https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/home API Reference] diff --git a/skeleton.txt b/skeleton.txt index aaea2e7..a1d4f4d 100644 --- a/skeleton.txt +++ b/skeleton.txt @@ -208,7 +208,7 @@ Shift can be logical, circular, or arithmetic. In logical shift the new bits ar ##gray|//left, right, both ends//##||#trim||Also called stripping. But prefer trimming, since stripping can mean removing internal occurrences of a character|| ||[[# pad]][#pad-note pad] _ ##gray|//left, right, both ends//##||#pad|| || -||[[# num-to-str]][#num-to-str-note number to string]||#num-to-str||precision and zero padding; explict conversion and operators which perform implicit conversion|| +||[[# num-to-str]][#num-to-str-note number to string]||#num-to-str||precision and zero padding; explicit conversion and operators which perform implicit conversion|| ||[[# str-to-num]][#str-to-num-note string to number]||#str-to-num||notes on whether full string must parse and what happen if conversion fails; explicit conversion and operators which perform implicit conversion|| ||[[# str-join]][#str-join-note string join] _ @< >@||#str-join|| || @@ -351,7 +351,7 @@ how boundary delimiters are handled|| _ permitted type of expression in switch: integer, any _ _ -type of comparision in case: equality test, regex match|| +type of comparison in case: equality test, regex match|| ||[[# while]][#while-note while] _ @< >@||#while||iterate over i and print the numbers 0 to 9 _ _