Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Line edits docs #294

Merged
merged 5 commits into from
Oct 16, 2017
Merged

Line edits docs #294

merged 5 commits into from
Oct 16, 2017

Conversation

Hbler
Copy link
Contributor

@Hbler Hbler commented Oct 11, 2017

addresses #96

What is included in this PR?

Small line edits in docs.

Copy link
Contributor

@adammichaelwood adammichaelwood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few changes needed, but mostly good work.

@@ -88,24 +88,24 @@ Pulling from Android 4.x and later device
- Once it is copied onto your local hard drive, unzip the file of the 'odk' directory.
- Open *ODK Briefcase*.
- In the window which opens up select :guilabel:`pull` tab.
- Select *Custom Path to ODK Directory* in the :guilabel:`pull data from` drop-down.
- Select *Custom Path to ODK Directory* in the :guilabel:`pull data from` the drop-down.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i don't understand this addition.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I misinterpreted the text. I'll correct it!

@@ -68,9 +68,9 @@ Pulling from Android 2.x and earlier device
- Connect your Android device to your computer using a USB cable and choose to mount the drive.
- Open *ODK Briefcase*.
- In the window which opens up select :guilabel:`pull` tab.
- Select `Mounted Android SD Card` in the :guilabel:`pull data from` drop-down.
- Select `Mounted Android SD Card` in the :guilabel:`pull data from` the drop-down.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand this addition.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I misinterpreted the text. I'll correct it!

glossary.rst Outdated
@@ -80,13 +80,13 @@ Glossary

widget

A single question, answer set, and attendant GUI elements, as rendered in an XForm compliant app such as :term:`Collect`.
A single question, answer set, and attendant GUI elements, as rendered in a XForm compliant app such as :term:`Collect`.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"XForm" pronounced eks-form, so "an XForm" is correct.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing it out, I was so focused on the grammatical aspect that I oversaw the phonetical part.

glossary.rst Outdated
The main part body of a form question or widget. In an :term:`XLSForm`, the contents of :th:`label`.

The main part body of a form question or widget. In a :term:`XLSForm`, the contents of the :th:`label`.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"XForm" is pronounced eks-form, so "an XForm" is correct.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing it out, I was so focused on the grammatical aspect that I oversaw the phonetical part.

@getodk-bot
Copy link
Member

Heads up @Hbler, we just merged some commits that conflict with the changes your made in this pull request! You can review this repository's recent commits to see where the conflicts occur. Please rebase your feature branch against the upstream/master branch and resolve your pull request's merge conflicts accordingly.

@adammichaelwood adammichaelwood merged commit d735051 into getodk:master Oct 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants