You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by he...@apache.org on 2015/08/10 19:32:54 UTC

[23/50] [abbrv] allura git commit: [#7915] ticket:831 Move installation instructions into the docs

[#7915] ticket:831 Move installation instructions into the docs


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/a8ace0d5
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/a8ace0d5
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/a8ace0d5

Branch: refs/heads/hs/7925
Commit: a8ace0d5e30c52d4a90fdcdb1f235b4f7861b1af
Parents: 26d0e06
Author: Igor Bondarenko <je...@gmail.com>
Authored: Mon Aug 3 21:08:06 2015 +0300
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Aug 5 17:53:22 2015 -0400

----------------------------------------------------------------------
 Allura/docs/development/contributing.rst     |   4 +-
 Allura/docs/getting_started/installation.rst | 340 +++++++++++++++++++++-
 INSTALL-docker.markdown                      | 117 --------
 INSTALL.markdown                             | 154 +---------
 NOTICE                                       |   2 +-
 README.markdown                              |   2 +-
 6 files changed, 342 insertions(+), 277 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/a8ace0d5/Allura/docs/development/contributing.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/development/contributing.rst b/Allura/docs/development/contributing.rst
index 3e6c8d9..2dff6ad 100644
--- a/Allura/docs/development/contributing.rst
+++ b/Allura/docs/development/contributing.rst
@@ -39,8 +39,8 @@ so you can see and test the changes you make. You can install Allura from
 scratch, or by using our pre-built Vagrant image. Instructions for these
 approaches can be found here:
 
-* `Install from scratch <https://forge-allura.apache.org/p/allura/git/ci/master/tree/INSTALL.markdown>`_
-* `Install from Vagrant image <https://forge-allura.apache.org/p/allura/wiki/Install%20and%20Run%20Allura%20-%20Vagrant/>`_
+* :ref:`Install from scratch <step-by-step-install>`
+* :ref:`Install using Docker <docker-install>`
 
 Managing Services
 -----------------

http://git-wip-us.apache.org/repos/asf/allura/blob/a8ace0d5/Allura/docs/getting_started/installation.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/getting_started/installation.rst b/Allura/docs/getting_started/installation.rst
index 30425b4..90fbeee 100644
--- a/Allura/docs/getting_started/installation.rst
+++ b/Allura/docs/getting_started/installation.rst
@@ -19,12 +19,346 @@
 Installation
 ************
 
+.. contents::
+   :local:
 
-Our step-by-step setup instructions are in our INSTALL.markdown file.  You can read it online at https://forge-allura.apache.org/p/allura/git/ci/master/tree/INSTALL.markdown  You should be able to get Allura up and running in well under an hour by following those instructions.
+.. _step-by-step-install:
 
-For a faster and easier setup, see our `Vagrant/VirtualBox installation guide <https://forge-allura.apache.org/p/allura/wiki/Install%20and%20Run%20Allura%20-%20Vagrant/>`_
+Step-by-Step Installation
+-------------------------
+
+For a simpler setup using Docker images, see :ref:`docker-install` instead.
+
+In these instructions, we'll use `VirtualBox <http://www.virtualbox.org>`_ and `Ubuntu 14.04 <http://ubuntu.com>`_ (12.04 works too) to create a disposable sandbox for Allura development/testing.  Allura should work on other Linux systems (including OSX), but setting up all the dependencies will be different.
+
+* Download and install `VirtualBox <http://www.virtualbox.org/wiki/Downloads>`_ for your platform.
+
+* Download a minimal `Ubuntu 14.04 64-bit ISO <https://help.ubuntu.com/community/Installation/MinimalCD>`_.
+
+* Create a new virtual machine in Virtual Box, selecting Ubuntu (64 bit) as the OS type.  The rest of the wizards' defaults are fine.
+
+* When you launch the virtual machine for the first time, you will be prompted to attach your installation media.  Browse to the :file:`mini.iso` that you downloaded earlier.
+
+* After a text-only installation, you may end up with a blank screen and blinking cursor.  Press :code:`Alt-F1` to switch to the first console.
+
+* Consult `available documentation <https://help.ubuntu.com/>`_ for help installing Ubuntu.
+
+
+Installation
+^^^^^^^^^^^^
+
+Before we begin, you'll need to install some system packages.
+
+.. code-block:: bash
+
+    ~$ sudo aptitude install git-core default-jre-headless python-dev libssl-dev libldap2-dev libsasl2-dev libjpeg8-dev zlib1g-dev
+
+To install MongoDB, follow the instructions `here <http://docs.mongodb.org/v2.6/tutorial/install-mongodb-on-ubuntu/>`_.
+
+Optional, for SVN support:
+
+.. code-block:: bash
+
+    ~$ sudo aptitude install subversion python-svn
+
+Setting up a virtual python environment
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The first step to installing the Allura platform is installing a virtual environment via `virtualenv <https://virtualenv.pypa.io/en/latest/>`_.  This helps keep our distribution python installation clean.
+
+.. code-block:: bash
+
+    ~$ sudo aptitude install python-pip
+    ~$ sudo pip install virtualenv
+
+Once you have virtualenv installed, you need to create a virtual environment.  We'll call our Allura environment 'env-allura'.
+
+.. code-block:: bash
+
+    ~$ virtualenv env-allura
+
+This gives us a nice, clean environment into which we can install all the allura dependencies.
+In order to use the virtual environment, you'll need to activate it:
+
+.. code-block:: bash
+
+    ~$ . env-allura/bin/activate
+
+You'll need to do this whenever you're working on the Allura codebase so you may want to consider adding it to your :file:`~/.bashrc` file.
+
+Creating the log directory
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: bash
+
+    (env-allura)~$ sudo mkdir -p /var/log/allura
+    (env-allura)~$ sudo chown $(whoami) /var/log/allura
+
+Installing the Allura code and dependencies
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Now we can get down to actually getting the Allura code and dependencies downloaded and ready to go.  If you don't have the source code yet, run:
+
+.. code-block:: bash
+
+    (env-allura)~$ mkdir src
+    (env-allura)~$ cd src
+    (env-allura)~/src$ git clone https://git-wip-us.apache.org/repos/asf/allura.git allura
+
+If you already reading this file from an Allura release or checkout, you're ready to continue.
+
+Although the application :file:`setup.py` files define a number of dependencies, the :file:`requirements.txt` files are currently the authoritative source, so we'll use those with `pip <https://pip.pypa.io/en/stable/>`_ to make sure the correct versions are installed.
+
+.. code-block:: bash
+
+    (env-allura)~/src$ cd allura
+    (env-allura)~/src/allura$ pip install -r requirements.txt
+
+This will take a while.  If you get an error from pip, it is typically a temporary download error.  Just run the command again and it will quickly pass through the packages it already downloaded and then continue.
+
+Optional, for SVN support: symlink the system pysvn package into our virtual environment
+
+.. code-block:: bash
+
+    (env-allura)~/src/allura$ ln -s /usr/lib/python2.7/dist-packages/pysvn ~/env-allura/lib/python2.7/site-packages/
+
+Next, run :code:`./rebuild-all.bash` to setup all the Allura applications.  If you only want to use a few tools, run:
+
+.. code-block:: bash
+
+    (env-allura)~/src/allura$ cd Allura
+    (env-allura)~/src/allura/Allura$ python setup.py develop
+    (env-allura)~/src/allura/Allura$ cd ../ForgeWiki   # required tool
+    (env-allura)~/src/allura/ForgeWiki$ python setup.py develop
+    # repeat for any other tools you want to use
+
+Initializing the environment
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The Allura forge consists of several components, all of which need to be running to have full functionality.
+
+SOLR search and indexing server
+*******************************
+
+We have a custom config ready for use.
+
+.. code-block:: bash
+
+    (env-allura)~$ cd ~/src
+    (env-allura)~/src$ wget -nv http://archive.apache.org/dist/lucene/solr/4.2.1/solr-4.2.1.tgz
+    (env-allura)~/src$ tar xf solr-4.2.1.tgz && rm -f solr-4.2.1.tgz
+    (env-allura)~/src$ cp -f allura/solr_config/schema.xml solr-4.2.1/example/solr/collection1/conf
+
+    (env-allura)~/src$ cd solr-4.2.1/example/
+    (env-allura)~/src/apache-solr-4.2.1/example/$ nohup java -jar start.jar > /var/log/allura/solr.log &
+
+
+Create code repo directories
+****************************
+
+The default configuration stores repos in :file:`/srv`, so we need to create those directories:
+
+.. code-block:: bash
+
+    ~$ sudo mkdir /srv/{git,svn,hg}
+    ~$ sudo chown $USER /srv/{git,svn,hg}
+    ~$ sudo chmod 775 /srv/{git,svn,hg}
+
+If you don't have :code:`sudo` permission or just want to store them somewhere else, change the :file:`/srv` paths in :file:`development.ini`
+
+If you want to set up remote access to the repositories, see :ref:`scm_hosting`
+
+Allura task processing
+**********************
+
+Allura uses a background task service called "taskd" to do async tasks like sending emails, and indexing data into solr, etc.  Let's get it running
+
+.. code-block:: bash
+
+    (env-allura)~$ cd ~/src/allura/Allura
+    (env-allura)~/src/allura/Allura$ nohup paster taskd development.ini > /var/log/allura/taskd.log 2>&1 &
+
+The application server
+**********************
+
+In order to initialize the Allura database, you'll need to run the following:
+
+For development setup:
+
+.. code-block:: bash
+
+    (env-allura)~/src/allura/Allura$ paster setup-app development.ini
+
+For production setup:
+
+.. code-block:: bash
+
+    (env-allura)~/src/allura/Allura$ ALLURA_TEST_DATA=False paster setup-app development.ini
+
+This shouldn't take too long, but it will start the taskd server doing tons of stuff in the background.  Once this is done, you can start the application server:
+
+.. code-block:: bash
+
+    (env-allura)~/src/allura/Allura$ nohup paster serve --reload development.ini  > /var/log/allura/allura.log 2>&1 &
+
+Next Steps
+~~~~~~~~~~
+
+Go to the Allura webapp running on your `local machine <http://localhost:8080/>`_ port 8080.
+(If you're running this inside a VM, you'll probably have to configure the port forwarding settings)
+
+You can log in with username `admin1`, `test-user` or `root`.  They all have password "foo".  (For more details
+on the default data, see :file:`bootstrap.py`)
+
+There are a few default projects (like "test") and neighborhoods.  Feel free to experiment with them.  If you want to
+register a new project in your own forge, visit `/p/add_project`.
+
+Extra
+~~~~~
+
+* Read :ref:`post-setup-instructions`
+* Ask questions and discuss Allura on the `allura-dev mailing list <http://mail-archives.apache.org/mod_mbox/allura-dev/>`_
+* Run the test suite (slow): :code:`$ ALLURA_VALIDATION=none ./run_tests`
+* File bug reports at https://forge-allura.apache.org/p/allura/tickets/new/ (login required)
+* Contribute code according to `this guide <https://forge-allura.apache.org/p/allura/wiki/Contributing%20Code/>`_
+
+.. _docker-install:
+
+Using Docker
+------------
+
+General info
+^^^^^^^^^^^^
+
+Allura runs on the following docker containers:
+
+- web
+- mongo
+- taskd
+- solr
+- inmail
+- outmail
+
+Host-mounted volumes
+~~~~~~~~~~~~~~~~~~~~
+
+These are created on first run.
+
+Current directory mounted as :file:`/allura` inside containers.
+
+Python environment:
+
+- :file:`env-docker/python`
+- :file:`env-docker/bin`
+
+Services data:
+
+- :file:`/allura-data/mongo` - mongo data
+- :file:`/allura-data/solr` - SOLR index
+- :code:`/allura-data/scm/{git,hg,svn}` - code repositories
+- :file:`/allura-data/scm/snapshots` - generated code snapshots
+
+Ports, exposed to host system
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- 8080 - webapp
+- 8983 - SOLR admin panel (http://localhost:8983/solr/)
+- 8825 - incoming mail listener
+
+
+First run
+^^^^^^^^^
+
+`Download the latest release <http://www.apache.org/dyn/closer.cgi/allura/>`_ of Allura, or `clone from git <https://forge-allura.apache.org/p/allura/git/ci/master/tree/>`_ for the bleeding edge.
+
+Install `Docker <http://docs.docker.com/installation/>`_ and `Docker Compose <https://docs.docker.com/compose/install/>`_.
+
+Build/fetch all required images (run these in allura source directory):
+
+.. code-block:: bash
+
+    ~$ docker-compose build
+
+Install requirements:
+
+.. code-block:: bash
+
+    ~$ docker-compose run web pip install -r requirements.txt
+
+Install Allura packages:
+
+.. code-block:: bash
+
+    ~$ docker-compose run web ./rebuild-all.bash
+
+Initialize database with test data:
+
+.. code-block:: bash
+
+    ~$ docker-compose run web bash -c 'cd Allura && paster setup-app docker-dev.ini'
+
+If you want to skip test data creation you can instead run:
+
+.. code-block:: bash
+
+    ~$ docker-compose run web bash -c 'cd Allura && ALLURA_TEST_DATA=False paster setup-app docker-dev.ini'
+
+Start containers in the background:
+
+.. code-block:: bash
+
+    ~$ docker-compose up -d
+
+Useful commands
+^^^^^^^^^^^^^^^
+
+Restarting all containers:
+
+.. code-block:: bash
+
+    ~$ docker-compose up -d
+
+View logs from all services:
+
+.. code-block:: bash
+
+    ~$ docker-compose logs
+
+You can specify one or more services to view logs only from them, e.g. to see
+outgoing mail:
+
+.. code-block:: bash
+
+    ~$ docker-compose logs outmail
+
+Update requirements and reinstall apps:
+
+.. code-block:: bash
+
+    ~$ docker-compose run web pip install -r requirements.txt
+    ~$ docker-compose run web ./rebuild-all.bash
+
+You may want to restart at least "taskd" container after that in order for it to
+pick up changes.
+
+Running all tests:
+
+.. code-block:: bash
+
+    ~$ docker-compose run web ./run_tests
+
+Running subset of tests:
+
+.. code-block:: bash
+
+    ~$ docker-compose run web bash -c 'cd ForgeGit && nosetests forgegit.tests.functional.test_controllers:TestFork'
+
+Connecting to mongo directly:
+
+.. code-block:: bash
+
+    ~$ docker-compose run mongo mongo --host mongo
 
-That's all for the development setup.  For the production setup see :ref:`next section <post-setup-instructions>`.
 
 .. _post-setup-instructions:
 

http://git-wip-us.apache.org/repos/asf/allura/blob/a8ace0d5/INSTALL-docker.markdown
----------------------------------------------------------------------
diff --git a/INSTALL-docker.markdown b/INSTALL-docker.markdown
deleted file mode 100644
index c4fb810..0000000
--- a/INSTALL-docker.markdown
+++ /dev/null
@@ -1,117 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-# General info
-
-## Allura runs on following docker containers:
-
-- web
-- mongo
-- taskd
-- solr
-- inmail
-- outmail
-
-## Host-mounted volumes (created on first run)
-
-Current directory mounted as `/allura` inside containers.
-
-Python environment:
-
-- `env-docker/python`
-- `env-docker/bin`
-
-Services data:
-
-- `/allura-data/mongo` - mongo data
-- `/allura-data/solr` - SOLR index
-- `/allura-data/scm/{git,hg,svn}` - code repositories
-- `/allura-data/scm/snapshots` - generated code snapshots
-
-## Ports, exposed to host system:
-
-- 8080 - webapp
-- 8983 - SOLR admin panel (http://localhost:8983/solr/)
-- 8825 - incoming mail listener
-
-
-# First run
-
-[Download the latest release](http://www.apache.org/dyn/closer.cgi/allura/) of Allura, or [clone from git](https://forge-allura.apache.org/p/allura/git/ci/master/tree/) for the bleeding edge.
-
-Install [Docker](http://docs.docker.com/installation/) and [Docker Compose](https://docs.docker.com/compose/install/).
-
-Build/fetch all required images (run these in your allura directory):
-
-    ~$ docker-compose build
-
-Install requirements:
-
-    ~$ docker-compose run web pip install -r requirements.txt
-
-Install Allura packages:
-
-    ~$ docker-compose run web ./rebuild-all.bash
-
-Initialize database with test data:
-
-    ~$ docker-compose run web bash -c 'cd Allura && paster setup-app docker-dev.ini'
-
-If you want to skip test data creation you can instead run:
-
-    ~$ docker-compose run web bash -c 'cd Allura && ALLURA_TEST_DATA=False paster setup-app docker-dev.ini'
-
-Start containers in background:
-
-    ~$ docker-compose up -d
-
-# Useful commands
-
-Restarting all containers:
-
-    ~$ docker-compose up -d
-
-View logs from all services:
-
-    ~$ docker-compose logs
-
-You can specify one or more services to view logs only from them, e.g. to see
-outgoing mail:
-
-    ~$ docker-compose logs outmail
-
-Update requirements and reinstall apps:
-
-    ~$ docker-compose run web pip install -r requirements.txt
-    ~$ docker-compose run web ./rebuild-all.bash
-
-You may want to restart at least taskd container after that in order for it to
-pick up changes.
-
-Running all tests:
-
-    ~$ docker-compose run web ./run_tests
-
-Running subset of tests:
-
-    ~$ docker-compose run web bash -c 'cd ForgeGit && nosetests forgegit.tests.functional.test_controllers:TestFork'
-
-Connecting to mongo directly:
-
-    ~$ docker-compose run mongo mongo --host mongo

http://git-wip-us.apache.org/repos/asf/allura/blob/a8ace0d5/INSTALL.markdown
----------------------------------------------------------------------
diff --git a/INSTALL.markdown b/INSTALL.markdown
index eab7dfd..57c0b89 100644
--- a/INSTALL.markdown
+++ b/INSTALL.markdown
@@ -17,156 +17,4 @@
     under the License.
 -->
 
-# Step-by-Step Installation
-
-For a simpler setup using Docker images, see INSTALL-docker.markdown instead.
-
-In these instructions, we'll use [VirtualBox](http://www.virtualbox.org) and [Ubuntu 14.04](http://ubuntu.com) (12.04 works too) to create a disposable sandbox for Allura development/testing.  Allura should work on other Linux systems (including OSX), but setting up all the dependencies will be different.
-
-* Download and install [VirtualBox](http://www.virtualbox.org/wiki/Downloads) for your platform.
-
-* Download a minimal [Ubuntu 14.04 64-bit ISO](https://help.ubuntu.com/community/Installation/MinimalCD).
-
-* Create a new virtual machine in Virtual Box, selecting Ubuntu (64 bit) as the OS type.  The rest of the wizards' defaults are fine.
-
-* When you launch the virtual machine for the first time, you will be prompted to attach your installation media.  Browse to the `mini.iso` that you downloaded earlier.
-
-* After a text-only installation, you may end up with a blank screen and blinking cursor.  Press Alt-F1 to switch to the first console.
-
-* Consult [available documentation](https://help.ubuntu.com/) for help installing Ubuntu.
-
-
-# Installation
-
-Before we begin, you'll need to install some system packages.
-
-    ~$ sudo aptitude install git-core default-jre-headless python-dev libssl-dev libldap2-dev libsasl2-dev libjpeg8-dev zlib1g-dev
-
-To install MongoDB, follow the instructions here: <http://docs.mongodb.org/v2.6/tutorial/install-mongodb-on-ubuntu/>
-
-Optional, for SVN support:
-
-    ~$ sudo aptitude install subversion python-svn
-
-## Setting up a virtual python environment
-
-The first step to installing the Allura platform is installing a virtual environment via `virtualenv`.  This helps keep our distribution python installation clean.
-
-    ~$ sudo aptitude install python-pip
-    ~$ sudo pip install virtualenv
-
-Once you have virtualenv installed, you need to create a virtual environment.  We'll call our Allura environment 'env-allura'.
-
-    ~$ virtualenv env-allura
-
-This gives us a nice, clean environment into which we can install all the allura dependencies.
-In order to use the virtual environment, you'll need to activate it:
-
-    ~$ . env-allura/bin/activate
-
-You'll need to do this whenever you're working on the Allura codebase so you may want to consider adding it to your `~/.bashrc` file.
-
-## Creating the log directory
-    (env-allura)~$ sudo mkdir -p /var/log/allura
-    (env-allura)~$ sudo chown $(whoami) /var/log/allura
-
-## Installing the Allura code and dependencies
-
-Now we can get down to actually getting the Allura code and dependencies downloaded and ready to go.  If you don't have the source code yet, run:
-
-    (env-allura)~$ mkdir src
-    (env-allura)~$ cd src
-    (env-allura)~/src$ git clone https://git-wip-us.apache.org/repos/asf/allura.git allura
-
-If you already reading this file from an Allura release or checkout, you're ready to continue.
-
-Although the application setup.py files define a number of dependencies, the `requirements.txt` files are currently the authoritative source, so we'll use those with `pip` to make sure the correct versions are installed.
-
-    (env-allura)~/src$ cd allura
-    (env-allura)~/src/allura$ pip install -r requirements.txt
-
-This will take a while.  If you get an error from pip, it is typically a temporary download error.  Just run the command again and it will quickly pass through the packages it already downloaded and then continue.
-
-Optional, for SVN support: symlink the system pysvn package into our virtual environment
-
-    (env-allura)~/src/allura$ ln -s /usr/lib/python2.7/dist-packages/pysvn ~/env-allura/lib/python2.7/site-packages/
-
-Next, run `./rebuild-all.bash` to setup all the Allura applications.  If you only want to use a few tools, run:
-
-    cd Allura
-    python setup.py develop
-    cd ../ForgeWiki   # required tool
-    python setup.py develop
-    # repeat for any other tools you want to use
-
-## Initializing the environment
-
-The Allura forge consists of several components, all of which need to be running to have full functionality.
-
-### SOLR search and indexing server
-
-We have a custom config ready for use.
-
-    (env-allura)~$ cd ~/src
-    (env-allura)~/src$ wget -nv http://archive.apache.org/dist/lucene/solr/4.2.1/solr-4.2.1.tgz
-    (env-allura)~/src$ tar xf solr-4.2.1.tgz && rm -f solr-4.2.1.tgz
-    (env-allura)~/src$ cp -f allura/solr_config/schema.xml solr-4.2.1/example/solr/collection1/conf
-
-    (env-allura)~/src$ cd solr-4.2.1/example/
-    (env-allura)~/src/apache-solr-4.2.1/example/$ nohup java -jar start.jar > /var/log/allura/solr.log &
-
-
-### Create code repo directories
-
-The default configuration stores repos in `/srv`, so we need to create those directories:
-
-    sudo mkdir /srv/{git,svn,hg}
-    sudo chown $USER /srv/{git,svn,hg}
-    sudo chmod 775 /srv/{git,svn,hg}
-
-If you don't have `sudo` permission or just want to store them somewhere else, change the `/srv` paths in `development.ini`
-
-If you want to set up remote access to the repositories, see <http://forge-allura.apache.org/docs/getting_started/scm_host.html>
-
-### Allura task processing
-
-Allura uses a background task service called "taskd" to do async tasks like sending emails, and indexing data into solr, etc.  Let's get it running
-
-    (env-allura)~$ cd ~/src/allura/Allura
-    (env-allura)~/src/allura/Allura$ nohup paster taskd development.ini > /var/log/allura/taskd.log 2>&1 &
-
-### The application server
-
-In order to initialize the Allura database, you'll need to run the following:
-
-For development setup:
-
-    (env-allura)~/src/allura/Allura$ paster setup-app development.ini
-
-For production setup:
-
-    (env-allura)~/src/allura/Allura$ ALLURA_TEST_DATA=False paster setup-app development.ini
-
-This shouldn't take too long, but it will start the taskd server doing tons of stuff in the background.  Once this is done, you can start the application server:
-
-    (env-allura)~/src/allura/Allura$ nohup paster serve --reload development.ini  > /var/log/allura/allura.log 2>&1 &
-
-## Next Steps
-
-Go to the Allura webapp running on your [local machine](http://localhost:8080/) port 8080.
-(If you're running this inside a VM, you'll probably have to configure the port forwarding settings)
-
-You can log in with username admin1, test-user or root.  They all have password "foo".  (For more details
-on the default data, see bootstrap.py)
-
-There are a few default projects (like "test") and neighborhoods.  Feel free to experiment with them.  If you want to
-register a new project in your own forge, visit /p/add_project
-
-## Extra
-
-* Read more documentation: <http://forge-allura.apache.org/docs/>
-    * Including how to enable extra features: <http://forge-allura.apache.org/docs/getting_started/installation.html>
-* Ask questions and discuss Allura on the <http://mail-archives.apache.org/mod_mbox/allura-dev/>
-* Run the test suite (slow): `$ ALLURA_VALIDATION=none ./run_tests`
-* File bug reports at <https://forge-allura.apache.org/p/allura/tickets/new/> (login required)
-* Contribute code according to this guide: <https://forge-allura.apache.org/p/allura/wiki/Contributing%20Code/>
+See `Allura/docs`.

http://git-wip-us.apache.org/repos/asf/allura/blob/a8ace0d5/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 69af9fe..fb04ff5 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Allura
-Copyright 2012-2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/allura/blob/a8ace0d5/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 5daeb0c..5eec88f 100644
--- a/README.markdown
+++ b/README.markdown
@@ -22,7 +22,7 @@ Apache Allura
 
 Allura is an open source implementation of a software "forge", a web site that manages source code repositories, bug reports, discussions, mailing lists, wiki pages, blogs and more for any number of individual projects.
 
-To install Allura, see INSTALL.markdown
+To install Allura, see `Allura/docs`.
 
 Website: <https://allura.apache.org/>