summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--colophon.mdwn8
-rw-r--r--contributing.mdwn6
-rw-r--r--contributing/web_pages.mdwn18
-rw-r--r--hurd/logo.mdwn2
-rw-r--r--index.mdwn19
-rw-r--r--index/discussion.mdwn3
-rw-r--r--logo.pngbin17674 -> 0 bytes
-rw-r--r--mailing_lists.mdwn2
-rwxr-xr-xrender_locally4
9 files changed, 33 insertions, 29 deletions
diff --git a/colophon.mdwn b/colophon.mdwn
index a48849a9..d9b771a9 100644
--- a/colophon.mdwn
+++ b/colophon.mdwn
@@ -41,3 +41,11 @@ started adding content.
On 2007-08-12 [[Thomas_Schwinge|tschwinge]] finished the conversion of the
TWiki content to [ikiwiki](http://ikiwiki.info). Read
[[about_the_twiki_to_ikiwiki_conversion]].
+
+
+---
+
+# Rev. III
+
+In November 2008, [[Thomas_Schwinge|tschwinge]] imported the Hurd's current web
+pages into this repository and made this the official GNU Hurd web appearance.
diff --git a/contributing.mdwn b/contributing.mdwn
index 8b38655f..4b731065 100644
--- a/contributing.mdwn
+++ b/contributing.mdwn
@@ -38,7 +38,7 @@ meant when people are talking about GNU/Hurd systems.
This system has mostly been designed and implemented [in the
'90s](http://www.gnu.org/software/hurd/history.html). It works and is usable.
-For example, this wiki system [is running on a GNU/Hurd
+For example, these web pages are rendered on a [GNU/Hurd
system](http://www.bddebian.com/cgi-bin/uptime).
You can try it out for yourself: for getting access, installing
@@ -62,7 +62,7 @@ system, e.g., [[microkernels_for_beginners|microkernel/for_beginners]]. Until
you can do the basic exercises listed there, you won't be able to significantly
contribute to the Hurd.
-For more reading resources, please see this whole wiki, and also
+For more reading resources, please see these web pages, and also
<http://www.gnu.org/software/hurd/devel.html>,
<http://www.gnu.org/software/hurd/docs.html> for links to a bunch of documents,
and <http://www.gnu.org/software/hurd/> in general.
@@ -109,7 +109,7 @@ project.
If you're interested in contributing in this area, knowing the *Hurd on Mach*
system nevertheless is a prerequisite. At least have a deep look at the
documentation pointers given in the previous section. Also read through the
-[[HurdNG|hurd/ng]] section of this wiki.
+[[HurdNG|hurd/ng]] section.
Please send email to the [[mailing_lists/l4-hurd]] mailing list for discussing
this post-Mach system design.
diff --git a/contributing/web_pages.mdwn b/contributing/web_pages.mdwn
index 45abeecc..4dc2e27c 100644
--- a/contributing/web_pages.mdwn
+++ b/contributing/web_pages.mdwn
@@ -16,7 +16,7 @@ projects:
* Install your changes *early* and *often*: don't hold your contribution back
until you think it is perfect.
-Before doing any changes, you are encouraged to play a bit in this wiki's
+Before doing any changes, you are encouraged to play a bit in the
[[sandbox]], to become familiar with the [[ikiwiki/Markdown]] syntax. Get some
[[help_on_formatting|ikiwiki/formatting]].
@@ -27,12 +27,10 @@ Feel free to ask questions or report problems on every page's [[discussion]]
sub-page. They're reachable from the *Discussion* link on the top of the page,
which will, when selected, create a new page if there isn't one yet.
-Every page on the site is editable. Feel free to join in, but we do have some
-simple requests. In an ideal wiki, everyone is equal and shares equal rights,
-liberties, responsibilities and common sense. Please try to match the *tone*
-of your topics and edits with the existing topics. If we all pull in the same
-direction the site will be more useful for everyone, especially for our own
-use.
+Every page on the site is editable, like in a wiki. Feel free to join in, but
+we do have some simple requests. Please try to match the *tone* of your topics
+and edits with the existing topics. If we all pull in the same direction these
+pages will be more useful for everyone, especially for our own use.
# Edit Via the Web Interface
@@ -40,7 +38,7 @@ use.
When you found a page you want to work on, just follow the *Edit* link on the
top of the page. When doing this for the first time, this will first transfer
you to a page where you have to create a wiki account. After logging in, you
-can edit the wiki pages.
+can edit the pages.
# Working on a Checkout of the git Repository
@@ -122,14 +120,14 @@ personal working copy. You'll finally have to explicitly install your changes
into the master repository, see below.
-You can also locally get the whole wiki rendered to html pages:
+You can also locally get the whole set of pages rendered to HTML:
$ wiki/render_locally
[...]
scanning contributing/web_pages.mdwn
rendering contributing/web_pages.mdwn
- Now open `wiki.rendered/index.html' to browse the wiki pages.
+ Now open `wiki.rendered/index.html' to browse the pages.
If you like what you've done, then it's now time to publish your changes.
diff --git a/hurd/logo.mdwn b/hurd/logo.mdwn
index b1030e50..fcfe22dd 100644
--- a/hurd/logo.mdwn
+++ b/hurd/logo.mdwn
@@ -20,6 +20,6 @@ sources](http://www.gnu.org/graphics/hurd.mf) to
[[img boxes-redrawn.png]]
-This symbol is also being used as a favicon for this whole wiki.
+This symbol is also being used as a favicon for this web site.
[[img /favicon.ico]]
diff --git a/index.mdwn b/index.mdwn
index c9d02976..410bf301 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -9,9 +9,7 @@ Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license
is included in the section entitled
[[GNU_Free_Documentation_License|/fdl]]."]]"""]]
-[[img logo.png alt="[] HURD-Wiki"]]
-
-Welcome to the **new** GNU Hurd wiki!
+Welcome to the GNU Hurd!
**There is a huge bunch of unpolished stuff on here, please help us to tidy
things up!** Comments about how that could be tackled are best posted onto
@@ -72,9 +70,9 @@ Find more information about it at the
There are [[various_possibilities|hurd/running]] of running a GNU/Hurd system.
-And this wiki is living proof of the usability of the Hurd, as it is served by a
-Debian GNU/Hurd system. More people using GNU in production can be found on
-[[Hurd/WhoRunsGNU]].
+And these web pages are a living proof of the usability of the Hurd, as they
+are rendered on a Debian GNU/Hurd system. More people using GNU Hurd in
+production can be found on [[Hurd/WhoRunsGNU]].
## What is the Hurd?
@@ -121,9 +119,8 @@ Functional systems are installable in a dual-boot configuration. Development
systems are currently mostly based on the [[Debian_GNU/Hurd|hurd/running/debian]] port
sponsored by the [Debian project](http://www.debian.org/).
-Community resources for related projects focus around the official website
-<http://hurd.gnu.org/>, this site at <http://www.bddebian.com/~wiki/>, the
-[[mailing_lists]] and the [[IRC_channels|IRC]].
+Community resources for related projects focus around these pages,
+<http://hurd.gnu.org/>, the [[mailing_lists]] and the [[IRC_channels|IRC]].
If you want to see the current discussions in the Hurd project, please have a look at
the [bug-hurd mailinglist archives](http://lists.gnu.org/pipermail/bug-hurd/).
@@ -134,11 +131,11 @@ the [bug-hurd mailinglist archives](http://lists.gnu.org/pipermail/bug-hurd/).
## How is this site arranged?
The menu on the upper right corner provides a rough structuring about the
-available content. Just follow those topics and explore the wiki.
+available content. Just follow those topics and explore these pages.
Further information about this site and how it was created can be found in the
[[colophon]].
----
-This wiki is powered by [ikiwiki](http://ikiwiki.info/).
+These pages are powered by [ikiwiki](http://ikiwiki.info/).
diff --git a/index/discussion.mdwn b/index/discussion.mdwn
index aec8711d..9d40f011 100644
--- a/index/discussion.mdwn
+++ b/index/discussion.mdwn
@@ -10,7 +10,8 @@ is included in the section entitled
# TODO
-Please add your comments here about what you think needs to be done on the wiki.
+Please add your comments here about what you think needs to be done on these
+web pages.
## What to Add
diff --git a/logo.png b/logo.png
deleted file mode 100644
index 2090f9db..00000000
--- a/logo.png
+++ /dev/null
Binary files differ
diff --git a/mailing_lists.mdwn b/mailing_lists.mdwn
index 9f16c341..130178a8 100644
--- a/mailing_lists.mdwn
+++ b/mailing_lists.mdwn
@@ -62,7 +62,7 @@ Hurd-specific questions; for users of the Hurd.
<http://lists.gnu.org/mailman/listinfo/web-hurd>
-Discussion of the <http://hurd.gnu.org/> website and this wiki.
+Discussion of the <http://hurd.gnu.org/> web site.
<a name="l4-hurd"></a>
## l4-hurd
diff --git a/render_locally b/render_locally
index 67c96fdb..e1c27748 100755
--- a/render_locally
+++ b/render_locally
@@ -15,7 +15,7 @@ dest=$src.rendered &&
ikiwiki \
--verbose \
- --wikiname GNU\ Hurd\ wiki \
+ --wikiname GNU\ Hurd \
--templatedir "$src"/.templates \
--userdir user \
--no-usedirs \
@@ -33,4 +33,4 @@ ikiwiki \
"$src" "$dest" &&
echo &&
-echo Now\ open\ \`"$dest"/index.html\'' to browse the wiki pages.'
+echo Now\ open\ \`"$dest"/index.html\'' to browse the web pages.'