search

openscriptures / HebrewLexicon

BDB outline with links to Strong's and more
109 stars 48 forks source link

added definition #1

Closed dowens76 closed 12 years ago

dowens76 commented 12 years ago

I added a definition to entry "a1," but I was not sure this is how you want to go about adding definitions.

DavidTroidl commented 12 years ago

Daniel,

The existing can be expanded to include all the content, rather than repeating it.

I wouldn't bother with the at all. (Those are for Strong's.)

I'm generally more sparing with the 's. I would use

Āleph, and leave the rest as plain text content of the . Generally, I use for the items BDB has in bold or italics, that seem to qualify as definitions. The אֿ is good. Once the entry has been edited, you can also update the status: base: for basic glosses; ref: for entries where the scripture references are included; done: for complete entries (as in this case). Thanks for helping. This will make a big difference. David On 1/21/2012 2:33 PM, Daniel Owens wrote: > I added a definition to entry "a1," but I was not sure this is how you want to go about adding definitions. > > You can merge this Pull Request by running: > > git pull https://github.com/dowens76/HebrewLexicon master > > Or you can view, comment on it, or merge it online at: > > https://github.com/openscriptures/HebrewLexicon/pull/1 > > -- Commit Summary -- > - Added definition to a1 > > -- File Changes -- > > M HebrewMesh.xml (3) > > -- Patch Links -- > > https://github.com/openscriptures/HebrewLexicon/pull/1.patch > https://github.com/openscriptures/HebrewLexicon/pull/1.diff > > --- > > Reply to this email directly or view it on GitHub: > https://github.com/openscriptures/HebrewLexicon/pull/1
dowens76 commented 12 years ago

Thanks, that helps clarify things.

On 01/21/2012 04:53 PM, David Troidl wrote:

Daniel,

The existing can be expanded to include all the content, rather than repeating it.

I wouldn't bother with the at all. (Those are for Strong's.)

I'm generally more sparing with the's. I would use

Āleph, and leave the rest as plain text content of the . Generally, I use for the items BDB has in bold or italics, that seem to qualify as definitions. Theאֿ is good. Once the entry has been edited, you can also update the status: base: for basic glosses; ref: for entries where the scripture references are included; done: for complete entries (as in this case). Thanks for helping. This will make a big difference. David On 1/21/2012 2:33 PM, Daniel Owens wrote: > I added a definition to entry "a1," but I was not sure this is how you want to go about adding definitions. > > You can merge this Pull Request by running: > > ``` > git pull https://github.com/dowens76/HebrewLexicon master > ``` > > Or you can view, comment on it, or merge it online at: > > ``` > https://github.com/openscriptures/HebrewLexicon/pull/1 > ``` > > -- Commit Summary -- > - Added definition to a1 > > -- File Changes -- > > M HebrewMesh.xml (3) > > -- Patch Links -- > > ``` > https://github.com/openscriptures/HebrewLexicon/pull/1.patch > https://github.com/openscriptures/HebrewLexicon/pull/1.diff > ``` > > --- > > Reply to this email directly or view it on GitHub: > > ## https://github.com/openscriptures/HebrewLexicon/pull/1 > > Reply to this email directly or view it on GitHub: > https://github.com/openscriptures/HebrewLexicon/pull/1#issuecomment-3599624
dowens76 commented 12 years ago

I edited a1 as you suggest and added more definitions. If you are satisfied with what I am doing, you can pull this into master.

DavidTroidl commented 12 years ago

The entry looks fine. Git says, 'This pull request cannot be automatically merged.' It gives instructions for a manual merge, but I'm not on my desktop, where my local repository is. I could probably try it tomorrow.

On 2/3/2012 3:40 PM, Daniel Owens wrote:

I edited a1 as you suggest and added more definitions. If you are satisfied with what I am doing, you can pull this into master.

Reply to this email directly or view it on GitHub: https://github.com/openscriptures/HebrewLexicon/pull/1#issuecomment-3804030

DavidTroidl commented 12 years ago

Daniel,

I tried the pull request this morning, following the instructions. I'm getting an error: error setting certificate verify location: CAfile: bin/curl-ca-bundle.crt CApath: none while accessing https://github.com/dowens76/HebrewLexicon.git/info/refs fatal: HTTP request failed

I have no idea what this means, or how to fix it. If you do, let me know. Otherwise, maybe you could save the entries you changed, get a fresh copy of the master in your branch, then paste them back in.
Hopefully this would allow an automatic pull. Failing that, we could develop some workaround.

David

On 2/3/2012 3:40 PM, Daniel Owens wrote:

I edited a1 as you suggest and added more definitions. If you are satisfied with what I am doing, you can pull this into master.

Reply to this email directly or view it on GitHub: https://github.com/openscriptures/HebrewLexicon/pull/1#issuecomment-3804030

dowens76 commented 12 years ago

Hmmm, I am not sure about that, but I am not a git expert. I could manually add them to master if you gave me permission to edit it.

Daniel

On 02/04/2012 06:46 AM, David Troidl wrote:

Daniel,

I tried the pull request this morning, following the instructions. I'm getting an error: error setting certificate verify location: CAfile: bin/curl-ca-bundle.crt CApath: none while accessing https://github.com/dowens76/HebrewLexicon.git/info/refs fatal: HTTP request failed

I have no idea what this means, or how to fix it. If you do, let me know. Otherwise, maybe you could save the entries you changed, get a fresh copy of the master in your branch, then paste them back in. Hopefully this would allow an automatic pull. Failing that, we could develop some workaround.

David

On 2/3/2012 3:40 PM, Daniel Owens wrote:

I edited a1 as you suggest and added more definitions. If you are satisfied with what I am doing, you can pull this into master.

Reply to this email directly or view it on GitHub:

https://github.com/openscriptures/HebrewLexicon/pull/1#issuecomment-3804030

Reply to this email directly or view it on GitHub: https://github.com/openscriptures/HebrewLexicon/pull/1#issuecomment-3810040

dowens76 commented 12 years ago

Let me try the option you mention below of getting a fresh copy in my branch. I will let you know how it goes.

On 02/04/2012 06:46 AM, David Troidl wrote:

Daniel,

I tried the pull request this morning, following the instructions. I'm getting an error: error setting certificate verify location: CAfile: bin/curl-ca-bundle.crt CApath: none while accessing https://github.com/dowens76/HebrewLexicon.git/info/refs fatal: HTTP request failed

I have no idea what this means, or how to fix it. If you do, let me know. Otherwise, maybe you could save the entries you changed, get a fresh copy of the master in your branch, then paste them back in. Hopefully this would allow an automatic pull. Failing that, we could develop some workaround.

David

On 2/3/2012 3:40 PM, Daniel Owens wrote:

I edited a1 as you suggest and added more definitions. If you are satisfied with what I am doing, you can pull this into master.

Reply to this email directly or view it on GitHub:

https://github.com/openscriptures/HebrewLexicon/pull/1#issuecomment-3804030

Reply to this email directly or view it on GitHub: https://github.com/openscriptures/HebrewLexicon/pull/1#issuecomment-3810040