Fixed several typos [Guide] [English]

[Bux666]

I read the complete Definitive Guide to Yii [English] and noted all typos. I fixed most of them, since some can't be fixed due to the PDF generation tool. I created an issue for that.
Some typos might be corrected in the meantime, since it took me a week between correcting and commiting.

[qiangxue]

Any idea why the diff result shows change of entire paragraphs?

[samdark]

CRLF possibly. @Bux666 can't merge it since unable to review changes. Can you fix your commit?

[Bux666]

I have no idea. It might be a CRLF problem, since I edited the files under Windows with phpDesigner. File format is set to Unix, though.
Any idea how to fix this? I'm a total noob with GitHub...

[Bux666]

Now I see the huge differences, which is weird since last week (yes, it took me some time to get GitHub working...) the changes where just what I changed. Nothing more, nothing less.
Here goes my first try to help with an Open Source project...damn!

[cebe]

@Bux666 https://help.github.com/articles/dealing-with-line-endings This is mostly a windows problem.

[cebe]

@qiangxue @samdark @mdomba you can add ?w=0 to a diff page to show diff by ignoring whitespace.
Of course it is not good for merge then but you are able to see the real changes.
https://github.com/yiisoft/yii/pull/1472/files?w=0

[qiangxue]

@cebe thanks for the pointer. It's good to know. Still, I think the line ending problem should be fixed before we merge it.

[cebe]

@qiangxue sure should be fixed before merge, thats what I wanted to say with Of course it is not good for merge.
There should also be a new pull request, closing this one.

@Bux666 please try again and open a new pull request.
If you encounter any problems, feel free to ask :)

[Bux666]

Hi Carsten,

Since I'm a total GitHub noob and have the Windows version, I'm not sure
I can use all that command line options.

If you can help me with this problem, I will be very grateful! Now I
don't know what to do. Roll back to before I edited anything (sort of
massive undo)?
How can I get rid of the CRLF problem?

Regards, Benoit (Bux666)

On 26-09-2012 18:10, Carsten Brandt wrote:

@qiangxue https://github.com/qiangxue sure should be fixed before
merge, thats what I wanted to say with |Of course it is not good for
merge|.
There should also be a new pull request, closing this one.

@Bux666 https://github.com/Bux666 please try again and open a new
pull request.
If you encounter any problems, feel free to ask :)

---

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

[cebe]

@Bux666 you can solve the crlf issue as described here; https://help.github.com/articles/dealing-with-line-endings

When you have done that run

git reset --soft HEAD^
git reset HEAD .

To undo the commit you made but keep the changes.
Run the following to reset your master branch:

git push origin master --force

You should go onto a branch to allow your master branch to be used for further pull requests later:

git checkout -b guide-typos

When you now commit it should be all fine with line endings.
After that you can do

git push origin guide-typos

And you can now create a new pull request from that branch

[Bux666]

Carsten, thank you very much for your really useful help!
I followed all the instructions below and wonder how I can 'create a new
pull request from that branch'... Should I do that via the GitHub
website or from the command line in the GitHub for Windows tool?

I don't want to mess it up again, you see...

Kind regards, Benoit (Bux666)

On 27-09-2012 12:14, Carsten Brandt wrote:

@Bux666 https://github.com/Bux666 you can solve the crlf issue as
described here;
https://help.github.com/articles/dealing-with-line-endings

When you have done that run

git reset --soft HEAD^
git reset HEAD .

To undo the commit you made but keep the changes.
Run the following to reset your master branch:

git push origin master --force

You should go onto a branch to allow your master branch to be used for
further pull requests later:

git checkout -b guide-typos

When you now commit it should be all fine with line endings

git push origin guide-typos

And you can now create a new pull request from that branch

---

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

[Bux666]

When I click the 'Pull Request' button on the frontpage off the GitHub site I get the message "Oops! yiisoft:master is already up-to-date with Bux666:master Try a different branch?".
See http://i50.tinypic.com/34xrx1z.jpg and http://i47.tinypic.com/fvzlmu.jpg. This is the case with both head branches (master and guide-typos).

So...what next? :(

[resurtm]

@Bux666, make sure you've pushed your local changes (commits) to the proper branch of your remote (origin) fork. I've looked to your fork—there are no your commits.

[Bux666]

As fas as I know I've pushed my changes, entering the required 'title' and entering some optional text. I see my changes on GitHub, but I have really no idea what to do now.
There are 2 branches, one created by entering the commands shown above I suppose (git checkout -b guide-typos)?

Is it really that difficult to use GitHub or am I just the idiot here...? I'm trying for 2 weeks to insert approximately 20 lines of changes. I lose quite some time with this, since I have no one here locally to instruct me.
Is it possible that someone takes over my PC or anything? That might be a solution...

Sorry about my frustration, but as a software engineer I have worked with ClearCase/ClearQuest and Subversion and it always was quite easy. Now I'm stuck in a web of total ignorance (from my side!). :(

All the help provided so far is greatly appreciated by the way!

[Bux666]

And it seems that everything worked out how it should. Apparently some things take a while (~30 minutes) before they are processed by the GitHub system and are visible on the website.
I will be more patient next time, now I know things may take some time to get through the system.

Thanks everybody for helping me, I surely learnt a lot and will delete my negative thoughts about GitHub haha.

[cebe]

commit != push

you need to commit AND push after that

git push origin guide-typos

[Bux666]

So far I know:
commit == staging your changes
push == pushing your staged commits to the repository
Please let me know if I'm right!

I entered the command you sended and it says "Everything up-to-date".
On the website I saw mine changes also in the list on the right, so I
suppose I managed to get it working.

I read a small manual about Git, but I like to use the command line
more. I will look for information about it.
Unfortunately I have very little time the comming 3 months because of a
project. After that, I will read the necessary information.

On 27-09-2012 15:14, Carsten Brandt wrote:

commit != push

you need to commit AND push after that

|git push origin guide-typos
|

---

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

[cebe]

@Bux666 your commit is not there: https://github.com/Bux666/yii/commits/guide-typos

try

git status
git log

to check situation

[Bux666]

That gives the following:

######__##################
$ git status

On branch master

nothing to commit (working directory clean)

$ git log
commit 8bcb2f4
Author: Bux666 github@buxolutions.com
Date: Thu Sep 27 14:33:25 2012 +0200

 Typos corrected [Guide] {English]

 Typos corrected in the English version of the Definitive Guide

commit 60154d5
Author: Alexander Makarov sam@rmcreative.ru
Date: Tue Sep 25 02:11:51 2012 +0400

 Refactored CHttpRequest a bit

commit c8aa982
Author: Alexander Makarov sam@rmcreative.ru
Date: Tue Sep 25 01:53:41 2012 +0400

 Fixes #1443: Added CHttpRequest::getRawBody() that allows reading 

RAW HTTP r

commit 5036829
Merge: 808f434 7595a0c
Author: Alexander Makarov sam@rmcreative.ru
Date: Mon Sep 24 14:35:13 2012 -0700

...
######__##################**

Nothing to commit, so everything is OK?
Why do I see all kind of other changes, as mine changes are solely
documentation based?

On 27-09-2012 15:45, Carsten Brandt wrote:

@Bux666 https://github.com/Bux666 your commit is not there:
https://github.com/Bux666/yii/commits/guide-typos

try

|git status
git log
|

to check situation

---

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