Skip to content

Commit

Permalink
removed SVN infos from docs
Browse files Browse the repository at this point in the history
  • Loading branch information
pigmej authored and alobbs committed Oct 19, 2011
1 parent 433ed76 commit 2f11a32
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 40 deletions.
2 changes: 1 addition & 1 deletion doc/basics.txt
Expand Up @@ -8,6 +8,6 @@
- link:basics_installation_unix.html[Unix]: Installation on Unix/Linux platforms. - link:basics_installation_unix.html[Unix]: Installation on Unix/Linux platforms.
- link:basics_installation_osx.html[OSX]: Installation on Mac OSX platform. - link:basics_installation_osx.html[OSX]: Installation on Mac OSX platform.
- link:basics_installation_windows.html[Windows]: Installation on Windows platform. - link:basics_installation_windows.html[Windows]: Installation on Windows platform.
- link:basics_installation_svn.html[From SVN]: Installation of the development release. - link:basics_installation_git.html[From GIT]: Installation of the development release.
. link:basics_upgrade.html[Upgrading Cherokee]: Upgrading from a previous release? . link:basics_upgrade.html[Upgrading Cherokee]: Upgrading from a previous release?
. link:basics_running_cherokee.html[Running Cherokee]: Basic steps to run Cherokee. . link:basics_running_cherokee.html[Running Cherokee]: Basic steps to run Cherokee.
13 changes: 6 additions & 7 deletions doc/basics_download.txt
Expand Up @@ -25,22 +25,21 @@ wget http://www.cherokee-project.com/download/x.y/x.y.z/cherokee-x.y.z.tar.gz \
The latest release is at your disposal with: The latest release is at your disposal with:


------------------------------------------------------------------------------ ------------------------------------------------------------------------------
wget http://www.cherokee-project.com/cherokee-latest-tarball -O -| tar zxvf - https://github.com/cherokee/webserver/zipball/master
------------------------------------------------------------------------------ ------------------------------------------------------------------------------


Finally, if you are a developer or simply want to test out the bleeding edge Finally, if you are a developer or simply want to test out the bleeding edge
version, you can access our Subversion repository. Be advised, this is the version, you can access our Git repository. Be advised, this is the
development branch, so use it at your own risk! development branch, so use it at your own risk!


To download simply use your Subversion client: To download simply use:


--------------------------------------------------------------------------- ---------------------------------------------------------------------------
svn co svn://svn.cherokee-project.com/cherokee/trunk cherokee git clone -b dev --recursive https://github.com/cherokee/webserver.git
--------------------------------------------------------------------------- ---------------------------------------------------------------------------


You can also download a package with the latest SVN contents: You can also download a package with the latest GIT contents:


--------------------------------------------------------------------------- ---------------------------------------------------------------------------
wget http://www.cherokee-project.com/download/trunk/cherokee-latest-svn.tar.gz \ wget https://github.com/cherokee/webserver/zipball/dev
-O - | gzip -dc - | tar xfv -
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
2 changes: 1 addition & 1 deletion doc/basics_installation.txt
Expand Up @@ -10,7 +10,7 @@ several platforms.
* link:basics_installation_unix.html[Unix installation] * link:basics_installation_unix.html[Unix installation]
* link:basics_installation_osx.html[OSX installation] * link:basics_installation_osx.html[OSX installation]
* link:basics_installation_windows.html[Windows installation] * link:basics_installation_windows.html[Windows installation]
* link:basics_installation_svn.html[Installation From SVN] * link:basics_installation_git.html[Installation From GIT]


For insight on more specific subjects such as cross-compilation or For insight on more specific subjects such as cross-compilation or
embedding Cherokee, check the link:cookbook.html[Cookbook]. embedding Cherokee, check the link:cookbook.html[Cookbook].
@@ -1,34 +1,22 @@
== link:index.html[Index] -> link:basics.html[Getting started] -> link:basics_installation.html[Installation] == link:index.html[Index] -> link:basics.html[Getting started] -> link:basics_installation.html[Installation]


Installation from SVN Installation from GIT
--------------------- ---------------------


