Ticket #1703: quickstart-reflow-and-utf8bom.diff.patch

File quickstart-reflow-and-utf8bom.diff.patch, 5.1 KB (added by zooko, at 2012-03-31T05:42:22Z)

  • docs/quickstart.rst 

    diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 4e8844b..7682ced 100644
    a b  
     1
    12==================
    23Getting Tahoe-LAFS
    34==================
    … … decentralized, fault-tolerant storage system. `About Tahoe-LAFS 
    910How To Get Tahoe-LAFS
    1011=====================
    1112
    12 This procedure has been verified to work on Windows, Mac, OpenSolaris,
    13 and too many flavors of Linux and of BSD to list. It's likely to work
    14 on other platforms.
     13This procedure has been verified to work on Windows, Mac, OpenSolaris, and
     14too many flavors of Linux and of BSD to list. It's likely to work on other
     15platforms.
    1516
    1617In Case Of Trouble
    1718------------------
    1819
    19 There are a few 3rd party libraries that Tahoe-LAFS depends on that
    20 might not be easy to set up on your platform. If the following
    21 instructions don't Just Work without any further effort on your part,
    22 then please write to `the tahoe-dev mailing list
    23 <https://tahoe-lafs.org/cgi-bin/mailman/listinfo/tahoe-dev>`_ where
    24 friendly hackers will help you out.
     20There are a few 3rd party libraries that Tahoe-LAFS depends on that might not
     21be easy to set up on your platform. If the following instructions don't Just
     22Work without any further effort on your part, then please write to `the
     23tahoe-dev mailing list
     24<https://tahoe-lafs.org/cgi-bin/mailman/listinfo/tahoe-dev>`_ where friendly
     25hackers will help you out.
    2526
    2627Install Python
    2728--------------
    2829
    29 Check if you already have an adequate version of Python installed by
    30 running ``python -V``. Python v2.4 (v2.4.4 or greater), Python v2.5,
    31 Python v2.6, or Python v2.7 will work. Python v3 does not work. On
    32 Windows, we recommend the use of Python v2.6 (native, not Cygwin). If
    33 you don't have one of these versions of Python installed, then follow
    34 the instructions on `the Python download page
    35 <http://www.python.org/download/releases/2.6.6/>`_ to download and
    36 install Python v2.6. Make sure that the path to the installation
    37 directory has no spaces in it (e.g. on Windows, do not install Python
    38 in the "Program Files" directory).
     30Check if you already have an adequate version of Python installed by running
     31``python -V``. Python v2.4 (v2.4.4 or greater), Python v2.5, Python v2.6, or
     32Python v2.7 will work. Python v3 does not work. On Windows, we recommend the
     33use of native Python, not Cygwin. If you don't have one of these versions of
     34Python installed, then follow the instructions on `the Python download page
     35<http://www.python.org/download/releases/2.7.2/>`_ to download and install
     36Python v2.7. Make sure that the path to the installation directory has no
     37spaces in it (e.g. on Windows, do not install Python in the "Program Files"
     38directory).
    3939
    4040Get Tahoe-LAFS
    4141--------------
    … … Set Up Tahoe-LAFS 
    4949Unpack the zip file and cd into the top-level directory.
    5050
    5151Run ``python setup.py build`` to generate the ``tahoe`` executable in a
    52 subdirectory of the current directory named ``bin``. This will download
    53 and build anything you need from various websites.
     52subdirectory of the current directory named ``bin``. This will download and
     53build anything you need from various websites.
    5454
    55 On Windows, the ``build`` step might tell you to open a new Command
    56 Prompt (or, on XP and earlier, to log out and back in again). This is
    57 needed the first time you set up Tahoe-LAFS on a particular
    58 installation of Windows.
     55On Windows, the ``build`` step might tell you to open a new Command Prompt
     56(or, on XP and earlier, to log out and back in again). This is needed the
     57first time you set up Tahoe-LAFS on a particular installation of Windows.
    5958
    60 Optionally run ``python setup.py test`` to verify that it passes all of
    61 its self-tests.
     59Optionally run ``python setup.py test`` to verify that it passes all of its
     60self-tests.
    6261
    63 Run ``bin/tahoe --version`` (on Windows, ``bin\tahoe --version``) to
    64 verify that the executable tool prints out the right version number.
     62Run ``bin/tahoe --version`` (on Windows, ``bin\tahoe --version``) to verify
     63that the executable tool prints out the right version number.
    6564
    6665Run Tahoe-LAFS
    6766--------------
    6867
    6968Now you are ready to deploy a decentralized filesystem. The ``tahoe``
    70 executable in the ``bin`` directory can configure and launch your
    71 Tahoe-LAFS nodes. See `running.rst <running.rst>`_ for instructions on
    72 how to do that.
    73 
    74 Advanced Installation
    75 ---------------------
    76 
    77 For optional features such as tighter integration with your operating
    78 system's package manager, you can see the `AdvancedInstall
    79 <https://tahoe-lafs.org/trac/tahoe-lafs/wiki/AdvancedInstall>`_ wiki page.
    80 The options on that page are not necessary to use Tahoe-LAFS and can be
    81 complicated, so we do not recommend following that page unless you have
    82 unusual requirements for advanced optional features. For most people,
    83 you should first follow the instructions on this page, and if that
    84 doesn't work then ask for help by writing to `the tahoe-dev mailing
    85 list <https://tahoe-lafs.org/cgi-bin/mailman/listinfo/tahoe-dev>`_.
    86 
     69executable in the ``bin`` directory can configure and launch your Tahoe-LAFS
     70nodes. See `running.rst <running.rst>`_ for instructions on how to do that.