Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Removed SVN info from docs #3

Closed
wants to merge 3 commits into from

5 participants

@pigmej
Collaborator

I removed the SVN infos from docs. I did it on master branch because it's for .101 also.

I also adjusted the infos a little bit. Mostly done from head, but should be ok.

Cheers

@skarcha
Collaborator

Apart from these comments, I think all is fine. Thanks @pigmej! :-)

@pigmej
Collaborator

@skarcha fixed ;)

@skarcha
Collaborator

Ops! I forgot to mention that I think all this changes should be done on "dev", and merged with "master" later.

@pigmej
Collaborator

@skarcha the problem is that @alobbs already started 102.

@skarcha
Collaborator

And where is the problem? All commits on "dev" will be merged in "master" when .102 will be launched. Well, this is what I think.. :)

@pigmej
Collaborator

I think those doc fixes are needed 'asap' because they are currently broken.

@skarcha
Collaborator

Ahhh! Ok, understood :-)

But if these "docs" are the same used in the web page, don't you think that it should have his own repository? I would not do commits/merges on "master" if it is not for a new version. But well, it's a decision of @alobbs :-)

@pigmej
Collaborator

well:

(23:34:19) pigmej: alobbs: wouldn't be it cool to have cherokee_doc
(23:34:26) pigmej: as a another repo?
(23:35:39) alobbs: it could be another another repo, yes
(23:36:01) pigmej: I know that it could be ;)
(23:36:05) alobbs: I do not see much of a point on it though :)
(23:36:35) pigmej: well you won't trigger 'updates' of cherokee by changing the documentation:)

Definitelly agree with you @skarcha.

But in current model, I would go to update master even without 'core changes' because of 'broken docs'. And those docs are for .101 also ;-)

@skarcha
Collaborator

Hahaha! Ok, @alobbs decision... ;)

@skinkie
Collaborator

Mmm... your download wget... how will that work with a submodule like CTK?

@skarcha
Collaborator

Good point @skinkie... :-)

@pigmej
Collaborator

Hmm the problem is that in fact that dev/master TIP doesn't have any submodules (https://picasaweb.google.com/lh/photo/ly9BiNabij1BPJP-OD7_o7_3jZbBmZzajyQXXwWfMxc)

Downloading ZIP/tarball package should contain all submodules when they are present.

@alobbs
Owner

The code has been already merged to 'dev'.

Thank you very much pigmej.
Great job!! :-)

@alobbs alobbs closed this
@ionmx
Collaborator

:-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
2  doc/basics.txt
@@ -8,6 +8,6 @@
- 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_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_running_cherokee.html[Running Cherokee]: Basic steps to run Cherokee.
View
13 doc/basics_download.txt
@@ -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:
------------------------------------------------------------------------------
-wget http://www.cherokee-project.com/cherokee-latest-tarball -O -| tar zxvf -
+wget https://github.com/cherokee/webserver/tarball/master -O - | tar zxvf -
------------------------------------------------------------------------------
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!
-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 \
--O - | gzip -dc - | tar xfv -
+wget https://github.com/cherokee/webserver/tarball/dev -O - | tar zxvf -
---------------------------------------------------------------------------
View
2  doc/basics_installation.txt
@@ -10,7 +10,7 @@ several platforms.
* link:basics_installation_unix.html[Unix installation]
* link:basics_installation_osx.html[OSX 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
embedding Cherokee, check the link:cookbook.html[Cookbook].
View
28 doc/basics_installation_svn.txt → doc/basics_installation_git.txt
@@ -1,34 +1,22 @@
== 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
-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
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
-software called an SVN client.
-
-[[checkout]]
-Checking out the sources
+[[clone]]
+Clonning the sourcess
~~~~~~~~~~~~~~~~~~~~~~~~
-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:
----
-svn co svn://svn.cherokee-project.com/cherokee/trunk cherokee
+git clone -b dev --recursive https://github.com/cherokee/webserver.git
----
[[update]]
@@ -38,7 +26,7 @@ Updating the sources
To update your sources every day, you use this command:
----
-svn up cherokee
+git pull -u
----
@@ -46,11 +34,11 @@ svn up cherokee
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.
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.
To generate the missing files simply run this command:
View
2  doc/basics_installation_unix.txt
@@ -193,7 +193,7 @@ having the repositories updated is really short.
However, in the event that they arent, some options remain if you want
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`
package with dependencies, and push the new release as fast as
possible to production.
View
2  doc/cookbook_cross_compilation.txt
@@ -39,7 +39,7 @@ RC=i586-mingw32msvc-windres
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:
View
4 doc/dev_quickstart.txt
@@ -11,14 +11,14 @@ environming for Cherokee.
The relevant documents would be those about
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].
In principle, provided you have the required tools in your system, it
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
./autogen.sh --enable-beta --enable-trace
make
View
2  doc/index.txt
@@ -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_osx.html[OSX]: Installation on Mac OSX 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_running_cherokee.html[Running Cherokee]: Basic steps to run Cherokee.
View
2  doc/other_bundle_cherokee-admin.txt
@@ -82,7 +82,7 @@ path:
----
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.
View
2  doc/other_community.txt
@@ -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-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
View
8 doc/other_faq.txt
@@ -134,8 +134,8 @@ link:cookbook_maintenance.html[recipe on the subject].
Cherokee is licensed under the GNU General Public License, version 2,
which can be found in the file *COPYING* distributed with the source
code. For more details, read the
-link:http://svn.cherokee-project.com/browser/cherokee/trunk/COPYING[full
-license] in the project's SVN repository.
+link:https://github.com/cherokee/webserver/blob/dev/COPYING[full
+license] in the project's GIT repository.
If for whatever reason this license does not suit your needs, other
licensing schemes can be negotiated on a particular basis. Contact
@@ -162,8 +162,8 @@ please take a look at the
link:http://powerman.name/doc/asciidoc[AsciiDoc Cheatsheet] and start
editing the documentation sources right ahead. They are distributed
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
-link:mailto:feedback@cherokee-project.com[feedback@cherokee-project.com].
+If you don't have GIT access, simply mail your contributions to
+link:mailto:feedback@cherokee-project.com[feedback@cherokee-project.com] or create fork on github and request pull.
[[faq14]]
=== Can encoders be set for specific file types?
Something went wrong with that request. Please try again.