Merge lp:~hackbinary/openobject-doc/trunk into lp:~openerp-dev/openobject-doc/trunk

Proposed by David
Status: Needs review
Proposed branch: lp:~hackbinary/openobject-doc/trunk
Merge into: lp:~openerp-dev/openobject-doc/trunk
Diff against target: 40 lines (+7/-7)
1 file modified
source/contribute/08_documentation_process.rst (+7/-7)
To merge this branch: bzr merge lp:~hackbinary/openobject-doc/trunk
Reviewer Review Type Date Requested Status
OpenERP R&D Team Pending
Review via email: mp+193501@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

1762. By David

updated:
 changed Tiny to Open ERP S.A
 launchpad repository address
 minor gramatical errors

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'source/contribute/08_documentation_process.rst'
--- source/contribute/08_documentation_process.rst 2011-09-01 08:19:52 +0000
+++ source/contribute/08_documentation_process.rst 2013-10-31 21:51:25 +0000
@@ -71,11 +71,11 @@
71Anyone can be an author and write a complete book or just one or several71Anyone can be an author and write a complete book or just one or several
72chapters on particular aspects of OpenERP. Chapters are then review72chapters on particular aspects of OpenERP. Chapters are then review
7373
74Authors from Tiny74Authors from OpenERP S.A.
75"""""""""""""""""75"""""""""""""""""""""""""
7676
77At Tiny (the editor of OpenERP), each employee can write a few chapters based77At OpenERP S.A. each employee can write a few chapters based
78on new module he wrote for specific customers, at the end of the project. As78on modules she wrote for specific customers, at the end of the project. As
79employees get a salary to write these chapters during their working hours,79employees get a salary to write these chapters during their working hours,
80author rights are computed slightly differently:80author rights are computed slightly differently:
8181
@@ -96,7 +96,7 @@
96The Sources for the documentation can be downloaded from:96The Sources for the documentation can be downloaded from:
97:: 97::
98 98
99 bzr branch lp:openobject-doc99 bzr branch bzr branch lp:~openerp-dev/openobject-doc/trunk
100100
101We use Sphinx_, a documentation generator, to build101We use Sphinx_, a documentation generator, to build
102the documentation. So, Sphinx should be installed on your system and you should102the documentation. So, Sphinx should be installed on your system and you should
@@ -203,9 +203,9 @@
203FAQ203FAQ
204+++204+++
205205
206.. describe:: How much items can we expect to sell for a book ?206.. describe:: How many books can we expect to sell ?
207207
208The first French book we wrote is sold at 500 items per month. It's good as it208The first French book we wrote sold 500 per month. It was good as it
209was our the first book on OpenERP but we can expect better results with an209was our the first book on OpenERP but we can expect better results with an
210English version. So probably between 250 and 1500 items per month for an210English version. So probably between 250 and 1500 items per month for an
211English book.211English book.

Subscribers

People subscribed via source and target branches

to all changes: