Merge pull request #15 from diffplug/fix/404s

Fix a few bad links

Author: WebsByTodd

next/src/pages/branches/save-for-later.mdx

@@ -10,7 +10,7 @@ It's common to make some changes in your working copy that end up looking like a
 	source="/branches/save-for-later/save-for-later.mp4"
 />
 
-*Images by Mr. Gray, Morio, Terri Monahan, Rama, and Gmhofmann under various CCSA licenses, see [here for full credits](https://github.com/diffplug/gitfromscratch/blob/master/manuscript/branches/save-for-later/licenses.md).*
+*Images by Mr. Gray, Morio, Terri Monahan, Rama, and Gmhofmann under various CCSA licenses, see [here for full credits](https://github.com/diffplug/gitfromscratch/blob/main/next/src/pages/branches/licenses.md).*
 
 {/*
 Set git user to "Eastman Kodak".
@@ -82,4 +82,4 @@ This gives you a fresh start, but you still have easy access to your work-in-pro
 
 *Hint 2: If you're an experienced git user who already uses the "git stash" command, see the [departures from vanilla git](/epilogue/departures) section for more info.*
 
-There *is* a chance that `Apply delta` will fail. That's okay, you'll still have both versions available, and you can manually copy-paste the work back over. We'll go into the details of when and how this fails in the [time-travel section](/time-travel/time-travel). But first, let's talk about [sharing your work with others](/share/share).
+There *is* a chance that `Apply delta` will fail. That's okay, you'll still have both versions available, and you can manually copy-paste the work back over. We'll go into the details of when and how this fails in the [time-travel section](/time-travel). But first, let's talk about [sharing your work with others](/share).

next/src/pages/index.mdx

@@ -18,4 +18,4 @@ There are lots of tutorials on how to get started with git.  There are two thing
 
 So, once you have [downloaded DiffPlug](http://www.diffplug.com/versions/latest), let's begin.  If you get stuck, you can ask for help in our [live chatroom](https://gitter.im/diffplug/gitfromscratch).  The source which generates this book is [available on GitHub](https://github.com/diffplug/gitfromscratch), so you can subcribe to updates or branch and modify it.
 
-With all that out of the way, let's [get started](intro/how-to-use-git)!
+With all that out of the way, let's [get started](intro)!

next/src/pages/share.mdx

@@ -2,8 +2,8 @@
 
 Git is a powerful way to track the history of your files, but it's an even more powerful way to share and collaborate on files.
 
-In this section, we'll show you how to share commits with other repositories. First, we'll show you how to [establish a connection](remotes/remotes.md) with a remote repository, and download everything it has to offer. Next we'll show you how to [collaborate on a fixed target (tags)](tags/tags.md) and then on a [moving target (branches)](branches/branches.md).
+In this section, we'll show you how to share commits with other repositories. First, we'll show you how to [establish a connection](/share/remotes) with a remote repository, and download everything it has to offer. Next we'll show you how to [collaborate on a fixed target (tags)](/share/tags) and then on a [moving target (branches)](/share/branches).
 
-After playing around with sharing, you're going to quickly encounter the situation where you've done some work, but someone else has published a new version in the meantime. This sets you up perfectly for the next section, where we'll show you how you can [move your work](../time-travel/time-travel.md) onto the latest version.
+After playing around with sharing, you're going to quickly encounter the situation where you've done some work, but someone else has published a new version in the meantime. This sets you up perfectly for the next section, where we'll show you how you can [move your work](/time-travel) onto the latest version.
 
-So, without further ado, let's [establish a connection](remotes/remotes.md).
+So, without further ado, let's [establish a connection](/share/remotes).

next/src/pages/share/branches.mdx

@@ -4,7 +4,7 @@ import { Video } from '@/components/Video/Video'
 
 # Collaborate on a moving target
 
-In [an earlier section](/branches) we discussed what a branch actually was - a name that points to a commit. When synchronizing with teammates, it is important to also remember the intent behind publishing a branch. **The purpose of publishing a branch is to synchronize and integrate work around a specific objective**. You can use your own convention, but the following are common:
+In [an earlier section](/branches/sticky-notes-and-paintbrushes) we discussed what a branch actually was - a name that points to a commit. When synchronizing with teammates, it is important to also remember the intent behind publishing a branch. **The purpose of publishing a branch is to synchronize and integrate work around a specific objective**. You can use your own convention, but the following are common:
 
 - **master** holds the latest working version of the integrated project
 - **feature/<feature name>** holds the work-in-progress towards a specific feature

next/src/pages/share/tags.mdx

@@ -23,4 +23,4 @@ The only way to move a tag is to delete it and create a new tag with the same na
 
 Tags are intended to mark a permanent spot in time, so there isn't a good mechanism for moving them. If you upload a tag, then delete it and upload the same tag in a different spot, it's very likely that some people in your team will have the tag in the first place, while others will have it in the second place.
 
-Now that we can share a fixed snapshot, we'll look at [collaborating on a moving target](/branches).
+Now that we can share a fixed snapshot, we'll look at [collaborating on a moving target](/share/branches).

next/src/pages/time-travel/patch.mdx

@@ -204,4 +204,4 @@ Great!  In fact, this is exactly how conventional "diff/patch" works, although c
 
 We've already outlined how zip files could be patched, but what about other kinds of file?  Stay tuned to DiffPlug for upcoming announcements!
 
-So far, we've used patches to solve a problem we encountered while merging.  Unsurprisingly, the ability to automatically redo work is useful [for a lot more than just merging](../cherry-pick-and-rebase/cherry-pick-and-rebase.md).
+So far, we've used patches to solve a problem we encountered while merging.  Unsurprisingly, the ability to automatically redo work is useful [for a lot more than just merging](/time-travel/cherry-pick-and-rebase).