From 545d320648a5ce93e394a3cbc1317f73553b0d75 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 26 Jul 2014 03:02:46 -0400 Subject: [PATCH] Docs fix --- .gobuild.yml | 7 ++++--- .gopmfile | 37 +++++++++++++++++++------------------ README.md | 8 +++----- README_ZH.md | 8 +++----- modules/ssh/ssh.go | 2 +- modules/workers/worker.go | 10 ---------- 6 files changed, 30 insertions(+), 42 deletions(-) delete mode 100644 modules/workers/worker.go diff --git a/.gobuild.yml b/.gobuild.yml index 2570717ed..c3fa262ef 100644 --- a/.gobuild.yml +++ b/.gobuild.yml @@ -1,11 +1,12 @@ filesets: includes: - - templates + - conf + - etc - public + - scripts + - templates - LICENSE - README.md - README_ZH.md - - start.bat - - start.sh excludes: - \.git diff --git a/.gopmfile b/.gopmfile index b8aa02372..235a8a436 100644 --- a/.gopmfile +++ b/.gopmfile @@ -2,24 +2,25 @@ path = github.com/gogits/gogs [deps] -github.com/Unknwon/cae = `commit:a1fa53b` -github.com/Unknwon/com = `commit:019c36f` -github.com/Unknwon/goconfig = `commit:c4e325f` -github.com/codegangsta/cli = `commit:bb91895` -github.com/go-martini/martini = `commit:49411a5` -github.com/go-sql-driver/mysql = `commit:b44cac6` -github.com/go-xorm/core = `commit:267e375` -github.com/go-xorm/xorm = `commit:bd1487b` -github.com/gogits/cache = `commit:f9bb61f` -github.com/gogits/gfm = `commit:40f747a` -github.com/gogits/git = `commit:3d9e771` -github.com/gogits/logs = `commit:0a97a46` -github.com/gogits/oauth2 = `commit:99cbec8` -github.com/gogits/session = `commit:7ab78d4` -github.com/juju2013/goldap = `commit:f4a7f67` -github.com/lib/pq = `commit:529edd9` -github.com/nfnt/resize = `commit:8aee0d9` +github.com/Unknwon/cae = +github.com/Unknwon/com = +github.com/Unknwon/goconfig = +github.com/Unknwon/i18n = +github.com/Unknwon/macaron = +github.com/codegangsta/cli = +github.com/go-sql-driver/mysql = +github.com/go-xorm/core = +github.com/go-xorm/xorm = +github.com/gogits/cache = +github.com/gogits/gfm = +github.com/gogits/git = +github.com/gogits/oauth2 = +github.com/juju2013/goldap = +github.com/lib/pq = +github.com/macaron-contrib/i18n = +github.com/macaron-contrib/session = +github.com/nfnt/resize = [res] -include = templates|public +include = conf|etc|public|scripts|templates diff --git a/README.md b/README.md index af33b0e8e..c1fd499e0 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ Gogs - Go Git Service [![wercker status](https://app.wercker.com/status/ad0bdb0bc450ac6f09bc56b9640a50aa/s/ "wercker status")](https://app.wercker.com/project/bykey/ad0bdb0bc450ac6f09bc56b9640a50aa) [![Build Status](https://drone.io/github.com/gogits/gogs/status.png)](https://drone.io/github.com/gogits/gogs/latest) ===================== -Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language. +Gogs(Go Git Service) is a painless self-hosted Git Service written in Go. ![Demo](http://gowalker.org/public/gogs_demo.gif) -##### Current version: 0.4.5 Alpha +##### Current version: 0.4.7 Alpha ### NOTICES @@ -18,9 +18,7 @@ Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language ## Purpose -Since we choose to use pure Go implementation of Git manipulation, Gogs certainly supports **ALL platforms** that Go supports, including Linux, Mac OS X, and Windows with **ZERO** dependency. - -More importantly, Gogs only needs one binary to setup your own project hosting on the fly! +The goal of this project is to make the easiest, fastest and most painless way to set up a self-hosted Git service. With Go, this can be done in independent binary distribution across **ALL platforms** that Go supports, including Linux, Mac OS X, and Windows. ## Overview diff --git a/README_ZH.md b/README_ZH.md index 26746ccbe..24836208d 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -1,17 +1,15 @@ Gogs - Go Git Service [![wercker status](https://app.wercker.com/status/ad0bdb0bc450ac6f09bc56b9640a50aa/s/ "wercker status")](https://app.wercker.com/project/bykey/ad0bdb0bc450ac6f09bc56b9640a50aa) [![Build Status](https://drone.io/github.com/gogits/gogs/status.png)](https://drone.io/github.com/gogits/gogs/latest) ===================== -Gogs(Go Git Service) 是一个由 Go 语言编写的自助 Git 托管服务。 +Gogs(Go Git Service) 是一个基于 Go 语言的自助 Git 服务。 ![Demo](http://gowalker.org/public/gogs_demo.gif) -##### 当前版本：0.4.5 Alpha +##### 当前版本：0.4.7 Alpha ## 开发目的 -Gogs 完全使用 Go 语言来实现对 Git 数据的操作，实现 **零** 依赖，并且支持 Go 语言所支持的 **所有平台**，包括 Linux、Mac OS X 以及 Windows。 - -更重要的是，您只需要一个可执行文件就能借助 Gogs 快速搭建属于您自己的代码托管服务！ +Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自助 Git 服务。使用 Go 语言开发使得 Gogs 能够通过独立的二进制分发，并且支持 Go 语言支持的 **所有平台**，包括 Linux、Mac OS X 以及 Windows。 ## 项目概览 diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go index 78ad678dc..814a3dd1f 100644 --- a/modules/ssh/ssh.go +++ b/modules/ssh/ssh.go @@ -17,7 +17,7 @@ import ( "github.com/Unknwon/com" - "github.com/gogits/gogs-ng/modules/log" + "github.com/gogits/gogs/modules/log" ) func handleServerConn(keyId string, chans <-chan ssh.NewChannel) { diff --git a/modules/workers/worker.go b/modules/workers/worker.go deleted file mode 100644 index 97535b2b4..000000000 --- a/modules/workers/worker.go +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2014 The Gogs Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package workers - -// Work represents a background work interface of any kind. -type Work interface { - Do() error -}