more typo fixes

csc-training · May 13, 2018 · 521bbeb · 521bbeb
1 parent cd21970
commit 521bbeb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 36 deletions.
diff --git a/notebooks/00_intro-to-julia.ipynb b/notebooks/00_intro-to-julia.ipynb
@@ -76,7 +76,10 @@
  "## Open source\n",
  "Julia is open source, developed now by a community. \n",
  "\n",
- "Lisenced under MIT license. "
+ "Licensed under MIT license. \n",
+ "- open and permissive license\n",
+ "\n",
+ "This means it *is* and *will be* open source."
  ]
  },
  {

diff --git a/notebooks/01_basics.ipynb b/notebooks/01_basics.ipynb
@@ -203,7 +203,7 @@
  "## Variables and data types\n",
  "Julia allows to write generic code, and 😺 is an example of this. \n",
  "\n",
- "In julia variable names \n",
+ "In Julia variable names \n",
  "- may contain letters, numbers, underscores or exclamation marks.\n",
  "- start with a letter or underscores (but not with a number!)\n",
  "- are case sensitive\n",
@@ -219,7 +219,7 @@
  },
  "source": [
  "## Special characters\n",
- "Julia supports many special characthers familiar from `LaTeX`. Just try common names such as `\\alpha` and press `<TAB>` to complete. \n",
+ "Julia supports many special characters familiar from `LaTeX`. Just try common names such as `\\alpha` and press `<TAB>` to complete. \n",
  "\n",
  "If the name is not familiar to you, just copy the character and use the `?` to probe what it is."
  ]
@@ -359,16 +359,20 @@
  },
  "source": [
  "# Data types\n",
- "\n",
- "- `Bool`: is a data type that can be either `true` or `false`.\n",
+ "### Primitive types\n",
  "- Numeric types, that represent numbers\n",
  " - `Number`\n",
- " - `Real`\n",
- " - `Integer` (`Int16`, `Int32`,...)\n",
- " - `Signed` and `Unsigned`\n",
- " - `AbstractFloat` (`Float16`, `Float32`,...)\n",
- " - `complex` (`Complex{Int64}`,...) with `1 + 0.1im`\n",
+ " - `Real`\n",
+ " - `Integer` \n",
+ " - `Signed` and `Unsigned`\n",
+ " - `Int16`, `Int32`, `Int64`,..., `UInt64`\n",
+ " - `AbstractFloat` \n",
+ " - `Float16`, `Float32`,`Float64`,...\n",
  "- Strings (`String`, `Char`,...)\n",
+ "- `Bool` is a data type that can be either `true` or `false`.\n",
+ "\n",
+ "### Composite types\n",
+ "- `complex` (`Complex{Int64}`,...) with `1 + 0.1im`\n",
  "- Arrays (`Array{Int64,1}`,...)\n",
  "- Mappings\n",
  " - `Dict`: a dictionary, also called a hashmap (`Dict{String,Int64}`,...)\n",

diff --git a/notebooks/02_control-flow.ipynb b/notebooks/02_control-flow.ipynb
@@ -23,7 +23,7 @@
  "- conditional statements\n",
  "- repeated evaluation\n",
  " - `while` and `for`\n",
- "- breaking\n",
+ "- breaking and continuing \n",
  "\n",
  "See also the [documentation](https://docs.julialang.org/en/stable/manual/control-flow/\n",
  ")"
@@ -175,30 +175,6 @@
  "false || true"
  ]
  },
- {
- "cell_type": "code",
- "execution_count": 1,
- "metadata": {
- "slideshow": {
- "slide_type": "fragment"
- }
- },
- "outputs": [
- {
- "data": {
- "text/plain": [
- "true"
- ]
- },
- "execution_count": 1,
- "metadata": {},
- "output_type": "execute_result"
- }
- ],
- "source": [
- "0 < 0.5 < 1"
- ]
- },
  {
  "cell_type": "markdown",
  "metadata": {

diff --git a/notebooks/03_functions.ipynb b/notebooks/03_functions.ipynb
@@ -654,7 +654,7 @@
  }
  },
  "source": [
- "## Macro incovation\n",
+ "## Macro invocation\n",
  "Macros are invoked with the following general syntax:\n",
  "```julia\n",
  "@name expr1 expr2 ...\n",