Merge branch 'master' of softwarepublico.gov.br:softwarepublico/articles

Conflicts: ieeeSW/releaseEng3/IEEE_ThemeIssue_ReleaseEng_CD.md

Merge branch 'master' of softwarepublico.gov.br:softwarepublico/articles
Conflicts: ieeeSW/releaseEng3/IEEE_ThemeIssue_ReleaseEng_CD.md
Paulo Meireles
2 parents d40be3be 5fff8bef
Showing 1 changed file with 5 additions and 5 deletions Show diff stats
ieeeSW/releaseEng3/IEEE_ThemeIssue_ReleaseEng_CD.md
@@ -25,15 +25,15 @@ delays could have sunk the project into oblivion.
 From 2013 to 2016, our team developed the new platform for the Brazilian Public
 Software (SPB, Portuguese acronym) Portal (www.softwarepublico.gov.br). The SPB
 Portal has evolved to a CDE [1] and this evolution has brought important
-benefits not just to the Brazilian government , but also to society as a whole.
+benefits not just to the Brazilian government, but also to society as a whole.
 For the government, the bureaucracy on using the same software across
 government agencies, duplicate works and costs all are reduced. The society
 gains a transparency and collaboration mechanism, since anyone can check the
 government expenses on software and contribute to the software communities. To
-achieve these goals, we have chosen to integrate more than free software tools
-(such as Gitlab (www.gitlab.com), Mailman (www.gnu.org/software/mailman),
-Noosfero (www.noosfero.org), and Colab (www.github.com/colab)) rather than
-write everything from scratch.
+achieve these goals, rather than writing everything from scratch, we have
+chosen to integrate free software tools such as Gitlab (www.gitlab.com),
+Mailman (www.gnu.org/software/mailman), Noosfero (www.noosfero.org), and
+Colab (www.github.com/colab).
  
 During the entire SPB Portal evolution project, we had to handle three distinct
 issues, usual in a software engineering scenario: reaching the goals which have
...	...	@@ -25,15 +25,15 @@ delays could have sunk the project into oblivion.
25	25	From 2013 to 2016, our team developed the new platform for the Brazilian Public
26	26	Software (SPB, Portuguese acronym) Portal (www.softwarepublico.gov.br). The SPB
27	27	Portal has evolved to a CDE [1] and this evolution has brought important
28		-benefits not just to the Brazilian government , but also to society as a whole.
	28	+benefits not just to the Brazilian government, but also to society as a whole.
29	29	For the government, the bureaucracy on using the same software across
30	30	government agencies, duplicate works and costs all are reduced. The society
31	31	gains a transparency and collaboration mechanism, since anyone can check the
32	32	government expenses on software and contribute to the software communities. To
33		-achieve these goals, we have chosen to integrate more than free software tools
34		-(such as Gitlab (www.gitlab.com), Mailman (www.gnu.org/software/mailman),
35		-Noosfero (www.noosfero.org), and Colab (www.github.com/colab)) rather than
36		-write everything from scratch.
	33	+achieve these goals, rather than writing everything from scratch, we have
	34	+chosen to integrate free software tools such as Gitlab (www.gitlab.com),
	35	+Mailman (www.gnu.org/software/mailman), Noosfero (www.noosfero.org), and
	36	+Colab (www.github.com/colab).
37	37
38	38	During the entire SPB Portal evolution project, we had to handle three distinct
39	39	issues, usual in a software engineering scenario: reaching the goals which have
...	...