The latest, bleeding edge Cherokee release can always be retrieved via The latest, bleeding edge Cherokee release can always be retrieved via
SVN. Note that this is the development release and could very well be GIT. Note that this is the development release and could very well be
unstable. In general it is not recommended to run this release in unstable. In general it is not recommended to run this release in
production environments. production environments.


Briefly, SVN is a system tool used to store and maintain files and a
history of their changes over time, and it is an invaluable development
tool. The Cherokee source code and related files are kept on a SVN
server at svn.cherokee-project.com.


To download the SVN repository you will need a special piece of [[clone]]
software called an SVN client. Clonning the sourcess

[[checkout]]
Checking out the sources
~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~
To list the available modules, type:

----
svn list svn://svn.cherokee-project.com/
----


To check out the sources for the first time from the repository, use this command: To check out the sources for the first time from the repository, use this command:


---- ----
svn co svn://svn.cherokee-project.com/cherokee/trunk cherokee git clone -b dev --recursive https://github.com/cherokee/webserver.git
---- ----


[[update]] [[update]]
Expand All @@ -38,19 +26,19 @@ Updating the sources
To update your sources every day, you use this command: To update your sources every day, you use this command:


---- ----
svn up cherokee git pull -u
---- ----




[[compile]] [[compile]]
Compiling and installing Compiling and installing
~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~


Once you have downloaded the latest SVN revision, you will need to Once you have downloaded the latest GIT head, you will need to
follow the installation instructions for your specific platform. follow the installation instructions for your specific platform.


Note that some of the files present in the tarball are not present in Note that some of the files present in the tarball are not present in
SVN. Most noticeably, the file `./configure` that will be needed for the GIT. Most noticeably, the file `./configure` that will be needed for the
installation process. installation process.


To generate the missing files simply run this command: To generate the missing files simply run this command:
Expand Down
2 changes: 1 addition & 1 deletion doc/basics_installation_unix.txt
Expand Up @@ -193,7 +193,7 @@ having the repositories updated is really short.


However, in the event that they arent, some options remain if you want However, in the event that they arent, some options remain if you want
to enjoy the latest Cherokee enhancements. Besides building directly to enjoy the latest Cherokee enhancements. Besides building directly
from our SVN repository, you can build from source for from our GIT repository, you can build from source for
Debian/Ubuntu. You will be able to build it cleanly in a `.deb` Debian/Ubuntu. You will be able to build it cleanly in a `.deb`
package with dependencies, and push the new release as fast as package with dependencies, and push the new release as fast as
possible to production. possible to production.
Expand Down
2 changes: 1 addition & 1 deletion doc/cookbook_cross_compilation.txt
Expand Up @@ -39,7 +39,7 @@ RC=i586-mingw32msvc-windres
Check out the last version of Cherokee trunk: Check out the last version of Cherokee trunk:


---- ----
$ svn co svn://svn.cherokee-project.com/cherokee/trunk cherokee $ git clone -b dev --recursive https://github.com/cherokee/webserver.git
---- ----


and execute a quite long "configure" command: and execute a quite long "configure" command:
Expand Down
4 changes: 2 additions & 2 deletions doc/dev_quickstart.txt
Expand Up @@ -11,14 +11,14 @@ environming for Cherokee.


The relevant documents would be those about The relevant documents would be those about
link:basics_requirements.html[software requirements], link:basics_requirements.html[software requirements],
link:basics_download.html[downloading the SVN repository], and the link:basics_download.html[downloading the GIT repository], and the
link:basics_installation_unix.html[quickstart installation notes]. link:basics_installation_unix.html[quickstart installation notes].


In principle, provided you have the required tools in your system, it In principle, provided you have the required tools in your system, it
should be as easy as: should be as easy as:


---- ----
svn co svn://svn.cherokee-project.com/cherokee/trunk ~/cherokee_dev git clone -b dev --recursive https://github.com/cherokee/webserver.git ~/cherokee_dev
cd ~/cherokee_dev cd ~/cherokee_dev
./autogen.sh --enable-beta --enable-trace ./autogen.sh --enable-beta --enable-trace
make make
Expand Down
2 changes: 1 addition & 1 deletion doc/index.txt
Expand Up @@ -12,7 +12,7 @@ link:basics.html[Getting started]: Cherokee basics
- link:basics_installation_unix.html[Unix]: Installation on Unix/Linux platforms. - link:basics_installation_unix.html[Unix]: Installation on Unix/Linux platforms.
- link:basics_installation_osx.html[OSX]: Installation on Mac OSX platform. - link:basics_installation_osx.html[OSX]: Installation on Mac OSX platform.
- link:basics_installation_windows.html[Windows]: Installation on Windows platform. - link:basics_installation_windows.html[Windows]: Installation on Windows platform.
- link:basics_installation_svn.html[From SVN]: Installation of the development release. - link:basics_installation_git.html[From GIT]: Installation of the development release.
. link:basics_upgrade.html[Upgrading Cherokee]: Upgrading from a previous release? . link:basics_upgrade.html[Upgrading Cherokee]: Upgrading from a previous release?
. link:basics_running_cherokee.html[Running Cherokee]: Basic steps to run Cherokee. . link:basics_running_cherokee.html[Running Cherokee]: Basic steps to run Cherokee.


Expand Down
2 changes: 1 addition & 1 deletion doc/other_bundle_cherokee-admin.txt
Expand Up @@ -82,7 +82,7 @@ path:


---- ----
cherokee-admin -b -p 9091 -C /etc/cherokee/cherokee2.conf \ cherokee-admin -b -p 9091 -C /etc/cherokee/cherokee2.conf \
-d /path/to/svn/trunk/cherokee-admin/ -d /path/to/git/dev/cherokee-admin/
---- ----


This is the full information provided by the manpage. This is the full information provided by the manpage.
Expand Down
2 changes: 1 addition & 1 deletion doc/other_community.txt
Expand Up @@ -35,7 +35,7 @@ These are the lists currently in existence:


- link:http://lists.octality.com/listinfo/cherokee[General list] - link:http://lists.octality.com/listinfo/cherokee[General list]
- link:http://lists.octality.com/listinfo/cherokee-dev[Development list] - link:http://lists.octality.com/listinfo/cherokee-dev[Development list]
- link:http://lists.octality.com/listinfo/cherokee-commits[SVN Reports] - link:http://lists.octality.com/listinfo/cherokee-commits[GIT Reports]




#cherokee IRC channel #cherokee IRC channel
Expand Down
8 changes: 4 additions & 4 deletions doc/other_faq.txt
Expand Up @@ -134,8 +134,8 @@ link:cookbook_maintenance.html[recipe on the subject].
Cherokee is licensed under the GNU General Public License, version 2, Cherokee is licensed under the GNU General Public License, version 2,
which can be found in the file *COPYING* distributed with the source which can be found in the file *COPYING* distributed with the source
code. For more details, read the code. For more details, read the
link:http://svn.cherokee-project.com/browser/cherokee/trunk/COPYING[full link:https://github.com/cherokee/webserver/blob/dev/COPYING[full
license] in the project's SVN repository. license] in the project's GIT repository.


If for whatever reason this license does not suit your needs, other If for whatever reason this license does not suit your needs, other
licensing schemes can be negotiated on a particular basis. Contact licensing schemes can be negotiated on a particular basis. Contact
Expand All @@ -162,8 +162,8 @@ please take a look at the
link:http://powerman.name/doc/asciidoc[AsciiDoc Cheatsheet] and start link:http://powerman.name/doc/asciidoc[AsciiDoc Cheatsheet] and start
editing the documentation sources right ahead. They are distributed editing the documentation sources right ahead. They are distributed
with the source code and are located under `./doc` of the source tree. with the source code and are located under `./doc` of the source tree.
If you don't have SVN access, simply mail your contributions to If you don't have GIT access, simply mail your contributions to
link:mailto:feedback@cherokee-project.com[feedback@cherokee-project.com]. link:mailto:feedback@cherokee-project.com[feedback@cherokee-project.com] or create fork on github and request pull.


[[faq14]] [[faq14]]
=== Can encoders be set for specific file types? === Can encoders be set for specific file types?
Expand Down

0 comments on commit 2f11a32

Please sign in to comment.