This is from the Jerusalem Bible:
John 4:1 When Jesus heard that the Pharisees had found out that he was making and baptizing more disciples than John though in fact it was his disciples who baptized, not Jesus himself he left Judaea and went back to Galilee.
John’s baptism was for the showing of one who repented of their sins first and then symbolized of actual water that they were made clean again. It was not for the receiving Jesus or the Holy Spirit as Jesus ministry hadn’t started yet and the Holy Spirit was given on the day of Pentecost in the upper room. When Jesus was baptized of John it was to fulfill Gods righteousness in Him to receive Gods power and authority to start His ministry here on earth. Water baptism is an outward appearance to others that you have been made righteous through Christ and have receive the Holy Spirit as we are given Gods power and authority through His grace to be His servants and witness here on Earth as Christ was.
Mat 3:14 But John forbade him, saying, I have need to be baptized of thee, and comest thou to me?
Mat 3:15 And Jesus answering said unto him, suffer it to be so now: for thus it becometh us to fulfill all righteousness. Then he suffered him.
Mark 10:39; 16:15,16; Acts 2:38 It is Gods Spirit that was in Christ and which we are now baptized or have received as the disciples did on the day of Pentecost as when Jesus ascended into Heaven the Holy Spirit came down and fell on those who received Jesus and his word. The baptism that Jesus and Peter was talking about was a Spiritual rebirth through Gods word, not water, Luke 3:16, as Peter taught it was through repentance and accepting Jesus and his teachings is when we receive the Holy Spirit.
This is what Smith's Bible dictionary says:
To be baptized for Christ shows an intention to become a true follower of Christ. John baptized with water unto repentance but as a sign of it, perhaps only a sign of their willingness to enroll themselves among John’s followers. Jesus himself did not baptize with water, but with the Spirit and Christian baptism was only instituted after the resurrection when the Lord gave the commission to his apostles to go into all the world and preach the gospel to every creature.
Act 10:47 Can any man forbid water, that these should not be baptized, which have received the Holy Ghost as well as we?
This verse shows that these men had already received the Holy Spirit, but wanted to be baptized in water also as followers of Christ. So I believe both verses in Acts to be water, but not for the receiving of the Holy Spirit, but an outward appearance to others that they have repented and received the Holy Spirit already.