From 47970761c57ca0fa61f240c769ec11d5b484eabe Mon Sep 17 00:00:00 2001 From: Ben Firshman <ben@firshman.co.uk> Date: Thu, 7 Aug 2014 14:19:27 -0700 Subject: [PATCH 1/2] Remove Orchard message from readme Signed-off-by: Ben Firshman <ben@firshman.co.uk> --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 924232185b..73af3e8b44 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,6 @@ There are commands to: - tail running services' log output - run a one-off command on a service -Fig is a project from [Orchard](https://orchardup.com), a Docker hosting service. [Follow us on Twitter](https://twitter.com/orchardup) to keep up to date with Fig and other Docker news. - Installation and documentation ------------------------------ From fc3c12ad908d9b1c323eb51e7f98f2833241c161 Mon Sep 17 00:00:00 2001 From: Ben Firshman <ben@firshman.co.uk> Date: Thu, 7 Aug 2014 14:42:49 -0700 Subject: [PATCH 2/2] Update repository URL Signed-off-by: Ben Firshman <ben@firshman.co.uk> --- CONTRIBUTING.md | 2 +- README.md | 2 +- docs/_layouts/default.html | 4 ++-- docs/index.md | 2 +- docs/install.md | 4 ++-- script/deploy-docs | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7460a72d48..a27b665d30 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ If you're looking contribute to [Fig](http://www.fig.sh/) but you're new to the project or maybe even to Python, here are the steps that should get you started. -1. Fork [https://github.com/orchardup/fig](https://github.com/orchardup/fig) to your username. kvz in this example. +1. Fork [https://github.com/docker/fig](https://github.com/docker/fig) to your username. kvz in this example. 1. Clone your forked repository locally `git clone git@github.com:kvz/fig.git`. 1. Enter the local directory `cd fig`. 1. Set up a development environment `python setup.py develop`. That will install the dependencies and set up a symlink from your `fig` executable to the checkout of the repo. So from any of your fig projects, `fig` now refers to your development project. Time to start hacking : ) diff --git a/README.md b/README.md index 73af3e8b44..dc43f65b1b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Fig === -[](https://travis-ci.org/orchardup/fig) +[](https://travis-ci.org/docker/fig) [](http://badge.fury.io/py/fig) Fast, isolated development environments using Docker. diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index e2cb4ad25c..31c75d52e5 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -44,14 +44,14 @@ </ul> </ul> <ul class="nav"> - <li><a href="https://github.com/orchardup/fig">Fig on GitHub</a></li> + <li><a href="https://github.com/docker/fig">Fig on GitHub</a></li> <li><a href="http://webchat.freenode.net/?channels=%23docker-fig&uio=d4">#docker-fig on Freenode</a></li> </ul> <p>Fig is a project from <a href="https://www.docker.com">Docker</a>.</p> <div class="badges"> - <iframe src="http://ghbtns.com/github-btn.html?user=orchardup&repo=fig&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe> + <iframe src="http://ghbtns.com/github-btn.html?user=docker&repo=fig&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe> <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://orchardup.github.io/fig/">Tweet</a> </div> </div> diff --git a/docs/index.md b/docs/index.md index 4424c6655f..050b90c652 100644 --- a/docs/index.md +++ b/docs/index.md @@ -137,4 +137,4 @@ If you started Fig with `fig up -d`, you'll probably want to stop your services $ fig stop -That's more-or-less how Fig works. See the reference section below for full details on the commands, configuration file and environment variables. If you have any thoughts or suggestions, [open an issue on GitHub](https://github.com/orchardup/fig). +That's more-or-less how Fig works. See the reference section below for full details on the commands, configuration file and environment variables. If you have any thoughts or suggestions, [open an issue on GitHub](https://github.com/docker/fig). diff --git a/docs/install.md b/docs/install.md index ee15f745d4..6d2aeb0153 100644 --- a/docs/install.md +++ b/docs/install.md @@ -16,12 +16,12 @@ Docker has guides for [Ubuntu](http://docs.docker.io/en/latest/installation/ubun Next, install Fig. On OS X: - $ curl -L https://github.com/orchardup/fig/releases/download/0.5.2/darwin > /usr/local/bin/fig + $ curl -L https://github.com/docker/fig/releases/download/0.5.2/darwin > /usr/local/bin/fig $ chmod +x /usr/local/bin/fig On 64-bit Linux: - $ curl -L https://github.com/orchardup/fig/releases/download/0.5.2/linux > /usr/local/bin/fig + $ curl -L https://github.com/docker/fig/releases/download/0.5.2/linux > /usr/local/bin/fig $ chmod +x /usr/local/bin/fig Fig is also available as a Python package if you're on another platform (or if you prefer that sort of thing): diff --git a/script/deploy-docs b/script/deploy-docs index 518815dc38..424472f816 100755 --- a/script/deploy-docs +++ b/script/deploy-docs @@ -13,7 +13,7 @@ if [ ! -d "$GIT_DIR" ]; then fi if !(git remote | grep origin); then - git remote add origin git@github.com:orchardup/fig.git + git remote add origin git@github.com:docker/fig.git fi git fetch origin