Skip to content

Commit

Permalink
Merge eeb4d71 into 54771c9
Browse files Browse the repository at this point in the history
  • Loading branch information
Cary-Xx committed Oct 9, 2019
2 parents 54771c9 + eeb4d71 commit 101511a
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
2 changes: 0 additions & 2 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/AY1920S1-CS2103-T14-4/main[image:https://travis-ci.org/AY1920S1-CS2103-T14-4/main.svg?branch=master[Build Status]]

https://ci.appveyor.com/project/damithc/addressbook-level3[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://ci.appveyor.com/project/Cary-Xx/main/branch/master[image:https://ci.appveyor.com/api/projects/status/lg8ga460l5xgq9ab/branch/master?svg=true[Build Status]]
https://coveralls.io/github/AY1920S1-CS2103-T14-4/main?branch=master[image:https://coveralls.io/repos/github/AY1920S1-CS2103-T14-4/main/badge.svg?branch=master[Coverage Status]]

Expand Down
2 changes: 1 addition & 1 deletion docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
:imagesDir: images
:stylesDir: stylesheets

MyMorise was developed by the https://github.com/orgs/AY1920S1-CS2103-T14-4/ team. +
MYMorise was developed by the https://github.com/orgs/AY1920S1-CS2103-T14-4/ team. +

We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].

Expand Down
6 changes: 4 additions & 2 deletions docs/DevOps.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= AddressBook Level 3 - Dev Ops
= MYMorise - Dev Ops
:site-section: DeveloperGuide
:toc:
:toc-title:
Expand Down Expand Up @@ -26,6 +26,7 @@ We use https://travis-ci.org/[Travis CI] and https://www.appveyor.com/[AppVeyor]

We use https://coveralls.io/[Coveralls] to track the code coverage of our projects. See <<UsingCoveralls#, UsingCoveralls.adoc>> for more details.

//TODO:Update DevOps
== Documentation Previews

When a pull request has changes to asciidoc files, you can use https://www.netlify.com/[Netlify] to see a preview of how the HTML version of those asciidoc files will look like when the pull request is merged. See <<UsingNetlify#, UsingNetlify.adoc>> for more details.
Expand All @@ -41,7 +42,8 @@ Here are the steps to create a new release.

== Managing Dependencies

A project often depends on third-party libraries. For example, Address Book depends on the https://github.com/FasterXML/jackson[Jackson library] for JSON parsing. Managing these _dependencies_ can be automated using Gradle. For example, Gradle can download the dependencies automatically, which is better than these alternatives:
A project often depends on third-party libraries. For example, MYMorise depends on the https://github
.com/FasterXML/jackson[Jackson library] for JSON parsing. Managing these _dependencies_ can be automated using Gradle. For example, Gradle can download the dependencies automatically, which is better than these alternatives:

[loweralpha]
. Include those libraries in the repo (this bloats the repo size)
Expand Down
2 changes: 1 addition & 1 deletion docs/DeveloperGuide.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ifdef::env-github[]
endif::[]
:repoURL: https://github.com/AY1920S1-CS2103-T14-4/main

By: `Team SE-EDU`      Since: `Jun 2016`      Licence: `MIT`
By: `Team T14-4`      Since: `Sep 2019`      Licence: `MIT`

== Setting up

Expand Down
2 changes: 1 addition & 1 deletion docs/Documentation.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= AddressBook Level 3 - Documentation
= MYMorise - Documentation
:site-section: DeveloperGuide
:toc:
:toc-title:
Expand Down
2 changes: 1 addition & 1 deletion docs/SettingUp.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= AddressBook Level 3 - Setting Up
= MYMorise - Setting Up
:site-section: DeveloperGuide
:toc:
:toc-title:
Expand Down
2 changes: 1 addition & 1 deletion docs/Testing.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= AddressBook Level 3 - Testing
= MYMorise - Testing
:site-section: DeveloperGuide
:toc:
:toc-title:
Expand Down
4 changes: 2 additions & 2 deletions docs/UserGuide.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= MYMorize - User Guide
= MYMorise - User Guide
:site-section: UserGuide
:toc:
:toc-title:
Expand All @@ -14,7 +14,7 @@ ifdef::env-github[]
endif::[]
:repoURL: https://github.com/se-edu/addressbook-level3

By: `Team 14-4` Since: `Sep 2019` Licence: `MIT`
By: `Team T14-4` Since: `Sep 2019` Licence: `MIT`

== Introduction

Expand Down

0 comments on commit 101511a

Please sign in to comment.