summaryrefslogtreecommitdiff
path: root/hurd/running.mdwn
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2013-09-26 15:18:15 +0200
committerThomas Schwinge <thomas@codesourcery.com>2013-09-26 15:18:15 +0200
commit2c18eac2140a577090c84854905728ebd2ce0fac (patch)
tree799129f165d6dc77a652fe574c7e8c4761e9625d /hurd/running.mdwn
parentbba1488c7be842e5d0311ffa6541373d63b1164c (diff)
parentce4899ded119f3607515cc54252c4bad7224f804 (diff)
Merge commit 'ce4899ded119f3607515cc54252c4bad7224f804'
Conflicts: community/gsoc/project_ideas/mtab.mdwn contributing.mdwn hurd/translator/eth-filter.mdwn hurd/translator/socketio.mdwn open_issues/exec.mdwn open_issues/gnumach_vm_object_resident_page_count.mdwn public_hurd_boxen.mdwn
Diffstat (limited to 'hurd/running.mdwn')
-rw-r--r--hurd/running.mdwn3
1 files changed, 2 insertions, 1 deletions
diff --git a/hurd/running.mdwn b/hurd/running.mdwn
index 41855433..15ee25d9 100644
--- a/hurd/running.mdwn
+++ b/hurd/running.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2007, 2008, 2009, 2011, 2012 Free Software
+[[!meta copyright="Copyright © 2007, 2008, 2009, 2011, 2012, 2013 Free Software
Foundation, Inc."]]
[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
@@ -17,6 +17,7 @@ There are several different ways to run a GNU/Hurd system:
* [[microkernel/mach/gnumach/ports/Xen]] - In Xen
* [[Live_CD]]
* [[QEMU]] - In QEMU
+* [[openstack]] - In openstack
* [[chroots|chroot]] need a couple of tricks to work properly.
* [[VirtualBox]] - In VirtualBox
* [[vmware]] (**non-free!**)