Skip to content

Conversation

@jodyhagins
Copy link
Contributor

…source-code blocks

This makes the feature in #555 configurable via the settings. Some people may want the old behavior. Thus, I made the default act like it did before (though #535 is similar but is explicitly for backticks), and you must opt-in to get the new behavior.

I can change the default easily enough, if so desired.

With this change, you specify the markers you want to be recognized as part of the settings.

If merged, I can go edit the github wiki and add an explanation for this setting.

@tomaz
Copy link
Owner

tomaz commented Feb 25, 2016

Thanks! For some reason, I totally managed to miss this pull request, sorry...

Looks good, can you rebase on top of current master, then I'll merge.

And if you'd like to contribute to next major version, let me know and I can add you to the team: http://www.gentlebytes.com/blog/2015/11/02/appledoc-contributors-needed/

@Coeur
Copy link
Collaborator

Coeur commented Apr 26, 2016

@tomaz, if @jodyhagins is not doing it, would you like me to solve the conflicts and merge (without rebase)?

@jodyhagins
Copy link
Contributor Author

Sorry, Tomaz.

My wife’s cancer came back in January, and since then she has had gamma-knife surgery for a tumor in her brain, and started on an intense treatment that has left her pretty sick (just released from hospital Saturday after a two-week stint). We’ve only had a couple of weeks since where we have not been dealing with some medical situation.

I either missed this email, or immediately forgot about it.

Anyway, I just saw it when an email showed up today from Antoine.

If Antoine wants to merge it, I’m fine with that… or I can do it. It might be good for me to play with appledoc a bit to get my mind off of her sickness and the pressure of actual work stuff.

I will try to set aside some time this weekend to look at it.

Also, I will consider your offer. At this moment, I don’t know how much I can do, but as she gets better, it may be a fun proposition.

Thanks.

On Feb 25, 2016, at 2:19 AM, tomaz notifications@github.com wrote:

Thanks! For some reason, I totally managed to miss this pull request, sorry...

Looks good, can you rebase on top of current master, then I'll merge.

And if you'd like to contribute to next major version, let me know and I can add you to the team: http://www.gentlebytes.com/blog/2015/11/02/appledoc-contributors-needed/ http://www.gentlebytes.com/blog/2015/11/02/appledoc-contributors-needed/

Reply to this email directly or view it on GitHub #558 (comment).

@Coeur
Copy link
Collaborator

Coeur commented Apr 26, 2016

Hi Jody,

I'm one of the new collaborators of the project and I can tell there are many aspects of it to help for.

But private life always comes first, there should be no commitment to Github.Reading Wikipedia or practicing Swift could be fun and simple alternatives. I think coming weekend is a 3 days weekend, so you can probably figure out better things to do with your wife.

I will let you solve the merge conflict, there is no hurry.

@tomaz
Copy link
Owner

tomaz commented Apr 27, 2016

Sorry to hear that Jody! Take time for your wife, she needs you most at this point. Don't worry about it, the delay and merge conflicts it caused were my fault, as said I missed this PR (happenes during very busy months...)

@Coeur Sure, go ahead, rebase and merge this if you have the time, thanks!

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.

4 participants