Skip to content
This repository
Browse code

Merge branch 'bug-1288'

Conflicts:
	doc/basics.txt
	doc/basics_download.txt
	doc/basics_installation.txt
	doc/basics_installation_git.txt
	doc/cookbook_cross_compilation.txt
	doc/dev_quickstart.txt
	doc/index.txt
	doc/other_bundle_cherokee-admin.txt
	doc/other_faq.txt
  • Loading branch information...
commit fcdebfdb103aae8483995a41151dd11f102e0ecd 2 parents 681b76c + d0331db
Stefan de Konink authored June 11, 2012
2  configure.in
@@ -25,7 +25,7 @@ AC_PREREQ([2.60])
25 25
 dnl Version
26 26
 m4_define([cherokee_major_version], [1])
27 27
 m4_define([cherokee_minor_version], [2])
28  
-m4_define([cherokee_micro_version], [101])
  28
+m4_define([cherokee_micro_version], [102])
29 29
 m4_define([cherokee_version], m4_format('%s.%s.%s', cherokee_major_version, cherokee_minor_version, cherokee_micro_version))
30 30
 
31 31
 dnl Init autoconf and automake
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_git.html[From Github]: 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.
10  doc/basics_download.txt
@@ -29,17 +29,17 @@ wget http://www.cherokee-project.com/cherokee-latest-tarball -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 Github 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 Git client:
  35
+To download simply use:
36 36
 
37 37
 ---------------------------------------------------------------------------
38  
-git clone git://github.com/cherokee/webserver.git cherokee
  38
+git clone https://github.com/cherokee/webserver.git
39 39
 ---------------------------------------------------------------------------
40 40
 
41  
-You can also download a ZIP or tar package with the latest contents by visiting:
  41
+You can also download a package with the latest GIT contents:
42 42
 
43 43
 ---------------------------------------------------------------------------
44  
-https://github.com/cherokee/webserver/downloads
  44
+wget https://github.com/cherokee/webserver/zipball/dev
45 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_git.html[Installation From Github]
  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].
15  doc/basics_installation_git.txt
@@ -16,8 +16,9 @@ at github.com/cherokee/webserver.git.
16 16
 To download the Git repository you will need a special piece of
17 17
 software called a Git client.
18 18
 
19  
-[[checkout]]
20  
-Checking out the sources
  19
+
  20
+[[clone]]
  21
+Clonning the sourcess
21 22
 ~~~~~~~~~~~~~~~~~~~~~~~~
22 23
 
23 24
 To check out the sources for the first time from the repository, use this command:
@@ -33,7 +34,7 @@ Updating the sources
33 34
 To update your sources every day, you use this command:
34 35
 
35 36
 ----
36  
-git pull
  37
+git pull -u
37 38
 ----
38 39
 
39 40
 
@@ -41,12 +42,12 @@ git pull
41 42
 Compiling and installing
42 43
 ~~~~~~~~~~~~~~~~~~~~~~~~
43 44
 
44  
-Once you have downloaded the latest Git revision, you will need to
  45
+Once you have downloaded the latest GIT head, you will need to
45 46
 follow the installation instructions for your specific platform.
46 47
 
47  
-Note that some of the files present in the tarball are not present in the
48  
-Git repository. Most noticeably, the file `./configure` that will be needed 
49  
-for the installation process.
  48
+Note that some of the files present in the tarball are not present in
  49
+GIT. Most noticeably, the file `./configure` that will be needed for the
  50
+installation process.
50 51
 
51 52
 To generate the missing files simply run this command:
52 53
 
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.
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 Git 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  
-    git clone git://github.com/cherokee/webserver.git ~/cherokee_dev
  21
+    git clone git://github.com/cherokee/webserver.git ~/cherokee
22 22
     cd ~/cherokee_dev
23 23
     git submodule init
24 24
     git submodule update
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_git.html[From Github]: 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_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
4  doc/other_faq.txt
@@ -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 Git 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?

0 notes on commit fcdebfd

Daniel Lo Nigro

This should be "cloning".

Please sign in to comment.
Something went wrong with that request. Please try again.