Skip to content
This repository

Removed SVN info from docs #3

Closed
wants to merge 3 commits into from

5 participants

Jędrzej Nowak Antonio Pérez Stefan de Konink Alvaro Lopez Ortega Jonathan Hernández
Jędrzej Nowak
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

Antonio Pérez
Collaborator

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

Jędrzej Nowak
Collaborator

@skarcha fixed ;)

Antonio Pérez
Collaborator

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

Jędrzej Nowak
Collaborator

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

Antonio Pérez
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.. :)

Jędrzej Nowak
Collaborator

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

Antonio Pérez
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 :-)

Jędrzej Nowak
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 ;-)

Antonio Pérez
Collaborator

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

Stefan de Konink
Collaborator

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

Antonio Pérez
Collaborator

Good point @skinkie... :-)

Jędrzej Nowak
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.

Alvaro Lopez Ortega
Owner

The code has been already merged to 'dev'.

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

Alvaro Lopez Ortega alobbs closed this
Jonathan Hernández
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.
2  doc/basics.txt
@@ -8,6 +8,6 @@
8 8
    - link:basics_installation_unix.html[Unix]: Installation on Unix/Linux platforms.
9 9
    - link:basics_installation_osx.html[OSX]: Installation on Mac OSX platform.
10 10
    - link:basics_installation_windows.html[Windows]: Installation on Windows platform.
11  
-   - link:basics_installation_svn.html[From SVN]: Installation of the development release.
  11
+   - link:basics_installation_git.html[From GIT]: Installation of the development release.
12 12
  . link:basics_upgrade.html[Upgrading Cherokee]: Upgrading from a previous release?
13 13
  . link:basics_running_cherokee.html[Running Cherokee]: Basic steps to run Cherokee.
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 \
25 25
 The latest release is at your disposal with:
26 26
 
27 27
 ------------------------------------------------------------------------------
28  
-wget http://www.cherokee-project.com/cherokee-latest-tarball -O -| tar zxvf -
  28
+wget https://github.com/cherokee/webserver/tarball/master -O - | tar zxvf -
29 29
 ------------------------------------------------------------------------------
30 30
 
31 31
 Finally, if you are a developer or simply want to test out the bleeding edge
32  
-version, you can access our Subversion repository. Be advised, this is the
  32
+version, you can access our Git repository. Be advised, this is the
33 33
 development branch, so use it at your own risk!
34 34
 
35  
-To download simply use your Subversion client:
  35
+To download simply use:
36 36
 
37 37
 ---------------------------------------------------------------------------
38  
-svn co svn://svn.cherokee-project.com/cherokee/trunk cherokee
  38
+git clone -b dev --recursive https://github.com/cherokee/webserver.git
39 39
 ---------------------------------------------------------------------------
40 40
 
41  
-You can also download a package with the latest SVN contents:
  41
+You can also download a package with the latest GIT contents:
42 42
 
43 43
 ---------------------------------------------------------------------------
44  
-wget http://www.cherokee-project.com/download/trunk/cherokee-latest-svn.tar.gz \
45  
--O - | gzip -dc - | tar xfv -
  44
+wget https://github.com/cherokee/webserver/tarball/dev -O - | tar zxvf -
46 45
 ---------------------------------------------------------------------------
2  doc/basics_installation.txt
@@ -10,7 +10,7 @@ several platforms.
10 10
 * link:basics_installation_unix.html[Unix installation]
11 11
 * link:basics_installation_osx.html[OSX installation]
12 12
 * link:basics_installation_windows.html[Windows installation]
13  
-* link:basics_installation_svn.html[Installation From SVN]
  13
+* link:basics_installation_git.html[Installation From GIT]
14 14
 
15 15
 For insight on more specific subjects such as cross-compilation or
16 16
 embedding Cherokee, check the link:cookbook.html[Cookbook].
