editing getting started sections for correct grammar given ref links

source/bundles_overview.rst

@@ -1,5 +1,7 @@
-Bundle overview
-############################################################
+.. _bundles_overview:
+
+Bundles overview
+################
 
 Linux-based operating systems contain the code of several hundred, if
 not thousands, of open source projects. To make this manageable,
@@ -12,14 +14,14 @@ distributions deploy their software. With those kinds of distributions,
 system administrators can then install and update sub-packages
 individually or as a set, using tools such as "yum" and "apt-get."
 
-The Clear Linux* OS for Intel® Architecture does things a bit differently. While we also use the
-concept of packages to manage compiling source code into binaries, we do
-not use the package concept to deploy software. Instead, we provide
-"bundles" that  provide a set of functionality to the system
-administrator, independent of how many and which pieces of the upstream
-open source projects are needed for this functionality. The diagram
-below gives an overall picture of it.
+The Clear Linux* OS for Intel® Architecture takes a slightly different
+approach. While we also use the concept of packages to manage compiling
+source code into binaries, we do not use the package concept to deploy
+software. Instead, we provide "bundles" that  provide a set of functionality
+to the system administrator, independent of how many and which pieces of
+the upstream open source projects are needed for this functionality. The
+diagram below gives an overall picture of it.
 
 .. image:: _static/images/bundles_overview.png
     :align: center
-    :alt: confirmation
+    :alt: bundles-overview

source/gs_getting_started.rst

@@ -3,9 +3,9 @@
 Getting started with Clear Linux* OS for Intel® Architecture
 ############################################################
 
-The easiest way to give Clear Linux OS for Intel Architecture a spin is to download a 
-recent KVM image from the `image directory <http://download.clearlinux.org/image/>`_ 
-on our download page. This directory contains a current image, the UEFI firmware 
+The easiest way to give Clear Linux OS for Intel Architecture a spin is to download a
+recent KVM image from the `image directory <http://download.clearlinux.org/image/>`_
+on our download page. This directory contains a current image, the UEFI firmware
 helper and the KVM start helper script. See :ref:`gs_running_clr_virtual` for details.
 
-You can also :ref:`gs_installing_clr_as_host` on a target computer.
+You can also try :ref:`gs_installing_clr_as_host` on a target computer.

source/gs_installing_clr_as_host.rst

@@ -34,5 +34,5 @@ You might need to switch to another TTY.
 For feedback on installation or other topics, please feel free to write in to our 
 `mailing list <https://lists.clearlinux.org/mailman/listinfo/dev>`_.
 
-Note: You can also :ref:`gs_running_clr_virtual`.
+Note: You can also try :ref:`gs_running_clr_virtual`.
 

source/gs_running_clr_virtual.rst

@@ -15,17 +15,11 @@ Starter script
 To start the image, run the ``start_qemu.sh`` script from
 `here <http://download.clearlinux.org/image/start_qemu.sh>`_, or modify
 the following script for your needs and run it from the command line
-<<<<<<< HEAD
-with ``$ script clr_image``::
-
-    #!/bin/bash 
-=======
 with ``$ script clr_image``
 
 .. code-block:: bash
 
     #!/bin/bash
->>>>>>> staging
     if [ $#  -eq 0 ] ; then
       echo "Please provide an image to emulate as first argument"
       exit 1
@@ -44,14 +38,13 @@ with ``$ script clr_image``
         -net user,hostfwd=tcp::2223-:22 \
         -monitor stdio "$@"
 
+
 To run this script, connect from host via SSH. Take note that SSH is not
 enabled by default. To enable it, log in through serial console with the
 username ``root``. After setting the password, enable root login via SSH
-<<<<<<< HEAD
-by configuring ``/etc/ssh/sshd_config`` with this content::
-=======
-by configuring :file:`/etc/ssh/sshd_config` with this content::
->>>>>>> staging
+by configuring :file:`/etc/ssh/sshd_config` with this line
+
+::
 
     PermitRootLogin yes
 
@@ -59,26 +52,16 @@ Now you may connect from host via SSH through 2223::
 
     $ ssh -p 2223 root@localhost
 
-<<<<<<< HEAD
-Alternately, there are a few other ways to approach this.
-=======
 Alternatively, there are a few other ways to approach this.
->>>>>>> staging
 
 -  To run the script without modifying its permissions::
 
        $ bash start_qemu.sh clr_image
 
 -  To run it as a background process::
-<<<<<<< HEAD
-
-       $ `bash start_qemu.sh clr_image` &
-
-=======
 
        $ bash start_qemu.sh clr_image &
 
->>>>>>> staging
 -  If you'd like to run the script with execute permission::
 
        $ chmod +x start_qemu.sh
@@ -86,4 +69,4 @@ Alternatively, there are a few other ways to approach this.
 
 -  And to run it as a background process::
 
-       $ ./start_qemu.sh clr_image &
+       $ ./start_qemu.sh clr_image &