Browse Source

Merge branch 'readme' into dev

 + The target is to improve README in upcomming version.

 Conflicts:
	CHANGELOG.md
	README.md
	_oasis
	setup.ml

 + Conflict in CHANGELOG.md file comes from changes recorded for the README
 improvement palced in the v0.3.x section.
 + In _oasis, it was a matter of copyright date and official website.
 + Changes in _oasis were applied to README.md and setup.ml file, solving
 conflicts.
Leo 9 years ago
parent
commit
2dffdd12b1
6 changed files with 33 additions and 15 deletions
  1. 1 0
      CHANGELOG.md
  2. 2 2
      CONTRIBUTING.md
  3. 23 6
      README.md
  4. 2 2
      _oasis
  5. 1 1
      opam
  6. 4 4
      setup.ml

+ 1 - 0
CHANGELOG.md

@@ -48,6 +48,7 @@
    + For the futur : Running infinite, daemon mode...
  + Improve release script, to enhance contributing experience (making easier to
    release source-code, binaries, signing…). Add indentation script too.
+ + Improve README.md file, using special code in \_oasis Description field.
 
 ## 0.2.x
 

+ 2 - 2
CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributions are most welcome, not only for the code !
 
-See [the website](http://oclaunch.tuxfamily.org/contribute.html) for details.
+See [the website](http://oclaunch.eu.org/contribute) for details.
 
 By participating in this project you agree to abide by its
-[terms](oclaunch.tuxfamily.org/rules.html).
+[rules](http://www.oclaunch.eu.org/rules).

+ 23 - 6
README.md

@@ -1,18 +1,35 @@
 <!--- OASIS_START --->
-<!--- DO NOT EDIT (digest: c3305a624f799eb22bd709594c61132a) --->
+<!--- DO NOT EDIT (digest: aa0b230bc61e32c4a92b1f461b88f498) --->
 
 OcLaunch - Launch commands automagically
 ========================================
 
-OcLaunch is a command-line tool to launch successively (each time the program
-is called) commands. It is designed to be used with any program, interactive
-or not. Feedback is welcome at leowzukw@vmail.me. Help at
-https://gitlab.com/WzukW/oclaunch/wikis/home. Try it, it works automagically!
+[![licence
+CeCILL](https://img.shields.io/badge/licence-CeCILL-blue.svg)](http://oclaunch.eu.org/floss-under-cecill)
+[![command
+line](https://img.shields.io/badge/command-line-lightgrey.svg)](http://oclaunch.eu.org/videos)
+[![platform UNIX (esp.
+LINUX)](https://img.shields.io/badge/platform-UNIX_\(esp._LINUX\)-lightgrey.svg)](http://download.tuxfamily.org/oclaunch/oclaunch.xml)
+[![language
+OCaml](https://img.shields.io/badge/language-OCaml-orange.svg)](http://www.ocaml.org/)
+[![opam
+oclaunch](https://img.shields.io/badge/opam-oclaunch-red.svg)](http://opam.ocaml.org/packages/oclaunch/oclaunch.0.2.2/)
+[![Getting
+help](https://img.shields.io/badge/Get-Help!-orange.svg)](http://www.oclaunch.eu.org/help.html)
+<hr/><p>OcLaunch is a command-line tool to launch successively (each time the
+program is called) commands. It is designed to be used with any program,
+interactive or not. Feedback is welcome at *contact@oclaunch.eu.org*.
+Detailed presentation at http://ocla.ml.<br/> Try it, it works
+automagically!</p><p>For example, here is a typical session (you open a
+terminal emulator between each item): <ul> <li>You open your first terminal,
+your chat client is opened,</li> <li>On second launch of a terminal, your
+task list is displayed,</li> <li>On third launch, everything has been done.
+You will not see anything more.</li> </ul></p>
 
 See the file [INSTALL.md](INSTALL.md) for building and installation
 instructions.
 
-[Home page](http://www.oclaunch.tuxfamily.org)
+[Home page](http://www.oclaunch.eu.org)
 
 Copyright and license
 ---------------------

File diff suppressed because it is too large
+ 2 - 2
_oasis


+ 1 - 1
opam

@@ -4,7 +4,7 @@ version: "0.3.1-dev"
 maintainer: "Leo <leowzukw@vmail.me>"
 authors: "Leo <leowzukw@vmail.me>"
 license: "CeCILL"
-homepage: "http://www.oclaunch.tuxfamily.org"
+homepage: "http://www.oclaunch.eu.org"
 bug-reports: "https://gitlab.com/WzukW/oclaunch/issues/new"
 dev-repo: "git@gitlab.com:WzukW/oclaunch.git"
 build: [

File diff suppressed because it is too large
+ 4 - 4
setup.ml