Skip to content

Commit

Permalink
Merge pull request #2 from multani/master
Browse files Browse the repository at this point in the history
Fix URLs directly related to Buildout
  • Loading branch information
Jim Fulton committed Dec 16, 2014
2 parents a0bd949 + 227b445 commit ad2cb0b
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 33 deletions.
26 changes: 12 additions & 14 deletions source/community.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ list.
Source code
-----------

The source code of Buildout is maintained in the Zope subversion
repository. To check out the trunk::
The source code of Buildout is maintained in a Git repository. To
check out the latest release::

svn co svn://svn.zope.org/repos/main/zc.buildout/trunk zc.buildout
git clone git://github.com/buildout/buildout

You can also browse the `source code
<http://svn.zope.org/repos/main/zc.buildout/trunk>`_ `online
<http://svn.zope.org/zc.buildout/trunk>`_ .

You can also browse the `source code online
<https://github.com/buildout/buildout>`_ .

You can contact `Jim Fulton <http://wiki.zope.org/zope3/JimFulton>`_
or ask in the `distutils-sig` for contributing to this project.
Expand All @@ -39,19 +39,17 @@ There is an IRC channel `#buildout` at freenode.net .
Issue tracker
-------------

Bugs and other issues are tracked at `Launchpad
<https://bugs.launchpad.net/zc.buildout>`_ . Feel free to submit
Bugs and other issues are tracked on `Github
<https://github.com/buildout/buildout/issues/>`_ . Feel free to submit
issues.

Website development
------------------------

The `www.buildout.org <http://www.buildout.org>`_ source code is
maintained in the Zope subversion repository. To check out the
trunk::
maintained in a Git repository. To check out the trunk::

svn co svn://svn.zope.org/repos/main/buildout-website/trunk buildout-website
git clone git://github.com/buildout/buildout.github.com

You can also browse the `source code
<http://svn.zope.org/repos/main/buildout-website/trunk>`_ `online
<http://svn.zope.org/buildout-website/trunk>`_.
You can also browse the `source code online
<https://github.com/buildout/buildout.github.com>`_.
12 changes: 4 additions & 8 deletions source/docs/dirstruct.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ directory.

The actual URL for fetching the :file:`bootstrap.py` file is:

http://svn.zope.org/\*checkout\*/zc.buildout/trunk/bootstrap/bootstrap.py
https://bootstrap.pypa.io/bootstrap-buildout.py


.. rubric:: buildout.cfg

Contains the default build specification for the entire project but others can
be defined such as file:`deployment.cfg` and :file:`production.cfg`.
be defined such as :file:`deployment.cfg` and :file:`production.cfg`.
Specification files can include other specification files.


Expand Down Expand Up @@ -119,12 +119,8 @@ distutils/setuptools in the process of constructing eggs.
Not strictly part of *zc.buildout*, this directory receives the final packed
representations of distributions such as eggs ready for uploading or sharing.

Example::

$ cd myproject
$ svn propedit svn:ignore

::
Here's a list of files and directories that you can ignore in your version
control system software::

.installed.cfg
parts
Expand Down
2 changes: 1 addition & 1 deletion source/docs/tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ Exercise 1

Try building out ``zope.event``.

- Check out: svn://svn.zope.org/repos/main/zope.event/trunk
- Check out: https://github.com/zopefoundation/zope.event

- Bootstrap

Expand Down
18 changes: 8 additions & 10 deletions source/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ eggs.
$ cd projectdir
$ bin/python bootstrap.py

.. sidebar:: Don't have an ``easy_install`` command?
.. sidebar:: Don't have the ``pip`` command?

You can install the :program:`pip` command by following the instructions on
the `pip installation page <https://pip.pypa.io/en/latest/installing.html>`_.

The :program:`easy_install` command comes as part of the `setuptools`_
package. To install it, download the :file:`ez_setup.py` file into a
temporary directory and run it with Administrator privileges.

2. While *zc.buildout* is most often installed within each project directory,
it can also be **installed system-wide**, to make it easy to create new
projects.

::

$ easy_install zc.buildout
$ pip install zc.buildout

This gives you a new command named :program:`buildout` to use in
initializing or updating a project.
Expand All @@ -44,7 +44,7 @@ eggs.

$ virtualenv --no-site-packages newproject
$ cd newproject
$ bin/easy_install zc.buildout
$ bin/pip install zc.buildout
$ bin/buildout init

3. To **add zc.buildout to a new project**, the primary step is to execute the
Expand Down Expand Up @@ -85,9 +85,7 @@ also covers which file/directories should be under version control and which
should not.


.. _`ez_setup.py`: http://peak.telecommunity.com/dist/ez_setup.py
.. _`bootstrap.py`: http://svn.zope.org/*checkout*/zc.buildout/trunk/bootstrap/bootstrap.py
.. _`ez_setup.py`: https://bootstrap.pypa.io/ez_setup.py
.. _`zc.buildout`: http://pypi.python.org/pypi/zc.buildout
.. _`virtualenv`: http://pypi.python.org/pypi/virtualenv
.. _`setuptools`: http://peak.telecommunity.com/DevCenter/setuptools

.. _`setuptools`: http://pypi.python.org/pypi/setuptools

0 comments on commit ad2cb0b

Please sign in to comment.