Merge lp:~nigelbabu/summit/docs-cleaning into lp:summit

Proposed by Nigel Babu
Status: Merged
Approved by: Michael Hall
Approved revision: 218
Merged at revision: 222
Proposed branch: lp:~nigelbabu/summit/docs-cleaning
Merge into: lp:summit
Diff against target: 79 lines (+18/-18)
1 file modified
docs/installing.rst (+18/-18)
To merge this branch: bzr merge lp:~nigelbabu/summit/docs-cleaning
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+81862@code.launchpad.net

Commit message

Spring cleaning the docs in readthedocs.org.

Description of the change

Spring cleaning the docs in readthedocs.org.

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

Looks good to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/installing.rst'
2--- docs/installing.rst 2011-09-14 02:32:31 +0000
3+++ docs/installing.rst 2011-11-10 14:50:31 +0000
4@@ -2,7 +2,7 @@
5 Installing Summit
6 ==================
7
8-efore you start hacking on summit, you need to first setup your environment.
9+Before you start hacking on summit, you need to first setup your environment.
10 We're going to set it up without breaking anything else in your current.
11
12
13@@ -12,22 +12,15 @@
14 * Python 2.6 (greater than 2.6.1)
15 * virtualenv
16
17-On Ubuntu
18-~~~~~~~~~
19-The following command will install the required development files on Ubuntu or,
20-if you're running a recent version, you can `install them automatically
21-<apt:python-virtualenv>`_::
22-
23- sudo apt-get install python-virtualenv
24-
25 virtualenv
26-----------
27-
28+~~~~~~~~~~
29 `virtualenv <http://pypi.python.org/pypi/virtualenv>`_ is a tool to create
30 isolated Python environments. We don't want to install packages system-wide
31-because that can create quite a mess. ::
32+because that can create quite a mess. The following command will install the
33+required development files on Ubuntu or, if you're running a recent version,
34+you can `install them automatically <apt:python-virtualenv>`_::
35
36- sudo easy_install virtualenv
37+ sudo apt-get install python-virtualenv
38
39 virtualenv is the only Python package you need to install system-wide.
40 Everything else goes in a virtual environment.
41@@ -38,7 +31,14 @@
42 `virtualenvwrapper <http://www.doughellmann.com/docs/virtualenvwrapper/>`_
43 is a set of shell functions that make virtualenv easy to work with.
44
45-Install it like this::
46+For Ubuntu Maverick Meerkat and above, `install virtualenvwrapper via apt
47+<apt:virtualenvwrapper>`_::
48+
49+ sudo apt-get install virtualenvwrapper
50+
51+Once installed, ``exec bash`` and you're set to start!
52+
53+For earlier releases, install it like this::
54
55 wget http://bitbucket.org/dhellmann/virtualenvwrapper/raw/f31869779141/virtualenvwrapper_bashrc -O ~/.virtualenvwrapper
56 mkdir ~/.virtualenvs
57@@ -86,7 +86,7 @@
58 .. note:: If you want to use a different Python binary, pass the path to
59 mkvirtualenv with ``--python``::
60
61- mkvirtualenv --python=/usr/local/bin/python2.6 --no-site-packages summit
62+ mkvirtualenv --python=/usr/bin/python2.6 --no-site-packages summit
63
64 Finish the install
65 ~~~~~~~~~~~~~~~~~~
66@@ -110,10 +110,10 @@
67 Get themes
68 ----------
69
70-Get the theme for Ubuntu and Linaro with::
71+Get setup for the themes for Ubuntu and Linaro::
72
73- bzr branch lp:ubuntu-community-webthemes/light-django-theme ubuntu_website
74- bzr branch lp:~linaro-infrastructure/ubuntu-community-webthemes/light-django-linaro-theme linaro_website
75+ ./manage.py init-summit
76+ ./manage.py pullapps
77
78 Database
79 --------

Subscribers

People subscribed via source and target branches