summaryrefslogtreecommitdiff
path: root/documentation.mdwn
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2018-05-25 17:40:49 +0200
committerThomas Schwinge <thomas@codesourcery.com>2018-05-25 17:40:49 +0200
commit127129b005d31d5553fb08cb28acfa43073abe4d (patch)
tree50a28c6f089c2de51c6ffca0b33c1047f35d78dd /documentation.mdwn
parent7353d3c182491ca34dfdb8d028a6ce9ab320c4fc (diff)
parent55f878869fda47b7897e2d866aca2eac4d0c7168 (diff)
Merge commit '55f878869fda47b7897e2d866aca2eac4d0c7168'
As part of the merge, add copyright and licensing headers, and apply a few more minor changes.
Diffstat (limited to 'documentation.mdwn')
-rw-r--r--documentation.mdwn4
1 files changed, 2 insertions, 2 deletions
diff --git a/documentation.mdwn b/documentation.mdwn
index bfdaa83..8776f5e 100644
--- a/documentation.mdwn
+++ b/documentation.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2008, 2010, 2011, 2015, 2016 Free Software
+[[!meta copyright="Copyright © 2008, 2010, 2011, 2015, 2016, 2017 Free Software
Foundation, Inc."]]
[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
@@ -47,7 +47,7 @@ text="*[[shapiro\_capintro\_1999|capability]]*:
port|microkernel/mach/port]].
* {{$capability#wikipedia_object-capability_model}}. Albeit not directly
- tailored at the GNU/Hurd operating system architecture, this artice anyway
+ tailored at the GNU/Hurd operating system architecture, this article anyway
does a good job at describing general principles of a [[capability]]-based
system architecture.