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

Convert some markdown to HTML #5978

Merged
merged 2 commits into from
Dec 12, 2016
Merged

Convert some markdown to HTML #5978

merged 2 commits into from
Dec 12, 2016

Conversation

richadr
Copy link
Contributor

@richadr richadr commented Nov 2, 2016

It is in a Markdown file, but inside a <table>, so it needs to be written as HTML, not as Markdown, in order to render properly.

@googlebot
Copy link

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed, please reply here (e.g. I signed it!) and we'll verify. Thanks.


  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If you signed the CLA as a corporation, please let us know the company's name.

@richadr
Copy link
Contributor Author

richadr commented Nov 2, 2016

I signed it

@googlebot
Copy link

CLAs look good, thanks!

@jridgewell
Copy link
Contributor

/to @bpaduch

@@ -168,11 +168,11 @@ HTML tags can be used unchanged in AMP HTML. Certain tags have equivalent custom
</tr>
<tr>
<td width="30%">form</td>
<td>Allowed. Require including [amp-form extension](../extensions/amp-form/amp-form.md).</td>
<td>Allowed. Require including <a href="../extensions/amp-form/amp-form.md">amp-form extension</a>.</td>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of a relative url (due to main doc site import process), replace with this link: https://github.com/ampproject/amphtml/blob/master/extensions/amp-form/amp-form.md

</tr>
<tr>
<td width="30%">input elements</td>
<td>Mostly Allowed with [exception of some input types](../extensions/amp-form/amp-form.md#inputs), namely, `input[type=image]`, `input[type=button]`, `input[type=password]`, `input[type=file]` are invalid. Related tags are also allowed: `fieldset`, `label`</td>
<td>Mostly Allowed with <a href="../extensions/amp-form/amp-form.md#inputs">exception of some input types</a>, namely, <code>&lt;input[type=image]&gt;</code>, <code>&lt;input[type=button]&gt;</code>, <code>&lt;input[type=password]&gt;</code>, <code>&lt;input[type=file]&gt;</code> are invalid. Related tags are also allowed: <code>&lt;fieldset&gt;</code>, <code>&lt;label&gt;</code></td>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fixes! Please change the URLs per my comments and it'll be good to go.

@ghost
Copy link

ghost commented Nov 24, 2016

@richadr - Do you want to implement the fixes, or shall I correct the doc?

richadr and others added 2 commits December 8, 2016 18:34
It is in a Markdown file, but inside a `<table>`, so it needs to be written as HTML, not as Markdown, in order to render properly.
@richadr
Copy link
Contributor Author

richadr commented Dec 8, 2016

@bpaduch - Apologies for the delay, the fixes are implemented now. I did a rebase and everything looks good.

@jridgewell jridgewell merged commit cd02523 into ampproject:master Dec 12, 2016
Lith pushed a commit to Lith/amphtml that referenced this pull request Dec 22, 2016
* Convert some markdown to HTML

It is in a Markdown file, but inside a `<table>`, so it needs to be written as HTML, not as Markdown, in order to render properly.

* Replace relative URL with absolute URL (needed because of main doc site import process)
Lith pushed a commit to Lith/amphtml that referenced this pull request Dec 22, 2016
* Convert some markdown to HTML

It is in a Markdown file, but inside a `<table>`, so it needs to be written as HTML, not as Markdown, in order to render properly.

* Replace relative URL with absolute URL (needed because of main doc site import process)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants