Merge branch 'ghamp'

Acked by RMS.

2 files changed, 20 insertions, 2 deletions

diff --git a/faq/ghamp.mdwn b/faq/ghamp.mdwn
new file mode 100644
index 00000000..16849aff
--- /dev/null
+++ b/faq/ghamp.mdwn
@@ -0,0 +1,18 @@
+[[!meta copyright="Copyright © 2010 Free Software Foundation, Inc."]]
+
+[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
+id="license" text="Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no Invariant
+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]]."]]"""]]
+
+[[!meta title="GHAMP"]]
+
+*GHAMP* is the GNU/Hurd-based Apache, MySQL, PHP solution stack -- analoguous
+to GLAMP, which is based on GNU/Linux.
+
+Pronounce it like the *G* in
+[GNU](http://www.gnu.org/pronunciation/pronunciation.html), followed by a
+mostly silent *H*, and *AMP* as in amplifier.
diff --git a/news/2010-08-31.mdwn b/news/2010-08-31.mdwn
index 84fa69c1..f3910b15 100644
--- a/news/2010-08-31.mdwn
+++ b/news/2010-08-31.mdwn
@@ -72,8 +72,8 @@ else="[[!paste id=full_news]]"]]
 >     and added a [Planet Arch Hurd](http://planet.archhurd.org/) which
 >     aggregates the different Arch Hurd Blogs.
 > 
->   * The team packaged everything you need for a [GNU/Hurd-based Apache,
->     MySQL, PHP system](http://www.archhurd.org/news/18/).
+>   * The team [packaged everything](http://www.archhurd.org/news/18/) you need
+>     for the [[faq/GHAMP]] solution stack.
 > 
 >   * Their Diego Nieto Cid sent a patch series to [*bring console-driver-xkb
 >     up to