[rhel7/f20/master 1/2] No longer install anaconda user documentation (#831512)

mulhern amulhern at redhat.com
Fri Nov 1 18:55:09 UTC 2013


Related: rhbz#831512

The current anaconda install puts some user documentation files in
/usr/share/doc/anaconda-<version>. The documents are now omitted from
the installation, because anaconda isn't your typical user program.
It seems more appropriate
to make that documentation available in the official docs and not
dependent on the install for users who are in the process of installing.

The ultimate goal is to make all user documents available externally
in the most official documentation that it is sensible to put it and use
the docs directory for developer documents.

Previously command-line.txt was
downloaded from the wiki as part of the build process,
but the page has moved so instead of a useful
document you get a 301 html page. Now, nothing is downloaded.

boot-options.html can be generated from boot-options.txt using asciidoc.
This is not made part of the build process because the ultimate goal is
to no longer maintain boot-options.txt and to have all that information
incorporated in the install guide instead.

Since command-line.txt will not be downloaded any more, it is removed from
cleans and ignores as appropriate.

install-methods.txt has been obsoleted and is removed.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 anaconda.spec.in         |   3 --
 docs/.gitignore          |   1 -
 docs/Makefile.am         |   9 ++--
 docs/install-methods.txt | 137 -----------------------------------------------
 4 files changed, 3 insertions(+), 147 deletions(-)
 delete mode 100644 docs/install-methods.txt

diff --git a/anaconda.spec.in b/anaconda.spec.in
index 1f67680..ccb4826 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -212,9 +212,6 @@ update-desktop-database &> /dev/null || :
 
 %files -f %{name}.lang
 %doc COPYING
-%doc docs/command-line.txt
-%doc docs/install-methods.txt
-%doc docs/mediacheck.txt
 %{_unitdir}/*
 %{_prefix}/lib/systemd/system-generators/*
 %{_bindir}/instperf
diff --git a/docs/.gitignore b/docs/.gitignore
index 6374628..278bdab 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,3 +1,2 @@
 api
-command-line.*
 kickstart-docs.*
diff --git a/docs/Makefile.am b/docs/Makefile.am
index aef2d5d..cbf244a 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -17,13 +17,10 @@
 #
 # Author: David Cantrell <dcantrell at redhat.com>
 
-EXTRA_DIST = install-methods.txt mediacheck.txt \
+EXTRA_DIST = boot-options.txt mediacheck.txt \
              lvm_sanity_checks.txt rescue-mode api.cfg making-screenshots \
-             threads.txt command-line.txt gettext.txt transifex.txt
+             threads.txt gettext.txt transifex.txt
 
 CLEANFILES = api *.xml
 
-MAINTAINERCLEANFILES = Makefile.in command-line.txt
-
-command-line.txt:
-	curl -4 -A "anaconda-build" -o command-line.txt "http://fedoraproject.org/w/index.php?title=Anaconda_Boot_Options&action=raw"
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/docs/install-methods.txt b/docs/install-methods.txt
deleted file mode 100644
index b630946..0000000
--- a/docs/install-methods.txt
+++ /dev/null
@@ -1,137 +0,0 @@
-11-07-2006
-----------
-
-Contents
---------
-
- 1) Description of install methods
- 2) Extra notes on install methods
-
-1)Description of Anaconda Install Methods (and ways of updating it)
--------------------------------------------------------------------
-
-Notes:
-------------
-
- - "fully exploded tree" - this is a tree which in the root has every
-   directory with .rpm files from every CD image merged into one directory
-   with the same name.
-   (So everything from cd's Client directories goes to Client directory and
-   likewise for Server, VT, Workstation ... dirs)
-
- - "ISO" - the ISO image for a CD image.
-
- - "anaconda updates" - patches for anaconda to fix bugs/etc.
-
- - "anaconda updates=[http://url|ftp://url]" - patches for anaconda to fix
-   bugs/etc. that can be downloaded from the specified remote location.
-   The image is the same format as an updates.img as specified below.
-
- - all paths without a leading '/' are relative to directory specified
-   to installer containing install source.
-
- - 'updates.img' is a ext2 filesystem containing the updated python
-   sources and modules for anaconda.
-          
-Current Installation Methods:
------------------------------
-
-- CDROM / DVD
--------------
-
-  Summary:
-      This is pretty self-explanatory.  Mounts the disc and installs packages,
-      prompts user to switch discs when the next disc is required.
-
-  Update Options: 
-      - floppy or USB key drive.
-      - 'updates.img' file in 'images/' directory of disc #1 image.
-      - remote updates.img downloaded via FTP or HTTP.
-
-- NFS (from a fully exploded tree)
-----------------------------------
-
-  Summary:
-      Mounts directory from NFS server.
-
-  Update Options:
-      - floppy or USB key drive.
-      - 'updates.img' file in 'images/' directory.
-      - remote updates.img downloaded via FTP or HTTP.
-
-- NFS (from a directory of ISOs)
---------------------------------
-
-  Summary:
-      Loopback mounts ISO images from NFS server.
-
-  Update Options:
-      - floppy or USB key drive.
-      - 'updates.img' file in 'images/' directory.
-      - remote updates.img downloaded via FTP or HTTP.
-
-- FTP/HTTP (from a fully exploded tree)
----------------------------------------
-
-  Summary:
-      Pulls files from tree via FTP or HTTP.
-
-  Update Options:
-      - floppy or USB key drive.
-      - 'updates.img' file in 'images/' directory.
-      - remote updates.img downloaded via FTP or HTTP.
-
-- FTP/HTTP (from a directory of loopback-mounted ISOs)
-------------------------------------------------------
-
-  Summary:
-      Pulls files from tree via FTP or HTTP.  Looks in 'disc1/' directory
-      to contain files from disc #1, 'disc2/' for disc #2, etc.  These can be
-      created on the server by loopback mounting the ISO images into these
-      directories under the directory made available to ftp.
-
-  Update Options:
-      - floppy or USB key drive.
-      - 'updates.img' file in 'images/' directory in ISO image for disc #1.
-      - remote updates.img downloaded via FTP or HTTP.
-
-Hard Drive from ISOs
---------------------
-
-  Summary:
-      Similar to NFS ISO-based method - loopback mounts ISOs in directory
-      specified by user.  The ISOs must be on an ext2 or vfat partition,
-      not a logical volume.
-
-  Update Options:
-      - floppy or USB key drive.
-      - 'updates.img' file in 'images/' directory of ISO image for CD #1.
-      - remote updates.img downloaded via FTP or HTTP.
-  
-
-2)Extra Notes:
---------------
-
-   By default NFS, harddrive, and CDROM/DVD-based installs are graphical,
-unless the 'text' option is passed on the boot command line.
-
-   FTP and HTTP are text-based, unless 'graphical' is passed on the command
-line.  For a graphical FTP or HTTP install to occur, one of the following
-must be true:
-
-   - the file 'RedHat/base/stage2.img' must exist on the install server. In
-     this case this file is downloaded int RAM, taking about 64MB to store.
-     It is recommended to only use this option on machines with more than
-     192MB of RAM.
-
- or:
- 
-   - the rescue CD is in the CD drive, in which case the stage2.img file
-     will be mounted from the rescue CD.  The packages will still be 
-     downloaded from the FTP/HTTP server.  No additional memory is required
-     because the second stage of the installer is mounted from the CD.
-
-   You can also specify 'graphical' or 'text' as kickstart directives in
-the kickstart config file you use, and this has the same affect as if you
-put the directive on the boot command line.
-
-- 
1.8.3.1



More information about the anaconda-patches mailing list