Merge branch 'master' of salsa.debian.org:installer-team/installation-guide

4 files changed, 31 insertions, 58 deletions

diff --git a/en/post-install/further-reading.xml b/en/post-install/further-reading.xml
index 8e69688ee..bae0634b2 100644
--- a/en/post-install/further-reading.xml
+++ b/en/post-install/further-reading.xml
@@ -4,23 +4,6 @@
  <sect1 id="further-reading"><title>Further Reading and Information</title>
 <para>
 
-If you need information about a particular program, you should first
-try <userinput>man <replaceable>program</replaceable></userinput>, or
-<userinput>info <replaceable>program</replaceable></userinput>.
-
-</para><para>
-
-There is lots of useful documentation in
-<filename>/usr/share/doc</filename> as well.  In particular,
-<filename>/usr/share/doc/HOWTO</filename> and
-<filename>/usr/share/doc/FAQ</filename> contain lots of interesting
-information.  To submit bugs, look at
-<filename>/usr/share/doc/debian/bug*</filename>.  To read about
-&debian;-specific issues for particular programs, look at
-<filename>/usr/share/doc/(package name)/README.Debian</filename>.
-
-</para><para>
-
 The
 <ulink url="http://www.debian.org/">Debian web site</ulink>
 contains a large quantity of documentation about &debian;.  In
@@ -37,6 +20,23 @@ Mail List Subscription</ulink> page.
 Last, but not least, the <ulink url="http://lists.debian.org/">Debian Mailing
 List Archives</ulink> contain a wealth of information on &debian;.
 
+</para><para>
+
+If you need information about a particular program, you should first
+try <userinput>man <replaceable>program</replaceable></userinput>, or
+<userinput>info <replaceable>program</replaceable></userinput>.
+
+</para><para>
+
+There is lots of useful documentation in
+<filename>/usr/share/doc</filename> as well.  In particular,
+<filename>/usr/share/doc/HOWTO</filename> and
+<filename>/usr/share/doc/FAQ</filename> contain lots of interesting
+information.  To submit bugs, look at
+<filename>/usr/share/doc/debian/bug*</filename>.  To read about
+&debian;-specific issues for particular programs, look at
+<filename>/usr/share/doc/(package name)/README.Debian</filename>.
+
 </para><para arch="linux-any">
 
 A general source of information on GNU/Linux is the
@@ -44,6 +44,19 @@ A general source of information on GNU/Linux is the
 There you will find the HOWTOs and pointers to other very valuable
 information on parts of a GNU/Linux system.
 
-</para>
+</para><para arch="linux-any">
 
+Linux is an implementation of Unix.  The
+<ulink url="&url-ldp;">Linux Documentation Project (LDP)</ulink>
+collects a number of HOWTOs and online books
+relating to Linux.
+
+</para><para arch="linux-any">
+
+If you are new to Unix, you probably should go out and buy some books
+and do some reading.
+This <ulink url="&url-unix-faq;">list of Unix FAQs</ulink> contains a
+number of UseNet documents which provide a nice historical reference.
+
+</para>
  </sect1>
diff --git a/en/post-install/new-to-unix.xml b/en/post-install/new-to-unix.xml
deleted file mode 100644
index f85182353..000000000
--- a/en/post-install/new-to-unix.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- retain these comments for translator revision tracking -->
-<!-- $Id$ -->
-
-
- <sect1 id="unix-intro">
- <title>If You Are New to Unix</title>
-<para>
-
-If you are new to Unix, you probably should go out and buy some books
-and do some reading.  A lot of valuable information can also be found
-in the <ulink url="&url-debian-reference;">Debian Reference</ulink>.
-This <ulink url="&url-unix-faq;">list of Unix FAQs</ulink> contains a
-number of UseNet documents which provide a nice historical reference.
-
-</para><para arch="linux-any">
-
-Linux is an implementation of Unix.  The
-<ulink url="&url-ldp;">Linux Documentation Project (LDP)</ulink>
-collects a number of HOWTOs and online books
-relating to Linux.  Most of these documents can be installed locally;
-just install the <classname>doc-linux-html</classname> package (HTML
-versions) or the <classname>doc-linux-text</classname> package (ASCII
-versions), then look in <filename>/usr/share/doc/HOWTO</filename>.
-International versions of the LDP HOWTOs are also available as &debian;
-packages.
-
-</para>
-
- </sect1>
diff --git a/en/post-install/post-install.xml b/en/post-install/post-install.xml
index 68da25de8..01b7d59e9 100644
--- a/en/post-install/post-install.xml
+++ b/en/post-install/post-install.xml
@@ -5,7 +5,6 @@
  <title>Next Steps and Where to Go From Here</title>
 
 &shutdown.xml;
-&new-to-unix.xml;
 &orientation.xml;
 &further-reading.xml;
 &mail-setup.xml;
diff --git a/en/welcome/what-is-debian.xml b/en/welcome/what-is-debian.xml
index 5ff808781..886d1b84a 100644
--- a/en/welcome/what-is-debian.xml
+++ b/en/welcome/what-is-debian.xml
@@ -75,16 +75,6 @@ community.  Some examples include:
 <listitem><para>
 
 The
-<ulink url="&url-lsb-org;">Linux Standard Base</ulink>
-(LSB) is a project aimed at standardizing the basic GNU/Linux system,
-which will enable third-party software and hardware developers to
-easily design programs and device drivers for Linux-in-general, rather
-than for a specific GNU/Linux distribution.
-
-</para></listitem>
-<listitem><para>
-
-The
 <ulink url="&url-fhs-home;">Filesystem Hierarchy Standard</ulink>
 (FHS) is an effort to standardize the layout of the Linux
 file system. The FHS will allow software developers to concentrate