remove pmg-quick-start.adoc, move content to pmg-installation.adoc

diff --git a/pmg-admin-guide.adoc b/pmg-admin-guide.adoc
index f7a7a152873b0177e6c56a77bb810e8fba3b351c..fb4a3236827b69752fb386a44c7a654f0992f2f2 100644 (file)
--- a/pmg-admin-guide.adoc
+++ b/pmg-admin-guide.adoc
@@ -21,8 +21,6 @@ ifndef::manvolnum[]
 
 include::pmg-intro.adoc[]
 
-include::pmg-quick-start.adoc[]
-
 include::pmg-planning-deployment.adoc[]
 
 include::pmg-installation.adoc[]

diff --git a/pmg-installation.adoc b/pmg-installation.adoc
index 11220f11e3407a177944c6756eb305b84e484306..e28aeab10bac526aeadd43eed2e0667a9f93612a 100644 (file)
--- a/pmg-installation.adoc
+++ b/pmg-installation.adoc
@@ -18,12 +18,13 @@ it requires more detailed knowledge about {pmg} and Debian.
 Using the {pmg} Installation CD-ROM
 -----------------------------------
 
-Includes the following:
+You can download the ISO from http://www.proxmox.com. It includes the
+following:
 
 * Complete operating system (Debian Linux, 64-bit)
 
-* Partitioning of the hard drive(s) containing the operating system
-  with ext4, ext3, xfs or ZFS
+* The {pmg} installer, which partitions the hard drive(s) with ext4,
+  ext3, xfs or ZFS and installs the operating system.
 
 * Linux kernel
 
@@ -31,9 +32,12 @@ Includes the following:
 
 * Web based management interface for using the toolset
 
-Please insert the installation CD-ROM, then boot from that
-drive. Immediately afterwards you can choose the following menu
-options:
+Please burn the downloaded ISO image to a CD or create a
+xref:create_bootable_usb[bootable USB stick].
+
+Then insert the installation CD-ROM on the physical host where you want
+to install {pmg} and boot from that drive. Immediately afterwards you
+can choose the following menu options:
 
 image::images/installer/pmg-grub-menu.png[]
 
@@ -131,9 +135,33 @@ Further configuration is done via the Proxmox web interface. Just
 point your browser to the IP address given during installation
 (https://youripaddress:8006).
 
+. Login and upload subscription key.
++
 NOTE: Default login is "root" and the root password is
 defined during the installation process.
 
+. Check the IP configuration and hostname.
+
+. Check and save the Time Zone.
+
+. Check your xref:firewall_settings[Firewall settings].
+
+. Configure {pmg} to forward the incoming SMTP traffic to your Mail
+server ('Configuration/Mail Proxy/Default Relay') - 'Default
+Relay' is your e-mail server.
+
+. Configure your e-mail server to send all outgoing messages through
+your {pmg} ('Smart Host', port 26 by default) - see
+xref:fitering_outgoing_mail[Filtering outgoing e-mails].
+
+For detailed deployment scenarios see chapter
+xref:chapter_deployment[Planning for Deployment].
+
+If the installation succeeds you have to route all your incoming and
+outgoing e-mail traffic to the Mail Gateway. For incoming traffic you
+have to configure your firewall and/or DNS settings. For outgoing
+traffic you need to change the existing e-mail server configuration.
+
 
 [[advanced_lvm_options]]
 Advanced LVM Configuration Options

diff --git a/pmg-planning-deployment.adoc b/pmg-planning-deployment.adoc
index 7c90fe72c6fe7cbbe897b40a3d19abb3b059d217..bebbcf0e9709dd8b173630157e05174bf28724ad 100644 (file)
--- a/pmg-planning-deployment.adoc
+++ b/pmg-planning-deployment.adoc
@@ -1,3 +1,4 @@
+[[chapter_deployment]]
 Planning for Deployment
 =======================
 

diff --git a/pmg-quick-start.adoc b/pmg-quick-start.adoc
deleted file mode 100644 (file)
index eb8fb38..0000000
--- a/pmg-quick-start.adoc
+++ /dev/null
@@ -1,49 +0,0 @@
-Quick Start Guide
-=================
-
-Experienced users can use this guide for a quick installation. For
-detailed instructions please read the whole documentation.
-
-
-. Download ISO from Download http://www.proxmox.com
-+
-NOTE: There is one ISO image for download covering all versions and
-features.
-
-. Burn the downloaded ISO image to a CD or create a
-xref:create_bootable_usb[bootable USB stick].
-
-. Boot from this CD/USB stick on your dedicated hardware - see xref:system_requirements[System requirements].
-
-[thumbnail="pmg-grub-menu.ppm"]
-
-. Follow the instructions on the graphical screen.
-+
-CAUTION: All existing data on your hard disk will be lost!
-
-. After reboot, go to your desktop PC and point your browser to the
-given IP address.
-
-. Login and upload subscription key.
-
-. Check the IP configuration and hostname.
-
-. Check and save the Time Zone.
-
-. Check your xref:firewall_settings[Firewall settings].
-
-. Configure {pmg} to forward the incoming SMTP traffic to your Mail
-server ('Configuration/Mail Proxy/Default Relay') - 'Default
-Relay' is your e-mail server.
-
-. Configure your e-mail server to send all outgoing messages through
-your {pmg} ('Smart Host', port 26 by default) - see
-xref:fitering_outgoing_mail[Filtering outgoing e-mails].
-
-For detailed deployment scenarios see the "{pmg} Deployment Guide".
-
-If the installation succeeds you have to route all your incoming and
-outgoing e-mail traffic to the Mail Gateway. For incoming traffic you
-have to configure your firewall and/or DNS settings. For outgoing
-traffic you need to change the existing e-mail server configuration.
-