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
cherokee · Jun 11, 2012 · fcdebfd · Daniel15 · Jun 12, 2012 · fcdebfd
2 parents 681b76c + d0331db
commit fcdebfd
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 22 deletions.
diff --git a/configure.in b/configure.in
@@ -25,7 +25,7 @@ AC_PREREQ([2.60])
 dnl Version
 m4_define([cherokee_major_version], [1])
 m4_define([cherokee_minor_version], [2])
-m4_define([cherokee_micro_version], [101])
+m4_define([cherokee_micro_version], [102])
 m4_define([cherokee_version], m4_format('%s.%s.%s', cherokee_major_version, cherokee_minor_version, cherokee_micro_version))
 
 dnl Init autoconf and automake

diff --git a/doc/basics.txt b/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_git.html[From Github]: 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.
diff --git a/doc/basics_download.txt b/doc/basics_download.txt
@@ -29,17 +29,17 @@ wget http://www.cherokee-project.com/cherokee-latest-tarball -O -| tar zxvf -
 ------------------------------------------------------------------------------
 
 Finally, if you are a developer or simply want to test out the bleeding edge
-version, you can access our Github 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 Git client:
+To download simply use:
 
 ---------------------------------------------------------------------------
-git clone git://github.com/cherokee/webserver.git cherokee
+git clone https://github.com/cherokee/webserver.git
 ---------------------------------------------------------------------------
 
-You can also download a ZIP or tar package with the latest contents by visiting:
+You can also download a package with the latest GIT contents:
 
 ---------------------------------------------------------------------------
-https://github.com/cherokee/webserver/downloads
+wget https://github.com/cherokee/webserver/zipball/dev
 ---------------------------------------------------------------------------
diff --git a/doc/basics_installation.txt b/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_git.html[Installation From Github]
+* 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].
diff --git a/doc/basics_installation_git.txt b/doc/basics_installation_git.txt
@@ -16,8 +16,9 @@ at github.com/cherokee/webserver.git.
 To download the Git repository you will need a special piece of
 software called a Git client.
 
-[[checkout]]
+
-Checking out the sources
+[[clone]]
+Clonning the sourcess
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 To check out the sources for the first time from the repository, use this command:
@@ -33,20 +34,20 @@ Updating the sources
 To update your sources every day, you use this command:
 
 ----
-git pull
+git pull -u
 ----
 
 
 [[compile]]
 Compiling and installing
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-Once you have downloaded the latest Git 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 the
+Note that some of the files present in the tarball are not present in
-Git repository. Most noticeably, the file `./configure` that will be needed 
+GIT. Most noticeably, the file `./configure` that will be needed for the
-for the installation process.
+installation process.
 
 To generate the missing files simply run this command:
 

diff --git a/doc/basics_installation_unix.txt b/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.

diff --git a/doc/dev_quickstart.txt b/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 Git 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:
 
 ----
-    git clone git://github.com/cherokee/webserver.git ~/cherokee_dev
+    git clone git://github.com/cherokee/webserver.git ~/cherokee
     cd ~/cherokee_dev
     git submodule init
     git submodule update

diff --git a/doc/index.txt b/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_git.html[From Github]: 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.
 

diff --git a/doc/other_community.txt b/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

diff --git a/doc/other_faq.txt b/doc/other_faq.txt
@@ -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 Git 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]]
 === Can encoders be set for specific file types?