faq/asking_questions.

6 files changed, 15 insertions, 30 deletions

diff --git a/faq/asking.mdwn b/faq/asking.mdwn
deleted file mode 100644
index 7dc7142b..00000000
--- a/faq/asking.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-[[!meta copyright="Copyright © 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010,
-2013 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]]."]]"""]]
-
-[[!tag faq/general]]
-
-[[!meta title="Why can't I get the answers I need from Hurd hackers?"]]
-
-This [document](http://www.catb.org/~esr/faqs/smart-questions.html) may help you
-understand some developers attitudes and social norms.
-
diff --git a/asking_questions.mdwn b/faq/asking_questions.mdwn
index 2d43cbbe..912c78dc 100644
--- a/asking_questions.mdwn
+++ b/faq/asking_questions.mdwn
@@ -1,12 +1,17 @@
-[[!meta copyright="Copyright © 2007, 2008 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010,
+2013 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]]."]]"""]]
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
+
+[[!tag faq/general]]
+
+[[!meta title="Why can't I get the answers I need from Hurd hackers?"]]
 
 Before asking a question, first make an effort to find the answer to your
 question.  A lot of questions have been asked and answered before, so please
@@ -19,5 +24,5 @@ e.g., "I am having trouble frobbing the foo.  I searched the web and only found
 information regarding how to frob a bar, but that seems unrelated."  Provide as
 many relevant details as possible reproducing them as exactly as possible.
 
-Also consider these
-[guidelines](http://catb.org/~esr/faqs/smart-questions.html).
+This [document](http://www.catb.org/~esr/faqs/smart-questions.html) may help you
+understand some developers attitudes and social norms.
diff --git a/getting_help.mdwn b/getting_help.mdwn
index 34e54159..57c3e276 100644
--- a/getting_help.mdwn
+++ b/getting_help.mdwn
@@ -24,7 +24,7 @@ License|/fdl]]."]]"""]]
 
 # Forums
 
-[[!inline pages=asking_questions raw=yes feeds=no]]
+[[!inline pages=faq/asking_questions raw=yes feeds=no]]
 
   * [[Mailing_lists]]
   * [[IRC]]
diff --git a/irc.mdwn b/irc.mdwn
index ebf63b97..b90aa680 100644
--- a/irc.mdwn
+++ b/irc.mdwn
@@ -1,5 +1,5 @@
 [[!meta copyright="Copyright © 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009,
-2010, 2011, 2012 Free Software Foundation, Inc."]]
+2010, 2011, 2012, 2013 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
@@ -20,7 +20,7 @@ Please try to stay on topic.  We're not interested in Emacs vs. vi discussions,
 we don't want to hear why you think that the GNU project sucks, or what your
 favorite GNU/Linux distribution is.
 
-[[!inline pages=asking_questions raw=yes feeds=no]]
+[[!inline pages=faq/asking_questions raw=yes feeds=no]]
 
 Sometimes providing a log or some other excerpt of text can
 help solve a problem or answer a question.  Do not paste
diff --git a/mailing_lists.mdwn b/mailing_lists.mdwn
index 33f131d5..0f90d200 100644
--- a/mailing_lists.mdwn
+++ b/mailing_lists.mdwn
@@ -1,5 +1,5 @@
 [[!meta copyright="Copyright © 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-2011, 2012 Free Software Foundation, Inc."]]
+2011, 2012, 2013 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
@@ -12,7 +12,7 @@ License|/fdl]]."]]"""]]
 
 # On Posting
 
-[[!inline pages=asking_questions raw=yes feeds=no]]
+[[!inline pages=faq/asking_questions raw=yes feeds=no]]
 
 List etiquette is to cc the sender and anyone **actively** involved in the
 discussion. Some people don't like this and they set their reply-to header
diff --git a/unsorted/GrantBowHurdPage.mdwn b/unsorted/GrantBowHurdPage.mdwn
index 89af3ada..1de346e7 100644
--- a/unsorted/GrantBowHurdPage.mdwn
+++ b/unsorted/GrantBowHurdPage.mdwn
@@ -19,8 +19,6 @@ If anyone knows more about these items, please add your comments below with your
 
 PLEASE read these once. They are worth the effort.
 
-* [How To Ask Questions The Smart Way](http://www.tuxedo.org/~esr/faqs/smart-questions.html)
-
 * [How To Report Bugs Effectively](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html) \*<http://khazad.dyndns.org/gnunet/>
 
 \*[Lincoln Portrait](http://www.people.virginia.edu/~skd9r/409/portrait.html) transcript - amazingly applicable to open source ideals.