[ 
https://issues.apache.org/jira/browse/CB-3962?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13813181#comment-13813181
 ] 

Michael Brooks commented on CB-3962:
------------------------------------

Alright, it's all merged.

Commits 8e4f91f88340e89f714fdcbdc9af3031be338532 and 
f76c6310039af02bc4850139542868b999583b26 had conflicts with 
{{docs/en/edge/guide/cli/index.md}}. It looks as though this branch's CLI 
document is either ahead or behind the master CLI document. In the master, the 
Cordova and Project upgrades are combined. In your branch, they are separated.

> document and implement editorial guidelines
> -------------------------------------------
>
>                 Key: CB-3962
>                 URL: https://issues.apache.org/jira/browse/CB-3962
>             Project: Apache Cordova
>          Issue Type: Task
>          Components: Docs
>            Reporter: Mike Sierra
>            Assignee: Mike Sierra
>            Priority: Critical
>
> The top-level STYLESHEET.md file collects editorial guidelines to help 
> standardize the doc. Keep updating to reflect any site-side conventions.



--
This message was sent by Atlassian JIRA
(v6.1#6144)

Reply via email to