diff --git a/README.md b/README.md index 7166daed75..8e00be5265 100644 --- a/README.md +++ b/README.md @@ -24,10 +24,10 @@ More importantly, Gogs only needs one binary to setup your own project hosting o ## Overview -- Please see [Wiki](https://github.com/gogits/gogs/wiki) for project design, known issues, and change log. +- Please see [Documentation](http://gogs.io/docs/intro/) for project design, known issues, and change log. - See [Trello Board](https://trello.com/b/uxAoeLUl/gogs-go-git-service) to follow the develop team. - Try it before anything? Do it [online](http://try.gogits.org/Unknown/gogs) or go down to **Installation -> Install from binary** section! -- Having troubles? Get help from [Troubleshooting](https://github.com/gogits/gogs/wiki/Troubleshooting). +- Having troubles? Get help from [Troubleshooting](http://gogs.io/docs/intro/troubleshooting.md). ## Features @@ -49,12 +49,12 @@ More importantly, Gogs only needs one binary to setup your own project hosting o ## Installation -Make sure you install [Prerequirements](https://github.com/gogits/gogs/wiki/Prerequirements) first. +Make sure you install [Prerequirements](http://gogs.io/docs/installation/) first. There are 3 ways to install Gogs: -- [Install from binary](https://github.com/gogits/gogs/wiki/Install-from-binary): **STRONGLY RECOMMENDED** -- [Install from source](https://github.com/gogits/gogs/wiki/Install-from-source) +- [Install from binary](http://gogs.io/docs/installation/install_from_binary.md): **STRONGLY RECOMMENDED** +- [Install from source](http://gogs.io/docs/installation/install_from_source.md) - [Ship with Docker](https://github.com/gogits/gogs/tree/master/dockerfiles) ## Acknowledgments diff --git a/README_ZH.md b/README_ZH.md index 177c679a85..e4c92685fe 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -15,10 +15,10 @@ Gogs 完全使用 Go 语言来实现对 Git 数据的操作,实现 **零** 依 ## 项目概览 -- 有关项目设计、已知问题和变更日志,请通过 [Wiki](https://github.com/gogits/gogs/wiki) 查看。 +- 有关项目设计、已知问题和变更日志,请通过 [使用手册](http://gogs.io/docs/intro/) 查看。 - 您可以到 [Trello Board](https://trello.com/b/uxAoeLUl/gogs-go-git-service) 跟随开发团队的脚步。 - 想要先睹为快?通过 [在线体验](http://try.gogits.org/Unknown/gogs) 或查看 **安装部署 -> 二进制安装** 小节。 -- 使用过程中遇到问题?尝试从 [故障排查](https://github.com/gogits/gogs/wiki/Troubleshooting) 页面获取帮助。 +- 使用过程中遇到问题?尝试从 [故障排查](http://gogs.io/docs/intro/troubleshooting.md) 页面获取帮助。 ## 功能特性 @@ -41,12 +41,12 @@ Gogs 完全使用 Go 语言来实现对 Git 数据的操作,实现 **零** 依 ## 安装部署 -在安装 Gogs 之前,您需要先安装 [基本环境](https://github.com/gogits/gogs/wiki/Prerequirements)。 +在安装 Gogs 之前,您需要先安装 [基本环境](http://gogs.io/docs/installation/)。 然后,您可以通过以下 3 种方式来安装 Gogs: -- [二进制安装](https://github.com/gogits/gogs/wiki/Install-from-binary): **强烈推荐** -- [源码安装](https://github.com/gogits/gogs/wiki/Install-from-source) +- [二进制安装](http://gogs.io/docs/installation/install_from_binary.md): **强烈推荐** +- [源码安装](http://gogs.io/docs/installation/install_from_source.md) - [采用 Docker 部署](https://github.com/gogits/gogs/tree/master/dockerfiles) ## 特别鸣谢 diff --git a/doc/install_gogs_from_binary_on_ubuntu.md b/doc/install_gogs_from_binary_on_ubuntu.md deleted file mode 100644 index 3b406b3643..0000000000 --- a/doc/install_gogs_from_binary_on_ubuntu.md +++ /dev/null @@ -1,26 +0,0 @@ -### Binary install gogs on ubuntu 14.04 LTS - -### create user and install denpendency -- sudo adduser git -- sudo apt-get update -- sudo apt-get upgrade -- sudo apt-get install git -- sudo apt-get install mysql-server - -### create the database -- $mysql -u root -p -- mysql> SET GLOBAL storage_engine = 'InnoDB'; -- mysql> CREATE DATABASE gogs CHARACTER SET utf8 COLLATE utf8_bin; -- mysql> GRANT ALL PRIVILEGES ON gogs.* TO 'root'@'localhost' IDENTIFIED BY 'password'; -- mysql> FLUSH PRIVILEGES; -- mysql> QUIT - -### install the gogs -- mkdir gogs -- cd gogs -- curl -L http://gobuild.io/github.com/gogits/gogs/v0.3.0/linux/amd64 -o v0.3.0.zip -- unzip v0.3.0.zip -- ./start.sh - -> The up-to-date binary could be found at -> http://gobuild.io/download/github.com/gogits/gogs diff --git a/doc/install_gogs_from_source_on_ubuntu.md b/doc/install_gogs_from_source_on_ubuntu.md deleted file mode 100644 index b8ae6fc790..0000000000 --- a/doc/install_gogs_from_source_on_ubuntu.md +++ /dev/null @@ -1,48 +0,0 @@ -##Install gogs under ubuntu 14.04 LTS 32bit from source code - -###Requirements -- Go Programming Language: Version >= 1.2 -- git(bash): Version >= 1.6.6(both server and client) -- MySQL: Version >= 5.1 or PostgreSQL or NOTHING. - -### Create the user which will run git -- sudo adduser git -- su git - -### Install git and Mysql-server -- sudo apt-get install git -- sudo apt-get install mysql-server - -### Create database -- $ mysql -u root -p -- mysql> SET GLOBAL storage_engine = 'InnoDB'; -- mysql> CREATE DATABASE gogs CHARACTER SET utf8 COLLATE utf8_bin; -- mysql> GRANT ALL PRIVILEGES ON gogs.* TO 'root'@'localhost' IDENTIFIED BY 'pasword'; -- mysql> FLUSH PRIVILEGES; -- mysql> QUIT - -### install go from source -- sudo apt-get install build-essential -- sudo apt-get install mercurial -- hg clone -r release https://go.googlecode.com/hg/ /home/git/golang/ - - -- echo export GOROOT=/home/git/golang >>.bashrc -- echo export GOARCH=386 >>.bashrc -- echo export GOOS=linux >>.bashrc -- echo export GOBIN= /home/git/golang/bin >>.bashrc -- echo export GOPATH=$HOME/app/Go >>.bashrc -- echo PATH=${PATH}: /$HOME/golang/bin >>.bashrc -- cd $GOROOT/src -- ./make.bash - -### Download and install dependencies -- $ go get -u github.com/gogits/gogs - -### Build main program -- $ cd $GOPATH/src/github.com/gogits/gogs -- $ go build -- $ ./start.sh - -### At present, you could access gogs from http://localhost:3000 - diff --git a/gogs.go b/gogs.go index 7f7267ecd6..af707862ad 100644 --- a/gogs.go +++ b/gogs.go @@ -19,7 +19,7 @@ import ( // Test that go1.2 tag above is included in builds. main.go refers to this definition. const go12tag = true -const APP_VER = "0.3.1.0430 Alpha" +const APP_VER = "0.3.1.0501 Alpha" func init() { base.AppVer = APP_VER diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 23a1173f99..b3e3368b44 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -15,7 +15,7 @@