summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2016-03-14 13:45:38 +0000
committergjb <gjb@FreeBSD.org>2016-03-14 13:45:38 +0000
commit9b54c74d292966e2f11caa5b4e892a36a74e0757 (patch)
tree88cb27509aab98da6139ddb60b0d5a0ffa97762f /release
parent48b87d0718e23300ac96327da6880c3b43f601af (diff)
downloadFreeBSD-src-9b54c74d292966e2f11caa5b4e892a36a74e0757.zip
FreeBSD-src-9b54c74d292966e2f11caa5b4e892a36a74e0757.tar.gz
Add the installation chapter back.
Approved by: re (implicit) Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release')
-rw-r--r--release/doc/en_US.ISO8859-1/installation/Makefile19
-rw-r--r--release/doc/en_US.ISO8859-1/installation/article.xml150
2 files changed, 169 insertions, 0 deletions
diff --git a/release/doc/en_US.ISO8859-1/installation/Makefile b/release/doc/en_US.ISO8859-1/installation/Makefile
new file mode 100644
index 0000000..53ec9837
--- /dev/null
+++ b/release/doc/en_US.ISO8859-1/installation/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+RELN_ROOT?= ${.CURDIR}/../..
+.ifdef NO_LANGCODE_IN_DESTDIR
+DESTDIR?= ${DOCDIR}/installation
+.else
+DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/installation
+.endif
+
+DOC?= article
+FORMATS?= html
+INSTALL_COMPRESSED?= gz
+INSTALL_ONLY_COMPRESSED?=
+
+# SGML content
+SRCS+= article.xml
+
+.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/en_US.ISO8859-1/installation/article.xml b/release/doc/en_US.ISO8859-1/installation/article.xml
new file mode 100644
index 0000000..1fe5d98
--- /dev/null
+++ b/release/doc/en_US.ISO8859-1/installation/article.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+%release;
+<!ENTITY local.rel "10.3">
+]>
+
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+ <info><title>&os; &release.current; Installation Instructions</title>
+
+ <author><orgname>The &os; Project</orgname></author>
+
+ <pubdate>$FreeBSD$</pubdate>
+
+ <copyright>
+ <year>2016</year>
+ <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
+ </copyright>
+
+ <legalnotice xml:id="trademarks" role="trademarks">
+ &tm-attrib.freebsd;
+ &tm-attrib.intel;
+ &tm-attrib.sparc;
+ &tm-attrib.general;
+ </legalnotice>
+
+ <abstract>
+ <para>This article gives some brief instructions on installing
+ &os; &release.current; and upgrading the systems running earlier
+ releases.</para>
+ </abstract>
+</info>
+
+ <sect1 xml:id="install">
+ <title>Installing &os;</title>
+
+ <para>The <uri
+ xlink:href="&url.books.handbook;/bsdinstall.html">Installing
+ &os;</uri>
+ chapter of the <uri
+ xlink:href="&url.books.handbook;/">&os;
+ Handbook</uri> provides more in-depth information about the
+ installation program itself, including a guided walk-through with
+ screenshots.</para>
+ </sect1>
+
+ <sect1 xml:id="upgrade">
+ <title>Upgrading &os;</title>
+
+ <para>If you are upgrading from a previous release of &os;, please
+ read <uri
+ xlink:href="http://www.FreeBSD.org/releases/&local.rel;R/relnotes.html#upgrade">upgrading
+ section in the Release Notes</uri> for notable
+ incompatibilities carefully.</para>
+
+ <sect2>
+ <title>Upgrading from Source</title>
+
+ <para>The procedure for doing a source code based update is
+ described in
+ <uri xlink:href="&url.books.handbook;/synching.html"></uri> and
+ <uri xlink:href="&url.books.handbook;/makeworld.html"></uri>.</para>
+
+ <para>For SVN use the <filename>releng/&local.rel;</filename> branch
+ which will be where any upcoming Security Advisories or Errata
+ Notices will be applied.</para>
+ </sect2>
+
+ <sect2>
+ <title>Upgrading Using <quote>&os; Update</quote></title>
+
+ <para>The &man.freebsd-update.8; utility supports binary
+ upgrades of &arch.i386; and &arch.amd64; systems running
+ earlier FreeBSD releases. Systems running
+ <literal>9.3-RELEASE</literal>,
+ <literal>10.3-RC[12]</literal> can upgrade as follows:</para>
+
+ <screen>&prompt.root; freebsd-update fetch
+&prompt.root; freebsd-update install</screen>
+
+ <para>Now the &man.freebsd-update.8; utility can fetch bits
+ belonging to &release.current;. During this process
+ &man.freebsd-update.8; will ask for help in merging
+ configuration files.</para>
+
+ <screen>&prompt.root; freebsd-update upgrade -r &local.rel;-RELEASE</screen>
+
+ <para>Due to changes in the way that &os; is packaged on the
+ release media, two complications may arise in this process if
+ upgrading from FreeBSD 8.x or 9.x:</para>
+
+ <orderedlist>
+ <listitem>
+ <para>The &os;, which previously could appear in either
+ <filename>/boot/kernel</filename> or
+ <filename>/boot/GENERIC</filename>, now only appears as
+ <filename>/boot/kernel</filename>. As a result, any
+ kernel appearing in <filename>/boot/GENERIC</filename>
+ will be deleted. Please carefully read the output printed
+ by &man.freebsd-update.8; and confirm that an updated
+ kernel will be placed into
+ <filename>/boot/kernel</filename> before proceeding beyond
+ this point.</para>
+ </listitem>
+
+ <listitem>
+ <para>The &os; source tree in <filename>/usr/src</filename>
+ (if present) will be deleted. (Normally the
+ &man.freebsd-update.8; utility will update a source tree,
+ but in this case the changes in release packaging result
+ in the &man.freebsd-update.8; utility not recognizing that
+ the source tree from the old release and the source tree
+ from the new release correspond to the same part of
+ &os;.)</para>
+ </listitem>
+ </orderedlist>
+
+ <screen>&prompt.root; freebsd-update install</screen>
+
+ <para>The system must now be rebooted with the newly installed
+ kernel before the non-kernel components are updated.</para>
+
+ <screen>&prompt.root; shutdown -r now</screen>
+
+ <para>After rebooting, &man.freebsd-update.8; needs to be run
+ again to install the new userland components:</para>
+
+ <screen>&prompt.root; freebsd-update install</screen>
+
+ <para>At this point, users of systems being upgraded from &os;
+ 9.2-RELEASE or earlier will be prompted by
+ &man.freebsd-update.8; to rebuild all third-party applications
+ (e.g., ports installed from the ports tree) due to updates in
+ system libraries.</para>
+
+ <para>After updating installed third-party applications (and
+ again, only if &man.freebsd-update.8; printed a message
+ indicating that this was necessary), run
+ &man.freebsd-update.8; again so that it can delete the old (no
+ longer used) system libraries:</para>
+
+ <screen>&prompt.root; freebsd-update install</screen>
+
+ <para>Finally, reboot into &release.current;</para>
+
+ <screen>&prompt.root; shutdown -r now</screen>
+ </sect2>
+ </sect1>
+</article>
OpenPOWER on IntegriCloud