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

Update Chinese docs #1289

Merged
merged 12 commits into from Oct 1, 2018

Conversation

Projects
None yet
2 participants
@CodeingBoy
Copy link
Contributor

commented May 26, 2018

After #1140 , I realized there's still a lot of docs improvement can be done. So I planned going through the whole MyBatis documentation and modify poorly-written sentences. Now I have accomplished a set of changes, which contains changes of:

  • Index
  • Getting started
  • Configuration
  • Mapper XML

The rest of work may take several months. Since I don't have much spare time, I'd like to commit them now. Feel free to merge. :)

CodeingBoy added some commits Apr 19, 2018

Merge pull request #2 from mybatis/master
Update from upstream
@harawata

This comment has been minimized.

Copy link
Member

commented Sep 30, 2018

Thanks a lot for your hard work, @CodeingBoy !
Unfortunately, there are a few minor conflicts.
Could you resolve them and update this PR, by any chance?

@CodeingBoy

This comment has been minimized.

Copy link
Contributor Author

commented Oct 1, 2018

Conflicts resolved. I'm going to build these docs again, making sure they are not corrupted.
Note that I have reverted changes from #1359, which is not correct.

@CodeingBoy CodeingBoy referenced this pull request Oct 1, 2018

Merged

"意于"->"易于" #1359

@CodeingBoy

This comment has been minimized.

Copy link
Contributor Author

commented Oct 1, 2018

Please don't merge this PR as I'm working on several changes.

@harawata

This comment has been minimized.

Copy link
Member

commented Oct 1, 2018

Okay. Please let us know when it's ready.
Thank you for your work!

@CodeingBoy

This comment has been minimized.

Copy link
Contributor Author

commented Oct 1, 2018

Hello @harawata, changes were committed. You can merge them now. :)

@harawata harawata merged commit 48e42b9 into mybatis:master Oct 1, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@harawata

This comment has been minimized.

Copy link
Member

commented Oct 1, 2018

Thank you both for your work, @CodeingBoy and @fanofxiaofeng !

And I'm sorry about the conflict. It should not have happened.

@CodeingBoy

This comment has been minimized.

Copy link
Contributor Author

commented Oct 1, 2018

That's OK, don't worry. :) I'm very appreciate your effort for maintaining this project.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.