.merge+ 1246

Added

if you tell me which file to modify to try to fix this issue, maybe I do it today: monero-project/monero-site #941

the site runs locally already

What I do when I don't know these things is grep for a similar thing and see where it is. If you want to add a FAQ, grep for an existing one.

well, grep in the github clone?

Where else.

Indeed, there is a match in the file "_i18n/en.yml"...

There is a § about it in the Faq, do you know why the issue is still open?

Anyway I modified this file instead but it's in the .gitignore file: _site/resources/user-guides/verification-windows-beginner.html

do you know where I can find the modifiable version?

found: _i18n/en/resources/user-guides/verification-windows-beginner.md

The file Gemfile.lock is in my 'git status', can I commit it?

git log Gemfile.lock will show you whether others before did so.

The name screams "I should not be in git" but I remember a lock file related to gem being a text file, because why not do things annoyingly.

Others did so... For today, I resisted to the 'git add -a' temptation

pushed, if you want to check it?

Make a PR, and people with a clue about how the site works will :)

Good call about not running add -a btw :)

you were sort of screaming "don't add Gemfile.lock", hehe...

seriously, I don't know how to make a PR but GitHub must have a link somewhere

I'm not sure it should be added. I was just saying the ".lock" in name normally strongly hints not to, but the "Gem" in the name hints it might need to. Hence looking at git log to see.

Pull request emited. As I'm doing this from work, this is for today... Thank you for your help, maybe Monday I'll do another small change

the .lock file shouldn't be touched indeed.

it's there to make sure people don't have not compatible dependencies installed

"the Gemfile.lock makes your application a single package of both your own code and the third-party code it ran the last time you know for sure that everything worked"

thomasb06: btw on the readme there are instructions step by step for everything. Including editing user guides

wait you wanted to edit a faq. That's even easier

I actually have to update the part of the readme related to the FAQ, now it's easier than it used to be. But basically just take a look at the other entries and copy that structure

ErCiccione apologies for not finding, but where is the step-by-step guide?

About user guides: github.com/monero-project/monero-site#how-to-make-a-user-guide

also, I didn't particularly wanted to update the Faq but to close issue

*issues

wow, I'm not there yet

I have to update the instructions for the FAQ

that's appreciated tho, adding a faq should be quite straightforward. Take a look at other PRs doing the same thing to get an idea

like monero-project/monero-site #1163

the files in _18n/ seem to be in the .gitignore, aren't they?

They are not. The _site folder is in .gitignore

understood

because that's the built website. You need to work on the source files

btw, this issue 941 seems to be closed but is still in the list: monero-project/monero-site #941

There is an entry in the Faq but the issue is still there

The issue is till open. Where od you see the entry in the FAQ?

about the issue 1025, being under linux, I can redo the screenshots. Do I add two files by GIMP'ing the old ones?

This § doesn't answers the issue: web.getmonero.org/get-started/faq/#anchor-buy ?

There is a PR already open for that. You see it linked in the issue itself.

They are quite similar, yes. The already existent entry is not specific to xmr -> fiat. But yeah, seems unnecessary to have both

GitHub is to new for me... This is the PR for the issue: monero-project/monero-site #944 ?

understood

wait i wrote it in the body of the issue itself:

"This question gets asked like 3 times a week on /r/monero. Worth making a dedicated answer or maybe we should just improve How can i get Monero? to include more info for the conversion from fiat. A mention to how to convert BTC -> XMR is probably good to have, since that's another very common question."

So the explanation is the Faq is not complete, this time I got it

What would you like to add, maybe I can do it on Monday? Do you have an answer on r/morero I can almost copy-paste?

I don't know, i haven't thought about it. I think even just a short faq linking to the other one ("how can i get monero?") would be ok

Maybe I'll do this next, let me bookmark your links

to summarize, I need to add a "qimporting:" and a "aimporting:" ?

To do what? and where?

the file I need to add a fiat answer is _18n/en.yml

all I need to do is add a "q21: How can I get Monero from fiat?" and a "a21: You can..."

well, I'm modifying it right now... What would be your answer, from an exchange, for example cex.io but the fees are really high or p2p: localmonero.com, hudlhudl.com, ...

?

It's not only that. See the link i sent you above to PR 1163. And please avoid using numbers in the tml key. Better a short and clear word (for example qxmrfiat axmrfiat or something like that)

Better to not link to specific exchnages, we have a list in the merchants page

ErCiccione the command "git add _i18n/en.yml" doesn't produce any effect. Do you have an idea about I could have broken? It workd this

it worked this afternoon..

It's a noop if the file is unchanged.

Is it unchanged ?

Yes, I added a few lines: qxmrfiat: How can I get Monero from fiat?

well, it is changed

Arg, it's on GitHub already... Now I pull-request it

It seems GitHub is considering both modifications I made today a single PR: monero-project/monero-site #1248

The entry in the Faq is made though: "axmrfiat: You can buy Monero from an institutional exchange but the fees can be very high. Also, you can buy XMR from local exchanges, i.e. peer-2-peer transaction sites, but beware of scammers as usual..."

moneromooo is it ok for you?

You probably pushed to the same branch. If you have two changes you want to kepe separate, make both of these changes on separate branches.

wow, I don't know how to do this

git checkout master; git branch pr1; git checkout pr1; edit files; git add somefile1 somefile2; git commit; git push origin pr1; git checkout master

thomasb06: beside that, you are still changing only one file, but that's not the only thing needed to add a FAQ entry. see how monero-project/monero-site #1163 changes 2 files

Them same with pr2.

moneromooo many thanks

ErCiccione the second file is "s/syncronize/synchronize/" ?

you have to edit _i18n/en.yml and get-started/faq/index.md

ErCiccione well, I really don't see any "get-started/faq/index.md" in the PR 1163

found

"Files changed 2", indeed...

Pushed, this is it?

you still used master. You have to remove th changes you made to the verification-windows-beginner.md file and change name of the commit and title of the PR

Hello. How can I fix this PR: monero-project/monero-site #1248

Maybe I can delete it?

thomasb06: did you want to just keep your 2 most recent commits?

Apparently the first one is not necessary anymore. But if I cancel it, I would also need to change the name of the PR?

Say yes, how to keep only the last two..

there's an edit button on the github webpage to change the title of your PR, as for the commits, you should be able to type `git rebase -i HEAD~4`, and then change `pick` to `drop` in front of the commits you want to get rid of

and then `git push --force`

Thanks

Can it all be done from GitHub?

not that I know of :(

Do this sound fit: stackoverflow.com/questions/3616883…-remove-commits-from-a-pull-request

?

you don't want to do what the first answer suggests (git revert) because this will create even more commits. it would be best if you did what the second answer describes (git rebase interactive and drop)

As I'm not on the computer that has the clone, the best is to wait... Thank you

By the way, how do you "replace picx with drop"?

For the moment, I don't know what it means...

It's answered in the comments, never mind

when you run that command, it opens up your editor and you'll get a line that says something like "pick <commit hash> <commit message>"

Indeed, this is what Slim answered too

Cheers, good week-end

:) happy weekend to you too

.fork

Whoops.

oh fork