Merged

doc/source/development_saio.rst

@@ -19,8 +19,7 @@ good idea what to do on other environments.
   #. `Use operating system installation disc image file`, pick the .iso
      from above.
   #. Select `Linux` and `Ubuntu 64-bit`.
-  #. Fill in the *Linux Easy Install* details (you should make the user
-     name match your launchpad user id).
+  #. Fill in the *Linux Easy Install* details.
   #. `Customize Settings`, name the image whatever you want 
      (`SAIO` for instance.)
   #. When the `Settings` window comes up, select `Hard Disk`, create an
@@ -153,10 +152,9 @@ good idea what to do on other environments.
      `bzr launchpad-login <launchpad_id>`
   #. Check out your bzr repo of swift, for example:
      `bzr branch lp:~swift-core/swift/trunk swift`
-  #. ``for f in `ls ~/swift/bin/`; do sudo ln -s /home/<your-user-name>/swift/bin/$f /usr/bin/$f`; done``
+  #. `cd ~<your-user-name>/swift; python setup.py develop`
   #. Edit `~/.bashrc` and add to the end::
 
-        export PYTHONPATH=~/swift
         export PATH_TO_TEST_XFS=/mnt/sdb1/test
         export SWIFT_TEST_CONFIG_FILE=/etc/swift/func_test.conf
         export PATH=${PATH}:~/bin

setup.py

@@ -28,11 +28,6 @@ setup(
     url='https://launchpad.net/swift',
     packages=find_packages(exclude=['tests','bin']),
     test_suite = 'nose.collector',
-    command_options = {
-        'build_sphinx': {
-            'version': ('setup.py', version),
-      }
-    },
     classifiers=[
         'Development Status :: 4 - Beta',
         'License :: OSI Approved :: Apache Software License',