28  doc/basics_installation_svn.txt → doc/basics_installation_git.txt
... ...
@@ -1,34 +1,22 @@
1 1
 == link:index.html[Index] -> link:basics.html[Getting started] -> link:basics_installation.html[Installation]
2 2
 
3  
-Installation from SVN
  3
+Installation from GIT
4 4
 ---------------------
5 5
 
6 6
 The latest, bleeding edge Cherokee release can always be retrieved via
7  
-SVN. Note that this is the development release and could very well be
  7
+GIT. Note that this is the development release and could very well be
8 8
 unstable. In general it is not recommended to run this release in
9 9
 production environments.
10 10
 
11  
-Briefly, SVN is a system tool used to store and maintain files and a
12  
-history of their changes over time, and it is an invaluable development
13  
-tool. The Cherokee source code and related files are kept on a SVN
14  
-server at svn.cherokee-project.com.
15 11
 
16  
-To download the SVN repository you will need a special piece of
17  
-software called an SVN client.
18  
-
19  
-[[checkout]]
20  
-Checking out the sources
  12
+[[clone]]
  13
+Clonning the sourcess
21 14
 ~~~~~~~~~~~~~~~~~~~~~~~~
22  
-To list the available modules, type:
23  
-
24  
-----
25  
-svn list svn://svn.cherokee-project.com/
26  
-----
27 15
 
28 16
 To check out the sources for the first time from the repository, use this command:
29 17
 
30 18
 ----
31  
-svn co svn://svn.cherokee-project.com/cherokee/trunk cherokee
  19
+git clone -b dev --recursive https://github.com/cherokee/webserver.git
32 20
 ----
33 21
 
34 22
 [[update]]
@@ -38,7 +26,7 @@ Updating the sources
38 26
 To update your sources every day, you use this command:
39 27
 
40 28
 ----
41  
-svn up cherokee
  29
+git pull -u
42 30
 ----
43 31
 
44 32
 
@@ -46,11 +34,11 @@ svn up cherokee
46 34
 Compiling and installing
47 35
 ~~~~~~~~~~~~~~~~~~~~~~~~
48 36
 
49  
-Once you have downloaded the latest SVN revision, you will need to
  37
+Once you have downloaded the latest GIT head, you will need to
50 38
 follow the installation instructions for your specific platform.
51 39
 
52 40
 Note that some of the files present in the tarball are not present in
53  
-SVN. Most noticeably, the file `./configure` that will be needed for the
  41
+GIT. Most noticeably, the file `./configure` that will be needed for the
54 42
 installation process.
55 43
 
56 44
 To generate the missing files simply run this command:
2  doc/basics_installation_unix.txt
@@ -193,7 +193,7 @@ having the repositories updated is really short.
193 193
 
194 194
 However, in the event that they arent, some options remain if you want
195 195
 to enjoy the latest Cherokee enhancements. Besides building directly
196  
-from our SVN repository, you can build from source for
  196
+from our GIT repository, you can build from source for
197 197
 Debian/Ubuntu. You will be able to build it cleanly in a `.deb`
198 198
 package with dependencies, and push the new release as fast as
199 199
 possible to production.
2  doc/cookbook_cross_compilation.txt
@@ -39,7 +39,7 @@ RC=i586-mingw32msvc-windres
39 39
 Check out the last version of Cherokee trunk:
40 40
 
41 41
 ----
42  
-$ svn co svn://svn.cherokee-project.com/cherokee/trunk cherokee
  42
+$ git clone -b dev --recursive https://github.com/cherokee/webserver.git
43 43
 ----
44 44
 
45 45
 and execute a quite long "configure" command:
4  doc/dev_quickstart.txt
@@ -11,14 +11,14 @@ environming for Cherokee.
11 11
 
12 12
 The relevant documents would be those about
13 13
 link:basics_requirements.html[software requirements],
14  
-link:basics_download.html[downloading the SVN repository], and the
  14
