aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2014-04-03 10:13:02 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2014-04-03 10:13:02 -0500
commit4a0778b3c1474c160fdc98995286f7ee2566470e (patch)
treef0dca590a5896ce75000da2db81289978dfd2979
parent5526150e1a997bc252aa6376e6924f1b6bfff48a (diff)
downloadmediagoblin-4a0778b3c1474c160fdc98995286f7ee2566470e.tar.lz
mediagoblin-4a0778b3c1474c160fdc98995286f7ee2566470e.tar.xz
mediagoblin-4a0778b3c1474c160fdc98995286f7ee2566470e.zip
Move ./bootstrap.sh to experimental-bootstrap.sh
-rw-r--r--docs/source/siteadmin/deploying.rst6
-rwxr-xr-xexperimental-bootstrap.sh (renamed from bootstrap.sh)0
2 files changed, 4 insertions, 2 deletions
diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst
index 34033adc..0dde3b6a 100644
--- a/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@ -204,14 +204,16 @@ And set up the in-package virtualenv::
.. note::
- We presently have an experimental make-style deployment system. if
+ We presently have an **experimental** make-style deployment system. if
you'd like to try it, instead of the above command, you can run::
- ./bootstrap.sh && ./configure && make
+ ./experimental-bootstrap.sh && ./configure && make
This also includes a number of nice features, such as keeping your
viratualenv up to date by simply running `make update`.
+ Note: this is liable to break. Use this method with caution.
+
.. ::
(NOTE: Is this still relevant?)
diff --git a/bootstrap.sh b/experimental-bootstrap.sh
index 78d0f1c7..78d0f1c7 100755
--- a/bootstrap.sh
+++ b/experimental-bootstrap.sh