summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Distrib.mdwn2
-rw-r--r--Distrib/QEMU.mdwn2
-rw-r--r--Hurd/FrequentlyAskedQuestions.mdwn2
-rw-r--r--hurd/running.mdwn (renamed from Hurd/running.mdwn)6
-rw-r--r--hurd/running/qemu.mdwn (renamed from Distrib/HurdOnQEMU.mdwn)2
-rw-r--r--index.mdwn2
-rw-r--r--sidebar.mdwn2
7 files changed, 9 insertions, 9 deletions
diff --git a/Distrib.mdwn b/Distrib.mdwn
index da1f5b7d..dbdb97a7 100644
--- a/Distrib.mdwn
+++ b/Distrib.mdwn
@@ -61,7 +61,7 @@ Distribution is in discussion & pre-planning phase
Another installation method is using an emulated environment. The [[BochsEmulator]] was originally the recommended virtual machine solution, however most have switched over to QEMU, as it runs faster.
-* [[HurdOnQEMU]] - A guide on how to use QEMU to run the hurd.
+* [[hurd/running/QEMU]] - A guide on how to use QEMU to run the hurd.
* [[BochsFAQ]] - Common questions you should read.
* [[VmWare]] - Why using it is discouraged.
diff --git a/Distrib/QEMU.mdwn b/Distrib/QEMU.mdwn
index 526eb9c7..27086257 100644
--- a/Distrib/QEMU.mdwn
+++ b/Distrib/QEMU.mdwn
@@ -8,8 +8,6 @@ QEMU has two operating modes:
The majority of the program is under the [[LGPL]], with the system mode emulation under the [[GPL]].
-See also: [[HurdOnQEMU]]
-
## <a name="External_links"> External links </a>
* <http://fabrice.bellard.free.fr/qemu/>
diff --git a/Hurd/FrequentlyAskedQuestions.mdwn b/Hurd/FrequentlyAskedQuestions.mdwn
index 55822a82..0bcb4e79 100644
--- a/Hurd/FrequentlyAskedQuestions.mdwn
+++ b/Hurd/FrequentlyAskedQuestions.mdwn
@@ -39,7 +39,7 @@ If you still have problems, do not hesitate to make use of the [[MailingLists]]
* **_Will GNU work in Vmware?_**
* It's highly recommended and easier to get a full image for Bochs. See [[Distrib]]
* It didn't use to, [Hurd bootstrap fails](http://lists.debian.org/debian-hurd/2002/debian-hurd-200207/msg00069.html). Vmware is not [free software](http://www.gnu.org/philosophy/free-sw.html) and it is [[Distrib/VmWare]]. We recommend to use [free](http://www.gnu.org/philosophy/free-sw.html) alternatives, like [[Distrib/BochsEmulator]].
- * A faster, more widespread and [free](http://www.gnu.org/philosophy/free-sw.html) recent alternative is [QEMU](http://hurd.gnufans.org/bin/view/Distrib/QEMU). You can find more informations on [[Distrib/HurdOnQEMU]].
+ * A faster, more widespread and [free](http://www.gnu.org/philosophy/free-sw.html) recent alternative is [QEMU](http://hurd.gnufans.org/bin/view/Distrib/QEMU). You can find more informations on [[running/QEMU]].
* If someone prefers using VMWare:
* It works with VMWare Workstation 4.0.5 build-6030.
* Running Debian GNU/HURD in VMWare works for me -- [[Main/MichaelAblassmeier]] - 03 Mar 2004
diff --git a/Hurd/running.mdwn b/hurd/running.mdwn
index 36f765bf..f8a516bd 100644
--- a/Hurd/running.mdwn
+++ b/hurd/running.mdwn
@@ -18,5 +18,7 @@ redistribute your contributions.
* [[Distrib]] - Distributions based on the Hurd
* [[microkernel/mach/gnumach/Xen]] - In Xen
* [[LiveCD]] - Live CDs
-* [[Distrib/QEMU]] - In an Emulator
-* [[FlashHurd]] - From a flash stick \ No newline at end of file
+* [[QEMU]] - In QEMU
+* [[FlashHurd]] - From a flash stick
+
+* [[Public_hurd_boxen]]
diff --git a/Distrib/HurdOnQEMU.mdwn b/hurd/running/qemu.mdwn
index 7f251b3f..b7b45126 100644
--- a/Distrib/HurdOnQEMU.mdwn
+++ b/hurd/running/qemu.mdwn
@@ -108,7 +108,7 @@ That should do it! Do not forget to edit/update `/etc/resolv.conf` to get DNS wo
# Related Links
-These are links that users of [[HurdOnQEMU]] may find helpful.
+These are links that users may find helpful.
[[DebianAfterInstall]] - good source of information pertaining to your system after installation.
diff --git a/index.mdwn b/index.mdwn
index 9665eda4..0d633a26 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -46,7 +46,7 @@ The most functional distribution of the Hurd is the one provided by Debian.
Find more information about it at the
[Debian GNU/Hurd website](http://www.debian.org/ports/hurd/hurd-install).
-You can also run the [[Distrib/HurdOnQEMU]].
+There are [[various_possibilities|hurd/running]] of running a GNU/Hurd system.
## What is the Hurd?
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 4454ce28..17480454 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -35,7 +35,7 @@ redistribute your contributions.
* *[[About|Hurd/TheGnuHurd]]*
* *[[Status|Hurd/GNUHurdStatus]]*
* *[[Hurd/Documentation]]*
- * *[[Hurd/Running]]*"]]
+ * *[[hurd/Running]]*"]]
* **[[microkernel/Mach]]**[[if test="destpage(microkernel/mach*)" then="
* *[[GNU_Mach|microkernel/mach/gnumach]]*
* *[[microkernel/mach/Documentation]]*"]]