+link:basics_download.html[downloading the GIT repository], and the
15 15
 link:basics_installation_unix.html[quickstart installation notes].
16 16
 
17 17
 In principle, provided you have the required tools in your system, it
18 18
 should be as easy as:
19 19
 
20 20
 ----
21  
-    svn co svn://svn.cherokee-project.com/cherokee/trunk ~/cherokee_dev
  21
+    git clone -b dev --recursive https://github.com/cherokee/webserver.git ~/cherokee_dev
22 22
     cd ~/cherokee_dev
23 23
     ./autogen.sh --enable-beta --enable-trace
24 24
     make
2  doc/index.txt
@@ -12,7 +12,7 @@ link:basics.html[Getting started]: Cherokee basics
12 12
    - link:basics_installation_unix.html[Unix]: Installation on Unix/Linux platforms.
13 13
    - link:basics_installation_osx.html[OSX]: Installation on Mac OSX platform.
14 14
    - link:basics_installation_windows.html[Windows]: Installation on Windows platform.
15  
-   - link:basics_installation_svn.html[From SVN]: Installation of the development release.
  15
+   - link:basics_installation_git.html[From GIT]: Installation of the development release.
16 16
  . link:basics_upgrade.html[Upgrading Cherokee]: Upgrading from a previous release?
17 17
  . link:basics_running_cherokee.html[Running Cherokee]: Basic steps to run Cherokee.
18 18
 
2  doc/other_bundle_cherokee-admin.txt
@@ -82,7 +82,7 @@ path:
82 82
 
83 83
 ----
84 84
 cherokee-admin -b -p 9091 -C /etc/cherokee/cherokee2.conf \
85  
-                 -d /path/to/svn/trunk/cherokee-admin/
  85
+                 -d /path/to/git/dev/cherokee-admin/
86 86
 ----
87 87
 
88 88
 This is the full information provided by the manpage.
2  doc/other_community.txt
@@ -35,7 +35,7 @@ These are the lists currently in existence:
35 35
 
36 36
 - link:http://lists.octality.com/listinfo/cherokee[General list]
37 37
 - link:http://lists.octality.com/listinfo/cherokee-dev[Development list]
38  
-- link:http://lists.octality.com/listinfo/cherokee-commits[SVN Reports]
  38
+- link:http://lists.octality.com/listinfo/cherokee-commits[GIT Reports]
39 39
 
40 40
 
41 41
 #cherokee IRC channel
8  doc/other_faq.txt
@@ -134,8 +134,8 @@ link:cookbook_maintenance.html[recipe on the subject].
134 134
 Cherokee is licensed under the GNU General Public License, version 2,
135 135
 which can be found in the file *COPYING* distributed with the source
136 136
 code. For more details, read the
137  
-link:http://svn.cherokee-project.com/browser/cherokee/trunk/COPYING[full
138  
-license] in the project's SVN repository.
  137
+link:https://github.com/cherokee/webserver/blob/dev/COPYING[full
  138
+license] in the project's GIT repository.
139 139
 
140 140
 If for whatever reason this license does not suit your needs, other
141 141
 licensing schemes can be negotiated on a particular basis. Contact
@@ -162,8 +162,8 @@ please take a look at the
162 162
 link:http://powerman.name/doc/asciidoc[AsciiDoc Cheatsheet] and start
163 163
 editing the documentation sources right ahead. They are distributed
164 164
 with the source code and are located under `./doc` of the source tree.
165  
-If you don't have SVN access, simply mail your contributions to
166  
-link:mailto:feedback@cherokee-project.com[feedback@cherokee-project.com].
  165
+If you don't have GIT access, simply mail your contributions to
  166
+link:mailto:feedback@cherokee-project.com[feedback@cherokee-project.com] or create fork on github and request pull.
167 167
 
168 168
 [[faq14]]
169 169
 === Can encoders be set for specific file types?
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.