diff options
| -rw-r--r-- | 404.html | 6 | ||||
| -rw-r--r-- | cpsc/index.md (renamed from computation/index.md) | 0 | ||||
| -rw-r--r-- | index.html | 6 | ||||
| -rw-r--r-- | ling/english-specifier.png (renamed from linguistics/english-specifier.png) | bin | 8373 -> 8373 bytes | |||
| -rw-r--r-- | ling/glossary.md (renamed from linguistics/glossary.md) | 0 | ||||
| -rw-r--r-- | ling/head-final.png (renamed from linguistics/head-final.png) | bin | 4644 -> 4644 bytes | |||
| -rw-r--r-- | ling/head-initial.png (renamed from linguistics/head-initial.png) | bin | 4848 -> 4848 bytes | |||
| -rw-r--r-- | ling/index.md (renamed from linguistics/index.md) | 0 | ||||
| -rw-r--r-- | ling/left-adjunct.png (renamed from linguistics/left-adjunct.png) | bin | 4733 -> 4733 bytes | |||
| -rw-r--r-- | ling/no-subject-movement.png (renamed from linguistics/no-subject-movement.png) | bin | 14696 -> 14696 bytes | |||
| -rw-r--r-- | ling/pragmatics.md (renamed from linguistics/pragmatics.md) | 0 | ||||
| -rw-r--r-- | ling/right-adjunct.png (renamed from linguistics/right-adjunct.png) | bin | 5163 -> 5163 bytes | |||
| -rw-r--r-- | ling/semantics.md (renamed from linguistics/semantics.md) | 4 | ||||
| -rw-r--r-- | ling/subject-movement.png (renamed from linguistics/subject-movement.png) | bin | 19203 -> 19203 bytes | |||
| -rw-r--r-- | ling/syntax.md (renamed from linguistics/syntax.md) | 0 | ||||
| -rw-r--r-- | ling/tense-ed.png (renamed from linguistics/tense-ed.png) | bin | 13876 -> 13876 bytes | |||
| -rw-r--r-- | ling/tense-no-tense.png (renamed from linguistics/tense-no-tense.png) | bin | 10820 -> 10820 bytes | |||
| -rw-r--r-- | ling/tense-null.png (renamed from linguistics/tense-null.png) | bin | 13530 -> 13530 bytes | |||
| -rw-r--r-- | ling/tense-s.png (renamed from linguistics/tense-s.png) | bin | 14158 -> 14158 bytes | |||
| -rw-r--r-- | ling/tense-will.png (renamed from linguistics/tense-will.png) | bin | 12780 -> 12780 bytes | |||
| -rw-r--r-- | ling/types.md (renamed from linguistics/types.md) | 0 | ||||
| -rw-r--r-- | math/algebra.md (renamed from mathematics/algebra.md) | 0 | ||||
| -rw-r--r-- | math/analysis.md (renamed from mathematics/analysis.md) | 0 | ||||
| -rw-r--r-- | math/category-theory.md (renamed from mathematics/category-theory.md) | 0 | ||||
| -rw-r--r-- | math/coding-theory.md (renamed from mathematics/coding-theory.md) | 0 | ||||
| -rw-r--r-- | math/foundations.md (renamed from mathematics/foundations.md) | 0 | ||||
| -rw-r--r-- | math/index.md (renamed from mathematics/index.md) | 0 | ||||
| -rw-r--r-- | math/information-theory.md (renamed from mathematics/information-theory.md) | 0 | ||||
| -rw-r--r-- | math/linear-algebra.md (renamed from mathematics/linear-algebra.md) | 0 | ||||
| -rw-r--r-- | math/logic.md (renamed from mathematics/logic.md) | 0 | ||||
| -rw-r--r-- | math/number-theory.md (renamed from mathematics/number-theory.md) | 0 | ||||
| -rw-r--r-- | math/proof.md (renamed from mathematics/proof.md) | 0 |
32 files changed, 8 insertions, 8 deletions
@@ -8,9 +8,9 @@ title: 404 </h1> <div> <nav> - <a href="/mathematics">mathematics</a> - <a href="/linguistics">linguistics</a> - <a href="/computation">computation</a> + <a href="/math">mathematics</a> + <a href="/ling">linguistics</a> + <a href="/cpsc">computation</a> </nav> </div> </header> diff --git a/computation/index.md b/cpsc/index.md index ce13a58..ce13a58 100644 --- a/computation/index.md +++ b/cpsc/index.md @@ -46,9 +46,9 @@ <main> <h1>scattered thoughts</h1> <nav> - <a href="/wiki/mathematics">mathematics</a> - <a href="/wiki/linguistics">linguistics</a> - <a href="/wiki/computation">computation</a> + <a href="/wiki/math">mathematics</a> + <a href="/wiki/ling">linguistics</a> + <a href="/wiki/cpsc">computation</a> </nav> </main> </body> diff --git a/linguistics/english-specifier.png b/ling/english-specifier.png Binary files differindex 4500211..4500211 100644 --- a/linguistics/english-specifier.png +++ b/ling/english-specifier.png diff --git a/linguistics/glossary.md b/ling/glossary.md index 5bfb895..5bfb895 100644 --- a/linguistics/glossary.md +++ b/ling/glossary.md diff --git a/linguistics/head-final.png b/ling/head-final.png Binary files differindex bbce198..bbce198 100644 --- a/linguistics/head-final.png +++ b/ling/head-final.png diff --git a/linguistics/head-initial.png b/ling/head-initial.png Binary files differindex 920f94e..920f94e 100644 --- a/linguistics/head-initial.png +++ b/ling/head-initial.png diff --git a/linguistics/index.md b/ling/index.md index 074db20..074db20 100644 --- a/linguistics/index.md +++ b/ling/index.md diff --git a/linguistics/left-adjunct.png b/ling/left-adjunct.png Binary files differindex 306483d..306483d 100644 --- a/linguistics/left-adjunct.png +++ b/ling/left-adjunct.png diff --git a/linguistics/no-subject-movement.png b/ling/no-subject-movement.png Binary files differindex 3f87211..3f87211 100644 --- a/linguistics/no-subject-movement.png +++ b/ling/no-subject-movement.png diff --git a/linguistics/pragmatics.md b/ling/pragmatics.md index d1b181a..d1b181a 100644 --- a/linguistics/pragmatics.md +++ b/ling/pragmatics.md diff --git a/linguistics/right-adjunct.png b/ling/right-adjunct.png Binary files differindex 12f3ba0..12f3ba0 100644 --- a/linguistics/right-adjunct.png +++ b/ling/right-adjunct.png diff --git a/linguistics/semantics.md b/ling/semantics.md index a6cb615..747d9c3 100644 --- a/linguistics/semantics.md +++ b/ling/semantics.md @@ -13,7 +13,7 @@ What conditions must hold for a sentence to be true? Formal semantics attempts to answer those questions by providing a *framework* for determining what *conditions* must hold for a sentence to be true. -This framework is [first-order/predicate logic](../mathematics/logic) and the [simply-typed lambda calculus](../plt/lambda-calculus). On top of this, we often build set theory, relying on *characteristic functions* of the lambda calculus as denotations of *set membership*. +This framework is [first-order/predicate logic](../math/logic) and the [simply-typed lambda calculus](../plt/lambda-calculus). On top of this, we often build set theory, relying on *characteristic functions* of the lambda calculus as denotations of *set membership*. ## Basic Principles @@ -30,7 +30,7 @@ The *Principle of Substitution* states that substituting one part of an expressi Formal semantics begets a formal system for such semantics, and *first-order logic* and *the lambda calculus* are a natural fit. Semantics is the study of meaning - and what is logic but a system for expressing meaning? As discussed above, language functions by composition - and what are functions but their property of composition? -[*An Invitation to Formal Semantics*](https://eecoppock.info/bootcamp/semantics-boot-camp.pdf) covers basic logic and the lambda calculus well in its first six chapters. Otherwise, for a worse introduction, see [logic](../mathematics/logic), and [the lambda calculus](../plt/lambda-calculus). +[*An Invitation to Formal Semantics*](https://eecoppock.info/bootcamp/semantics-boot-camp.pdf) covers basic logic and the lambda calculus well in its first six chapters. Otherwise, for a worse introduction, see [logic](../math/logic), and [the lambda calculus](../plt/lambda-calculus). ## Denotational Semantics diff --git a/linguistics/subject-movement.png b/ling/subject-movement.png Binary files differindex 1136f5e..1136f5e 100644 --- a/linguistics/subject-movement.png +++ b/ling/subject-movement.png diff --git a/linguistics/syntax.md b/ling/syntax.md index 46708fa..46708fa 100644 --- a/linguistics/syntax.md +++ b/ling/syntax.md diff --git a/linguistics/tense-ed.png b/ling/tense-ed.png Binary files differindex cac54d6..cac54d6 100644 --- a/linguistics/tense-ed.png +++ b/ling/tense-ed.png diff --git a/linguistics/tense-no-tense.png b/ling/tense-no-tense.png Binary files differindex 1ea1c6d..1ea1c6d 100644 --- a/linguistics/tense-no-tense.png +++ b/ling/tense-no-tense.png diff --git a/linguistics/tense-null.png b/ling/tense-null.png Binary files differindex 106e0b9..106e0b9 100644 --- a/linguistics/tense-null.png +++ b/ling/tense-null.png diff --git a/linguistics/tense-s.png b/ling/tense-s.png Binary files differindex 9f8120f..9f8120f 100644 --- a/linguistics/tense-s.png +++ b/ling/tense-s.png diff --git a/linguistics/tense-will.png b/ling/tense-will.png Binary files differindex 0d10a69..0d10a69 100644 --- a/linguistics/tense-will.png +++ b/ling/tense-will.png diff --git a/linguistics/types.md b/ling/types.md index 437ab50..437ab50 100644 --- a/linguistics/types.md +++ b/ling/types.md diff --git a/mathematics/algebra.md b/math/algebra.md index 3717445..3717445 100644 --- a/mathematics/algebra.md +++ b/math/algebra.md diff --git a/mathematics/analysis.md b/math/analysis.md index 7bfef62..7bfef62 100644 --- a/mathematics/analysis.md +++ b/math/analysis.md diff --git a/mathematics/category-theory.md b/math/category-theory.md index 19100a7..19100a7 100644 --- a/mathematics/category-theory.md +++ b/math/category-theory.md diff --git a/mathematics/coding-theory.md b/math/coding-theory.md index b080ed6..b080ed6 100644 --- a/mathematics/coding-theory.md +++ b/math/coding-theory.md diff --git a/mathematics/foundations.md b/math/foundations.md index 9057bea..9057bea 100644 --- a/mathematics/foundations.md +++ b/math/foundations.md diff --git a/mathematics/index.md b/math/index.md index 7e03385..7e03385 100644 --- a/mathematics/index.md +++ b/math/index.md diff --git a/mathematics/information-theory.md b/math/information-theory.md index d0cd75c..d0cd75c 100644 --- a/mathematics/information-theory.md +++ b/math/information-theory.md diff --git a/mathematics/linear-algebra.md b/math/linear-algebra.md index 3d58b39..3d58b39 100644 --- a/mathematics/linear-algebra.md +++ b/math/linear-algebra.md diff --git a/mathematics/logic.md b/math/logic.md index b07e867..b07e867 100644 --- a/mathematics/logic.md +++ b/math/logic.md diff --git a/mathematics/number-theory.md b/math/number-theory.md index 47e63e7..47e63e7 100644 --- a/mathematics/number-theory.md +++ b/math/number-theory.md diff --git a/mathematics/proof.md b/math/proof.md index 17548dd..17548dd 100644 --- a/mathematics/proof.md +++ b/math/proof.md |
