summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAdam Bard <github@adambard.com>2013-10-09 09:21:03 -0700
committerAdam Bard <github@adambard.com>2013-10-09 09:21:03 -0700
commitdac3063ddf1781eeff8704f0b61d38a302b42db7 (patch)
treea3a3c419761608eb48397b71444f189e04866603
parent90461919cdd9672495b421c425510ff2f0a1e4c3 (diff)
parent925ded87809a5ae9f40a3c825324cb083eaba81e (diff)
Merge pull request #375 from xakon/master
[perl/en] Fix some links at Perl tutorial
-rw-r--r--bash.html.markdown4
-rw-r--r--common-lisp.html.markdown2
-rw-r--r--git.html.markdown2
-rw-r--r--java.html.markdown2
-rw-r--r--perl.html.markdown12
5 files changed, 10 insertions, 12 deletions
diff --git a/bash.html.markdown b/bash.html.markdown
index 4d80545e..276bc31f 100644
--- a/bash.html.markdown
+++ b/bash.html.markdown
@@ -94,12 +94,12 @@ python2 hello.py 2> "error.err"
# The output error will overwrite the file if it exists, if you want to
# concatenate them, use ">>" instead.
-# Commands can be substitued within other commands using $( ):
+# Commands can be substituted within other commands using $( ):
# The following command displays the number of files and directories in the
# current directory.
echo "There are $(ls | wc -l) items here."
-# Bash uses a case statement that works similarily to switch in Java and C++:
+# Bash uses a case statement that works similarly to switch in Java and C++:
case "$VARIABLE" in
#List patterns for the conditions you want to meet
0) echo "There is a zero.";;
diff --git a/common-lisp.html.markdown b/common-lisp.html.markdown
index a672b682..dda60797 100644
--- a/common-lisp.html.markdown
+++ b/common-lisp.html.markdown
@@ -377,7 +377,7 @@ nil ; for false - and the empty list
;; 4. Equality
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Common Lisp has a sophisticated equality system. A couple are covered yere.
+;; Common Lisp has a sophisticated equality system. A couple are covered here.
;; for numbers use `='
(= 3 3.0) ; => t
diff --git a/git.html.markdown b/git.html.markdown
index abe8e3a7..4b5e466e 100644
--- a/git.html.markdown
+++ b/git.html.markdown
@@ -40,7 +40,7 @@ Version control is a system that records changes to a file, or set of files, ove
### Repository
-A set of files, directories, historical records, commits, and heads. Imagine it as a source code datastructure,
+A set of files, directories, historical records, commits, and heads. Imagine it as a source code data structure,
with the attribute that each source code "element" gives you access to its revision history, among other things.
A git repository is comprised of the .git directory & working tree.
diff --git a/java.html.markdown b/java.html.markdown
index 0dec51d1..3d0cb1d7 100644
--- a/java.html.markdown
+++ b/java.html.markdown
@@ -250,7 +250,7 @@ public class LearnJava {
// Conditional Shorthand
// You can use the '?' operator for quick assignments or logic forks.
// Reads as "If (statement) is true, use <first value>, otherwise, use <second value>"
- int foo = 5
+ int foo = 5;
String bar = (foo < 10) ? "A" : "B";
System.out.println(bar); // Prints A, because the statement is true
diff --git a/perl.html.markdown b/perl.html.markdown
index 18339dde..ad9155e4 100644
--- a/perl.html.markdown
+++ b/perl.html.markdown
@@ -131,19 +131,17 @@ sub logger {
# Now we can use the subroutine just as any other built-in function:
logger("We have a logger subroutine!");
-
-
```
#### Using Perl modules
-Perl modules provide a range of features to help you avoid reinventing the wheel, and can be downloaded from CPAN ( http://www.cpan.org/ ). A number of popular modules are included with the Perl distribution itself.
+Perl modules provide a range of features to help you avoid reinventing the wheel, and can be downloaded from CPAN (http://www.cpan.org/). A number of popular modules are included with the Perl distribution itself.
perlfaq contains questions and answers related to many common tasks, and often provides suggestions for good CPAN modules to use.
#### Further Reading
- - [perl-tutorial](http://perl-tutorial.org/)
- - [Learn at www.perl.com](http://www.perl.org/learn.html)
- - [perldoc](http://perldoc.perl.org/)
- - and perl built-in : `perldoc perlintro`
+ - [perl-tutorial](http://perl-tutorial.org/)
+ - [Learn at www.perl.com](http://www.perl.org/learn.html)
+ - [perldoc](http://perldoc.perl.org/)
+ - and perl built-in : `perldoc perlintro`